From c8f642d83ac5f519bd5670b39c6f8d8410de157a Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 17 Aug 2022 22:12:23 -0700 Subject: [PATCH] Add rename case to summary and grid cases (#9204) * #9203 Summary Case : Add rename to right-click menu * Janitor: Move ID and description to private fields * Eclipse Case: Add rename to right-click menu * Rename feature --- .../Application/RiaApplication.cpp | 2 +- .../Application/Tools/RiaProjectModifier.cpp | 4 +- .../RicfComputeCaseGroupStatistics.cpp | 2 +- .../RicfCreateSaturationPressurePlots.cpp | 2 +- .../CommandFileInterface/RicfCreateView.cpp | 2 +- .../CommandFileInterface/RicfSetTimeStep.cpp | 2 +- .../Commands/CMakeLists_files.cmake | 2 + .../EclipseCommands/CMakeLists_files.cmake | 2 + .../EclipseCommands/RicRenameCaseFeature.cpp | 66 ++++++++++++++++++ .../EclipseCommands/RicRenameCaseFeature.h | 31 +++++++++ .../RicExecuteScriptForCasesFeature.cpp | 2 +- .../Commands/RicRenameSummaryCaseFeature.cpp | 66 ++++++++++++++++++ .../Commands/RicRenameSummaryCaseFeature.h | 31 +++++++++ .../Commands/RicReplaceCaseFeature.cpp | 2 +- .../WellLogCommands/CMakeLists_files.cmake | 4 +- ...=> RicNewRftSegmentWellLogPlotFeature.cpp} | 20 +++--- ...h => RicNewRftSegmentWellLogPlotFeature.h} | 2 +- .../GeoMech/RimGeoMechCase.cpp | 6 +- .../ProjectDataModel/RimCase.cpp | 68 +++++++++++++++---- ApplicationLibCode/ProjectDataModel/RimCase.h | 11 ++- .../RimContextCommandBuilder.cpp | 4 +- .../RimContourMapProjection.cpp | 2 +- .../ProjectDataModel/RimEclipseInputCase.cpp | 10 +-- .../ProjectDataModel/RimEclipseResultCase.cpp | 6 +- .../RimEclipseStatisticsCase.cpp | 4 +- .../RimIdenticalGridCaseGroup.cpp | 4 +- .../ProjectDataModel/RimProject.cpp | 2 +- .../Summary/RimSummaryCase.cpp | 11 +++ .../ProjectDataModel/Summary/RimSummaryCase.h | 2 + .../SocketInterface/RiaCaseInfoCommands.cpp | 6 +- .../RiaProjectInfoCommands.cpp | 4 +- .../RiaPropertyDataCommands.cpp | 4 +- .../SocketInterface/RiaSocketServer.cpp | 2 +- .../SocketInterface/RiaSocketTools.cpp | 4 +- .../RiuRelativePermeabilityPlotUpdater.cpp | 2 +- .../UserInterface/RiuResultQwtPlot.cpp | 4 +- GrpcInterface/RiaGrpcCaseService.cpp | 2 +- GrpcInterface/RiaGrpcPropertiesService.cpp | 2 +- 38 files changed, 331 insertions(+), 71 deletions(-) create mode 100644 ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.cpp create mode 100644 ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.h create mode 100644 ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.cpp create mode 100644 ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.h rename ApplicationLibCode/Commands/WellLogCommands/{RicNewRftSegmentWellLogCurveFeature.cpp => RicNewRftSegmentWellLogPlotFeature.cpp} (84%) rename ApplicationLibCode/Commands/WellLogCommands/{RicNewRftSegmentWellLogCurveFeature.h => RicNewRftSegmentWellLogPlotFeature.h} (95%) diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp index 221f6b0da7..da409da9f5 100644 --- a/ApplicationLibCode/Application/RiaApplication.cpp +++ b/ApplicationLibCode/Application/RiaApplication.cpp @@ -888,7 +888,7 @@ bool RiaApplication::openOdbCaseFromFile( const QString& fileName, bool applyTim auto geoMechCase = std::make_unique(); geoMechCase->setGridFileName( fileName ); - geoMechCase->caseUserDescription = caseName; + geoMechCase->setCaseUserDescription( caseName ); geoMechCase->setApplyTimeFilter( applyTimeStepFilter ); m_project->assignCaseIdToCase( geoMechCase.get() ); diff --git a/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp b/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp index 3316ec4acc..3acff6a8c2 100644 --- a/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp +++ b/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp @@ -216,12 +216,12 @@ void RiaProjectModifier::replaceCase( RimProject* project ) if ( eclipseResultCase ) { eclipseResultCase->setGridFileName( replaceFileName ); - eclipseResultCase->caseUserDescription = caseNameFromGridFileName( replaceFileName ); + eclipseResultCase->setCaseUserDescription( caseNameFromGridFileName( replaceFileName ) ); } else if ( geomechCase ) { geomechCase->setGridFileName( replaceFileName ); - geomechCase->caseUserDescription = caseNameFromGridFileName( replaceFileName ); + geomechCase->setCaseUserDescription( caseNameFromGridFileName( replaceFileName ) ); } } } diff --git a/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp b/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp index 87d317dd98..7cb40f64ea 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp @@ -69,7 +69,7 @@ caf::PdmScriptResponse RicfComputeCaseGroupStatistics::execute() { for ( RimEclipseCase* c : group->statisticsCaseCollection->reservoirs ) { - if ( c->caseId == caseId ) + if ( c->caseId() == caseId ) { RimEclipseStatisticsCase* statsCase = dynamic_cast( c ); if ( statsCase ) diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp index 84db70096d..970ea54de0 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp @@ -83,7 +83,7 @@ caf::PdmScriptResponse RicfCreateSaturationPressurePlots::execute() for ( auto caseId : caseIds ) { - if ( c->caseId == caseId ) + if ( c->caseId() == caseId ) { int timeStep = 0; RicCreateSaturationPressurePlotsFeature::createPlots( eclipseResultCase, timeStep ); diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp index 1a518ef432..6ebdf10724 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp @@ -48,7 +48,7 @@ caf::PdmScriptResponse RicfCreateView::execute() for ( RimCase* rimCase : allCases ) { - if ( rimCase->caseId == m_caseId() ) + if ( rimCase->caseId() == m_caseId() ) { int viewId = -1; RimEclipseCase* eclipseCase = dynamic_cast( rimCase ); diff --git a/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp b/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp index b1214012a5..a3678ad0d7 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp @@ -78,7 +78,7 @@ caf::PdmScriptResponse RicfSetTimeStep::execute() bool foundCase = false; for ( RimCase* c : allCases ) { - if ( c->caseId == m_caseId ) + if ( c->caseId() == m_caseId ) { rimCase = c; foundCase = true; diff --git a/ApplicationLibCode/Commands/CMakeLists_files.cmake b/ApplicationLibCode/Commands/CMakeLists_files.cmake index 87bd2880c6..2d5a7e2c65 100644 --- a/ApplicationLibCode/Commands/CMakeLists_files.cmake +++ b/ApplicationLibCode/Commands/CMakeLists_files.cmake @@ -85,6 +85,7 @@ set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RicUserDefinedCalculatorUi.h ${CMAKE_CURRENT_LIST_DIR}/RicShowDataSourcesForRealization.h ${CMAKE_CURRENT_LIST_DIR}/RicDeleteUncheckedSubItemsFeature.h + ${CMAKE_CURRENT_LIST_DIR}/RicRenameSummaryCaseFeature.h ) set(SOURCE_GROUP_SOURCE_FILES @@ -173,6 +174,7 @@ set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RicUserDefinedCalculatorUi.cpp ${CMAKE_CURRENT_LIST_DIR}/RicShowDataSourcesForRealization.cpp ${CMAKE_CURRENT_LIST_DIR}/RicDeleteUncheckedSubItemsFeature.cpp + ${CMAKE_CURRENT_LIST_DIR}/RicRenameSummaryCaseFeature.cpp ) if(RESINSIGHT_USE_QT_CHARTS) diff --git a/ApplicationLibCode/Commands/EclipseCommands/CMakeLists_files.cmake b/ApplicationLibCode/Commands/EclipseCommands/CMakeLists_files.cmake index 4fc0c3efdd..392da3bdcb 100644 --- a/ApplicationLibCode/Commands/EclipseCommands/CMakeLists_files.cmake +++ b/ApplicationLibCode/Commands/EclipseCommands/CMakeLists_files.cmake @@ -18,6 +18,7 @@ set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEclipseShowOnlyFaultFeature.h + ${CMAKE_CURRENT_LIST_DIR}/RicRenameCaseFeature.h ) set(SOURCE_GROUP_SOURCE_FILES @@ -40,6 +41,7 @@ set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEclipseShowOnlyFaultFeature.cpp + ${CMAKE_CURRENT_LIST_DIR}/RicRenameCaseFeature.cpp ) list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES}) diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.cpp new file mode 100644 index 0000000000..b594be2a2d --- /dev/null +++ b/ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.cpp @@ -0,0 +1,66 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2022 Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RicRenameCaseFeature.h" + +#include "RimCase.h" + +#include "cafSelectionManager.h" + +#include +#include + +CAF_CMD_SOURCE_INIT( RicRenameCaseFeature, "RicRenameCaseFeature" ); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RicRenameCaseFeature::isCommandEnabled() +{ + return true; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicRenameCaseFeature::onActionTriggered( bool isChecked ) +{ + auto rimCase = caf::SelectionManager::instance()->selectedItemOfType(); + if ( !rimCase ) return; + + bool ok; + QString userDefinedName = QInputDialog::getText( nullptr, + "Rename Case", + "Enter new name:", + QLineEdit::Normal, + rimCase->caseUserDescription(), + &ok ); + + if ( !ok ) return; + + rimCase->setCustomCaseName( userDefinedName.trimmed() ); + rimCase->updateConnectedEditors(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicRenameCaseFeature::setupActionLook( QAction* actionToSetup ) +{ + actionToSetup->setText( "Rename" ); +} diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.h b/ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.h new file mode 100644 index 0000000000..66937f5979 --- /dev/null +++ b/ApplicationLibCode/Commands/EclipseCommands/RicRenameCaseFeature.h @@ -0,0 +1,31 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2022 Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + +class RicRenameCaseFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + bool isCommandEnabled() override; + void onActionTriggered( bool isChecked ) override; + void setupActionLook( QAction* actionToSetup ) override; +}; diff --git a/ApplicationLibCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp b/ApplicationLibCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp index a69854611c..b23dc21161 100644 --- a/ApplicationLibCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp +++ b/ApplicationLibCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp @@ -96,7 +96,7 @@ void RicExecuteScriptForCasesFeature::onActionTriggered( bool isChecked ) for ( RimCase* rimCase : selection ) { - caseIdsInSelection.push_back( rimCase->caseId ); + caseIdsInSelection.push_back( rimCase->caseId() ); } } diff --git a/ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.cpp b/ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.cpp new file mode 100644 index 0000000000..d924b4d152 --- /dev/null +++ b/ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.cpp @@ -0,0 +1,66 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2022 Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RicRenameSummaryCaseFeature.h" + +#include "RimSummaryCase.h" + +#include "cafSelectionManager.h" + +#include +#include + +CAF_CMD_SOURCE_INIT( RicRenameSummaryCaseFeature, "RicRenameSummaryCaseFeature" ); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RicRenameSummaryCaseFeature::isCommandEnabled() +{ + return true; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicRenameSummaryCaseFeature::onActionTriggered( bool isChecked ) +{ + auto summaryCase = caf::SelectionManager::instance()->selectedItemOfType(); + if ( !summaryCase ) return; + + bool ok; + QString userDefinedName = QInputDialog::getText( nullptr, + "Rename Case", + "Enter new name:", + QLineEdit::Normal, + summaryCase->displayCaseName(), + &ok ); + + if ( !ok ) return; + + summaryCase->setCustomCaseName( userDefinedName.trimmed() ); + summaryCase->updateConnectedEditors(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicRenameSummaryCaseFeature::setupActionLook( QAction* actionToSetup ) +{ + actionToSetup->setText( "Rename" ); +} diff --git a/ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.h b/ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.h new file mode 100644 index 0000000000..6ce2d57f45 --- /dev/null +++ b/ApplicationLibCode/Commands/RicRenameSummaryCaseFeature.h @@ -0,0 +1,31 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2022 Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + +class RicRenameSummaryCaseFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + bool isCommandEnabled() override; + void onActionTriggered( bool isChecked ) override; + void setupActionLook( QAction* actionToSetup ) override; +}; diff --git a/ApplicationLibCode/Commands/RicReplaceCaseFeature.cpp b/ApplicationLibCode/Commands/RicReplaceCaseFeature.cpp index 1fb74c865c..126085f8a6 100644 --- a/ApplicationLibCode/Commands/RicReplaceCaseFeature.cpp +++ b/ApplicationLibCode/Commands/RicReplaceCaseFeature.cpp @@ -96,7 +96,7 @@ void RicReplaceCaseFeature::onActionTriggered( bool isChecked ) // Use the file base name as case user description QFileInfo fi( fileName ); - selectedCase->caseUserDescription = fi.baseName(); + selectedCase->setCaseUserDescription( fi.baseName() ); // Find and update attached grid summary cases. RimSummaryCaseMainCollection* sumCaseColl = RiaSummaryTools::summaryCaseMainCollection(); diff --git a/ApplicationLibCode/Commands/WellLogCommands/CMakeLists_files.cmake b/ApplicationLibCode/Commands/WellLogCommands/CMakeLists_files.cmake index bb63a201ce..e6bff1f084 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/CMakeLists_files.cmake +++ b/ApplicationLibCode/Commands/WellLogCommands/CMakeLists_files.cmake @@ -28,7 +28,7 @@ set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RicNewWellMeasurementCurveFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewEnsembleWellLogCurveSetFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewRftWellLogCurveFeature.h - ${CMAKE_CURRENT_LIST_DIR}/RicNewRftSegmentWellLogCurveFeature.h + ${CMAKE_CURRENT_LIST_DIR}/RicNewRftSegmentWellLogPlotFeature.h ) set(SOURCE_GROUP_SOURCE_FILES @@ -61,7 +61,7 @@ set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RicNewWellMeasurementCurveFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewEnsembleWellLogCurveSetFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewRftWellLogCurveFeature.cpp - ${CMAKE_CURRENT_LIST_DIR}/RicNewRftSegmentWellLogCurveFeature.cpp + ${CMAKE_CURRENT_LIST_DIR}/RicNewRftSegmentWellLogPlotFeature.cpp ) list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES}) diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogCurveFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp similarity index 84% rename from ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogCurveFeature.cpp rename to ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp index 42ba16e65f..ac1971be7a 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogCurveFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewRftSegmentWellLogCurveFeature.h" +#include "RicNewRftSegmentWellLogPlotFeature.h" #include "RicNewWellLogPlotFeatureImpl.h" #include "RicWellLogPlotCurveFeatureImpl.h" @@ -43,12 +43,12 @@ #include -CAF_CMD_SOURCE_INIT( RicNewRftSegmentWellLogCurveFeature, "RicNewRftSegmentWellLogCurveFeature" ); +CAF_CMD_SOURCE_INIT( RicNewRftSegmentWellLogPlotFeature, "RicNewRftSegmentWellLogCurveFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewRftSegmentWellLogCurveFeature::isCommandEnabled() +bool RicNewRftSegmentWellLogPlotFeature::isCommandEnabled() { return true; } @@ -56,7 +56,7 @@ bool RicNewRftSegmentWellLogCurveFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewRftSegmentWellLogCurveFeature::onActionTriggered( bool isChecked ) +void RicNewRftSegmentWellLogPlotFeature::onActionTriggered( bool isChecked ) { auto rftCase = caf::SelectionManager::instance()->selectedItemOfType(); if ( !rftCase ) return; @@ -91,10 +91,10 @@ void RicNewRftSegmentWellLogCurveFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewRftSegmentWellLogCurveFeature::appendTrackAndCurveForBranchType( RimWellLogPlot* plot, - const QString& resultName, - RiaDefines::RftBranchType branchType, - RimSummaryCase* summaryCase ) +void RicNewRftSegmentWellLogPlotFeature::appendTrackAndCurveForBranchType( RimWellLogPlot* plot, + const QString& resultName, + RiaDefines::RftBranchType branchType, + RimSummaryCase* summaryCase ) { RimWellLogTrack* plotTrack = new RimWellLogTrack(); plot->addPlot( plotTrack ); @@ -112,8 +112,8 @@ void RicNewRftSegmentWellLogCurveFeature::appendTrackAndCurveForBranchType( RimW //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewRftSegmentWellLogCurveFeature::setupActionLook( QAction* actionToSetup ) +void RicNewRftSegmentWellLogPlotFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "Append RFT Segment Curve" ); + actionToSetup->setText( "Create RFT Segment Plot" ); actionToSetup->setIcon( QIcon( ":/WellLogCurve16x16.png" ) ); } diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogCurveFeature.h b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.h similarity index 95% rename from ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogCurveFeature.h rename to ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.h index 5737bb8f38..24a144e993 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogCurveFeature.h +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.h @@ -28,7 +28,7 @@ class RimSummaryCase; //================================================================================================== /// //================================================================================================== -class RicNewRftSegmentWellLogCurveFeature : public caf::CmdFeature +class RicNewRftSegmentWellLogPlotFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp index 9f0b361be2..bacb0a0d63 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp @@ -296,7 +296,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName ) QFileInfo filenameInfo( newInputFileName ); QString newCaseName = filenameInfo.completeBaseName(); - copycase->caseUserDescription.setValue( newCaseName + " (copy of " + caseUserDescription.value() + ")" ); + copycase->setCaseUserDescription( newCaseName + " (copy of " + caseUserDescription() + ")" ); copycase->setGridFileName( newInputFileName ); project->assignCaseIdToCase( copycase ); @@ -1099,8 +1099,8 @@ void RimGeoMechCase::importElementPropertyFile() //-------------------------------------------------------------------------------------------------- void RimGeoMechCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - uiOrdering.add( &caseUserDescription ); - uiOrdering.add( &caseId ); + uiOrdering.add( &m_caseUserDescription ); + uiOrdering.add( &m_caseId ); uiOrdering.add( &m_caseFileName ); caf::PdmUiGroup* caseGroup = uiOrdering.addNewGroup( "Case Options" ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCase.cpp b/ApplicationLibCode/ProjectDataModel/RimCase.cpp index 47662a94f7..4199c45e2c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCase.cpp @@ -49,14 +49,14 @@ RimCase::RimCase() { CAF_PDM_InitScriptableObjectWithNameAndComment( "Case", ":/Case48x48.png", "", "", "Case", "The ResInsight base class for Cases" ); - CAF_PDM_InitScriptableField( &caseUserDescription, "Name", QString(), "Case Name" ); - caseUserDescription.registerKeywordAlias( "CaseUserDescription" ); + CAF_PDM_InitScriptableField( &m_caseUserDescription, "Name", QString(), "Case Name" ); + m_caseUserDescription.registerKeywordAlias( "CaseUserDescription" ); CAF_PDM_InitScriptableFieldNoDefault( &m_displayNameOption, "NameSetting", "Name Setting" ); - CAF_PDM_InitScriptableField( &caseId, "Id", -1, "Case ID" ); - caseId.registerKeywordAlias( "CaseId" ); - caseId.uiCapability()->setUiReadOnly( true ); - caseId.capability()->setIOWriteable( false ); + CAF_PDM_InitScriptableField( &m_caseId, "Id", -1, "Case ID" ); + m_caseId.registerKeywordAlias( "CaseId" ); + m_caseId.uiCapability()->setUiReadOnly( true ); + m_caseId.capability()->setIOWriteable( false ); CAF_PDM_InitScriptableFieldNoDefault( &m_caseFileName, "FilePath", "Case File Name" ); m_caseFileName.registerKeywordAlias( "CaseFileName" ); @@ -87,6 +87,38 @@ RimCase::~RimCase() m_isInActiveDestruction = true; // Needed because destruction of m_intersectionViews results in call to views() } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +int RimCase::caseId() const +{ + return m_caseId(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimCase::setCaseId( int id ) +{ + m_caseId = id; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimCase::caseUserDescription() const +{ + return m_caseUserDescription(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimCase::setCaseUserDescription( const QString& description ) +{ + m_caseUserDescription = description; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -106,6 +138,15 @@ QString RimCase::gridFileName() const return m_caseFileName().path(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimCase::setCustomCaseName( const QString& caseName ) +{ + m_displayNameOption = RimCaseDisplayNameTools::DisplayName::CUSTOM; + m_caseUserDescription = caseName; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -195,7 +236,7 @@ void RimCase::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const Q { updateAutoShortName(); } - else if ( changedField == &caseUserDescription ) + else if ( changedField == &m_caseUserDescription ) { updateTreeItemName(); } @@ -235,7 +276,8 @@ QList RimCase::calculateValueOptions( const caf::PdmFiel //-------------------------------------------------------------------------------------------------- void RimCase::updateOptionSensitivity() { - caseUserDescription.uiCapability()->setUiReadOnly( m_displayNameOption != RimCaseDisplayNameTools::DisplayName::CUSTOM ); + m_caseUserDescription.uiCapability()->setUiReadOnly( m_displayNameOption != + RimCaseDisplayNameTools::DisplayName::CUSTOM ); } //-------------------------------------------------------------------------------------------------- @@ -243,7 +285,7 @@ void RimCase::updateOptionSensitivity() //-------------------------------------------------------------------------------------------------- void RimCase::initAfterRead() { - if ( caseId() == -1 ) + if ( m_caseId() == -1 ) { RimProject::current()->assignCaseIdToCase( this ); } @@ -262,7 +304,7 @@ void RimCase::initAfterRead() //-------------------------------------------------------------------------------------------------- caf::PdmFieldHandle* RimCase::userDescriptionField() { - return &caseUserDescription; + return &m_caseUserDescription; } //-------------------------------------------------------------------------------------------------- @@ -272,11 +314,11 @@ void RimCase::updateAutoShortName() { if ( m_displayNameOption == RimCaseDisplayNameTools::DisplayName::FULL_CASE_NAME ) { - caseUserDescription = caseName(); + m_caseUserDescription = caseName(); } else if ( m_displayNameOption == RimCaseDisplayNameTools::DisplayName::SHORT_CASE_NAME ) { - caseUserDescription = RimCase::uniqueShortNameCase( this, RimCaseDisplayNameTools::CASE_SHORT_NAME_LENGTH ); + m_caseUserDescription = RimCase::uniqueShortNameCase( this, RimCaseDisplayNameTools::CASE_SHORT_NAME_LENGTH ); } updateTreeItemName(); } @@ -286,7 +328,7 @@ void RimCase::updateAutoShortName() //-------------------------------------------------------------------------------------------------- void RimCase::updateTreeItemName() { - setUiName( caseUserDescription() ); + setUiName( m_caseUserDescription() ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimCase.h b/ApplicationLibCode/ProjectDataModel/RimCase.h index 7cc4675de7..7b637507c8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimCase.h @@ -54,13 +54,16 @@ public: RimCase(); ~RimCase() override; - caf::PdmField caseId; - caf::PdmField caseUserDescription; + int caseId() const; + void setCaseId( int id ); + + QString caseUserDescription() const; + void setCaseUserDescription( const QString& description ); void setGridFileName( const QString& fileName ); QString gridFileName() const; - void setDisplayNameOption( RimCaseDisplayNameTools::DisplayName displayNameOption ); + void setCustomCaseName( const QString& caseName ); void updateAutoShortName(); void updateOptionSensitivity(); @@ -105,6 +108,8 @@ private: caf::PdmFieldHandle* userDescriptionField() override; protected: + caf::PdmField m_caseId; + caf::PdmField m_caseUserDescription; caf::PdmField m_caseFileName; caf::PdmField m_displayNameOption; caf::PdmChildField m_timeStepFilter; diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp index 137a501729..f6363bf30c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -268,6 +268,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() } else if ( dynamic_cast( firstUiItem ) ) { + menuBuilder << "RicRenameCaseFeature"; menuBuilder << "RicPasteEclipseCasesFeature"; menuBuilder << "RicPasteEclipseViewsFeature"; menuBuilder << "Separator"; @@ -1074,7 +1075,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() else if ( dynamic_cast( firstUiItem ) ) { menuBuilder << "RicNewRftWellLogCurveFeature"; - menuBuilder << "RicNewRftSegmentWellLogCurveFeature"; + menuBuilder << "RicNewRftSegmentWellLogPlotFeature"; } if ( dynamic_cast( firstUiItem ) ) @@ -1124,6 +1125,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() menuBuilder << "RicImportObservedDataFeature"; menuBuilder << "RicImportObservedFmuDataFeature"; + menuBuilder << "RicRenameSummaryCaseFeature"; menuBuilder << "RicReloadSummaryCaseFeature"; menuBuilder << "RicReplaceSummaryCaseFeature"; menuBuilder << "RicCreateSummaryCaseCollectionFeature"; diff --git a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp index 0f9448cbe5..59fa0d1289 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp @@ -266,7 +266,7 @@ QString RimContourMapProjection::caseName() const return QString(); } - return rimCase->caseUserDescription.value(); + return rimCase->caseUserDescription(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp index 07ede4cb78..11133e7b1a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -94,8 +94,8 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::FRACTURE_MODEL )->computeDerivedData(); QFileInfo gridFileName( fileNames[0] ); - QString caseName = gridFileName.completeBaseName(); - this->caseUserDescription = caseName; + QString caseName = gridFileName.completeBaseName(); + this->setCaseUserDescription( caseName ); computeCachedData(); @@ -127,7 +127,7 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) QFileInfo gridFileName( fileNames[i] ); QString caseName = gridFileName.completeBaseName(); - this->caseUserDescription = caseName; + this->setCaseUserDescription( caseName ); this->eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis ); @@ -299,9 +299,9 @@ cvf::ref RimEclipseInputCase::createMockModel( QString model //-------------------------------------------------------------------------------------------------- void RimEclipseInputCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - uiOrdering.add( &caseUserDescription ); + uiOrdering.add( &m_caseUserDescription ); uiOrdering.add( &m_displayNameOption ); - uiOrdering.add( &caseId ); + uiOrdering.add( &m_caseId ); uiOrdering.add( &m_caseFileName ); uiOrdering.add( &m_additionalFiles ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index a6f8b85b38..d6008141e2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -560,7 +560,7 @@ RifReaderRftInterface* RimEclipseResultCase::rftReader() //-------------------------------------------------------------------------------------------------- void RimEclipseResultCase::setCaseInfo( const QString& userDescription, const QString& fileName ) { - this->caseUserDescription = userDescription; + this->setCaseUserDescription( userDescription ); setGridFileName( fileName ); RimProject* proj = RimProject::current(); @@ -590,9 +590,9 @@ bool RimEclipseResultCase::hasSourSimFile() //-------------------------------------------------------------------------------------------------- void RimEclipseResultCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - uiOrdering.add( &caseUserDescription ); + uiOrdering.add( &m_caseUserDescription ); uiOrdering.add( &m_displayNameOption ); - uiOrdering.add( &caseId ); + uiOrdering.add( &m_caseId ); uiOrdering.add( &m_caseFileName ); uiOrdering.add( &m_unitSystem ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 586a7b9058..5f4574fcd4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -387,8 +387,8 @@ void RimEclipseStatisticsCase::defineUiOrdering( QString uiConfigName, caf::PdmU updateSelectionListVisibilities(); updatePercentileUiVisibility(); - uiOrdering.add( &caseUserDescription ); - uiOrdering.add( &caseId ); + uiOrdering.add( &m_caseUserDescription ); + uiOrdering.add( &m_caseId ); uiOrdering.add( &m_calculateEditCommand ); diff --git a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 63836de8b0..5a1d7f39e0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -358,8 +358,8 @@ RimEclipseStatisticsCase* RimIdenticalGridCaseGroup::createAndAppendStatisticsCa { RimEclipseStatisticsCase* newStatisticsCase = new RimEclipseStatisticsCase; - newStatisticsCase->caseUserDescription = QString( "Statistics " ) + - QString::number( statisticsCaseCollection()->reservoirs.size() + 1 ); + newStatisticsCase->setCaseUserDescription( QString( "Statistics " ) + + QString::number( statisticsCaseCollection()->reservoirs.size() + 1 ) ); statisticsCaseCollection()->reservoirs.push_back( newStatisticsCase ); newStatisticsCase->populateResultSelectionAfterLoadingGrid(); diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.cpp b/ApplicationLibCode/ProjectDataModel/RimProject.cpp index 8d374b85e1..67955902b0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimProject.cpp @@ -549,7 +549,7 @@ void RimProject::assignCaseIdToCase( RimCase* reservoirCase ) m_nextValidCaseId = std::max( m_nextValidCaseId, rimCase->caseId() + 1 ); } - reservoirCase->caseId = m_nextValidCaseId++; + reservoirCase->setCaseId( m_nextValidCaseId++ ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp index 882a16c6f4..999087ff32 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -252,6 +252,8 @@ void RimSummaryCase::buildChildNodes() //-------------------------------------------------------------------------------------------------- void RimSummaryCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { + updateOptionSensitivity(); + uiOrdering.add( &m_displayName ); uiOrdering.add( &m_displayNameOption ); uiOrdering.add( &m_summaryHeaderFilename ); @@ -380,6 +382,15 @@ int RimSummaryCase::caseId() const return m_caseId(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSummaryCase::setCustomCaseName( const QString& caseName ) +{ + m_displayNameOption = RimCaseDisplayNameTools::DisplayName::CUSTOM; + m_displayName = caseName; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h index 8728d2dea8..7dfbd07501 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h @@ -60,6 +60,8 @@ public: void setCaseId( int caseId ); int caseId() const; + void setCustomCaseName( const QString& caseName ); + caf::AppEnum unitsSystem(); void setDisplayNameOption( RimCaseDisplayNameTools::DisplayName displayNameOption ); diff --git a/ApplicationLibCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationLibCode/SocketInterface/RiaCaseInfoCommands.cpp index ee3365d762..1ebbb8fb59 100644 --- a/ApplicationLibCode/SocketInterface/RiaCaseInfoCommands.cpp +++ b/ApplicationLibCode/SocketInterface/RiaCaseInfoCommands.cpp @@ -632,7 +632,7 @@ public: ->ijkFromCellIndex( eclipseItem->m_gridLocalCellIndex, &i, &j, &k ); gridIndex = eclipseItem->m_gridIndex; - caseId = eclipseItem->m_resultDefinition->eclipseCase()->caseId; + caseId = eclipseItem->m_resultDefinition->eclipseCase()->caseId(); } else if ( item->type() == RiuSelectionItem::GEOMECH_SELECTION_OBJECT ) { @@ -647,14 +647,14 @@ public: CVF_ASSERT( validIndex ); gridIndex = geomechItem->m_gridIndex; - caseId = geomechItem->m_resultDefinition->geoMechCase()->caseId; + caseId = geomechItem->m_resultDefinition->geoMechCase()->caseId(); } else { continue; } - if ( caseId == reservoirCase->caseId && validIndex ) + if ( caseId == reservoirCase->caseId() && validIndex ) { caseNumber.push_back( static_cast( caseId ) ); gridNumber.push_back( static_cast( gridIndex ) ); diff --git a/ApplicationLibCode/SocketInterface/RiaProjectInfoCommands.cpp b/ApplicationLibCode/SocketInterface/RiaProjectInfoCommands.cpp index b8e8b590bc..4d4241918d 100644 --- a/ApplicationLibCode/SocketInterface/RiaProjectInfoCommands.cpp +++ b/ApplicationLibCode/SocketInterface/RiaProjectInfoCommands.cpp @@ -62,8 +62,8 @@ void getCaseInfoFromCases( std::vector& cases, qint64 caseGroupId = -1; RiaSocketTools::getCaseInfoFromCase( rimCase, caseId, caseName, caseType, caseGroupId ); - caseIds.push_back( rimCase->caseId ); - caseNames.push_back( rimCase->caseUserDescription ); + caseIds.push_back( rimCase->caseId() ); + caseNames.push_back( rimCase->caseUserDescription() ); caseTypes.push_back( caseType ); caseGroupIds.push_back( caseGroupId ); } diff --git a/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp index 577253c7e3..964383c3f7 100644 --- a/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -1343,7 +1343,7 @@ public: { const RiuEclipseSelectionItem* eclipseItem = static_cast( item ); - if ( eclipseItem->m_resultDefinition->eclipseCase()->caseId == reservoirCase->caseId ) + if ( eclipseItem->m_resultDefinition->eclipseCase()->caseId() == reservoirCase->caseId() ) { selectedCells.push_back( std::make_pair( eclipseItem->m_gridIndex, eclipseItem->m_gridLocalCellIndex ) ); } @@ -1352,7 +1352,7 @@ public: { const RiuGeoMechSelectionItem* geomechItem = static_cast( item ); - if ( geomechItem->m_resultDefinition->geoMechCase()->caseId == reservoirCase->caseId ) + if ( geomechItem->m_resultDefinition->geoMechCase()->caseId() == reservoirCase->caseId() ) { selectedCells.push_back( std::make_pair( geomechItem->m_gridIndex, geomechItem->m_cellIndex ) ); } diff --git a/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp b/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp index 3d96126fc0..d0696b0b69 100644 --- a/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp +++ b/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp @@ -165,7 +165,7 @@ RimEclipseCase* RiaSocketServer::findReservoir( int caseId ) for ( size_t i = 0; i < cases.size(); i++ ) { - if ( cases[i]->caseId == currCaseId ) + if ( cases[i]->caseId() == currCaseId ) { return dynamic_cast( cases[i] ); } diff --git a/ApplicationLibCode/SocketInterface/RiaSocketTools.cpp b/ApplicationLibCode/SocketInterface/RiaSocketTools.cpp index 9a77eb4ea2..38f64e6e31 100644 --- a/ApplicationLibCode/SocketInterface/RiaSocketTools.cpp +++ b/ApplicationLibCode/SocketInterface/RiaSocketTools.cpp @@ -72,8 +72,8 @@ void RiaSocketTools::getCaseInfoFromCase( RimCase* rimCase, qint64& caseId, QStr { CVF_ASSERT( rimCase ); - caseId = rimCase->caseId; - caseName = rimCase->caseUserDescription; + caseId = rimCase->caseId(); + caseName = rimCase->caseUserDescription(); RimEclipseCase* eclCase = dynamic_cast( rimCase ); RimCaseCollection* caseCollection = nullptr; diff --git a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp index a5c40a3b2b..f8930b8940 100644 --- a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp +++ b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp @@ -208,7 +208,7 @@ bool RiuRelativePermeabilityPlotUpdater::queryDataAndUpdatePlot( const RimEclips QString cellRefText = constructCellReferenceText( eclipseCaseData, gridIndex, gridLocalCellIndex, "SATNUM", cellSATNUM ); - QString caseName = eclipseResultCase->caseUserDescription; + QString caseName = eclipseResultCase->caseUserDescription(); plotPanel->setPlotData( eclipseCaseData->unitsType(), relPermCurveArr, cellSWAT, cellSGAS, caseName, cellRefText ); diff --git a/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp index 768335ec35..c9e7c7452b 100644 --- a/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp @@ -93,9 +93,9 @@ void RiuResultQwtPlot::addCurve( const RimCase* rimCase, this->replot(); - int caseId = rimCase->caseId; + int caseId = rimCase->caseId(); - m_caseNames[caseId] = rimCase->caseUserDescription; + m_caseNames[caseId] = rimCase->caseUserDescription(); m_curveNames[caseId].push_back( curveName ); m_curveData[caseId].push_back( timeHistoryValues ); m_timeSteps[caseId] = dateTimes; diff --git a/GrpcInterface/RiaGrpcCaseService.cpp b/GrpcInterface/RiaGrpcCaseService.cpp index 7044a203e5..05b8c14999 100644 --- a/GrpcInterface/RiaGrpcCaseService.cpp +++ b/GrpcInterface/RiaGrpcCaseService.cpp @@ -618,7 +618,7 @@ grpc::Status RiaSelectedCellsStateHandler::assignReply( rips::SelectedCells* rep for ( auto item : items ) { RiuEclipseSelectionItem* eclipseItem = dynamic_cast( item ); - if ( eclipseItem && eclipseItem->m_resultDefinition->eclipseCase()->caseId == m_request->id() ) + if ( eclipseItem && eclipseItem->m_resultDefinition->eclipseCase()->caseId() == m_request->id() ) { eclipseItems.push_back( eclipseItem ); } diff --git a/GrpcInterface/RiaGrpcPropertiesService.cpp b/GrpcInterface/RiaGrpcPropertiesService.cpp index 2c596c584c..2236a5bd21 100644 --- a/GrpcInterface/RiaGrpcPropertiesService.cpp +++ b/GrpcInterface/RiaGrpcPropertiesService.cpp @@ -309,7 +309,7 @@ protected: for ( auto item : items ) { RiuEclipseSelectionItem* eclipseItem = dynamic_cast( item ); - if ( eclipseItem && eclipseItem->m_resultDefinition->eclipseCase()->caseId == caseData->ownerCase()->caseId ) + if ( eclipseItem && eclipseItem->m_resultDefinition->eclipseCase()->caseId() == caseData->ownerCase()->caseId() ) { eclipseItems.push_back( eclipseItem ); }