Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+3
-4
@@ -10,15 +10,14 @@
|
||||
namespace LtsTimelineClassic
|
||||
{
|
||||
|
||||
AbstractTimelineModel::AbstractTimelineModel(QObject *parent)
|
||||
: QAbstractItemModel(parent)
|
||||
AbstractTimelineModel::AbstractTimelineModel(QObject *parent) : QAbstractItemModel(parent)
|
||||
.getNGLLogger("Timeline.AbstractTimelineModel"))
|
||||
, m_highestPositionedItem(0)
|
||||
, m_lowestPositionedItem(0)
|
||||
, m_getEventListsRecursive(true)
|
||||
, m_rootItem(new Item(QLatin1String("#mwille/r00t/")))
|
||||
, m_markersItem(new Item(tr("Markers"), QStringLiteral("Markers")))
|
||||
{
|
||||
, m_markersItem(new Item(tr("Markers"), QStringLiteral("Markers"))),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -45,6 +45,9 @@ public:
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
protected:
|
||||
|
||||
|
||||
|
||||
@@ -16,8 +16,7 @@ namespace LtsTimelineClassic
|
||||
Event::Event(int uniqueId, int typeId, qint64 startTime,
|
||||
qint64 endTime, int playerId, int partyId, int equipmentId, const QStringList &path,
|
||||
const EventPaintFunc &paintFunc, const QColor &paintColor, const QJsonObject &detailData, int subEventId,
|
||||
const LtsUtils::QPoint3D &pos, LtsSession::LtsSession *session)
|
||||
: m_path(path)
|
||||
const LtsUtils::QPoint3D &pos, LtsSession::LtsSession *session) : m_path(path)
|
||||
, m_detailData(detailData)
|
||||
, m_position(pos)
|
||||
, m_paintFunc(paintFunc)
|
||||
@@ -32,9 +31,8 @@ Event::Event(int uniqueId, int typeId, qint64 startTime,
|
||||
, m_partyId(partyId)
|
||||
, m_equipmentId(equipmentId)
|
||||
, m_deleted(false)
|
||||
, m_visible(true)
|
||||
|
||||
{
|
||||
, m_visible(true),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
checkDuration();
|
||||
}
|
||||
|
||||
|
||||
@@ -125,6 +125,9 @@ public:
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QStringList m_path;
|
||||
QJsonObject m_detailData;
|
||||
|
||||
|
||||
@@ -39,8 +39,7 @@
|
||||
namespace LtsTimelineClassic
|
||||
{
|
||||
|
||||
TimelineIndicator::TimelineIndicator(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
TimelineIndicator::TimelineIndicator(QWidget *parent) : QWidget(parent)
|
||||
, m_zoomFactorPoints(0)
|
||||
, m_pbZoom(new QPushButton(this))
|
||||
, m_pbUnzoom(new QPushButton(this))
|
||||
@@ -49,8 +48,8 @@ TimelineIndicator::TimelineIndicator(QWidget *parent)
|
||||
, m_currentTextWidth(0)
|
||||
, m_sectionPos(0)
|
||||
, m_sectionSize(0)
|
||||
.getNGLLogger("Timeline.Indicator"))
|
||||
{
|
||||
.getNGLLogger("Timeline.Indicator")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_timeArray.reserve(11 + 11 + 7 + 10);
|
||||
|
||||
m_timeArray <<
|
||||
@@ -380,7 +379,7 @@ void TimelineIndicator::refreshData()
|
||||
|
||||
if (steps > 60000 || steps < 1)
|
||||
{
|
||||
ERROR_LOG() << "More than 60000 ("<<steps<<") or less than 1 lines to draw. Loop will exit after 60000 lines.";
|
||||
ERROR_LOG(m_logger) << "More than 60000 ("<<steps<<") or less than 1 lines to draw. Loop will exit after 60000 lines.";
|
||||
}
|
||||
|
||||
if (steps < 1)
|
||||
@@ -474,7 +473,7 @@ void TimelineIndicator::paintEvent(QPaintEvent *)
|
||||
DTG::toStringMSec(time, DTG::Short));
|
||||
|
||||
#ifdef VERBOSE
|
||||
WARNING_LOG() << "paintEvent: actual drawing position: x=" << centeredPos << " y=" << textY;
|
||||
WARNING_LOG(m_logger) << "paintEvent: actual drawing position: x=" << centeredPos << " y=" << textY;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ private:
|
||||
protected:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void paintEvent(QPaintEvent *);
|
||||
|
||||
signals:
|
||||
|
||||
@@ -20,8 +20,7 @@
|
||||
namespace LtsTimelineClassic
|
||||
{
|
||||
|
||||
TimelineWidget::TimelineWidget(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
TimelineWidget::TimelineWidget(QWidget *parent) : QWidget(parent)
|
||||
.getNGLLogger("Timeline.Widget"))
|
||||
, m_timelineUi(new Ui::Timeline)
|
||||
, m_min(0)
|
||||
@@ -29,8 +28,8 @@ TimelineWidget::TimelineWidget(QWidget *parent)
|
||||
, m_sbPos(0)
|
||||
, m_zoomFactor(1)
|
||||
, m_headerView(new TimelineHeaderView)
|
||||
, m_model(nullptr)
|
||||
{
|
||||
, m_model(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_timelineUi->setupUi(this);
|
||||
m_timelineUi->view->setHeader(m_headerView);
|
||||
m_headerView->setMinimumSectionSize(150);
|
||||
@@ -99,7 +98,7 @@ void TimelineWidget::knownRangesChanged(const QVector<Range> &newRanges)
|
||||
EventDelegate *ed = qobject_cast<EventDelegate *>(m_timelineUi->view->itemDelegate());
|
||||
if (ed == nullptr)
|
||||
{
|
||||
WARNING_LOG() << "ed == nullptr";
|
||||
WARNING_LOG(m_logger) << "ed == nullptr";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ public:
|
||||
private:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void setTimelineRange(qint64 min, qint64 max);
|
||||
|
||||
void refreshData();
|
||||
|
||||
Reference in new issue
Block a user