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
a6912804
Commit
a6912804
authored
Dec 03, 2009
by
Mathias Goldau
Browse files
[ADD
#157
] Fiber Display Module loads now automatically
parent
22e42c45
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
src/kernel/WKernel.cpp
src/kernel/WKernel.cpp
+1
-0
src/modules/data/WMData.cpp
src/modules/data/WMData.cpp
+0
-2
src/modules/fiberDisplay/WMFiberDisplay.cpp
src/modules/fiberDisplay/WMFiberDisplay.cpp
+6
-0
src/modules/fiberDisplay/WMFiberDisplay.h
src/modules/fiberDisplay/WMFiberDisplay.h
+6
-0
No files found.
src/kernel/WKernel.cpp
View file @
a6912804
...
...
@@ -134,6 +134,7 @@ void WKernel::threadMain()
// default modules
m_moduleContainer
->
add
(
m_moduleFactory
->
create
(
m_moduleFactory
->
getPrototypeByName
(
"Navigation Slice Module"
)
)
,
true
);
m_moduleContainer
->
add
(
m_moduleFactory
->
create
(
m_moduleFactory
->
getPrototypeByName
(
"Coordinate System Module"
)
)
,
true
);
m_moduleContainer
->
add
(
m_moduleFactory
->
create
(
m_moduleFactory
->
getPrototypeByName
(
"Fiber Display Module"
)
)
,
true
);
// actually there is nothing more to do here
waitForStop
();
...
...
src/modules/data/WMData.cpp
View file @
a6912804
...
...
@@ -82,8 +82,6 @@ void WMData::connectors()
void
WMData
::
properties
()
{
// properties
// filename of file to load and handle
m_properties
->
addString
(
"filename"
);
m_properties
->
hideProperty
(
"filename"
);
...
...
src/modules/fiberDisplay/WMFiberDisplay.cpp
View file @
a6912804
...
...
@@ -94,6 +94,12 @@ osg::ref_ptr< osg::Geode > WMFiberDisplay::genFiberGeode(
return
geode
;
}
void
WMFiberDisplay
::
connectToGui
()
{
WKernel
::
getRunningKernel
()
->
getGui
()
->
connectProperties
(
m_properties
);
WKernel
::
getRunningKernel
()
->
getGui
()
->
addModuleToBrowser
(
shared_from_this
()
);
}
void
WMFiberDisplay
::
moduleMain
()
{
// ready();
...
...
src/modules/fiberDisplay/WMFiberDisplay.h
View file @
a6912804
...
...
@@ -73,6 +73,12 @@ public:
*/
virtual
boost
::
shared_ptr
<
WModule
>
factory
()
const
;
/**
* Takes all the relevant GUI signals and connects them to own member functions.
* NOTE: this is only temporal. See ticket 142.
*/
virtual
void
connectToGui
();
protected:
/**
* Entry point after loading the module. Runs in separate thread.
...
...
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