From 929ed0099f7ec7848d12d1cc903fac558e9ccd34 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <svechnikovmv@gmail.com>
Date: Fri, 17 Feb 2023 12:23:50 +0100
Subject: [PATCH] ProjectDocument: add job and real models as separate
variables
---
GUI/Model/Project/ProjectDocument.cpp | 4 ++--
GUI/Model/Project/ProjectDocument.h | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 1da81bc9d7b..8c1f3da9758 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -129,12 +129,12 @@ SampleModel* ProjectDocument::sampleModel() const
RealModel* ProjectDocument::realModel() const
{
- return m_applicationModels.realModel();
+ return const_cast<RealModel*>(&m_realDataModel);
}
JobModel* ProjectDocument::jobModel() const
{
- return m_applicationModels.jobModel();
+ return const_cast<JobModel*>(&m_jobModel);
}
SimulationOptionsItem* ProjectDocument::simulationOptionsItem()
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 1f48b3e2892..791caea49a4 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -136,9 +136,11 @@ private:
bool m_singleSampleMode;
Functionalities m_functionalities;
SimulationOptionsItem m_simulationOptionsItem;
- SampleModel m_sampleModel;
InstrumentsEditController m_instrumentEditController;
InstrumentModel m_instrumentModel;
+ SampleModel m_sampleModel;
+ RealModel m_realDataModel;
+ JobModel m_jobModel;
int m_lastViewActive;
};
--
GitLab