Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Plugin-ViewControl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Plugin-ViewControl
Commits
e040e48d
Commit
e040e48d
authored
Apr 20, 2017
by
Jascha Wedowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
draw mode for objects can now be combined freely even with draw mode set to global, fixing #91
parent
3f6a0d62
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
ViewControlPlugin.cc
ViewControlPlugin.cc
+9
-2
No files found.
ViewControlPlugin.cc
View file @
e040e48d
...
...
@@ -721,6 +721,13 @@ void ViewControlPlugin::slotDrawModeSelected( QAction * _action) {
bool
useGlobalDrawMode
=
false
;
bool
contextMenuStaysOpen
=
false
;
if
(
_action
->
text
()
!=
USEGLOBALDRAWMODE
)
{
// extract global draw mode in case we want to combine it with another draw mode
if
(
activeDrawModes_
==
ACG
::
SceneGraph
::
DrawModes
::
DEFAULT
)
{
ACG
::
SceneGraph
::
DrawModes
::
DrawMode
widgetDrawMode
=
PluginFunctions
::
drawMode
();
activeDrawModes_
.
combine
(
widgetDrawMode
);
}
// As this is not the global draw mode, filter out default as draw mode or it will interfere with the other modes!
activeDrawModes_
.
filter
(
ACG
::
SceneGraph
::
DrawModes
::
DEFAULT
);
...
...
@@ -728,7 +735,7 @@ void ViewControlPlugin::slotDrawModeSelected( QAction * _action) {
// Otherwise we directly take the new mode
if
(
qApp
->
keyboardModifiers
()
&
Qt
::
ShiftModifier
)
{
if
(
activateDrawMode
)
{
activeDrawModes_
|=
mode
;
activeDrawModes_
.
combine
(
mode
);
// explicit call to combine() states intent more clearly
}
else
{
if
(
activeDrawModes_
==
mode
)
{
activeDrawModes_
=
ACG
::
SceneGraph
::
DrawModes
::
DEFAULT
;
...
...
@@ -1275,7 +1282,7 @@ ViewControlPlugin::setDrawMode(QString _mode, int _viewer)
for
(
int
i
=
0
;
i
<
list
.
size
()
;
++
i
)
drawModeList
.
push_back
(
list
[
i
]);
ACG
::
SceneGraph
::
DrawModes
::
DrawMode
mode
=
listToDrawMode
(
drawModeList
);
ACG
::
SceneGraph
::
DrawModes
::
DrawMode
mode
=
listToDrawMode
(
drawModeList
);
PluginFunctions
::
setDrawMode
(
mode
,
_viewer
);
emit
updateView
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment