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
b2723071
Commit
b2723071
authored
Mar 17, 2013
by
Sebastian Eichelbaum
Browse files
[ADD
#256
] ROI dock now provides add/del actions in its titlebar
parent
d21cf4a2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
2 deletions
+23
-2
resources/qt4gui/share/openwalnut/qt4gui/popup_close.png
resources/qt4gui/share/openwalnut/qt4gui/popup_close.png
+0
-0
resources/qt4gui/share/openwalnut/qt4gui/popup_more.png
resources/qt4gui/share/openwalnut/qt4gui/popup_more.png
+0
-0
src/qt4gui/WMainWindow.cpp
src/qt4gui/WMainWindow.cpp
+5
-1
src/qt4gui/controlPanel/WQtControlPanel.cpp
src/qt4gui/controlPanel/WQtControlPanel.cpp
+11
-1
src/qt4gui/controlPanel/WQtControlPanel.h
src/qt4gui/controlPanel/WQtControlPanel.h
+7
-0
No files found.
resources/qt4gui/share/openwalnut/qt4gui/popup_close.png
View replaced file @
d21cf4a2
View file @
b2723071
2.17 KB
|
W:
|
H:
1.4 KB
|
W:
|
H:
2-up
Swipe
Onion skin
resources/qt4gui/share/openwalnut/qt4gui/popup_more.png
View replaced file @
d21cf4a2
View file @
b2723071
779 Bytes
|
W:
|
H:
188 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
src/qt4gui/WMainWindow.cpp
View file @
b2723071
...
...
@@ -289,7 +289,7 @@ void WMainWindow::setupGUI()
connect
(
m_saveAction
,
SIGNAL
(
triggered
(
bool
)
),
this
,
SLOT
(
projectSaveAll
()
)
);
m_loadButton
->
setToolTip
(
"Load a dataset or project from file"
);
roiButton
->
setToolTip
(
"
Create
new ROI"
);
roiButton
->
setToolTip
(
"
Insert a
new ROI"
);
m_saveAction
->
setToolTip
(
"Save current project to file"
);
// we want the upper most tree item to be selected. This helps to make the always compatible modules
...
...
@@ -442,6 +442,10 @@ void WMainWindow::setupGUI()
// allow the control panel to complete setup
m_controlPanel
->
completeGuiSetup
();
// add the roi actions to roi dock title
m_controlPanel
->
getRoiDock
()
->
addTitleAction
(
roiButton
);
m_controlPanel
->
getRoiDock
()
->
addTitleAction
(
m_controlPanel
->
getRoiDeleteAction
()
);
// after creating the GUI, restore its saved state
restoreSavedState
();
}
...
...
src/qt4gui/controlPanel/WQtControlPanel.cpp
View file @
b2723071
...
...
@@ -201,13 +201,14 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent )
connectSlots
();
// similar to the module delete action: a ROI delete action
m_deleteRoiAction
=
new
QAction
(
WQt4Gui
::
getMainWindow
()
->
getIconManager
()
->
getIcon
(
"
remove
"
),
"Remove ROI"
,
m_roiTreeWidget
);
m_deleteRoiAction
=
new
QAction
(
WQt4Gui
::
getMainWindow
()
->
getIconManager
()
->
getIcon
(
"
del_roi
"
),
"Remove ROI"
,
m_roiTreeWidget
);
{
// Set the key for removing modules
m_deleteRoiAction
->
setShortcutContext
(
Qt
::
WidgetShortcut
);
m_deleteRoiAction
->
setShortcut
(
QKeySequence
::
Delete
);
m_deleteRoiAction
->
setIconVisibleInMenu
(
true
);
}
m_deleteRoiAction
->
setEnabled
(
false
);
connect
(
m_deleteRoiAction
,
SIGNAL
(
triggered
()
),
this
,
SLOT
(
deleteROITreeItem
()
)
);
m_roiTreeWidget
->
addAction
(
m_deleteModuleAction
);
m_roiTreeWidget
->
addAction
(
m_deleteRoiAction
);
...
...
@@ -222,6 +223,11 @@ void WQtControlPanel::completeGuiSetup()
m_mainWindow
->
addGlobalMenu
(
m_mainWindow
->
getNetworkEditor
()
->
getView
()
);
}
QAction
*
WQtControlPanel
::
getRoiDeleteAction
()
const
{
return
m_deleteRoiAction
;
}
void
WQtControlPanel
::
connectSlots
()
{
// if the user changes some white/blacklist setting: update.
...
...
@@ -742,6 +748,9 @@ void WQtControlPanel::selectRoiTreeItem( QTreeWidgetItem* item )
// activate the item
m_roiTreeWidget
->
setCurrentItem
(
item
);
// delete is disabled by default
m_deleteRoiAction
->
setEnabled
(
false
);
// what kind of item is it?
switch
(
item
->
type
()
)
{
...
...
@@ -760,6 +769,7 @@ void WQtControlPanel::selectRoiTreeItem( QTreeWidgetItem* item )
props
=
(
static_cast
<
WQtRoiTreeItem
*
>
(
item
)
)
->
getRoi
()
->
getProperties
();
props
->
getProperty
(
"active"
)
->
toPropBool
()
->
set
(
item
->
checkState
(
0
)
);
WKernel
::
getRunningKernel
()
->
getRoiManager
()
->
setSelectedRoi
(
getSelectedRoi
()
);
m_deleteRoiAction
->
setEnabled
(
true
);
break
;
default:
break
;
...
...
src/qt4gui/controlPanel/WQtControlPanel.h
View file @
b2723071
...
...
@@ -177,6 +177,13 @@ public:
*/
WQtDockWidget
*
getRoiDock
()
const
;
/**
* Return the action to delete a selected roi
*
* \return the action
*/
QAction
*
getRoiDeleteAction
()
const
;
/**
* Gets the module dock widget.
*
...
...
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