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
2aca0822
Commit
2aca0822
authored
Apr 19, 2010
by
Mathias Goldau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ADD] Now the stub even compiles! => ship it!
parent
900d2e5d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
12 deletions
+14
-12
doc/developer/doxygenConfig
doc/developer/doxygenConfig
+3
-1
src/CMakeLists.txt
src/CMakeLists.txt
+1
-1
src/modules/lic/fibernavigator/FStreamlineOnSurfaceEuler.cpp
src/modules/lic/fibernavigator/FStreamlineOnSurfaceEuler.cpp
+1
-1
src/modules/lic/fibernavigator/FStreamlineOnSurfaceEuler.h
src/modules/lic/fibernavigator/FStreamlineOnSurfaceEuler.h
+2
-2
src/modules/lic/fibernavigator/SurfaceLIC.cpp
src/modules/lic/fibernavigator/SurfaceLIC.cpp
+3
-3
src/modules/lic/fibernavigator/SurfaceLIC.h
src/modules/lic/fibernavigator/SurfaceLIC.h
+3
-3
src/modules/lic/fibernavigator/TensorField.cpp
src/modules/lic/fibernavigator/TensorField.cpp
+1
-1
No files found.
doc/developer/doxygenConfig
View file @
2aca0822
...
...
@@ -616,7 +616,9 @@ EXCLUDE = src/dataHandler/io/nifti \
src/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \
src/dataHandler/io/libeep \
src/common/platformDependent/visualStudio/inttypes.h
src/common/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \
src/modules/lic/fantom
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
...
...
src/CMakeLists.txt
View file @
2aca0822
...
...
@@ -216,7 +216,7 @@ ADD_CUSTOM_TARGET( tags DEPENDS ctags DEPENDS cscope )
FILE
(
GLOB_RECURSE STYLE_CPP
${
PROJECT_SOURCE_DIR
}
/*.cpp
)
FILE
(
GLOB_RECURSE STYLE_H
${
PROJECT_SOURCE_DIR
}
/*.h
)
# Set dirs to exclude from stylecheck
SET
(
EXCLUDE_DIRS
"/dataHandler/io/nifti/;/dataHandler/io/biosig/;/dataHandler/io/biosigWin/;/dataHandler/io/biosig/XMLParser/;/dataHandler/io/biosigWin/XMLParser/;/dataHandler/io/libeep/avr/;/dataHandler/io/libeep/cnt/;/dataHandler/io/libeep/eep/;/common/platformDependent/visualStudio/"
)
SET
(
EXCLUDE_DIRS
"/dataHandler/io/nifti/;/dataHandler/io/biosig/;/dataHandler/io/biosigWin/;/dataHandler/io/biosig/XMLParser/;/dataHandler/io/biosigWin/XMLParser/;/dataHandler/io/libeep/avr/;/dataHandler/io/libeep/cnt/;/dataHandler/io/libeep/eep/;/common/platformDependent/visualStudio/
;/modules/lic/fibernavigator/;/modules/lic/fantom/
"
)
FOREACH
(
dirname
${
EXCLUDE_DIRS
}
)
FILE
(
GLOB EXCLUDE_H
${
PROJECT_SOURCE_DIR
}${
dirname
}
*.h
)
FILE
(
GLOB EXCLUDE_CPP
${
PROJECT_SOURCE_DIR
}${
dirname
}
*.cpp
)
...
...
src/modules/lic/fibernavigator/FStreamlineOnSurfaceEuler.cpp
View file @
2aca0822
...
...
@@ -31,7 +31,7 @@ F::FVector lastDirectionVector(3);
//---------------------------------------------------------------------------
#if 1
FStreamlineOnSurfaceEuler
::
FStreamlineOnSurfaceEuler
(
const
WDataSetVector
&
vectors
,
TriangleMesh
*
mesh
)
FStreamlineOnSurfaceEuler
::
FStreamlineOnSurfaceEuler
(
boost
::
shared_ptr
<
WDataSetVector
>
vectors
,
TriangleMesh
*
mesh
)
:
allSteps
(),
steps
(),
allNormals
(),
...
...
src/modules/lic/fibernavigator/FStreamlineOnSurfaceEuler.h
View file @
2aca0822
...
...
@@ -92,7 +92,7 @@ public:
};
FStreamlineOnSurfaceEuler
(
const
WDataSetVector
&
vectors
,
TriangleMesh
*
mesh
);
FStreamlineOnSurfaceEuler
(
boost
::
shared_ptr
<
WDataSetVector
>
vectors
,
TriangleMesh
*
mesh
);
virtual
~
FStreamlineOnSurfaceEuler
();
...
...
@@ -164,7 +164,7 @@ protected:
protected:
const
WDataSetVector
&
m_vectors
;
boost
::
shared_ptr
<
WDataSetVector
>
m_vectors
;
TensorField
*
m_tensorField
;
TriangleMesh
*
m_mesh
;
...
...
src/modules/lic/fibernavigator/SurfaceLIC.cpp
View file @
2aca0822
...
...
@@ -10,11 +10,11 @@
#include "SurfaceLIC.h"
#include "../fantom/FTensor.h"
SurfaceLIC
::
SurfaceLIC
(
const
WDataSetVector
&
vectors
,
boost
::
shared_ptr
<
WTriangleMesh2
>
mesh
)
SurfaceLIC
::
SurfaceLIC
(
boost
::
shared_ptr
<
WDataSetVector
>
vectors
,
boost
::
shared_ptr
<
WTriangleMesh2
>
mesh
)
:
m_vectors
(
vectors
)
{
WAssert
(
boost
::
shared_dynamic_cast
<
WGridRegular3D
>
(
vectors
.
getGrid
()
),
"Only vector field with regular grid are allowed... aborting"
);
m_mesh
=
new
TriangleMesh
(
mesh
,
boost
::
shared_dynamic_cast
<
WGridRegular3D
>
(
vectors
.
getGrid
()
)
);
WAssert
(
boost
::
shared_dynamic_cast
<
WGridRegular3D
>
(
vectors
->
getGrid
()
),
"Only vector field with regular grid are allowed... aborting"
);
m_mesh
=
new
TriangleMesh
(
mesh
,
boost
::
shared_dynamic_cast
<
WGridRegular3D
>
(
vectors
->
getGrid
()
)
);
nbFold
=
20
;
max_length
=
10.
;
...
...
src/modules/lic/fibernavigator/SurfaceLIC.h
View file @
2aca0822
...
...
@@ -18,7 +18,7 @@
class
SurfaceLIC
{
public:
SurfaceLIC
(
const
WDataSetVector
&
vectors
,
boost
::
shared_ptr
<
WTriangleMesh2
>
mesh
);
SurfaceLIC
(
boost
::
shared_ptr
<
WDataSetVector
>
vectors
,
boost
::
shared_ptr
<
WTriangleMesh2
>
mesh
);
virtual
~
SurfaceLIC
();
virtual
void
execute
();
std
::
vector
<
std
::
vector
<
float
>
>
testLines
;
...
...
@@ -29,7 +29,7 @@ private:
{
public:
MyLICStreamline
(
const
WDataSetVector
&
vectors
,
TriangleMesh
*
mesh
)
MyLICStreamline
(
boost
::
shared_ptr
<
WDataSetVector
>
vectors
,
TriangleMesh
*
mesh
)
:
FStreamlineOnSurfaceEuler
(
vectors
,
mesh
)
{
}
...
...
@@ -56,7 +56,7 @@ private:
positive
threshold
;
};
const
WDataSetVector
&
m_vectors
;
boost
::
shared_ptr
<
WDataSetVector
>
m_vectors
;
TriangleMesh
*
m_mesh
;
int
nbTriangles
;
...
...
src/modules/lic/fibernavigator/TensorField.cpp
View file @
2aca0822
...
...
@@ -42,7 +42,7 @@ TensorField::~TensorField()
FTensor
TensorField
::
getInterpolatedVector
(
float
x
,
float
y
,
float
z
)
{
bool
success
=
false
;
wmath
::
WVector3D
result
=
m_vectors
->
interpolate
(
wmath
::
WPosition
(
x
,
y
,
z
),
success
);
wmath
::
WVector3D
result
=
m_vectors
->
interpolate
(
wmath
::
WPosition
(
x
,
y
,
z
),
&
success
);
WAssert
(
success
,
"Vector interpolation was not successful"
);
return
FTensor
(
FArray
(
result
[
0
],
result
[
1
],
result
[
2
]
)
);
...
...
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