From b2e9d3fe1110cd2cd812dbe3bbfd588a93cfa602 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 6 Mar 2017 19:22:32 +0100 Subject: [PATCH] #1292 Fixed CppCheck Issues in AppFwk viewer/vizExtensions/CommonCode --- Fwk/AppFwk/CommonCode/cafColorTable.h | 2 +- Fwk/AppFwk/CommonCode/cafEffectCache.cpp | 1 - Fwk/AppFwk/CommonCode/cafEffectGenerator.h | 4 ++-- Fwk/AppFwk/CommonCode/cafMessagePanel.h | 2 +- Fwk/AppFwk/CommonCode/cvfStructGridCutPlane.h | 2 +- Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h | 4 ++-- Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp | 1 + Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp | 9 ++++++++- Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h | 7 +++++++ Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp | 3 ++- Fwk/AppFwk/cafVizExtensions/cafFixedAtlasFont.h | 2 +- .../cafTransparentWBRenderConfiguration.cpp | 2 +- 12 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Fwk/AppFwk/CommonCode/cafColorTable.h b/Fwk/AppFwk/CommonCode/cafColorTable.h index 21720f189e..5a8f41a101 100644 --- a/Fwk/AppFwk/CommonCode/cafColorTable.h +++ b/Fwk/AppFwk/CommonCode/cafColorTable.h @@ -56,7 +56,7 @@ namespace caf { class ColorTable { public: - ColorTable(const std::vector& colors); + explicit ColorTable(const std::vector& colors); cvf::Color3f cycledColor3f(size_t itemIndex) const; cvf::Color3ub cycledColor3ub(size_t itemIndex) const; diff --git a/Fwk/AppFwk/CommonCode/cafEffectCache.cpp b/Fwk/AppFwk/CommonCode/cafEffectCache.cpp index d0734f361a..18bf9e7986 100644 --- a/Fwk/AppFwk/CommonCode/cafEffectCache.cpp +++ b/Fwk/AppFwk/CommonCode/cafEffectCache.cpp @@ -86,7 +86,6 @@ cvf::Effect* EffectCache::findEffect(const EffectGenerator* generator) if (m_effectCache[i].first->isEqual(generator)) { cvf::ref effect = m_effectCache[i].second; - EffectGenerator* effGen = m_effectCache[i].first; return effect.p(); } } diff --git a/Fwk/AppFwk/CommonCode/cafEffectGenerator.h b/Fwk/AppFwk/CommonCode/cafEffectGenerator.h index 54da50d0db..0a8856cce4 100644 --- a/Fwk/AppFwk/CommonCode/cafEffectGenerator.h +++ b/Fwk/AppFwk/CommonCode/cafEffectGenerator.h @@ -206,7 +206,7 @@ private: class ScalarMapperMeshEffectGenerator : public EffectGenerator { public: - ScalarMapperMeshEffectGenerator(const cvf::ScalarMapper* scalarMapper); + explicit ScalarMapperMeshEffectGenerator(const cvf::ScalarMapper* scalarMapper); void setOpacityLevel(float opacity) { m_opacityLevel = cvf::Math::clamp(opacity, 0.0f , 1.0f ); } void setUndefinedColor(cvf::Color3f color) { m_undefinedColor = color; } @@ -237,7 +237,7 @@ private: class MeshEffectGenerator : public EffectGenerator { public: - MeshEffectGenerator(const cvf::Color3f& color); + explicit MeshEffectGenerator(const cvf::Color3f& color); void setLineStipple(bool enable) { m_lineStipple = enable; } void setLineWidth(float lineWidth); diff --git a/Fwk/AppFwk/CommonCode/cafMessagePanel.h b/Fwk/AppFwk/CommonCode/cafMessagePanel.h index cbc084eeae..57806df71e 100644 --- a/Fwk/AppFwk/CommonCode/cafMessagePanel.h +++ b/Fwk/AppFwk/CommonCode/cafMessagePanel.h @@ -55,7 +55,7 @@ class MessagePanel : public QWidget Q_OBJECT public: - MessagePanel(QDockWidget* parent); + explicit MessagePanel(QDockWidget* parent); static MessagePanel* instance(); diff --git a/Fwk/AppFwk/CommonCode/cvfStructGridCutPlane.h b/Fwk/AppFwk/CommonCode/cvfStructGridCutPlane.h index 3017f83e27..cd1e130624 100644 --- a/Fwk/AppFwk/CommonCode/cvfStructGridCutPlane.h +++ b/Fwk/AppFwk/CommonCode/cvfStructGridCutPlane.h @@ -58,7 +58,7 @@ class StructGridScalarDataAccess; class StructGridCutPlane : public Object { public: - StructGridCutPlane(const StructGridInterface* grid); + explicit StructGridCutPlane(const StructGridInterface* grid); ~StructGridCutPlane(); void setPlane(const Plane& plane); diff --git a/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h b/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h index 03ba0642bb..29b532828b 100644 --- a/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h +++ b/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h @@ -144,7 +144,7 @@ private: class StuctGridTriangleToCellFaceMapper : public Object { public: - StuctGridTriangleToCellFaceMapper(const StructGridQuadToCellFaceMapper* quadMapper) { m_quadMapper = quadMapper; } + explicit StuctGridTriangleToCellFaceMapper(const StructGridQuadToCellFaceMapper* quadMapper) { m_quadMapper = quadMapper; } size_t triangleCount() const { return 2* m_quadMapper->quadCount();} size_t cellIndex(size_t triangleIdx) const {return m_quadMapper->cellIndex(triangleIdx/2); } @@ -163,7 +163,7 @@ private: class StructGridGeometryGenerator : public Object { public: - StructGridGeometryGenerator(const StructGridInterface* grid); + explicit StructGridGeometryGenerator(const StructGridInterface* grid); ~StructGridGeometryGenerator(); // Setup methods diff --git a/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp index 8c0e152041..e66df439b2 100644 --- a/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp @@ -61,6 +61,7 @@ using cvf::ManipulatorTrackball; /// //-------------------------------------------------------------------------------------------------- caf::CeetronNavigation::CeetronNavigation() + : m_isRotCenterInitialized(false) { } diff --git a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp index a5c3ecc88c..519b5d8534 100644 --- a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp @@ -50,7 +50,14 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::TrackBallBasedNavigation::TrackBallBasedNavigation() : m_consumeEvents(false) +caf::TrackBallBasedNavigation::TrackBallBasedNavigation() : + m_isRotCenterInitialized(false), + m_isNavigating(false), + m_hasMovedMouseDuringNavigation(false), + m_isZooming(false), + m_lastPosX(0), + m_lastPosY(0), + m_consumeEvents(false) { } diff --git a/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h b/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h index 73a2c20920..74e9f1d03a 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h +++ b/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h @@ -62,6 +62,13 @@ protected: { OverlayColorLegendLayoutInfo(const cvf::Vec2i& pos, const cvf::Vec2ui& setSize) { + charHeight = 0.0f; + lineSpacing = 0.0f; + margins = cvf::Vec2f::ZERO; + tickX = 0.0f; + x0 = 0.0f; + x1 = 0.0f; + position = pos; size = setSize; } diff --git a/Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp b/Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp index 8b22153732..a95c9027ca 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp +++ b/Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp @@ -16,7 +16,8 @@ namespace caf { /// //-------------------------------------------------------------------------------------------------- CategoryMapper::CategoryMapper() - : m_textureSize(2048) + : m_textureSize(2048), + m_maxTexCoord(1.0) { } diff --git a/Fwk/AppFwk/cafVizExtensions/cafFixedAtlasFont.h b/Fwk/AppFwk/cafVizExtensions/cafFixedAtlasFont.h index 39dc217d91..0756ce5de5 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafFixedAtlasFont.h +++ b/Fwk/AppFwk/cafVizExtensions/cafFixedAtlasFont.h @@ -70,7 +70,7 @@ public: }; public: - FixedAtlasFont(FontSize size); + explicit FixedAtlasFont(FontSize size); virtual ~FixedAtlasFont(); virtual const cvf::String& name() const; diff --git a/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp b/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp index d0617aaf93..9e05655d84 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp +++ b/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp @@ -56,7 +56,7 @@ using namespace cvf; class RenderPassPreparator : public cvf::DynamicUniformSet { public: - RenderPassPreparator(TransparentWBRenderConfiguration* renderConfiguration) + explicit RenderPassPreparator(TransparentWBRenderConfiguration* renderConfiguration) { CVF_ASSERT(renderConfiguration); m_renderConfiguration = renderConfiguration;