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
7f6674e3
Commit
7f6674e3
authored
Dec 12, 2011
by
Mathias Goldau
Browse files
[MERGE]
parents
75099d33
b287e821
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
src/modules/arbitraryROIs/WMArbitraryROIs.cpp
src/modules/arbitraryROIs/WMArbitraryROIs.cpp
+1
-1
src/modules/gaussFiltering/WMGaussFiltering.cpp
src/modules/gaussFiltering/WMGaussFiltering.cpp
+8
-0
No files found.
src/modules/arbitraryROIs/WMArbitraryROIs.cpp
View file @
7f6674e3
...
...
@@ -130,7 +130,7 @@ void WMArbitraryROIs::moduleMain()
break
;
}
if
(
m_dataSet
!=
m_input
->
getData
()
)
if
(
m_input
->
getData
()
&&
m_dataSet
!=
m_input
->
getData
()
)
{
// acquire data from the input connector
m_dataSet
=
m_input
->
getData
();
...
...
src/modules/gaussFiltering/WMGaussFiltering.cpp
View file @
7f6674e3
...
...
@@ -325,6 +325,14 @@ void WMGaussFiltering::moduleMain()
newValueSet
=
iterativeFilterField
(
vals
,
iterations
);
break
;
}
case
W_DT_UINT16
:
{
boost
::
shared_ptr
<
WValueSet
<
uint16_t
>
>
vals
;
vals
=
boost
::
shared_dynamic_cast
<
WValueSet
<
uint16_t
>
>
(
(
*
m_dataSet
).
getValueSet
()
);
WAssert
(
vals
,
"Data type and data type indicator must fit."
);
newValueSet
=
iterativeFilterField
(
vals
,
iterations
);
break
;
}
case
W_DT_SIGNED_INT
:
{
boost
::
shared_ptr
<
WValueSet
<
int32_t
>
>
vals
;
...
...
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