Commit ac641687 authored by Marc R.'s avatar Marc R.

Merge branch '213-time-annotation-is-not-updated-when-loading-a-session' into 'master'

Resolve "Time annotation is not updated when loading a session"

Closes #213

See merge request !199
parents 8ab3272a 47b77562
......@@ -2920,8 +2920,17 @@ void MSceneViewGLWidget::loadConfiguration(QSettings *settings)
displayDateTimePositionProperty,
settings->value("position", QPointF(-0.99, 0.99)).toPointF());
settings->endGroup(); // display date time
synchronizeWith(sysMC->getSyncControl(syncControlName));
// Update display time when loading configuration only if the view is
// initialised since otherwise adding the text will lead to an
// initialisation error when the text is added.
if (viewIsInitialised)
{
updateDisplayTime();
}
// Load arrow pointing north properties.
settings->beginGroup("ArrowPointingNorth");
sysMC->getBoolPropertyManager()->setValue(
......@@ -2971,6 +2980,7 @@ void MSceneViewGLWidget::onHandleSizeChanged()
void MSceneViewGLWidget::synchronizeWith(
MSyncControl *sync, bool updateGUIProperties)
{
Q_UNUSED(updateGUIProperties);
if (synchronizationControl == sync)
{
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment