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

Add rename case to summary and grid cases (#9204)

Browse Source 
* #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
This commit is contained in:
Magne Sjaastad
2022-08-17 22:12:23 -07:00
committed by GitHub
parent 597a3d1f97
commit c8f642d83a
38 changed files with 331 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

@@ -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<int>( caseId ) );
gridNumber.push_back( static_cast<int>( gridIndex ) );

4
ApplicationLibCode/SocketInterface/RiaProjectInfoCommands.cpp
View File

@@ -62,8 +62,8 @@ void getCaseInfoFromCases( std::vector<RimCase*>& 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 );
}

4
ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -1343,7 +1343,7 @@ public:
{
const RiuEclipseSelectionItem* eclipseItem = static_cast<const RiuEclipseSelectionItem*>( 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<const RiuGeoMechSelectionItem*>( 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 ) );
}

2
ApplicationLibCode/SocketInterface/RiaSocketServer.cpp
View File

@@ -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<RimEclipseCase*>( cases[i] );
}

4
ApplicationLibCode/SocketInterface/RiaSocketTools.cpp
View File

@@ -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<RimEclipseCase*>( rimCase );
RimCaseCollection* caseCollection = nullptr;