Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+14
-14
@@ -112,12 +112,12 @@ SituationReplayEditor::SituationReplayEditor(
|
||||
|
||||
if ((*m_essentialsViewsSrpIfc) != nullptr)
|
||||
{
|
||||
WARNING_LOG() << "essentials view available - using srp replay control widget as editor!";
|
||||
WARNING_LOG(m_logger) << "essentials view available - using srp replay control widget as editor!";
|
||||
onAddReplayControlWidget();
|
||||
}
|
||||
else
|
||||
{
|
||||
WARNING_LOG() << "essentials view not available - using traditional editor";
|
||||
WARNING_LOG(m_logger) << "essentials view not available - using traditional editor";
|
||||
}
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("Script_Editor-Add_Situation_Replay_Topic"));
|
||||
@@ -133,7 +133,7 @@ SituationReplayEditor::~SituationReplayEditor()
|
||||
|
||||
void SituationReplayEditor::updateInternalData()
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
|
||||
|
||||
if (m_firstUpdate)
|
||||
{
|
||||
@@ -181,7 +181,7 @@ void SituationReplayEditor::updateInternalData()
|
||||
|
||||
void SituationReplayEditor::updateInternalLength()
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
|
||||
qint64 end = calculateEnd(m_ui->dteStartTime->msecsSinceEpoch(), m_topicData.duration, m_ui->sbSpeed->value(), true);
|
||||
bool hasChanges = hasUnsavedChanges();
|
||||
m_ui->dteEndTime->setMsecsSinceEpoch(end);
|
||||
@@ -226,19 +226,19 @@ qint64 SituationReplayEditor::calculateEnd(qint64 startTime, int lengthInSeconds
|
||||
else
|
||||
result /= speed;
|
||||
result += startTime;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " result = " << result;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " result = " << result;
|
||||
return result;
|
||||
}
|
||||
|
||||
qint64 SituationReplayEditor::calculateDuration(qint64 startTime, qint64 endTime, double speed)
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " startTime=" << startTime << " endTime=" << endTime << " speed=" << speed;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " startTime=" << startTime << " endTime=" << endTime << " speed=" << speed;
|
||||
qint64 duration = endTime - startTime;
|
||||
double result = duration;
|
||||
result /= speed;
|
||||
qint64 result2 = result;
|
||||
result2 += 500;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " result = " << result2;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " result = " << result2;
|
||||
return result2;
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ void SituationReplayEditor::setMapSettings(const QByteArray &mapSettings)
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
ERROR_LOG() << "map settings not valid json at" << parseError.errorString();
|
||||
ERROR_LOG(m_logger) << "map settings not valid json at" << parseError.errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ void SituationReplayEditor::setMapFilter(const QByteArray &mapFilter)
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
ERROR_LOG() << "filter settings not valid json at" << parseError.errorString();
|
||||
ERROR_LOG(m_logger) << "filter settings not valid json at" << parseError.errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -345,7 +345,7 @@ bool SituationReplayEditor::apply2()
|
||||
m_ui->lblDuration->setText(QStringLiteral(" - "));
|
||||
else
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " setText length = " << duration;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " setText length = " << duration;
|
||||
m_ui->lblDuration->setText(tr("%1 sec").arg(m_topicDuration));
|
||||
}
|
||||
}
|
||||
@@ -463,7 +463,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
|
||||
|
||||
if (marker.id() <= 0)
|
||||
{
|
||||
ERROR_LOG() << "marker has id 0";
|
||||
ERROR_LOG(m_logger) << "marker has id 0";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -477,13 +477,13 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
|
||||
|
||||
void SituationReplayEditor::onChangesMade()
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
|
||||
|
||||
qint64 start = m_ui->dteStartTime->msecsSinceEpoch();
|
||||
qint64 end = m_ui->dteEndTime->msecsSinceEpoch();
|
||||
double speed = m_ui->sbSpeed->value();
|
||||
qint64 duration = calculateDuration(start, end, speed) / 1000;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " duration = " << duration;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " duration = " << duration;
|
||||
|
||||
if (duration < 0)
|
||||
m_ui->lblDuration->setText(QStringLiteral(" - "));
|
||||
@@ -493,7 +493,7 @@ void SituationReplayEditor::onChangesMade()
|
||||
m_topicData.duration = duration;
|
||||
m_ui->widget->previewer()->setTopicData(m_topicData);
|
||||
m_ui->lblDuration->setText(tr("%1 sec").arg(m_topicDuration));
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " setText duration = " << duration;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " setText duration = " << duration;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -38,6 +38,8 @@ public:
|
||||
~SituationReplayEditor();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateInternalData() override;
|
||||
void updateInternalLength() override;
|
||||
void retranslate() override;
|
||||
|
||||
Reference in new issue
Block a user