diff --git a/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp b/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp index 788c21f6c0..2ce6ac2532 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp @@ -30,7 +30,8 @@ /// //-------------------------------------------------------------------------------------------------- RifReaderEclipseSummary::RifReaderEclipseSummary() - : m_ecl_sum(NULL) + : m_ecl_sum(NULL), + m_ecl_SmSpec(nullptr) { } diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h index b67b022286..96fbf16c44 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h @@ -85,8 +85,6 @@ private: float m_opacityLevel; cvf::Color3f m_defaultColor; - bool m_showLabel; - cvf::ref m_cellVisibility; cvf::ref m_nativeFaultGenerator; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp index ec37ff7d34..32d51e4131 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp @@ -95,6 +95,7 @@ RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator(const s unusedAppearTypes.insert(LINE_STYLE); unusedAppearTypes.insert(SYMBOL); unusedAppearTypes.insert(LINE_THICKNESS); + m_currentCurveGradient = 0.0f; m_dimensionCount = 0; if(m_variableCount > 1) { m_varAppearanceType = *(unusedAppearTypes.begin()); unusedAppearTypes.erase(unusedAppearTypes.begin()); m_dimensionCount++; } diff --git a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h index 2a7b730af0..8722f13259 100644 --- a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h +++ b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h @@ -104,7 +104,7 @@ public: ArrayWrapperConst completeFacePolygon, const cvf::Vec3d& faceNormal, const std::vector< std::vector* >& faceOverlapPolygons, - const std::vector faceOverlapPolygonWindingSameAsCubeFaceFlags, + const std::vector& faceOverlapPolygonWindingSameAsCubeFaceFlags, std::vector* partialFacePolygon, bool* m_partiallyFreeCubeFaceHasHoles); }; diff --git a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.inl b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.inl index 8a27e4ba5d..a3d1a03517 100644 --- a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.inl +++ b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.inl @@ -577,7 +577,7 @@ void GeometryTools::calculatePartiallyFreeCubeFacePolygon(ArrayWrapperConst completeFacePolygon, const cvf::Vec3d& faceNormal, const std::vector< std::vector* >& faceOverlapPolygons, - const std::vector faceOverlapPolygonWindingSameAsCubeFaceFlags, + const std::vector& faceOverlapPolygonWindingSameAsCubeFaceFlags, std::vector* partialFacePolygon, bool* m_partiallyFreeCubeFaceHasHoles) { diff --git a/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h b/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h index 299961ade9..35bce2927e 100644 --- a/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h +++ b/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h @@ -59,7 +59,6 @@ private: size_t m_gridIndex; int m_elementIndex; - size_t m_scalarResultIndex; int m_face; int m_closestNodeId; diff --git a/ApplicationCode/UserInterface/RiuSimpleHistogramWidget.cpp b/ApplicationCode/UserInterface/RiuSimpleHistogramWidget.cpp index 253b098955..3f0785e38f 100644 --- a/ApplicationCode/UserInterface/RiuSimpleHistogramWidget.cpp +++ b/ApplicationCode/UserInterface/RiuSimpleHistogramWidget.cpp @@ -14,6 +14,11 @@ QWidget(parent, f) m_min = HUGE_VAL; m_max = -HUGE_VAL; m_maxHistogramCount = 0; + + m_width = 0; + m_height = 0; + m_x = 0; + m_y = 0; } //--------------------------------------------------------------------------------------------------