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

ProjDoc sort class members

parent e8275dfb
No related branches found
No related tags found
1 merge request!2440revert premature edits: leave mask ownership with data
......@@ -52,10 +52,10 @@ const QString ActiveView("ActiveView");
ProjectDocument::ProjectDocument()
: m_project_name("Untitled")
, m_modified(false)
, m_options(std::make_unique<SimulationOptionsItem>())
, m_instruments(std::make_unique<InstrumentsSet>())
, m_samples(std::make_unique<SamplesSet>())
, m_datafiles(std::make_unique<DatafilesSet>())
, m_options(std::make_unique<SimulationOptionsItem>())
, m_jobs(std::make_unique<JobsSet>())
{
connect(m_instruments.get(), &InstrumentsSet::setChanged, this, &ProjectDocument::setModified);
......@@ -68,10 +68,10 @@ ProjectDocument::~ProjectDocument() = default;
void ProjectDocument::clear()
{
m_project_name = "Untitled";
m_options = std::make_unique<SimulationOptionsItem>();
m_instruments->clear();
m_samples->clear();
m_datafiles->clear();
m_options = std::make_unique<SimulationOptionsItem>();
m_jobs = std::make_unique<JobsSet>();
m_modified = false;
}
......
......@@ -62,14 +62,14 @@ public:
const InstrumentsSet* instruments() const { return m_instruments.get(); };
const SamplesSet* samples() const { return m_samples.get(); };
const DatafilesSet* datafiles() const { return m_datafiles.get(); };
const JobsSet* jobs() const { return m_jobs.get(); };
const SimulationOptionsItem* simulationOptionsItem() const { return m_options.get(); };
const JobsSet* jobs() const { return m_jobs.get(); };
InstrumentsSet* instrumentsRW() { return m_instruments.get(); };
SamplesSet* samplesRW() { return m_samples.get(); };
DatafilesSet* datafilesRW() { return m_datafiles.get(); };
JobsSet* jobsRW() { return m_jobs.get(); };
SimulationOptionsItem* simulationOptionsRW() { return m_options.get(); };
JobsSet* jobsRW() { return m_jobs.get(); };
signals:
void modifiedStateChanged();
......@@ -83,10 +83,10 @@ private:
QString m_project_dir;
QString m_project_name;
bool m_modified;
std::unique_ptr<SimulationOptionsItem> m_options;
std::unique_ptr<InstrumentsSet> m_instruments;
std::unique_ptr<SamplesSet> m_samples;
std::unique_ptr<DatafilesSet> m_datafiles;
std::unique_ptr<SimulationOptionsItem> m_options;
std::unique_ptr<JobsSet> m_jobs;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment