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
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
d5f8e631
Commit
d5f8e631
authored
Apr 11, 2010
by
Sebastian Eichelbaum
Browse files
[MERGE]
parents
841d64b4
32e12e56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
7 deletions
+27
-7
src/gui/qt4/WQtNavGLWidget.cpp
src/gui/qt4/WQtNavGLWidget.cpp
+19
-7
src/gui/qt4/WQtNavGLWidget.h
src/gui/qt4/WQtNavGLWidget.h
+8
-0
No files found.
src/gui/qt4/WQtNavGLWidget.cpp
View file @
d5f8e631
...
...
@@ -26,7 +26,6 @@
#include <iostream>
#include <QtGui/QDockWidget>
#include <QtGui/QSlider>
#include <QtGui/QVBoxLayout>
#include <QtGui/QKeyEvent>
...
...
@@ -42,10 +41,10 @@ WQtNavGLWidget::WQtNavGLWidget( QString title, QWidget* parent, int maxValue, st
setAllowedAreas
(
Qt
::
LeftDockWidgetArea
|
Qt
::
RightDockWidgetArea
);
setFeatures
(
QDockWidget
::
DockWidgetMovable
|
QDockWidget
::
DockWidgetFloatable
);
QSlider
*
slider
=
new
QSlider
(
Qt
::
Horizontal
);
slider
->
setMaximum
(
maxValue
);
slider
->
setValue
(
maxValue
/
2
);
slider
->
setSizePolicy
(
QSizePolicy
::
Minimum
,
QSizePolicy
::
Minimum
);
m_
slider
=
new
QSlider
(
Qt
::
Horizontal
);
m_
slider
->
setMaximum
(
maxValue
);
m_
slider
->
setValue
(
maxValue
/
2
);
m_
slider
->
setSizePolicy
(
QSizePolicy
::
Minimum
,
QSizePolicy
::
Minimum
);
QWidget
*
panel
=
new
QWidget
(
this
);
QVBoxLayout
*
layout
=
new
QVBoxLayout
();
...
...
@@ -99,17 +98,22 @@ WQtNavGLWidget::WQtNavGLWidget( QString title, QWidget* parent, int maxValue, st
}
layout
->
addWidget
(
m_glWidget
.
get
()
);
layout
->
addWidget
(
slider
);
layout
->
addWidget
(
m_
slider
);
panel
->
setLayout
(
layout
);
setWidget
(
panel
);
connect
(
slider
,
SIGNAL
(
valueChanged
(
int
)
),
this
,
SLOT
(
sliderValueChanged
(
int
)
)
);
connect
(
m_
slider
,
SIGNAL
(
valueChanged
(
int
)
),
this
,
SLOT
(
sliderValueChanged
(
int
)
)
);
}
WQtNavGLWidget
::~
WQtNavGLWidget
()
{
if
(
m_slider
)
{
delete
m_slider
;
m_slider
=
0
;
}
}
void
WQtNavGLWidget
::
closeEvent
(
QCloseEvent
*
event
)
...
...
@@ -142,5 +146,13 @@ void WQtNavGLWidget::sliderValueChanged( int value )
void
WQtNavGLWidget
::
setSliderProperty
(
WPropInt
prop
)
{
m_sliderProp
=
prop
;
m_sliderProp
->
getCondition
()
->
subscribeSignal
(
boost
::
bind
(
&
WQtNavGLWidget
::
handleChangedPropertyValue
,
this
)
);
}
void
WQtNavGLWidget
::
handleChangedPropertyValue
()
{
if
(
m_slider
)
{
m_slider
->
setValue
(
m_sliderProp
->
get
()
);
}
}
src/gui/qt4/WQtNavGLWidget.h
View file @
d5f8e631
...
...
@@ -28,6 +28,7 @@
#include <string>
#include <QtGui/QDockWidget>
#include <QtGui/QSlider>
#include "../../common/WPropertyVariable.h"
#include "../../graphicsEngine/WGEGroupNode.h"
...
...
@@ -99,6 +100,8 @@ private:
*/
QString
m_sliderTitle
;
QSlider
*
m_slider
;
//!< A pointer to the slider widget.
/**
* My GL widget.
*/
...
...
@@ -109,6 +112,11 @@ private:
*/
osg
::
ref_ptr
<
WGEGroupNode
>
m_scene
;
/**
* Update slider if property changed.
*/
void
handleChangedPropertyValue
();
private
slots
:
/**
...
...
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