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
c5f37fa9
Commit
c5f37fa9
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
disambiguate fct name
parent
8da2bed6
No related branches found
No related tags found
1 merge request
!1637
Provide loader for Motofit MFT files, and simplify command flow in RealModel context
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Model/RealModel.cpp
+4
-4
4 additions, 4 deletions
GUI/Model/Model/RealModel.cpp
GUI/Model/Model/RealModel.h
+1
-1
1 addition, 1 deletion
GUI/Model/Model/RealModel.h
with
5 additions
and
5 deletions
GUI/Model/Model/RealModel.cpp
+
4
−
4
View file @
c5f37fa9
...
...
@@ -90,7 +90,7 @@ void RealModel::readFrom(QXmlStreamReader* r)
// real item
if
(
tag
==
Tag
::
RealData
)
{
createReal
Item
()
->
readFrom
(
r
);
pushNew
Item
()
->
readFrom
(
r
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
// selected index
...
...
@@ -127,7 +127,7 @@ void RealModel::readDataFiles(const QString& projectDir, MessageService* message
dataFilesCleaner
.
recollectDataNames
(
dataItems
());
}
RealItem
*
RealModel
::
createReal
Item
()
RealItem
*
RealModel
::
pushNew
Item
()
{
m_realItems
.
emplace_back
(
new
RealItem
);
return
m_realItems
.
back
().
get
();
...
...
@@ -135,14 +135,14 @@ RealItem* RealModel::createRealItem()
RealItem
*
RealModel
::
insertSpecularDataItem
()
{
RealItem
*
r
=
createReal
Item
();
RealItem
*
r
=
pushNew
Item
();
r
->
initAsSpecularItem
();
return
r
;
}
RealItem
*
RealModel
::
insertIntensityDataItem
()
{
RealItem
*
r
=
createReal
Item
();
RealItem
*
r
=
pushNew
Item
();
r
->
initAsIntensityItem
();
return
r
;
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Model/RealModel.h
+
1
−
1
View file @
c5f37fa9
...
...
@@ -40,7 +40,7 @@ public:
void
writeDataFiles
(
const
QString
&
projectDir
);
void
readDataFiles
(
const
QString
&
projectDir
,
MessageService
*
messageService
);
RealItem
*
createReal
Item
();
RealItem
*
pushNew
Item
();
RealItem
*
insertSpecularDataItem
();
RealItem
*
insertIntensityDataItem
();
RealItem
*
insertDataItem
(
int
rank
);
...
...
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