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
a1e4670b
Commit
a1e4670b
authored
Aug 11, 2015
by
Mathias Goldau
Browse files
[MERGE]
parents
2428ffc9
ffe25558
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
src/qtgui/WMainWindow.cpp
src/qtgui/WMainWindow.cpp
+3
-3
src/qtgui/controlPanel/WQtControlPanel.cpp
src/qtgui/controlPanel/WQtControlPanel.cpp
+5
-3
No files found.
src/qtgui/WMainWindow.cpp
View file @
a1e4670b
...
...
@@ -378,7 +378,7 @@ void WMainWindow::setupGUI()
m_navAxial
->
setSliderProperty
(
WKernel
::
getRunningKernel
()
->
getSelectionManager
()
->
getPropAxialPos
()
);
m_navAxial
->
getGLWidget
()
->
setCameraManipulator
(
WQtGLWidget
::
NO_OP
);
m_glDock
->
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navAxial
.
get
()
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navAxial
.
get
()
,
Qt
::
Vertical
);
m_navCoronal
=
boost
::
shared_ptr
<
WQtNavGLWidget
>
(
new
WQtNavGLWidget
(
"Coronal View"
,
"Coronal View"
,
this
,
"Coronal Slice"
,
m_mainGLWidget
)
);
...
...
@@ -386,7 +386,7 @@ void WMainWindow::setupGUI()
m_navCoronal
->
setSliderProperty
(
WKernel
::
getRunningKernel
()
->
getSelectionManager
()
->
getPropCoronalPos
()
);
m_navCoronal
->
getGLWidget
()
->
setCameraManipulator
(
WQtGLWidget
::
NO_OP
);
m_glDock
->
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navCoronal
.
get
()
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navCoronal
.
get
()
,
Qt
::
Vertical
);
m_navSagittal
=
boost
::
shared_ptr
<
WQtNavGLWidget
>
(
new
WQtNavGLWidget
(
"Sagittal View"
,
"Sagittal View"
,
this
,
"Sagittal Slice"
,
...
...
@@ -395,7 +395,7 @@ void WMainWindow::setupGUI()
m_navSagittal
->
setSliderProperty
(
WKernel
::
getRunningKernel
()
->
getSelectionManager
()
->
getPropSagittalPos
()
);
m_navSagittal
->
getGLWidget
()
->
setCameraManipulator
(
WQtGLWidget
::
NO_OP
);
m_glDock
->
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navSagittal
.
get
()
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
m_navSagittal
.
get
()
,
Qt
::
Vertical
);
}
}
...
...
src/qtgui/controlPanel/WQtControlPanel.cpp
View file @
a1e4670b
...
...
@@ -144,8 +144,8 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent )
if
(
m_mainWindow
->
getNetworkEditor
()
)
{
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
setContextMenuPolicy
(
Qt
::
ActionsContextMenu
);
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_addModuleAction
);
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_connectWithPrototypeAction
);
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_addModuleAction
);
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_connectWithModuleAction
);
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_disconnectAction
);
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_deleteModuleAction
);
...
...
@@ -153,8 +153,8 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent )
m_mainWindow
->
getNetworkEditor
()
->
getView
()
->
addAction
(
m_configModuleFilterAction
);
// also add to the title actions
m_mainWindow
->
getNetworkEditor
()
->
addTitleAction
(
m_addModuleAction
,
true
);
m_mainWindow
->
getNetworkEditor
()
->
addTitleAction
(
m_connectWithPrototypeAction
,
true
);
m_mainWindow
->
getNetworkEditor
()
->
addTitleAction
(
m_addModuleAction
,
true
);
m_mainWindow
->
getNetworkEditor
()
->
addTitleAction
(
m_deleteModuleAction
,
true
);
// m_mainWindow->getNetworkEditor()->addTitleAction( m_connectWithModuleAction );
...
...
@@ -1080,8 +1080,10 @@ void WQtControlPanel::createCompatibleButtons( boost::shared_ptr< WModule > modu
m_disconnectActionList
=
WQtCombinerActionList
(
this
,
m_mainWindow
->
getIconManager
(),
module
->
getPossibleDisconnections
()
);
}
QMenu
*
m
;
// build the add menu
QMenu
*
m
=
new
WQtMenuFiltered
(
getMissingModuleAction
(),
m_moduleTreeWidget
);
m
=
new
WQtMenuFiltered
(
getMissingModuleAction
(),
m_moduleTreeWidget
);
m
->
addActions
(
m_addModuleActionList
);
m_addModuleAction
->
setDisabled
(
!
m_addModuleActionList
.
size
()
);
// disable if no entry inside
// delete( m_addModuleAction->menu() ); // ensure that combiners get free'd
...
...
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