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
3e09a9ee
Commit
3e09a9ee
authored
1 year ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
repair 'RealModel' tag
parent
8b24b9bb
No related branches found
No related tags found
1 merge request
!2204
Cleanup and preparations for #805
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Model/DatafilesModel.cpp
+1
-0
1 addition, 0 deletions
GUI/Model/Model/DatafilesModel.cpp
GUI/Model/Project/ProjectDocument.cpp
+3
-3
3 additions, 3 deletions
GUI/Model/Project/ProjectDocument.cpp
with
4 additions
and
3 deletions
GUI/Model/Model/DatafilesModel.cpp
+
1
−
0
View file @
3e09a9ee
...
@@ -98,6 +98,7 @@ void DatafilesModel::readFrom(QXmlStreamReader* r)
...
@@ -98,6 +98,7 @@ void DatafilesModel::readFrom(QXmlStreamReader* r)
XML
::
readAttribute
(
r
,
XML
::
Attrib
::
value
,
&
m_selectedRank
);
XML
::
readAttribute
(
r
,
XML
::
Attrib
::
value
,
&
m_selectedRank
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
}
else
}
else
r
->
skipCurrentElement
();
r
->
skipCurrentElement
();
}
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Project/ProjectDocument.cpp
+
3
−
3
View file @
3e09a9ee
...
@@ -42,7 +42,7 @@ const QString SimulationOptions("SimulationOptions");
...
@@ -42,7 +42,7 @@ const QString SimulationOptions("SimulationOptions");
const
QString
InstrumentModel
(
"InstrumentModel"
);
const
QString
InstrumentModel
(
"InstrumentModel"
);
const
QString
SampleModel
(
"SampleModel"
);
const
QString
SampleModel
(
"SampleModel"
);
const
QString
JobModel
(
"JobModel"
);
const
QString
JobModel
(
"JobModel"
);
const
QString
DatafilesModel
(
"Datafiles
Model"
);
const
QString
RealModel
(
"Real
Model"
);
const
QString
ActiveView
(
"ActiveView"
);
const
QString
ActiveView
(
"ActiveView"
);
}
// namespace Tag
}
// namespace Tag
...
@@ -247,7 +247,7 @@ void ProjectDocument::writeProject(QIODevice* device)
...
@@ -247,7 +247,7 @@ void ProjectDocument::writeProject(QIODevice* device)
w
.
writeEndElement
();
w
.
writeEndElement
();
// real model
// real model
w
.
writeStartElement
(
Tag
::
Datafiles
Model
);
w
.
writeStartElement
(
Tag
::
Real
Model
);
m_realModel
.
writeTo
(
&
w
);
m_realModel
.
writeTo
(
&
w
);
w
.
writeEndElement
();
w
.
writeEndElement
();
...
@@ -309,7 +309,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
...
@@ -309,7 +309,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
XML
::
gotoEndElementOfTag
(
&
r
,
tag
);
XML
::
gotoEndElementOfTag
(
&
r
,
tag
);
// real model
// real model
}
else
if
(
tag
==
Tag
::
Datafiles
Model
)
{
}
else
if
(
tag
==
Tag
::
Real
Model
)
{
// 'm_instrumentModel' should be read before
// 'm_instrumentModel' should be read before
m_realModel
.
readFrom
(
&
r
);
m_realModel
.
readFrom
(
&
r
);
XML
::
gotoEndElementOfTag
(
&
r
,
tag
);
XML
::
gotoEndElementOfTag
(
&
r
,
tag
);
...
...
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