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
1a1f9ac1
Commit
1a1f9ac1
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
QObject has no QWidget parent
parent
953a1985
No related branches found
No related tags found
1 merge request
!2115
rm scale=1; correct coords/bins in mask presenter (repairs worst of #823)
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Model/Data/MaskResultsPresenter.cpp
+1
-5
1 addition, 5 deletions
GUI/Model/Data/MaskResultsPresenter.cpp
GUI/Model/Data/MaskResultsPresenter.h
+2
-3
2 additions, 3 deletions
GUI/Model/Data/MaskResultsPresenter.h
GUI/View/Mask/MaskEditorCanvas.cpp
+1
-1
1 addition, 1 deletion
GUI/View/Mask/MaskEditorCanvas.cpp
with
4 additions
and
9 deletions
GUI/Model/Data/MaskResultsPresenter.cpp
+
1
−
5
View file @
1a1f9ac1
...
...
@@ -60,11 +60,7 @@ Datafield* createMaskPresentation(Data2DItem* data2DItem)
}
// namespace
MaskResultsPresenter
::
MaskResultsPresenter
(
QWidget
*
parent
)
:
QObject
(
parent
)
,
m_interpolation_flag_backup
(
false
)
{
}
MaskResultsPresenter
::
MaskResultsPresenter
()
=
default
;
MaskResultsPresenter
::~
MaskResultsPresenter
()
=
default
;
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Data/MaskResultsPresenter.h
+
2
−
3
View file @
1a1f9ac1
...
...
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
#define BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
#include
"GUI/Model/Data/MaskEditorFlags.h"
#include
<QObject>
#include
<memory>
...
...
@@ -27,7 +26,7 @@ class Datafield;
class
MaskResultsPresenter
:
public
QObject
{
Q_OBJECT
public:
MaskResultsPresenter
(
QWidget
*
parent
=
nullptr
);
MaskResultsPresenter
();
~
MaskResultsPresenter
();
void
setContextMRP
(
Data2DItem
*
data2DItem
);
...
...
@@ -37,7 +36,7 @@ public:
private:
Data2DItem
*
m_data2DItem
;
std
::
unique_ptr
<
Datafield
>
m_dataBackup
;
bool
m_interpolation_flag_backup
;
bool
m_interpolation_flag_backup
=
false
;
};
#endif // BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
This diff is collapsed.
Click to expand it.
GUI/View/Mask/MaskEditorCanvas.cpp
+
1
−
1
View file @
1a1f9ac1
...
...
@@ -31,7 +31,7 @@ MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
,
m_view
(
new
MaskGraphicsView
(
m_scene
))
,
m_data2DItem
(
nullptr
)
,
m_statusLabel
(
new
PlotStatusLabel
(
nullptr
,
this
))
,
m_resultsPresenter
(
new
MaskResultsPresenter
(
this
)
)
,
m_resultsPresenter
(
new
MaskResultsPresenter
)
{
setObjectName
(
"MaskEditorCanvas"
);
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
);
...
...
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