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
ce6d0da0
Commit
ce6d0da0
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
disambiguate, simplify
parent
8c2228e3
No related branches found
No related tags found
1 merge request
!2359
Use same tree view with delegate for datafiles, samples, and instruments. Also move some code between GUI/View directories. Restore Py wrappers lost in previous MR.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Model/Files/DatafilesQModel.cpp
+1
-1
1 addition, 1 deletion
GUI/Model/Files/DatafilesQModel.cpp
GUI/Model/Files/DatafilesSet.cpp
+2
-3
2 additions, 3 deletions
GUI/Model/Files/DatafilesSet.cpp
GUI/Model/Files/DatafilesSet.h
+1
-1
1 addition, 1 deletion
GUI/Model/Files/DatafilesSet.h
with
4 additions
and
5 deletions
GUI/Model/Files/DatafilesQModel.cpp
+
1
−
1
View file @
ce6d0da0
...
...
@@ -50,7 +50,7 @@ void DatafilesQModel::removeDatafileItem(DatafileItem* item)
const
int
row
=
m_items
.
indexOf
(
item
);
beginRemoveRows
(
indexOfHeadline
(),
row
,
row
);
m_items
.
removeAll
(
item
);
m_model
->
remov
eDatafileItem
(
item
);
m_model
->
delet
eDatafileItem
(
item
);
endRemoveRows
();
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Files/DatafilesSet.cpp
+
2
−
3
View file @
ce6d0da0
...
...
@@ -38,7 +38,7 @@ void DatafilesSet::appendDatafileItem(DatafileItem* dfi)
m_dfile_items
.
emplace_back
(
dfi
);
}
void
DatafilesSet
::
remov
eDatafileItem
(
DatafileItem
*
dfi
)
void
DatafilesSet
::
delet
eDatafileItem
(
DatafileItem
*
dfi
)
{
ASSERT
(
dfi
);
m_dfile_items
.
delete_element
(
dfi
);
...
...
@@ -46,8 +46,7 @@ void DatafilesSet::removeDatafileItem(DatafileItem* dfi)
void
DatafilesSet
::
clear
()
{
for
(
auto
*
dfi
:
m_dfile_items
)
removeDatafileItem
(
dfi
);
m_dfile_items
.
clear
();
}
QVector
<
DataItem
*>
DatafilesSet
::
dataItems
()
const
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Files/DatafilesSet.h
+
1
−
1
View file @
ce6d0da0
...
...
@@ -32,7 +32,7 @@ public:
~
DatafilesSet
();
void
appendDatafileItem
(
DatafileItem
*
dfi
);
void
remov
eDatafileItem
(
DatafileItem
*
dfi
);
void
delet
eDatafileItem
(
DatafileItem
*
dfi
);
void
clear
();
void
readFrom
(
QXmlStreamReader
*
r
);
void
readDatafiles
(
const
QString
&
projectDir
,
MessageService
*
messageService
);
...
...
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