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
b308ca28
Commit
b308ca28
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
localize member
parent
8b158c24
No related branches found
No related tags found
1 merge request
!2007
cleanup while reading mask GUI
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/Import/RealDataMaskWidget.cpp
+8
-8
8 additions, 8 deletions
GUI/View/Import/RealDataMaskWidget.cpp
GUI/View/Import/RealDataMaskWidget.h
+0
-2
0 additions, 2 deletions
GUI/View/Import/RealDataMaskWidget.h
with
8 additions
and
10 deletions
GUI/View/Import/RealDataMaskWidget.cpp
+
8
−
8
View file @
b308ca28
...
@@ -25,7 +25,6 @@
...
@@ -25,7 +25,6 @@
RealDataMaskWidget
::
RealDataMaskWidget
(
QWidget
*
parent
)
RealDataMaskWidget
::
RealDataMaskWidget
(
QWidget
*
parent
)
:
DataAccessWidget
(
parent
)
:
DataAccessWidget
(
parent
)
,
m_editorActions
(
new
MaskEditorActions
(
this
))
,
m_editorActions
(
new
MaskEditorActions
(
this
))
,
m_toolbar
(
new
MaskEditorToolbar
(
m_editorActions
))
,
m_editorPropertyPanel
(
new
MaskEditorPropertyPanel
)
,
m_editorPropertyPanel
(
new
MaskEditorPropertyPanel
)
,
m_editorCanvas
(
new
MaskEditorCanvas
)
,
m_editorCanvas
(
new
MaskEditorCanvas
)
{
{
...
@@ -42,9 +41,10 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
...
@@ -42,9 +41,10 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
mainLayout
->
setSpacing
(
0
);
mainLayout
->
setSpacing
(
0
);
mainLayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
mainLayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
m_toolbar
->
setOrientation
(
Qt
::
Vertical
);
auto
*
toolbar
=
new
MaskEditorToolbar
(
m_editorActions
);
m_toolbar
->
setStyleSheet
(
"QToolBar{border-left:1px solid rgb(180,180,180);}"
);
toolbar
->
setOrientation
(
Qt
::
Vertical
);
mainLayout
->
addWidget
(
m_toolbar
);
toolbar
->
setStyleSheet
(
"QToolBar{border-left:1px solid rgb(180,180,180);}"
);
mainLayout
->
addWidget
(
toolbar
);
m_editorPropertyPanel
->
setPanelHidden
(
true
);
m_editorPropertyPanel
->
setPanelHidden
(
true
);
...
@@ -63,19 +63,19 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
...
@@ -63,19 +63,19 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
&
MaskEditorCanvas
::
onSavePlotRequest
);
&
MaskEditorCanvas
::
onSavePlotRequest
);
// selection/drawing activity is propagated from Toolbar to graphics scene
// selection/drawing activity is propagated from Toolbar to graphics scene
connect
(
m_
toolbar
,
&
MaskEditorToolbar
::
activityModeChanged
,
m_editorCanvas
->
getScene
(),
connect
(
toolbar
,
&
MaskEditorToolbar
::
activityModeChanged
,
m_editorCanvas
->
getScene
(),
&
MaskGraphicsScene
::
onActivityModeChanged
);
&
MaskGraphicsScene
::
onActivityModeChanged
);
// mask value is propagated from Toolbar to graphics scene
// mask value is propagated from Toolbar to graphics scene
connect
(
m_
toolbar
,
&
MaskEditorToolbar
::
maskValueChanged
,
m_editorCanvas
->
getScene
(),
connect
(
toolbar
,
&
MaskEditorToolbar
::
maskValueChanged
,
m_editorCanvas
->
getScene
(),
&
MaskGraphicsScene
::
onMaskValueChanged
);
&
MaskGraphicsScene
::
onMaskValueChanged
);
// show results request is propagated from Toolbar to Canvas
// show results request is propagated from Toolbar to Canvas
connect
(
m_
toolbar
,
&
MaskEditorToolbar
::
presentationTypeRequest
,
m_editorCanvas
,
connect
(
toolbar
,
&
MaskEditorToolbar
::
presentationTypeRequest
,
m_editorCanvas
,
&
MaskEditorCanvas
::
onPresentationTypeRequest
);
&
MaskEditorCanvas
::
onPresentationTypeRequest
);
// space bar push (request for zoom mode) is propagated from graphics view to Toolbar
// space bar push (request for zoom mode) is propagated from graphics view to Toolbar
connect
(
m_editorCanvas
,
&
MaskEditorCanvas
::
changeActivityRequest
,
m_
toolbar
,
connect
(
m_editorCanvas
,
&
MaskEditorCanvas
::
changeActivityRequest
,
toolbar
,
&
MaskEditorToolbar
::
onChangeActivityRequest
);
&
MaskEditorToolbar
::
onChangeActivityRequest
);
// Delete request is propagated from canvas to actions
// Delete request is propagated from canvas to actions
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Import/RealDataMaskWidget.h
+
0
−
2
View file @
b308ca28
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
class
MaskEditorActions
;
class
MaskEditorActions
;
class
MaskEditorCanvas
;
class
MaskEditorCanvas
;
class
MaskEditorPropertyPanel
;
class
MaskEditorPropertyPanel
;
class
MaskEditorToolbar
;
//! Mask editing for RealItem on ImportDataView.
//! Mask editing for RealItem on ImportDataView.
...
@@ -42,7 +41,6 @@ private:
...
@@ -42,7 +41,6 @@ private:
void
onPropertyPanelRequest
();
void
onPropertyPanelRequest
();
MaskEditorActions
*
m_editorActions
;
MaskEditorActions
*
m_editorActions
;
MaskEditorToolbar
*
m_toolbar
;
MaskEditorPropertyPanel
*
m_editorPropertyPanel
;
MaskEditorPropertyPanel
*
m_editorPropertyPanel
;
MaskEditorCanvas
*
m_editorCanvas
;
MaskEditorCanvas
*
m_editorCanvas
;
};
};
...
...
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