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
e27e1600
Commit
e27e1600
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
repair bug introduced in ada416 (line masks not shown)
parent
e1e5d92d
No related branches found
No related tags found
1 merge request
!2250
repair recently introduced bug
Pipeline
#124000
failed
1 year ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/View/Overlay/IOverlay.h
+1
-1
1 addition, 1 deletion
GUI/View/Overlay/IOverlay.h
GUI/View/Overlay/LineOverlays.cpp
+0
-3
0 additions, 3 deletions
GUI/View/Overlay/LineOverlays.cpp
GUI/View/Scene/MaskGraphicsScene.cpp
+1
-4
1 addition, 4 deletions
GUI/View/Scene/MaskGraphicsScene.cpp
with
2 additions
and
8 deletions
GUI/View/Overlay/IOverlay.h
+
1
−
1
View file @
e27e1600
...
...
@@ -38,9 +38,9 @@ public:
public
slots
:
void
onGeometryChange
();
void
onVisibilityChange
();
virtual
void
update_view
()
=
0
;
//!< update visual appearance of view (triggered by event)
protected
slots
:
virtual
void
update_view
()
=
0
;
//!< update visual appearance of view (triggered by event)
virtual
void
onChangedX
()
{}
virtual
void
onChangedY
()
{}
virtual
void
onPropertyChange
()
{}
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Overlay/LineOverlays.cpp
+
0
−
3
View file @
e27e1600
...
...
@@ -19,7 +19,6 @@
#include
<QCursor>
#include
<QPainter>
#include
<QStyleOptionGraphicsItem>
#include
<iostream>
namespace
{
...
...
@@ -145,8 +144,6 @@ void VerticalLineOverlay::update_view()
setX
(
m_plot
->
toSceneX
(
m_item
->
pos
()));
setY
(
plot_scene_rectangle
.
top
());
std
::
cout
<<
"DEBUG height="
<<
plot_scene_rectangle
.
height
()
<<
" xhig_in="
<<
m_item
->
pos
()
<<
" xhig_to="
<<
m_plot
->
toSceneX
(
m_item
->
pos
())
<<
" width="
<<
mask_width
<<
std
::
endl
;
m_bounding_rect
=
QRectF
(
-
mask_width
/
2.
,
0.0
,
mask_width
,
plot_scene_rectangle
.
height
());
update
();
}
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Scene/MaskGraphicsScene.cpp
+
1
−
4
View file @
e27e1600
...
...
@@ -26,7 +26,6 @@
#include
"GUI/View/Scene/MaskGraphicsProxy.h"
#include
"GUI/View/Scene/OverlayFactory.h"
#include
<QGraphicsSceneContextMenuEvent>
#include
<iostream>
namespace
{
...
...
@@ -447,6 +446,7 @@ IOverlay* MaskGraphicsScene::registerOverlay(OverlayItem* item)
m_mask2overlay
[
item
]
=
overlay
;
addItem
(
overlay
);
}
overlay
->
update_view
();
return
overlay
;
}
...
...
@@ -578,7 +578,6 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
setDrawingInProgress
(
true
);
QPointF
click_pos
=
event
->
buttonDownScenePos
(
Qt
::
LeftButton
);
std
::
cout
<<
"DEBUG MaskGraphicsScene::processLineItem mm="
<<
m_mask_mode
<<
std
::
endl
;
if
(
m_mask_mode
==
MaskFlags
::
VERTICAL_LINE_MODE
)
processVerticalLineItem
(
click_pos
);
if
(
m_mask_mode
==
MaskFlags
::
HORIZONTAL_LINE_MODE
)
...
...
@@ -602,8 +601,6 @@ void MaskGraphicsScene::processVerticalLineItem(const QPointF& pos)
m_mask_list_model
->
insertMask
(
0
,
item
);
m_active_mask
=
item
;
item
->
setPos
(
m_plot
->
fromSceneX
(
pos
.
x
()));
std
::
cout
<<
"DEBUG MaskGraphicsScene::processVerticalLineItem xin="
<<
pos
.
x
()
<<
" xout="
<<
m_plot
->
fromSceneX
(
pos
.
x
())
<<
std
::
endl
;
}
void
MaskGraphicsScene
::
processHorizontalLineItem
(
const
QPointF
&
pos
)
...
...
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