Adds further migration results and moves generated tests in
This commit is contained in:
442 files changed
+17126
-246
No files matched your search
@@ -29,7 +29,7 @@ QPixmap getMinLimitIndicator()
|
||||
triangle << QPoint(10, 10);
|
||||
triangle << QPoint(4, 5);
|
||||
QPainter painter(&pixmap);
|
||||
painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||
painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform);
|
||||
painter.setPen(QGuiApplication::palette().color(QPalette::Text));
|
||||
painter.setBrush(QBrush(QGuiApplication::palette().color(QPalette::Text)));
|
||||
painter.drawLine(1, 0, 1, 10);
|
||||
@@ -47,7 +47,7 @@ QPixmap getMaxLimitIndicator()
|
||||
triangle << QPoint(0, 10);
|
||||
triangle << QPoint(6, 5);
|
||||
QPainter painter(&pixmap);
|
||||
painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||
painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform);
|
||||
painter.setPen(QGuiApplication::palette().color(QPalette::Text));
|
||||
painter.setBrush(QBrush(QGuiApplication::palette().color(QPalette::Text)));
|
||||
painter.drawLine(10, 0, 10, 10);
|
||||
@@ -355,7 +355,7 @@ void TimelineHeaderView::paintSection(QPainter* painter, const QRect& rect, int
|
||||
if (logicalIndex == Section::eActuator)
|
||||
{
|
||||
painter->save();
|
||||
painter->setRenderHints(QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
|
||||
painter->setRenderHints(QPainter::TextAntialiasing | QPainter::RenderHint::Antialiasing);
|
||||
painter->setPen(backgroundColor());
|
||||
painter->setBrush(QBrush(backgroundColor()));
|
||||
painter->drawRect(rect);
|
||||
@@ -373,7 +373,7 @@ void TimelineHeaderView::paintSection(QPainter* painter, const QRect& rect, int
|
||||
painter->setClipping(true);
|
||||
painter->setClipRect(rect);
|
||||
painter->setFont(m_font);
|
||||
painter->setRenderHints(QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
|
||||
painter->setRenderHints(QPainter::TextAntialiasing | QPainter::RenderHint::Antialiasing);
|
||||
painter->setPen(backgroundColor());
|
||||
painter->setBrush(backgroundColor());
|
||||
painter->drawRect(rect);
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace LtsTimeline
|
||||
|
||||
TimelineModel::TimelineModel(TimelineView *view, QObject *parent)
|
||||
: QAbstractItemModel(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineModel"))
|
||||
, m_view(view)
|
||||
.getNGLLogger("Timeline.TimelineModel"))
|
||||
{
|
||||
m_rootTrack.m_id = nextFreeTrackId();
|
||||
m_trackCache.insert(std::pair<int, Track*>(m_rootTrack.m_id, &m_rootTrack));
|
||||
|
||||
@@ -187,7 +187,6 @@ class LTSTIMELINE_EXPORT TimelineModel : public QAbstractItemModel
|
||||
}
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger& m_logger;
|
||||
|
||||
ItemPtrNCVRef _itemNCV(Track& track, int id) noexcept(false)
|
||||
{
|
||||
|
||||
@@ -25,12 +25,12 @@ const int TimelineView::s_textHeight = 20;
|
||||
|
||||
TimelineView::TimelineView(QWidget *parent)
|
||||
: QTreeView(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineView"))
|
||||
, m_header(new TimelineHeaderView(this))
|
||||
, m_dragHandler(new TimelineViewDragHandler(this))
|
||||
, m_resizeHandler(new TimelineViewResizeHandler(this))
|
||||
, m_selectHandler(new TimelineViewSelectHandler(this))
|
||||
, m_trackHandler(new TimelineViewTrackHandler(this))
|
||||
.getNGLLogger("Timeline.TimelineView"))
|
||||
{
|
||||
setAlternatingRowColors(true);
|
||||
setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||
@@ -378,13 +378,13 @@ void TimelineView::mouseDoubleClickEvent(QMouseEvent* event)
|
||||
|
||||
void TimelineView::mouseMoveEvent(QMouseEvent* event)
|
||||
{
|
||||
m_cursorPosition = event->pos();
|
||||
m_cursorPosition = event->position().toPoint();
|
||||
|
||||
const QModelIndex index(indexAt(event->pos()));
|
||||
const QModelIndex index(indexAt(event->position().toPoint()));
|
||||
|
||||
if (m_header)
|
||||
{
|
||||
m_header->setHoverPosition(isCursorWithinRange(event->pos()) ? event->pos().x() : -1);
|
||||
m_header->setHoverPosition(isCursorWithinRange(event->position().toPoint()) ? event->position().toPoint().x() : -1);
|
||||
if (m_header->mouseHandler()->isBusy())
|
||||
{
|
||||
m_header->mouseHandler()->mouseMoveEvent(event);
|
||||
@@ -440,10 +440,10 @@ void TimelineView::mouseMoveEvent(QMouseEvent* event)
|
||||
try
|
||||
{
|
||||
Track& track = m_timelineModel->track(index.data().toInt());
|
||||
Item& item = track.itemAt(toTime(event->pos().x()));
|
||||
Item& item = track.itemAt(toTime(event->position().toPoint().x()));
|
||||
int startPos = toPixel(item.startTime());
|
||||
int endPos = toPixel(item.startTime() + item.duration());
|
||||
if (endPos - startPos < 15 || (startPos + 5 < event->pos().x() && event->pos().x() < endPos - 5))
|
||||
if (endPos - startPos < 15 || (startPos + 5 < event->position().toPoint().x() && event->position().toPoint().x() < endPos - 5))
|
||||
setCursor(QCursor(Qt::ArrowCursor));
|
||||
else
|
||||
setCursor(QCursor(Qt::SizeHorCursor));
|
||||
@@ -466,7 +466,7 @@ void TimelineView::mousePressEvent(QMouseEvent* event)
|
||||
return;
|
||||
}
|
||||
|
||||
const QModelIndex index = indexAt(event->pos());
|
||||
const QModelIndex index = indexAt(event->position().toPoint());
|
||||
if (index.column() == Section::eActuator)
|
||||
{
|
||||
QTreeView::mousePressEvent(event);
|
||||
@@ -493,7 +493,7 @@ void TimelineView::mousePressEvent(QMouseEvent* event)
|
||||
}
|
||||
|
||||
if (event->button() == Qt::RightButton)
|
||||
emit customContextMenuRequested(event->pos());
|
||||
emit customContextMenuRequested(event->position().toPoint());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -556,7 +556,7 @@ void TimelineView::keyPressEvent(QKeyEvent* event)
|
||||
|
||||
void TimelineView::wheelEvent(QWheelEvent* event)
|
||||
{
|
||||
if (event->pos().y() <= m_header->geometry().bottom())
|
||||
if (event->position().toPoint().y() <= m_header->geometry().bottom())
|
||||
m_header->wheelEvent(event);
|
||||
else if (QGuiApplication::queryKeyboardModifiers() == Qt::ControlModifier)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace LtsTimeline
|
||||
TimelineWidget::TimelineWidget(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::Timeline)
|
||||
.getNGLLogger("Timeline.Widget"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineWidget"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->debugWidget->hide();
|
||||
|
||||
Reference in new issue
Block a user