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
fd7d233b
Commit
fd7d233b
authored
Dec 17, 2009
by
Sebastian Eichelbaum
Browse files
[CHANGE] - now modules use the same WPrototyped interface as WTransferable
parent
a1143245
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
33 additions
and
42 deletions
+33
-42
src/common/WPrototyped.h
src/common/WPrototyped.h
+2
-2
src/dataHandler/WDataSet.cpp
src/dataHandler/WDataSet.cpp
+2
-2
src/dataHandler/WDataSet.h
src/dataHandler/WDataSet.h
+2
-2
src/dataHandler/WDataSetFibers.cpp
src/dataHandler/WDataSetFibers.cpp
+2
-2
src/dataHandler/WDataSetFibers.h
src/dataHandler/WDataSetFibers.h
+2
-2
src/dataHandler/WDataSetMultiple.cpp
src/dataHandler/WDataSetMultiple.cpp
+2
-2
src/dataHandler/WDataSetMultiple.h
src/dataHandler/WDataSetMultiple.h
+2
-2
src/dataHandler/WDataSetSingle.cpp
src/dataHandler/WDataSetSingle.cpp
+2
-2
src/dataHandler/WDataSetSingle.h
src/dataHandler/WDataSetSingle.h
+2
-2
src/dataHandler/WEEG.cpp
src/dataHandler/WEEG.cpp
+2
-2
src/dataHandler/WEEG.h
src/dataHandler/WEEG.h
+2
-2
src/dataHandler/WRecording.cpp
src/dataHandler/WRecording.cpp
+2
-2
src/dataHandler/WRecording.h
src/dataHandler/WRecording.h
+2
-2
src/kernel/WModule.cpp
src/kernel/WModule.cpp
+1
-0
src/kernel/WModule.h
src/kernel/WModule.h
+2
-12
src/kernel/test/WModuleConnector_test.h
src/kernel/test/WModuleConnector_test.h
+4
-4
No files found.
src/common/WPrototyped.h
View file @
fd7d233b
...
...
@@ -52,14 +52,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
=
0
;
virtual
const
std
::
string
getName
()
const
=
0
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
=
0
;
virtual
const
std
::
string
getDescription
()
const
=
0
;
protected:
private:
...
...
src/dataHandler/WDataSet.cpp
View file @
fd7d233b
...
...
@@ -60,12 +60,12 @@ boost::shared_ptr< WDataTexture3D > WDataSet::getTexture()
throw
WDHException
(
"This dataset does not provide a texture."
);
}
std
::
string
WDataSet
::
getName
()
const
const
std
::
string
WDataSet
::
getName
()
const
{
return
"WDataSet"
;
}
std
::
string
WDataSet
::
getDescription
()
const
const
std
::
string
WDataSet
::
getDescription
()
const
{
return
"Encapsulates the whole common feature set of all datasets."
;
}
...
...
src/dataHandler/WDataSet.h
View file @
fd7d233b
...
...
@@ -86,14 +86,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
;
virtual
const
std
::
string
getName
()
const
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
;
virtual
const
std
::
string
getDescription
()
const
;
/**
* Returns a prototype instantiated with the true type of the deriving class.
...
...
src/dataHandler/WDataSetFibers.cpp
View file @
fd7d233b
...
...
@@ -82,12 +82,12 @@ const wmath::WFiber& WDataSetFibers::operator[]( const size_t index ) const
return
(
*
m_fibers
)[
index
];
}
std
::
string
WDataSetFibers
::
getName
()
const
const
std
::
string
WDataSetFibers
::
getName
()
const
{
return
"WDataSetFibers"
;
}
std
::
string
WDataSetFibers
::
getDescription
()
const
const
std
::
string
WDataSetFibers
::
getDescription
()
const
{
return
"Contains tracked fiber data."
;
}
...
...
src/dataHandler/WDataSetFibers.h
View file @
fd7d233b
...
...
@@ -88,14 +88,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
;
virtual
const
std
::
string
getName
()
const
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
;
virtual
const
std
::
string
getDescription
()
const
;
/**
* Returns a prototype instantiated with the true type of the deriving class.
...
...
src/dataHandler/WDataSetMultiple.cpp
View file @
fd7d233b
...
...
@@ -37,12 +37,12 @@ WDataSetMultiple::WDataSetMultiple()
// TODO(wiebel): implement this
}
std
::
string
WDataSetMultiple
::
getName
()
const
const
std
::
string
WDataSetMultiple
::
getName
()
const
{
return
"WDataSetMultiple"
;
}
std
::
string
WDataSetMultiple
::
getDescription
()
const
const
std
::
string
WDataSetMultiple
::
getDescription
()
const
{
// TODO(all): write this
return
"Please write me."
;
...
...
src/dataHandler/WDataSetMultiple.h
View file @
fd7d233b
...
...
@@ -47,14 +47,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
;
virtual
const
std
::
string
getName
()
const
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
;
virtual
const
std
::
string
getDescription
()
const
;
/**
* Returns a prototype instantiated with the true type of the deriving class.
...
...
src/dataHandler/WDataSetSingle.cpp
View file @
fd7d233b
...
...
@@ -81,12 +81,12 @@ boost::shared_ptr< WDataTexture3D > WDataSetSingle::getTexture()
return
m_texture3D
;
}
std
::
string
WDataSetSingle
::
getName
()
const
const
std
::
string
WDataSetSingle
::
getName
()
const
{
return
"WDataSetSingle"
;
}
std
::
string
WDataSetSingle
::
getDescription
()
const
const
std
::
string
WDataSetSingle
::
getDescription
()
const
{
// TODO(all): write this
return
"Please write me."
;
...
...
src/dataHandler/WDataSetSingle.h
View file @
fd7d233b
...
...
@@ -101,14 +101,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
;
virtual
const
std
::
string
getName
()
const
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
;
virtual
const
std
::
string
getDescription
()
const
;
/**
* Returns a prototype instantiated with the true type of the deriving class.
...
...
src/dataHandler/WEEG.cpp
View file @
fd7d233b
...
...
@@ -65,12 +65,12 @@ bool WEEG::isTexture() const
return
false
;
}
std
::
string
WEEG
::
getName
()
const
const
std
::
string
WEEG
::
getName
()
const
{
return
"WEEG"
;
}
std
::
string
WEEG
::
getDescription
()
const
const
std
::
string
WEEG
::
getDescription
()
const
{
return
"Contains data acquired using EEG."
;
}
...
...
src/dataHandler/WEEG.h
View file @
fd7d233b
...
...
@@ -136,14 +136,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
;
virtual
const
std
::
string
getName
()
const
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
;
virtual
const
std
::
string
getDescription
()
const
;
/**
* Returns a prototype instantiated with the true type of the deriving class.
...
...
src/dataHandler/WRecording.cpp
View file @
fd7d233b
...
...
@@ -36,12 +36,12 @@ WRecording::WRecording()
{
}
std
::
string
WRecording
::
getName
()
const
const
std
::
string
WRecording
::
getName
()
const
{
return
"WRecording"
;
}
std
::
string
WRecording
::
getDescription
()
const
const
std
::
string
WRecording
::
getDescription
()
const
{
return
"Contains several recorded data, like EEG or FMRT."
;
}
...
...
src/dataHandler/WRecording.h
View file @
fd7d233b
...
...
@@ -50,14 +50,14 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
;
virtual
const
std
::
string
getName
()
const
;
/**
* Gets the description for this prototype.
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
;
virtual
const
std
::
string
getDescription
()
const
;
/**
* Returns a prototype instantiated with the true type of the deriving class.
...
...
src/kernel/WModule.cpp
View file @
fd7d233b
...
...
@@ -50,6 +50,7 @@
WModule
::
WModule
()
:
WThreadedRunner
(),
WPrototyped
(),
m_initialized
(
new
WCondition
(),
false
),
m_isAssociated
(
new
WCondition
(),
false
),
m_isUsable
(
new
WCondition
(),
false
),
...
...
src/kernel/WModule.h
View file @
fd7d233b
...
...
@@ -45,6 +45,7 @@
#include "../common/WLogger.h"
#include "../common/WProperties.h"
#include "../common/WThreadedRunner.h"
#include "../common/WPrototyped.h"
#include "../common/WConditionSet.h"
class
WModuleConnector
;
...
...
@@ -58,6 +59,7 @@ class WModuleFactory;
* \ingroup kernel
*/
class
WModule
:
public
WThreadedRunner
,
public
WPrototyped
,
public
boost
::
enable_shared_from_this
<
WModule
>
{
friend
class
WModuleConnector
;
// requires access to notify members
...
...
@@ -77,18 +79,6 @@ public:
*/
virtual
~
WModule
();
/**
* Gives back the name of this module.
* \return the module's name.
*/
virtual
const
std
::
string
getName
()
const
=
0
;
/**
* Gives back a description of this module.
* \return description to module.
*/
virtual
const
std
::
string
getDescription
()
const
=
0
;
/**
* Gives back input connectors.
*
...
...
src/kernel/test/WModuleConnector_test.h
View file @
fd7d233b
...
...
@@ -70,7 +70,7 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
virtual
const
std
::
string
getName
()
const
{
return
"WTestTransferableBase"
;
}
...
...
@@ -80,7 +80,7 @@ public:
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
virtual
const
std
::
string
getDescription
()
const
{
return
"Test class for testing transfer of data."
;
}
...
...
@@ -146,7 +146,7 @@ public:
*
* \return the name.
*/
virtual
std
::
string
getName
()
const
virtual
const
std
::
string
getName
()
const
{
return
"WTestTransferableDerived"
;
}
...
...
@@ -156,7 +156,7 @@ public:
*
* \return the description
*/
virtual
std
::
string
getDescription
()
const
virtual
const
std
::
string
getDescription
()
const
{
return
"Test class for testing transfer of data."
;
}
...
...
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