Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ArmarXGui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
ArmarXGui
Commits
bb29de48
Commit
bb29de48
authored
5 years ago
by
Adrian Knobloch
Browse files
Options
Downloads
Patches
Plain Diff
Fix locking of ViewerWidget
parent
cffb831b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp
+1
-1
1 addition, 1 deletion
...ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp
source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
+2
-1
2 additions, 1 deletion
...e/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
with
3 additions
and
2 deletions
source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp
+
1
−
1
View file @
bb29de48
...
@@ -215,7 +215,7 @@ void Viewer3DWidget::postDocking()
...
@@ -215,7 +215,7 @@ void Viewer3DWidget::postDocking()
viewer
->
show
();
viewer
->
show
();
cb3DViewers
=
new
QComboBox
(
getWidget
());
cb3DViewers
=
new
QComboBox
(
getWidget
());
QLabel
*
label
=
new
QLabel
(
"Scene:"
);
label
=
new
QLabel
(
"Scene:"
);
sceneConfigDialogButton
=
new
QPushButton
(
QIcon
(
":/icons/configure-3.png"
),
""
,
getWidget
());
sceneConfigDialogButton
=
new
QPushButton
(
QIcon
(
":/icons/configure-3.png"
),
""
,
getWidget
());
sceneConfigDialogButton
->
setToolTip
(
"Configure Scene"
);
sceneConfigDialogButton
->
setToolTip
(
"Configure Scene"
);
grid
->
addWidget
(
view1
,
0
,
0
,
1
,
3
);
grid
->
addWidget
(
view1
,
0
,
0
,
1
,
3
);
...
...
This diff is collapsed.
Click to expand it.
source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
+
2
−
1
View file @
bb29de48
...
@@ -33,6 +33,7 @@ class SoSeparator;
...
@@ -33,6 +33,7 @@ class SoSeparator;
class
QComboBox
;
class
QComboBox
;
class
QPushButton
;
class
QPushButton
;
class
QLabel
;
class
Ui_Viewer3DWidget
;
class
Ui_Viewer3DWidget
;
class
Ui_ViewerWidgetConfigDialog
;
class
Ui_ViewerWidgetConfigDialog
;
...
@@ -85,7 +86,7 @@ namespace armarx
...
@@ -85,7 +86,7 @@ namespace armarx
SoSeparator
*
emptyNode
;
SoSeparator
*
emptyNode
;
QPointer
<
QComboBox
>
cb3DViewers
;
QPointer
<
QComboBox
>
cb3DViewers
;
QPointer
<
QPushButton
>
sceneConfigDialogButton
;
QPointer
<
QPushButton
>
sceneConfigDialogButton
;
QPointer
<
Q
Widget
>
label
;
QPointer
<
Q
Label
>
label
;
void
setNode
(
int
index
);
void
setNode
(
int
index
);
public
slots
:
public
slots
:
...
...
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