Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenWalnut Core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
44
Issues
44
List
Boards
Labels
Service Desk
Milestones
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
75abd8c3
Commit
75abd8c3
authored
Dec 07, 2010
by
Alexander Wiebel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX #455] somehow miss thes before the merge
parent
aaf5428e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
src/graphicsEngine/WROI.h
src/graphicsEngine/WROI.h
+11
-2
src/gui/qt4/WQt4Gui.cpp
src/gui/qt4/WQt4Gui.cpp
+10
-4
No files found.
src/graphicsEngine/WROI.h
View file @
75abd8c3
...
...
@@ -113,7 +113,15 @@ public:
*
* \param notifier the notifier function
*/
void
addChangeNotifier
(
boost
::
function
<
void
()
>
notifier
);
void
addChangeNotifier
(
boost
::
shared_ptr
<
boost
::
function
<
void
()
>
>
notifier
);
/**
* Remove a specified notifier from the list of default notifiers which get connected to each roi.
*
* \param notifier the notifier function
*/
void
removeChangeNotifier
(
boost
::
shared_ptr
<
boost
::
function
<
void
()
>
>
notifier
);
protected:
/**
...
...
@@ -173,7 +181,8 @@ protected:
/**
* The notifiers connected to added rois by default.
*/
std
::
list
<
boost
::
function
<
void
()
>
>
m_changeNotifiers
;
std
::
list
<
boost
::
shared_ptr
<
boost
::
function
<
void
()
>
>
>
m_changeNotifiers
;
/**
* Lock for associated notifiers set.
...
...
src/gui/qt4/WQt4Gui.cpp
View file @
75abd8c3
...
...
@@ -193,11 +193,17 @@ int WQt4Gui::run()
t_GenericSignalHandlerType
connectionClosedSignal
=
boost
::
bind
(
&
WQt4Gui
::
slotConnectionClosed
,
this
,
_1
,
_2
);
m_kernel
->
getRootContainer
()
->
addDefaultNotifier
(
CONNECTION_CLOSED
,
connectionClosedSignal
);
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
assocRoiSignal
=
boost
::
bind
(
&
WQt4Gui
::
slotAddRoiToTree
,
this
,
_1
);
boost
::
shared_ptr
<
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
>
assocRoiSignal
;
assocRoiSignal
=
boost
::
shared_ptr
<
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
>
(
new
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
(
boost
::
bind
(
&
WQt4Gui
::
slotAddRoiToTree
,
this
,
_1
)
)
);
m_kernel
->
getRoiManager
()
->
addAddNotifier
(
assocRoiSignal
);
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
removeRoiSignal
=
boost
::
bind
(
&
WQt4Gui
::
slotRemoveRoiFromTree
,
this
,
_1
);
boost
::
shared_ptr
<
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
>
removeRoiSignal
;
removeRoiSignal
=
boost
::
shared_ptr
<
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
>
(
new
boost
::
function
<
void
(
osg
::
ref_ptr
<
WROI
>
)
>
(
boost
::
bind
(
&
WQt4Gui
::
slotRemoveRoiFromTree
,
this
,
_1
)
)
);
m_kernel
->
getRoiManager
()
->
addRemoveNotifier
(
removeRoiSignal
);
// now we are initialized
...
...
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