From ba032020ecef78d32ad13bf448df03a6afe16eb5 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 26 Oct 2015 10:29:57 +0100 Subject: [PATCH] System : Assign value directly --- .../ProjectDataModel/RimReservoirCellResultsStorage.cpp | 4 +--- ApplicationCode/ProjectDataModel/RimView.cpp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index 711af3f91b..63a2d10190 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -231,9 +231,7 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(const QString& res { if (!m_cellResults) return cvf::UNDEFINED_SIZE_T; - size_t scalarResultIndex = cvf::UNDEFINED_SIZE_T; - - scalarResultIndex = this->findOrLoadScalarResult(RimDefines::STATIC_NATIVE, resultName); + size_t scalarResultIndex = this->findOrLoadScalarResult(RimDefines::STATIC_NATIVE, resultName); if (scalarResultIndex == cvf::UNDEFINED_SIZE_T) { diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp index 8e03871c39..834674b359 100644 --- a/ApplicationCode/ProjectDataModel/RimView.cpp +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -75,8 +75,7 @@ RimView::RimView(void) CAF_PDM_InitField(&cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", ""); cameraPosition.uiCapability()->setUiHidden(true); - double defaultScaleFactor = 1.0; - defaultScaleFactor = preferences->defaultScaleFactorZ; + double defaultScaleFactor = preferences->defaultScaleFactorZ; CAF_PDM_InitField(&scaleZ, "GridZScale", defaultScaleFactor, "Z Scale", "", "Scales the scene in the Z direction", ""); cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor();