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
81a3c9d0
Commit
81a3c9d0
authored
May 31, 2015
by
Alexander Wiebel
Browse files
[DOC
#42
][STYLE
#42
] improved name and docu of a property
and some more small style fixes
parent
46d81fcc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
src/modules/gaussFiltering/WMGaussFiltering.cpp
src/modules/gaussFiltering/WMGaussFiltering.cpp
+9
-9
src/modules/gaussFiltering/WMGaussFiltering.h
src/modules/gaussFiltering/WMGaussFiltering.h
+1
-1
No files found.
src/modules/gaussFiltering/WMGaussFiltering.cpp
View file @
81a3c9d0
...
...
@@ -123,7 +123,7 @@ std::vector<double> WMGaussFiltering::filterField( boost::shared_ptr< WValueSet<
size_t
nY
=
grid
->
getNbCoordsY
();
size_t
nZ
=
grid
->
getNbCoordsZ
();
if
(
m_
m
ode
->
get
(
true
)
)
if
(
m_
3DMaskM
ode
->
get
(
true
)
)
{
std
::
vector
<
double
>
newVals
(
vals
->
elementsPerValue
()
*
nX
*
nY
*
nZ
,
0.
);
...
...
@@ -209,15 +209,15 @@ boost::shared_ptr< WValueSet< double > > WMGaussFiltering::iterativeFilterField(
// use a custom progress combiner
boost
::
shared_ptr
<
WProgress
>
prog
;
if
(
m_
m
ode
->
get
()
)
if
(
m_
3DMaskM
ode
->
get
()
)
{
prog
=
boost
::
shared_ptr
<
WProgress
>
(
new
WProgress
(
"Gauss Filter Iteration"
,
iterations
*
grid
->
getNbCoordsZ
()
)
);
prog
=
boost
::
shared_ptr
<
WProgress
>
(
new
WProgress
(
"Gauss Filter Iteration"
,
iterations
*
grid
->
getNbCoordsZ
()
)
);
}
else
{
prog
=
boost
::
shared_ptr
<
WProgress
>
(
new
WProgress
(
"Gauss Filter Iteration"
,
3
*
iterations
*
grid
->
getNbCoordsZ
()
)
);
prog
=
boost
::
shared_ptr
<
WProgress
>
(
new
WProgress
(
"Gauss Filter Iteration"
,
3
*
iterations
*
grid
->
getNbCoordsZ
()
)
);
}
m_progress
->
addSubProgress
(
prog
);
...
...
@@ -297,7 +297,7 @@ void WMGaussFiltering::moduleMain()
dataChanged
=
(
iterations
>=
1
);
}
if
(
m_
m
ode
->
changed
()
)
if
(
m_
3DMaskM
ode
->
changed
()
)
{
dataChanged
=
true
;
}
...
...
@@ -397,11 +397,11 @@ void WMGaussFiltering::properties()
{
m_propCondition
=
boost
::
shared_ptr
<
WCondition
>
(
new
WCondition
()
);
m_iterations
=
m_properties
->
addProperty
(
"Iterations"
,
"How often should the filter be applied."
,
1
,
m_propCondition
);
m_iterations
=
m_properties
->
addProperty
(
"Iterations"
,
"How often should the filter be applied."
,
1
,
m_propCondition
);
m_iterations
->
setMin
(
0
);
m_iterations
->
setMax
(
100
);
m_
mode
=
m_properties
->
addProperty
(
"
Mode"
,
"
"
,
false
,
m_propCondition
);
m_
3DMaskMode
=
m_properties
->
addProperty
(
"
Filter 3D"
,
"Filter with a 3D mask instead of three 1D masks.
"
,
false
,
m_propCondition
);
WModule
::
properties
();
}
src/modules/gaussFiltering/WMGaussFiltering.h
View file @
81a3c9d0
...
...
@@ -115,7 +115,7 @@ private:
/**
* 1D or 3D filtering flag
*/
WPropBool
m_
m
ode
;
WPropBool
m_
3DMaskM
ode
;
/**
* Simple convolution using a small gauss-like mask
...
...
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