Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
a4225ba6
Commit
a4225ba6
authored
1 year ago
by
Wuttke, Joachim
Committed by
Wuttke, Joachim
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
ProjDoc sort class members
parent
e8275dfb
No related branches found
No related tags found
1 merge request
!2440
revert premature edits: leave mask ownership with data
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Project/ProjectDocument.cpp
+2
-2
2 additions, 2 deletions
GUI/Model/Project/ProjectDocument.cpp
GUI/Model/Project/ProjectDocument.h
+3
-3
3 additions, 3 deletions
GUI/Model/Project/ProjectDocument.h
with
5 additions
and
5 deletions
GUI/Model/Project/ProjectDocument.cpp
+
2
−
2
View file @
a4225ba6
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Project/ProjectDocument.h
+
3
−
3
View file @
a4225ba6
...
...
@@ -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
;
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment