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
5ba5ae19
Commit
5ba5ae19
authored
Jul 20, 2012
by
Sebastian Eichelbaum
Browse files
[MERGE]
parents
fb4dcb81
6e90246c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
src/modules/modules-others.toolbox
src/modules/modules-others.toolbox
+1
-1
src/modules/vectorAlign/WMVectorAlign.cpp
src/modules/vectorAlign/WMVectorAlign.cpp
+15
-15
src/modules/vectorAlign/WMVectorAlign.h
src/modules/vectorAlign/WMVectorAlign.h
+7
-7
No files found.
src/modules/modules-others.toolbox
View file @
5ba5ae19
...
...
@@ -36,7 +36,7 @@ ADD_MODULE( schmahmannPandyaSlices )
ADD_MODULE( splineSurface )
ADD_MODULE( surfaceIllustrator )
ADD_MODULE( surfaceParameterAnimator )
ADD_MODULE(
unifyEvecs
)
ADD_MODULE(
vectorAlign
)
ADD_MODULE( webglSupport )
IF( Teem_FOUND )
...
...
src/modules/
unifyEvecs/WMUnifyEvecs
.cpp
→
src/modules/
vectorAlign/WMVectorAlign
.cpp
View file @
5ba5ae19
...
...
@@ -28,41 +28,41 @@
#include "core/dataHandler/WDataSetVector.h"
#include "core/kernel/WKernel.h"
#include "modules/emptyIcon.xpm" // Please put a real icon here.
#include "WM
UnifyEvecs
.h"
#include "WM
VectorAlign
.h"
// This line is needed by the module loader to actually find your module. Do not remove. Do NOT add a ";" here.
W_LOADABLE_MODULE
(
WM
UnifyEvecs
)
W_LOADABLE_MODULE
(
WM
VectorAlign
)
WM
UnifyEvecs
::
WMUnifyEvecs
()
:
WM
VectorAlign
::
WMVectorAlign
()
:
WModule
()
{
}
WM
UnifyEvecs
::~
WMUnifyEvecs
()
WM
VectorAlign
::~
WMVectorAlign
()
{
}
boost
::
shared_ptr
<
WModule
>
WM
UnifyEvecs
::
factory
()
const
boost
::
shared_ptr
<
WModule
>
WM
VectorAlign
::
factory
()
const
{
return
boost
::
shared_ptr
<
WModule
>
(
new
WM
UnifyEvecs
()
);
return
boost
::
shared_ptr
<
WModule
>
(
new
WM
VectorAlign
()
);
}
const
char
**
WM
UnifyEvecs
::
getXPMIcon
()
const
const
char
**
WM
VectorAlign
::
getXPMIcon
()
const
{
return
emptyIcon_xpm
;
// Please put a real icon here.
}
const
std
::
string
WM
UnifyEvecs
::
getName
()
const
const
std
::
string
WM
VectorAlign
::
getName
()
const
{
return
"
Unify Evecs
"
;
return
"
Vector Align
"
;
}
const
std
::
string
WM
UnifyEvecs
::
getDescription
()
const
const
std
::
string
WM
VectorAlign
::
getDescription
()
const
{
return
"
This module may switch orientation of vectors
, so they are aligned in s
o
me halfspace
as best as possible
."
;
return
"
Aligns vectors of each grid cell
, so they are aligned in s
a
me halfspace."
;
}
void
WM
UnifyEvecs
::
connectors
()
void
WM
VectorAlign
::
connectors
()
{
m_vectorIC
=
WModuleInputData
<
WDataSetVector
>::
createAndAdd
(
shared_from_this
(),
"vectors"
,
"Some vector dataset."
);
m_vectorOC
=
WModuleOutputData
<
WDataSetVector
>::
createAndAdd
(
shared_from_this
(),
"alignedVectors"
,
...
...
@@ -71,12 +71,12 @@ void WMUnifyEvecs::connectors()
WModule
::
connectors
();
}
void
WM
UnifyEvecs
::
properties
()
void
WM
VectorAlign
::
properties
()
{
WModule
::
properties
();
}
void
WM
UnifyEvecs
::
requirements
()
void
WM
VectorAlign
::
requirements
()
{
}
...
...
@@ -125,7 +125,7 @@ namespace
}
}
void
WM
UnifyEvecs
::
moduleMain
()
void
WM
VectorAlign
::
moduleMain
()
{
// get notified about data changes
m_moduleState
.
setResetable
(
true
,
true
);
...
...
src/modules/
unifyEvecs/WMUnifyEvecs
.h
→
src/modules/
vectorAlign/WMVectorAlign
.h
View file @
5ba5ae19
...
...
@@ -22,8 +22,8 @@
//
//---------------------------------------------------------------------------
#ifndef WM
UNIFYEVECS
_H
#define WM
UNIFYEVECS
_H
#ifndef WM
VECTORALIGN
_H
#define WM
VECTORALIGN
_H
#include <string>
...
...
@@ -34,22 +34,22 @@
#include "core/kernel/WModuleOutputData.h"
/**
* This module aligns
diffusion direction
s so that they are inside of the same halfspace.
* This module aligns
vector
s so that they are inside of the same halfspace
by just mirroring their directions if necessary
.
* This is done mainly for trilinear interpolation which would produce artifacts otherwise.
* \ingroup modules
*/
class
WM
UnifyEvecs
:
public
WModule
class
WM
VectorAlign
:
public
WModule
{
public:
/**
*
*/
WM
UnifyEvecs
();
WM
VectorAlign
();
/**
*
*/
virtual
~
WM
UnifyEvecs
();
virtual
~
WM
VectorAlign
();
/**
* Gives back the name of this module.
...
...
@@ -112,4 +112,4 @@ private:
boost
::
shared_ptr
<
WModuleOutputData
<
WDataSetVector
>
>
m_vectorOC
;
};
#endif // WM
UNIFYEVECS
_H
#endif // WM
VECTORALIGN
_H
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