diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp index 4b3a5a83c0912a304983a0d092513ffc7d28f55f..657b93ace6eb2c949ee9398c27d9d5171bc305bf 100644 --- a/GUI/Model/Project/ProjectDocument.cpp +++ b/GUI/Model/Project/ProjectDocument.cpp @@ -243,11 +243,15 @@ bool ProjectDocument::isModified() const return m_modified; } -void ProjectDocument::setModified(bool flag) +void ProjectDocument::setModified() { - m_modified = flag; - if (m_modified) - emit modified(); + m_modified = true; + emit modified(); +} + +void ProjectDocument::clearModified() +{ + m_modified = false; } bool ProjectDocument::hasData() const diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h index 40d02a5c9c11b01c47ea8ed462000409fe96b595..daeeb4939b41141cc81cdf7a383f6e844396526d 100644 --- a/GUI/Model/Project/ProjectDocument.h +++ b/GUI/Model/Project/ProjectDocument.h @@ -89,7 +89,8 @@ public: bool hasValidNameAndPath(); bool isModified() const; - void setModified(bool flag = true); + void setModified(); + void clearModified(); bool hasData() const; diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp index 516fc719a141a05a12491eae7b94aaff70c5efc3..b3f2008bac619a2eae5b1d7a502ce615f968e3f9 100644 --- a/GUI/View/Main/ProjectManager.cpp +++ b/GUI/View/Main/ProjectManager.cpp @@ -352,7 +352,7 @@ void ProjectManager::createNewProject() gSessionData->projectDocument->setSingleSampleMode(appSettings->defaultIsSingleSampleMode()); gSessionData->projectDocument->setProjectName("Untitled"); - gSessionData->projectDocument->setModified(false); + gSessionData->projectDocument->clearModified(); m_saveService->setDocument(gSessionData->projectDocument); @@ -383,7 +383,7 @@ ProjectDocument::ReadResult ProjectManager::loadProject(const QString& projectFi QApplication::setOverrideCursor(Qt::WaitCursor); readResult = gSessionData->projectDocument->loadProjectFile(autosaveName, messageService); gSessionData->projectDocument->setProjectFileName(projectFileName); - gSessionData->projectDocument->setModified(true); + gSessionData->projectDocument->setModified(); } else { QApplication::setOverrideCursor(Qt::WaitCursor); readResult = diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp index 98d7e6a69978fb200f889f037bcbddfcc5c97189..a4578541b193ed8e32e6d8e3e89670a3bd7d887c 100644 --- a/GUI/View/Toplevel/SimulationView.cpp +++ b/GUI/View/Toplevel/SimulationView.cpp @@ -83,21 +83,19 @@ SimulationView::SimulationView(QWidget* parent, ProjectDocument* document) &SimulationView::updateEnabling); connect(m_ui->runPolicyImmediatelyRadio, &QRadioButton::toggled, - [=]() { document->setModified(true); }); + [=]() { document->setModified(); }); - connect(m_ui->analyticalRadio, &QRadioButton::toggled, [=]() { document->setModified(true); }); + connect(m_ui->analyticalRadio, &QRadioButton::toggled, [=]() { document->setModified(); }); - connect(m_ui->averageLayerRadio, &QRadioButton::toggled, - [=]() { document->setModified(true); }); + connect(m_ui->averageLayerRadio, &QRadioButton::toggled, [=]() { document->setModified(); }); connect(m_ui->numberOfThreadsCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), - [=]() { document->setModified(true); }); + [=]() { document->setModified(); }); connect(m_ui->numberOfMonteCarloPoints, QOverload<int>::of(&QSpinBox::valueChanged), - [=]() { document->setModified(true); }); + [=]() { document->setModified(); }); - connect(m_ui->includeSpecularCheck, &QCheckBox::toggled, - [=]() { document->setModified(true); }); + connect(m_ui->includeSpecularCheck, &QCheckBox::toggled, [=]() { document->setModified(); }); connect(m_document, &ProjectDocument::modified, this, &SimulationView::updateFunctionalityNarrowing); diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp index c670b46ad52c592ec0447cfa10439e7e29b38726..e46c32dc8b3690560080e4df4f5620ab2531c3dc 100644 --- a/Tests/Unit/GUI/TestSaveService.cpp +++ b/Tests/Unit/GUI/TestSaveService.cpp @@ -216,7 +216,7 @@ TEST_F(TestSaveService, autosaveEnabled) GUI::Model::JobItemUtils::createDefaultDetectorMap( intensityItem, document->instrumentModel()->instrument2DItems().front()); intensityItem->setFileName("realdata.int.gz"); - document->setModified(false); + document->clearModified(); EXPECT_FALSE(document->isModified()); SaveService service;