OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

System : Assign value directly

Browse Source
This commit is contained in:
Magne Sjaastad 2015-10-26 10:29:57 +01:00
parent 1e9f77274a
commit ba032020ec
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@ -231,9 +231,7 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(const QString& res
{ {
if (!m_cellResults) return cvf::UNDEFINED_SIZE_T; if (!m_cellResults) return cvf::UNDEFINED_SIZE_T;
size_t scalarResultIndex = cvf::UNDEFINED_SIZE_T; size_t scalarResultIndex = this->findOrLoadScalarResult(RimDefines::STATIC_NATIVE, resultName);
scalarResultIndex = this->findOrLoadScalarResult(RimDefines::STATIC_NATIVE, resultName);
if (scalarResultIndex == cvf::UNDEFINED_SIZE_T) if (scalarResultIndex == cvf::UNDEFINED_SIZE_T)
{ {

3
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -75,8 +75,7 @@ RimView::RimView(void)
CAF_PDM_InitField(&cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", ""); CAF_PDM_InitField(&cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", "");
cameraPosition.uiCapability()->setUiHidden(true); cameraPosition.uiCapability()->setUiHidden(true);
double defaultScaleFactor = 1.0; double defaultScaleFactor = preferences->defaultScaleFactorZ;
defaultScaleFactor = preferences->defaultScaleFactorZ;
CAF_PDM_InitField(&scaleZ, "GridZScale", defaultScaleFactor, "Z Scale", "", "Scales the scene in the Z direction", ""); CAF_PDM_InitField(&scaleZ, "GridZScale", defaultScaleFactor, "Z Scale", "", "Scales the scene in the Z direction", "");
cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor(); cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor();