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
72203f0a
Commit
72203f0a
authored
Feb 21, 2011
by
Sebastian Eichelbaum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CHANGE] - renamed bbox module to gridRenderer.
parent
fbaa3afe
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
38 additions
and
40 deletions
+38
-40
src/modules/boundingBox/boundingbox.png
src/modules/boundingBox/boundingbox.png
+0
-0
src/modules/gridRenderer/CMakeLists.txt
src/modules/gridRenderer/CMakeLists.txt
+0
-0
src/modules/gridRenderer/WMGridRenderer.cpp
src/modules/gridRenderer/WMGridRenderer.cpp
+24
-24
src/modules/gridRenderer/WMGridRenderer.h
src/modules/gridRenderer/WMGridRenderer.h
+7
-9
src/modules/gridRenderer/WMGridRenderer.xpm
src/modules/gridRenderer/WMGridRenderer.xpm
+1
-1
src/modules/gridRenderer/WMGridRenderer_boundary.xpm
src/modules/gridRenderer/WMGridRenderer_boundary.xpm
+1
-1
src/modules/gridRenderer/WMGridRenderer_grid.xpm
src/modules/gridRenderer/WMGridRenderer_grid.xpm
+1
-1
src/modules/gridRenderer/WMGridRenderer_label.xpm
src/modules/gridRenderer/WMGridRenderer_label.xpm
+1
-1
src/modules/modules-base.toolbox
src/modules/modules-base.toolbox
+3
-3
No files found.
src/modules/boundingBox/boundingbox.png
deleted
100644 → 0
View file @
fbaa3afe
266 Bytes
src/modules/
boundingBox
/CMakeLists.txt
→
src/modules/
gridRenderer
/CMakeLists.txt
View file @
72203f0a
File moved
src/modules/
boundingBox/WMBoundingBox
.cpp
→
src/modules/
gridRenderer/WMGridRenderer
.cpp
View file @
72203f0a
...
...
@@ -43,16 +43,16 @@
#include "../../graphicsEngine/callbacks/WGENodeMaskCallback.h"
#include "../../kernel/modules/data/WMData.h"
#include "../../kernel/WKernel.h"
#include "WM
BoundingBox
.h"
#include "WM
BoundingBox
.xpm"
#include "WM
BoundingBox
_boundary.xpm"
#include "WM
BoundingBox
_grid.xpm"
#include "WM
BoundingBox
_label.xpm"
#include "WM
GridRenderer
.h"
#include "WM
GridRenderer
.xpm"
#include "WM
GridRenderer
_boundary.xpm"
#include "WM
GridRenderer
_grid.xpm"
#include "WM
GridRenderer
_label.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE
(
WM
BoundingBox
)
W_LOADABLE_MODULE
(
WM
GridRenderer
)
WM
BoundingBox
::
WMBoundingBox
()
:
WM
GridRenderer
::
WMGridRenderer
()
:
WModule
(),
m_recompute
(
boost
::
shared_ptr
<
WCondition
>
(
new
WCondition
()
)
)
{
...
...
@@ -60,33 +60,33 @@ WMBoundingBox::WMBoundingBox():
// Implement WModule::initializeConnectors instead.
}
WM
BoundingBox
::~
WMBoundingBox
()
WM
GridRenderer
::~
WMGridRenderer
()
{
// cleanup
removeConnectors
();
}
boost
::
shared_ptr
<
WModule
>
WM
BoundingBox
::
factory
()
const
boost
::
shared_ptr
<
WModule
>
WM
GridRenderer
::
factory
()
const
{
return
boost
::
shared_ptr
<
WModule
>
(
new
WM
BoundingBox
()
);
return
boost
::
shared_ptr
<
WModule
>
(
new
WM
GridRenderer
()
);
}
const
char
**
WM
BoundingBox
::
getXPMIcon
()
const
const
char
**
WM
GridRenderer
::
getXPMIcon
()
const
{
return
WM
BoundingBox
_xpm
;
return
WM
GridRenderer
_xpm
;
}
const
std
::
string
WM
BoundingBox
::
getName
()
const
const
std
::
string
WM
GridRenderer
::
getName
()
const
{
return
"
Bounding Box
"
;
return
"
Grid Renderer
"
;
}
const
std
::
string
WM
BoundingBox
::
getDescription
()
const
const
std
::
string
WM
GridRenderer
::
getDescription
()
const
{
return
"Shows the bounding box of a data set."
;
return
"Shows the bounding box
and grid
of a data set."
;
}
void
WM
BoundingBox
::
moduleMain
()
void
WM
GridRenderer
::
moduleMain
()
{
// use the m_input "data changed" flag
m_moduleState
.
setResetable
(
true
,
true
);
...
...
@@ -139,7 +139,7 @@ void WMBoundingBox::moduleMain()
WGraphicsEngine
::
getGraphicsEngine
()
->
getScene
()
->
remove
(
m_gridNode
);
}
void
WM
BoundingBox
::
connectors
()
void
WM
GridRenderer
::
connectors
()
{
// initialize connectors
m_input
=
boost
::
shared_ptr
<
WModuleInputData
<
WDataSetSingle
>
>
(
...
...
@@ -154,18 +154,18 @@ void WMBoundingBox::connectors()
WModule
::
connectors
();
}
void
WM
BoundingBox
::
properties
()
void
WM
GridRenderer
::
properties
()
{
WPropertyBase
::
PropertyChangeNotifierType
notifier
=
boost
::
bind
(
&
WM
BoundingBox
::
updateNode
,
this
,
_1
);
WPropertyBase
::
PropertyChangeNotifierType
notifier
=
boost
::
bind
(
&
WM
GridRenderer
::
updateNode
,
this
,
_1
);
m_bboxColor
=
m_properties
->
addProperty
(
"Bounding Box Color"
,
"The color of the bounding box."
,
WColor
(
0.3
,
0.3
,
0.3
,
1.0
),
notifier
);
m_gridColor
=
m_properties
->
addProperty
(
"Grid Color"
,
"The color of the grid."
,
WColor
(
0.1
,
0.1
,
0.1
,
1.0
),
notifier
);
m_possibleModes
=
WItemSelection
::
SPtr
(
new
WItemSelection
()
);
m_possibleModes
->
addItem
(
"Labels"
,
"Show the boundary labels."
,
WM
BoundingBox
_label_xpm
);
// NOTE: you can add XPM images here.
m_possibleModes
->
addItem
(
"Bounding Box"
,
"Show the bounding box."
,
WM
BoundingBox
_boundary_xpm
);
m_possibleModes
->
addItem
(
"Grid"
,
"Show the inner grid."
,
WM
BoundingBox
_grid_xpm
);
m_possibleModes
->
addItem
(
"Labels"
,
"Show the boundary labels."
,
WM
GridRenderer
_label_xpm
);
// NOTE: you can add XPM images here.
m_possibleModes
->
addItem
(
"Bounding Box"
,
"Show the bounding box."
,
WM
GridRenderer
_boundary_xpm
);
m_possibleModes
->
addItem
(
"Grid"
,
"Show the inner grid."
,
WM
GridRenderer
_grid_xpm
);
// selecting all at once might be a bad idea since the grid rendering can be very very slow. So, by default, only show bbox and labels.
WItemSelector
sel
=
m_possibleModes
->
getSelectorFirst
();
...
...
@@ -175,7 +175,7 @@ void WMBoundingBox::properties()
WModule
::
properties
();
}
void
WM
BoundingBox
::
updateNode
(
WPropertyBase
::
SPtr
property
)
void
WM
GridRenderer
::
updateNode
(
WPropertyBase
::
SPtr
property
)
{
// only update if there is a grid node
if
(
!
m_gridNode
)
...
...
src/modules/
boundingBox/WMBoundingBox
.h
→
src/modules/
gridRenderer/WMGridRenderer
.h
View file @
72203f0a
...
...
@@ -22,8 +22,8 @@
//
//---------------------------------------------------------------------------
#ifndef WM
BOUNDINGBOX
_H
#define WM
BOUNDINGBOX
_H
#ifndef WM
GRIDRENDERER
_H
#define WM
GRIDRENDERER
_H
#include <map>
#include <string>
...
...
@@ -39,24 +39,22 @@
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
class
WPickHandler
;
/**
* Show the bounding box of a WDataSetSingle
* Show the bounding box
and grid
of a WDataSetSingle
* \ingroup modules
*/
class
WM
BoundingBox
:
public
WModule
class
WM
GridRenderer
:
public
WModule
{
public:
/**
* Standard constructor.
*/
WM
BoundingBox
();
WM
GridRenderer
();
/**
* Destructor.
*/
~
WM
BoundingBox
();
~
WM
GridRenderer
();
/**
* Gives back the name of this module.
...
...
@@ -134,4 +132,4 @@ private:
*/
void
updateNode
(
WPropertyBase
::
SPtr
property
);
};
#endif // WM
BOUNDINGBOX
_H
#endif // WM
GRIDRENDERER
_H
src/modules/
boundingBox/WMBoundingBox
.xpm
→
src/modules/
gridRenderer/WMGridRenderer
.xpm
View file @
72203f0a
/* XPM */
static const char * WM
BoundingBox
_xpm[] = {
static const char * WM
GridRenderer
_xpm[] = {
"32 32 3 1",
" c None",
". c #7D7D7D",
...
...
src/modules/
boundingBox/WMBoundingBox
_boundary.xpm
→
src/modules/
gridRenderer/WMGridRenderer
_boundary.xpm
View file @
72203f0a
/* XPM */
static const char * WM
BoundingBox
_boundary_xpm[] = {
static const char * WM
GridRenderer
_boundary_xpm[] = {
"32 32 2 1",
" c None",
". c #7D7D7D",
...
...
src/modules/
boundingBox/WMBoundingBox
_grid.xpm
→
src/modules/
gridRenderer/WMGridRenderer
_grid.xpm
View file @
72203f0a
/* XPM */
static const char * WM
BoundingBox
_grid_xpm[] = {
static const char * WM
GridRenderer
_grid_xpm[] = {
"32 32 2 1",
" c None",
". c #000000",
...
...
src/modules/
boundingBox/WMBoundingBox
_label.xpm
→
src/modules/
gridRenderer/WMGridRenderer
_label.xpm
View file @
72203f0a
/* XPM */
static const char * WM
BoundingBox
_label_xpm[] = {
static const char * WM
GridRenderer
_label_xpm[] = {
"32 32 2 1",
" c None",
". c #000000",
...
...
src/modules/modules-base.toolbox
View file @
72203f0a
# mostly modules from our default whitelist
ADD_SUBDIRECTORY( arbitraryRois )
ADD_SUBDIRECTORY( boundingBox )
#ADD_SUBDIRECTORY( clusterDisplayVoxels )
#ADD_SUBDIRECTORY( overlayAtlas )
ADD_SUBDIRECTORY( arbitraryRois )
ADD_SUBDIRECTORY( coordinateHUD )
ADD_SUBDIRECTORY( coordinateSystem )
ADD_SUBDIRECTORY( distanceMap )
ADD_SUBDIRECTORY( distanceMapIsosurface )
ADD_SUBDIRECTORY( fiberDisplay )
ADD_SUBDIRECTORY( functionalMRIViewer )
ADD_SUBDIRECTORY( gridRenderer )
ADD_SUBDIRECTORY( hud )
ADD_SUBDIRECTORY( imageSpaceLIC )
ADD_SUBDIRECTORY( isosurfaceRaytracer )
ADD_SUBDIRECTORY( lic )
ADD_SUBDIRECTORY( marchingCubes )
#ADD_SUBDIRECTORY( overlayAtlas )
ADD_SUBDIRECTORY( paintTexture )
ADD_SUBDIRECTORY( superquadricGlyphs )
ADD_SUBDIRECTORY( template )
...
...
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