Skip to content
Snippets Groups Projects
Commit 214d454a authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

replace 'instrumentsModifier' by 'instrumentsRW'

parent 9087a5b3
No related branches found
No related tags found
1 merge request!2408rm instrument linking; repair simulation (break endless loop); rename and move things
......@@ -76,7 +76,7 @@ public:
const JobsSet* jobs() const { return m_jobs.get(); };
const SimulationOptionsItem* simulationOptionsItem() const { return m_options.get(); };
InstrumentsSet* instrumentsModifier() { return m_instruments.get(); };
InstrumentsSet* instrumentsRW() { return m_instruments.get(); };
SamplesSet* samplesModifier() { return m_samples.get(); };
DatafilesSet* datafilesModifier() { return m_datafiles.get(); };
JobsSet* jobsModifier() { return m_jobs.get(); };
......
......@@ -32,7 +32,7 @@
#include <QTextEdit>
InstrumentView::InstrumentView()
: m_set(gDoc->instrumentsModifier())
: m_set(gDoc->instrumentsRW())
, m_qlistview(new SetView(m_set))
, m_scroll_area(new QScrollArea)
{
......
......@@ -19,7 +19,7 @@ protected:
// helper method to modify something in a model
void modelsModifier(ProjectDocument& doc)
{
auto* instrument = doc.instrumentsModifier()->at(0);
auto* instrument = doc.instrumentsRW()->at(0);
instrument->setName(QUuid::createUuid().toString());
emit gDoc->instruments()->currentModified();
}
......@@ -40,7 +40,7 @@ TEST_F(TestAutosaveController, autoSaveController)
gDoc = std::make_unique<ProjectDocument>();
auto* instrument = new Scatter2DInstrumentItem;
gDoc->instrumentsModifier()->add_item(instrument);
gDoc->instrumentsRW()->add_item(instrument);
instrument->setName("GISAS");
gDoc->saveProjectFileWithData(projectFileName);
......@@ -85,7 +85,7 @@ TEST_F(TestAutosaveController, autoSaveControllerNewDocument)
{
gDoc = std::make_unique<ProjectDocument>();
auto* instrument = new Scatter2DInstrumentItem;
gDoc->instrumentsModifier()->add_item(instrument);
gDoc->instrumentsRW()->add_item(instrument);
instrument->setName("GISAS");
const int autosave_time(100);
......@@ -120,7 +120,7 @@ TEST_F(TestAutosaveController, autosaveEnabled)
gDoc->setProjectFullPath(projectFileName);
auto* instrument = new Scatter2DInstrumentItem;
gDoc->instrumentsModifier()->add_item(instrument);
gDoc->instrumentsRW()->add_item(instrument);
instrument->setName("GISAS");
DatafileItem* realData =
......
......@@ -20,7 +20,7 @@ protected:
//! helper method to modify something in a model
void modelsModifier(ProjectDocument& doc)
{
auto* instrument = doc.instrumentsModifier()->at(0);
auto* instrument = doc.instrumentsRW()->at(0);
instrument->setName(QUuid::createUuid().toString());
emit gDoc->instruments()->currentModified();
}
......@@ -42,7 +42,7 @@ TEST_F(TestProjectDocument, projectDocument)
EXPECT_EQ(gDoc->projectFullPath(), QString());
auto* instrument = new Scatter2DInstrumentItem;
gDoc->instrumentsModifier()->add_item(instrument);
gDoc->instrumentsRW()->add_item(instrument);
instrument->setName("GISAS");
// Checking document name and isModified status after project save
......@@ -79,7 +79,7 @@ TEST_F(TestProjectDocument, projectDocumentWithData)
const QString ext = QString(GUI::Util::Project::projectFileExtension);
auto* instrument = new Scatter2DInstrumentItem;
gDoc->instrumentsModifier()->add_item(instrument);
gDoc->instrumentsRW()->add_item(instrument);
instrument->setName("GISAS");
DatafileItem* realData =
UTest::GUI::createRealData2D("TestData", *gDoc->datafilesModifier(), 0.);
......@@ -113,7 +113,7 @@ TEST_F(TestProjectDocument, failingProjectSave)
gDoc = std::make_unique<ProjectDocument>();
auto* instrument = new Scatter2DInstrumentItem;
gDoc->instrumentsModifier()->add_item(instrument);
gDoc->instrumentsRW()->add_item(instrument);
instrument->setName("GISAS");
modelsModifier(*gDoc);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment