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
7b36dc11
Commit
7b36dc11
authored
Dec 01, 2009
by
Sebastian Eichelbaum
Browse files
[CHANGE] - additional views are enabled again.
parent
09fcbd42
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
26 deletions
+27
-26
src/gui/qt4/WMainWindow.cpp
src/gui/qt4/WMainWindow.cpp
+20
-22
src/gui/qt4/WQtNavGLWidget.cpp
src/gui/qt4/WQtNavGLWidget.cpp
+4
-3
src/gui/qt4/WQtNavGLWidget.h
src/gui/qt4/WQtNavGLWidget.h
+3
-1
No files found.
src/gui/qt4/WMainWindow.cpp
View file @
7b36dc11
...
...
@@ -77,32 +77,31 @@ void WMainWindow::setupGUI( boost::program_options::variables_map guiConfigurati
m_mainGLWidget
->
initialize
();
setCentralWidget
(
m_mainGLWidget
.
get
()
);
// initially 3 views
m_navAxial
=
boost
::
shared_ptr
<
WQtNavGLWidget
>
(
new
WQtNavGLWidget
(
"axial"
,
this
,
160
,
"axialPos"
)
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navAxial
.
get
()
);
m_navCoronal
=
boost
::
shared_ptr
<
WQtNavGLWidget
>
(
new
WQtNavGLWidget
(
"coronal"
,
this
,
200
,
"coronalPos"
)
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navCoronal
.
get
()
);
m_navSagittal
=
boost
::
shared_ptr
<
WQtNavGLWidget
>
(
new
WQtNavGLWidget
(
"sagittal"
,
this
,
160
,
"sagittalPos"
)
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navSagittal
.
get
()
);
connect
(
m_navAxial
.
get
(),
SIGNAL
(
navSliderValueChanged
(
QString
,
int
)
),
&
m_propertyManager
,
SLOT
(
slotIntChanged
(
QString
,
int
)
)
);
connect
(
m_navCoronal
.
get
(),
SIGNAL
(
navSliderValueChanged
(
QString
,
int
)
),
&
m_propertyManager
,
SLOT
(
slotIntChanged
(
QString
,
int
)
)
);
connect
(
m_navSagittal
.
get
(),
SIGNAL
(
navSliderValueChanged
(
QString
,
int
)
),
&
m_propertyManager
,
SLOT
(
slotIntChanged
(
QString
,
int
)
)
);
if
(
guiConfiguration
.
count
(
"ge.bgColor.r"
)
&&
guiConfiguration
.
count
(
"ge.bgColor.g"
)
&&
guiConfiguration
.
count
(
"ge.bgColor.b"
)
)
{
WColor
bgColor
(
guiConfiguration
[
"ge.bgColor.r"
].
as
<
float
>
(),
guiConfiguration
[
"ge.bgColor.g"
].
as
<
float
>
(),
guiConfiguration
[
"ge.bgColor.b"
].
as
<
float
>
()
);
m_mainGLWidget
->
setBgColor
(
bgColor
);
m_navAxial
->
getGLWidget
()
->
setBgColor
(
bgColor
);
m_navCoronal
->
getGLWidget
()
->
setBgColor
(
bgColor
);
m_navSagittal
->
getGLWidget
()
->
setBgColor
(
bgColor
);
}
//TODO(all): this is commented out
// initially 3 views
// m_navAxial = boost::shared_ptr< WQtNavGLWidget >( new WQtNavGLWidget( "axial", 160, "axialPos" ) );
//m_navAxial->getGLWidget()->initialize();
//addDockWidget( Qt::LeftDockWidgetArea, m_navAxial.get() );
//m_navCoronal = boost::shared_ptr< WQtNavGLWidget >( new WQtNavGLWidget( "coronal", 200, "coronalPos" ) );
//m_navCoronal->getGLWidget()->initialize();
//addDockWidget( Qt::LeftDockWidgetArea, m_navCoronal.get() );
//m_navSagittal = boost::shared_ptr< WQtNavGLWidget >( new WQtNavGLWidget( "sagittal", 160, "sagittalPos" ) );
//m_navSagittal->getGLWidget()->initialize();
//addDockWidget( Qt::LeftDockWidgetArea, m_navSagittal.get() );
//connect( m_navAxial.get(), SIGNAL( navSliderValueChanged( QString, int ) ), &m_propertyManager, SLOT( slotIntChanged( QString, int ) ) );
//connect( m_navCoronal.get(), SIGNAL( navSliderValueChanged( QString, int ) ), &m_propertyManager, SLOT( slotIntChanged( QString, int ) ) );
//connect( m_navSagittal.get(), SIGNAL( navSliderValueChanged( QString, int ) ), &m_propertyManager, SLOT( slotIntChanged( QString, int ) ) );
m_datasetBrowser
=
new
WQtDatasetBrowser
();
addDockWidget
(
Qt
::
RightDockWidgetArea
,
m_datasetBrowser
);
m_datasetBrowser
->
addSubject
(
"subject1"
);
...
...
@@ -235,10 +234,9 @@ void WMainWindow::closeEvent( QCloseEvent* e )
// clean up gl widgets
m_mainGLWidget
->
close
();
//TODO(all): this is commented out
//m_navAxial->close();
//m_navCoronal->close();
//m_navSagittal->close();
m_navAxial
->
close
();
m_navCoronal
->
close
();
m_navSagittal
->
close
();
// finally close
e
->
accept
();
...
...
src/gui/qt4/WQtNavGLWidget.cpp
View file @
7b36dc11
...
...
@@ -32,8 +32,8 @@
#include "WQtNavGLWidget.h"
WQtNavGLWidget
::
WQtNavGLWidget
(
QString
title
,
int
maxValue
,
std
::
string
sliderTitle
)
:
QDockWidget
(
title
)
WQtNavGLWidget
::
WQtNavGLWidget
(
QString
title
,
QWidget
*
parent
,
int
maxValue
,
std
::
string
sliderTitle
)
:
QDockWidget
(
title
,
parent
)
{
m_sliderTitle
=
QString
(
sliderTitle
.
c_str
()
);
...
...
@@ -47,7 +47,8 @@ WQtNavGLWidget::WQtNavGLWidget( QString title, int maxValue, std::string sliderT
QVBoxLayout
*
layout
=
new
QVBoxLayout
();
m_glWidget
=
boost
::
shared_ptr
<
WQtGLWidget
>
(
new
WQtGLWidget
(
title
.
toStdString
()
,
panel
,
WGECamera
::
ORTHOGRAPHIC
)
);
m_glWidget
=
boost
::
shared_ptr
<
WQtGLWidget
>
(
new
WQtGLWidget
(
title
.
toStdString
(),
panel
,
WGECamera
::
ORTHOGRAPHIC
)
);
m_glWidget
->
initialize
();
layout
->
addWidget
(
m_glWidget
.
get
()
);
layout
->
addWidget
(
slider
);
...
...
src/gui/qt4/WQtNavGLWidget.h
View file @
7b36dc11
...
...
@@ -40,8 +40,10 @@ class WQtNavGLWidget : public QDockWidget
public:
/**
* default constructor
*
* \param parent the parent widget.
*/
explicit
WQtNavGLWidget
(
QString
title
,
int
maxValue
=
100
,
std
::
string
sliderTitle
=
"pos"
);
explicit
WQtNavGLWidget
(
QString
title
,
QWidget
*
parent
,
int
maxValue
=
100
,
std
::
string
sliderTitle
=
"pos"
);
/**
* destructor
...
...
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