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
74c70b94
Commit
74c70b94
authored
Aug 16, 2015
by
Sebastian Eichelbaum
Browse files
[FIX] fixed several compilation warnings, mainly related to implicit casts of shared_ptr to bool.
parent
6fe96969
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
26 additions
and
26 deletions
+26
-26
src/core/common/math/WTensorFunctions.h
src/core/common/math/WTensorFunctions.h
+1
-1
src/modules/HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.cpp
...HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.cpp
+1
-1
src/modules/anisotropicFiltering/WMAnisotropicFiltering.cpp
src/modules/anisotropicFiltering/WMAnisotropicFiltering.cpp
+1
-1
src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp
src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp
+1
-1
src/modules/datasetProfile/WMDatasetProfile.cpp
src/modules/datasetProfile/WMDatasetProfile.cpp
+1
-1
src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp
...modules/directVolumeRendering/WMDirectVolumeRendering.cpp
+1
-1
src/modules/fiberDisplay/WMFiberDisplay.cpp
src/modules/fiberDisplay/WMFiberDisplay.cpp
+1
-1
src/modules/fiberFilterIndex/WMFiberFilterIndex.cpp
src/modules/fiberFilterIndex/WMFiberFilterIndex.cpp
+1
-1
src/modules/fiberFilterROI/WMFiberFilterROI.cpp
src/modules/fiberFilterROI/WMFiberFilterROI.cpp
+1
-1
src/modules/fiberParameterColoring/WMFiberParameterColoring.cpp
...dules/fiberParameterColoring/WMFiberParameterColoring.cpp
+1
-1
src/modules/fibersToPoints/WMFibersToPoints.cpp
src/modules/fibersToPoints/WMFibersToPoints.cpp
+1
-1
src/modules/gridRenderer/WMGridRenderer.cpp
src/modules/gridRenderer/WMGridRenderer.cpp
+1
-1
src/modules/hierarchicalClustering/hierchClustDisplay/WHtree.cpp
...ules/hierarchicalClustering/hierchClustDisplay/WHtree.cpp
+4
-4
src/modules/hierarchicalClustering/hierchClustDisplay/WMHierchClustDisplay.cpp
...calClustering/hierchClustDisplay/WMHierchClustDisplay.cpp
+1
-1
src/modules/hierarchicalClustering/partition2Mesh/WMPartition2Mesh.cpp
...ierarchicalClustering/partition2Mesh/WMPartition2Mesh.cpp
+4
-4
src/modules/imageExtractor/WMImageExtractor.cpp
src/modules/imageExtractor/WMImageExtractor.cpp
+1
-1
src/modules/isosurfaceRaytracer/WMIsosurfaceRaytracer.cpp
src/modules/isosurfaceRaytracer/WMIsosurfaceRaytracer.cpp
+1
-1
src/modules/meshToPoints/WMMeshToPoints.cpp
src/modules/meshToPoints/WMMeshToPoints.cpp
+1
-1
src/modules/openIGTLink/WMOpenIGTLink.cpp
src/modules/openIGTLink/WMOpenIGTLink.cpp
+1
-1
src/modules/paintTexture/WMPaintTexture.cpp
src/modules/paintTexture/WMPaintTexture.cpp
+1
-1
No files found.
src/core/common/math/WTensorFunctions.h
View file @
74c70b94
...
...
@@ -61,7 +61,7 @@ std::ostream& operator<<( std::ostream& os, const RealEigenSystem& sys );
*
* \param es Eigensystem consisting of eigenvalues and eigenvectors.
*/
void
sortRealEigenSystem
(
RealEigenSystem
*
es
)
inline
void
sortRealEigenSystem
(
RealEigenSystem
*
es
)
{
if
(
(
*
es
)[
0
].
first
>
(
*
es
)[
2
].
first
)
{
...
...
src/modules/HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.cpp
View file @
74c70b94
...
...
@@ -111,7 +111,7 @@ void WMHARDIToSphericalHarmonics::moduleMain()
boost
::
shared_ptr
<
WDataSetRawHARDI
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_dataSet
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
switch
(
m_reconstructionTypeProp
->
get
(
true
).
getItemIndexOfSelected
(
0
)
)
{
...
...
src/modules/anisotropicFiltering/WMAnisotropicFiltering.cpp
View file @
74c70b94
...
...
@@ -121,7 +121,7 @@ void WMAnisotropicFiltering::moduleMain()
boost
::
shared_ptr
<
WDataSetSingle
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_dataSet
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
if
(
dataValid
)
{
...
...
src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp
View file @
74c70b94
...
...
@@ -282,7 +282,7 @@ void WMClusterDisplayVoxels::moduleMain()
boost
::
shared_ptr
<
WDataSetSingle
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_dataSet
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
if
(
dataValid
)
{
...
...
src/modules/datasetProfile/WMDatasetProfile.cpp
View file @
74c70b94
...
...
@@ -148,7 +148,7 @@ void WMDatasetProfile::moduleMain()
boost
::
shared_ptr
<
WDataSetScalar
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_dataSet
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
if
(
dataValid
)
{
...
...
src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp
View file @
74c70b94
...
...
@@ -244,7 +244,7 @@ void WMDirectVolumeRendering::moduleMain()
// was there an update?
bool
dataUpdated
=
m_input
->
updated
()
||
m_gradients
->
updated
();
boost
::
shared_ptr
<
WDataSetScalar
>
dataSet
=
m_input
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
propUpdated
=
m_localIlluminationAlgo
->
changed
()
||
m_stochasticJitterEnabled
->
changed
()
||
m_opacityCorrectionEnabled
->
changed
()
||
m_maximumIntensityProjectionEnabled
->
changed
()
||
m_depthProjectionEnabled
->
changed
();
...
...
src/modules/fiberDisplay/WMFiberDisplay.cpp
View file @
74c70b94
...
...
@@ -319,7 +319,7 @@ void WMFiberDisplay::moduleMain()
boost
::
shared_ptr
<
WDataSetFibers
>
fibers
=
m_fiberInput
->
getData
();
boost
::
shared_ptr
<
WDataSetFiberClustering
>
fiberClustering
=
m_fiberClusteringInput
->
getData
();
bool
dataValid
=
(
fibers
);
bool
dataValid
=
(
fibers
!=
NULL
);
bool
dataPropertiesUpdated
=
propObserver
->
updated
();
bool
propertiesUpdated
=
m_tubeEnable
->
changed
()
||
m_plainColorMode
->
changed
()
||
m_plainColor
->
changed
();
...
...
src/modules/fiberFilterIndex/WMFiberFilterIndex.cpp
View file @
74c70b94
...
...
@@ -103,7 +103,7 @@ void WMFiberFilterIndex::moduleMain()
// Remember the above criteria. We now need to check if the data is valid. After a connect-update, it might be NULL.
boost
::
shared_ptr
<
WDataSetFibers
>
dataSet
=
m_input
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
dataChanged
=
dataSet
!=
m_fibers
;
// do something with the data
...
...
src/modules/fiberFilterROI/WMFiberFilterROI.cpp
View file @
74c70b94
...
...
@@ -101,7 +101,7 @@ void WMFiberFilterROI::moduleMain()
// Remember the above criteria. We now need to check if the data is valid. After a connect-update, it might be NULL.
boost
::
shared_ptr
<
WDataSetFibers
>
dataSet
=
m_input
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
dataChanged
=
dataSet
!=
m_fibers
;
// do something with the data
...
...
src/modules/fiberParameterColoring/WMFiberParameterColoring.cpp
View file @
74c70b94
...
...
@@ -150,7 +150,7 @@ void WMFiberParameterColoring::moduleMain()
// To query whether an input was updated, simply ask the input:
bool
dataUpdated
=
m_fiberInput
->
handledUpdate
();
boost
::
shared_ptr
<
WDataSetFibers
>
dataSet
=
m_fiberInput
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
propUpdated
=
m_baseColor
->
changed
()
||
m_scaleColor
->
changed
();
// reset everything if input was disconnected/invalid
...
...
src/modules/fibersToPoints/WMFibersToPoints.cpp
View file @
74c70b94
...
...
@@ -130,7 +130,7 @@ void WMFibersToPoints::moduleMain()
// To query whether an input was updated, simply ask the input:
bool
dataUpdated
=
m_fiberInput
->
handledUpdate
();
boost
::
shared_ptr
<
WDataSetFibers
>
dataSet
=
m_fiberInput
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
propsChanged
=
m_parametersFilterValue
->
changed
()
||
m_parametersFilterWidth
->
changed
()
||
m_color
->
changed
();
...
...
src/modules/gridRenderer/WMGridRenderer.cpp
View file @
74c70b94
...
...
@@ -104,7 +104,7 @@ void WMGridRenderer::moduleMain()
m_moduleState
.
wait
();
boost
::
shared_ptr
<
WDataSet
>
dataSet
=
m_input
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
dataChanged
=
(
dataSet
!=
m_dataSet
);
m_dataSet
=
dataSet
;
...
...
src/modules/hierarchicalClustering/hierchClustDisplay/WHtree.cpp
View file @
74c70b94
...
...
@@ -1210,7 +1210,7 @@ bool WHtree::writeTree( const std::string &filename, const bool niftiMode ) cons
std
::
ofstream
outFile
(
filename
.
c_str
()
);
if
(
!
outFile
)
{
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
outFil
e
<<
"
\"
"
<<
std
::
endl
;
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
filenam
e
<<
"
\"
"
<<
std
::
endl
;
exit
(
-
1
);
}
...
...
@@ -1344,7 +1344,7 @@ bool WHtree::writeTreeDebug( const std::string &filename ) const
std
::
ofstream
outFile
(
filename
.
c_str
()
);
if
(
!
outFile
)
{
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
outFil
e
<<
"
\"
"
<<
std
::
endl
;
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
filenam
e
<<
"
\"
"
<<
std
::
endl
;
exit
(
-
1
);
}
...
...
@@ -1380,7 +1380,7 @@ bool WHtree::writeTreeOldWalnut( const std::string &filename ) const
std
::
ofstream
outFile
(
filename
.
c_str
()
);
if
(
!
outFile
)
{
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
outFil
e
<<
"
\"
"
<<
std
::
endl
;
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
filenam
e
<<
"
\"
"
<<
std
::
endl
;
exit
(
-
1
);
}
...
...
@@ -1422,7 +1422,7 @@ bool WHtree::writeTreeSimple( const std::string &filename ) const
std
::
ofstream
outFile
(
filename
.
c_str
()
);
if
(
!
outFile
)
{
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
outFil
e
<<
"
\"
"
<<
std
::
endl
;
std
::
cerr
<<
"ERROR: unable to open out file:
\"
"
<<
filenam
e
<<
"
\"
"
<<
std
::
endl
;
exit
(
-
1
);
}
...
...
src/modules/hierarchicalClustering/hierchClustDisplay/WMHierchClustDisplay.cpp
View file @
74c70b94
...
...
@@ -879,7 +879,7 @@ void WMHierchClustDisplay::moduleMain()
}
boost
::
shared_ptr
<
WDataSetSingle
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_anatomy
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
if
(
dataValid
)
{
if
(
dataChanged
)
...
...
src/modules/hierarchicalClustering/partition2Mesh/WMPartition2Mesh.cpp
View file @
74c70b94
...
...
@@ -141,7 +141,7 @@ void WMPartition2Mesh::moduleMain()
boost
::
shared_ptr
<
WDataSetScalar
>
newCoordVector
=
m_coordInput
->
getData
();
bool
coordsChanged
=
(
m_coordinateVector
!=
newCoordVector
);
bool
coordsValid
=
(
newCoordVector
);
bool
coordsValid
=
(
newCoordVector
!=
NULL
);
if
(
coordsValid
)
{
...
...
@@ -154,7 +154,7 @@ void WMPartition2Mesh::moduleMain()
boost
::
shared_ptr
<
WDataSetVector
>
newColorVector
=
m_colorInput
->
getData
();
bool
colorsChanged
=
(
m_colorVector
!=
newColorVector
);
bool
colorsValid
=
(
newColorVector
);
bool
colorsValid
=
(
newColorVector
!=
NULL
);
if
(
colorsValid
)
{
...
...
@@ -167,7 +167,7 @@ void WMPartition2Mesh::moduleMain()
boost
::
shared_ptr
<
WTriangleMesh
>
newRefMesh
=
m_meshInput1
->
getData
();
bool
refMeshChanged
=
(
m_referenceMesh
!=
newRefMesh
);
bool
refMeshValid
=
(
newRefMesh
);
bool
refMeshValid
=
(
newRefMesh
!=
NULL
);
if
(
refMeshValid
)
{
...
...
@@ -181,7 +181,7 @@ void WMPartition2Mesh::moduleMain()
boost
::
shared_ptr
<
WTriangleMesh
>
newOutMesh
=
m_meshInput2
->
getData
();
bool
outMeshChanged
=
(
m_outMesh
!=
newOutMesh
);
bool
outMeshValid
=
(
newOutMesh
);
bool
outMeshValid
=
(
newOutMesh
!=
NULL
);
if
(
outMeshValid
)
{
...
...
src/modules/imageExtractor/WMImageExtractor.cpp
View file @
74c70b94
...
...
@@ -128,7 +128,7 @@ void WMImageExtractor::moduleMain()
boost
::
shared_ptr
<
WDataSetSingle
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_dataSet
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
if
(
dataValid
)
{
...
...
src/modules/isosurfaceRaytracer/WMIsosurfaceRaytracer.cpp
View file @
74c70b94
...
...
@@ -223,7 +223,7 @@ void WMIsosurfaceRaytracer::moduleMain()
// was there an update?
bool
dataUpdated
=
m_input
->
updated
()
||
m_gradients
->
updated
();
boost
::
shared_ptr
<
WDataSetScalar
>
dataSet
=
m_input
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
// valid data available?
if
(
!
dataValid
)
...
...
src/modules/meshToPoints/WMMeshToPoints.cpp
View file @
74c70b94
...
...
@@ -180,7 +180,7 @@ void WMMeshToPoints::moduleMain()
// To query whether an input was updated, simply ask the input:
bool
dataUpdated
=
m_meshInput
->
handledUpdate
();
boost
::
shared_ptr
<
WTriangleMesh
>
dataSet
=
m_meshInput
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
bool
propsChanged
=
m_doRefinement
->
changed
()
||
m_maxIterations
->
changed
()
||
m_minDistance
->
changed
();
// reset everything if input was disconnected/invalid
...
...
src/modules/openIGTLink/WMOpenIGTLink.cpp
View file @
74c70b94
...
...
@@ -280,7 +280,7 @@ void WMOpenIGTLinkSender::moduleMain()
{
debugLog
()
<<
"prepare sending new data"
;
WDataSetScalarSPtr
dataSet
=
m_input
->
getData
();
bool
dataValid
=
(
dataSet
);
bool
dataValid
=
(
dataSet
!=
NULL
);
if
(
dataValid
)
{
...
...
src/modules/paintTexture/WMPaintTexture.cpp
View file @
74c70b94
...
...
@@ -150,7 +150,7 @@ void WMPaintTexture::moduleMain()
boost
::
shared_ptr
<
WDataSetSingle
>
newDataSet
=
m_input
->
getData
();
bool
dataChanged
=
(
m_dataSet
!=
newDataSet
);
bool
dataValid
=
(
newDataSet
);
bool
dataValid
=
(
newDataSet
!=
NULL
);
if
(
dataValid
)
{
...
...
Prev
1
2
Next
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