OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-26 21:27:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix backwards compability for time history curves

Browse Source
This commit is contained in:
Magne Sjaastad
2025-03-14 11:48:32 +01:00
parent e8885065ea
commit 932e99017d
9 changed files with 131 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
+17 -21
View File
@@ -70,32 +70,28 @@ void RimGeoMechGeometrySelectionItem::setFromSelectionItem( const RiuGeoMechSele
m_localIntersectionPoint = selectionItem->m_localIntersectionPointInDisplay;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechGeometrySelectionItem::setFromSelectionItem( const RimGeoMechGeometrySelectionItem* selectionItem )
{
m_geoMechCase = selectionItem->geoMechCase();
m_gridIndex = selectionItem->m_gridIndex();
m_cellIndex = selectionItem->m_cellIndex();
m_elementFace = selectionItem->m_elementFace();
m_hasIntersectionTriangle = selectionItem->m_hasIntersectionTriangle();
m_intersectionTriangle_0 = selectionItem->m_intersectionTriangle_0();
m_intersectionTriangle_1 = selectionItem->m_intersectionTriangle_1();
m_intersectionTriangle_2 = selectionItem->m_intersectionTriangle_2();
m_localIntersectionPoint = selectionItem->m_localIntersectionPoint();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGeoMechGeometrySelectionItem::geometrySelectionText() const
{
QString text;
/*
if (m_geoMechCase)
{
text += m_geoMechCase->caseUserDescription();
}
else
{
text = "No case";
}
text += ", ";
text += QString("Grid index %1").arg(m_gridIndex);
text += ", ";
text += RigTimeHistoryResultAccessor::geometrySelectionText(m_geoMechCase->eclipseCaseData(), m_gridIndex,
m_cellIndex);
*/
return text;
return {};
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.h
+5 -2
View File
@@ -18,19 +18,21 @@
#pragma once
#include "RimGeometrySelectionItem.h"
#include "cafPdmField.h"
#include "cafPdmFieldCvfVec3d.h"
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
class RiuGeoMechSelectionItem;
class RimGeoMechCase;
class RiuGeoMechSelectionItem;
//==================================================================================================
///
///
//==================================================================================================
class RimGeoMechGeometrySelectionItem : public caf::PdmObject
class RimGeoMechGeometrySelectionItem : public RimGeometrySelectionItem_OBSOLETE
{
CAF_PDM_HEADER_INIT;
@@ -39,6 +41,7 @@ public:
~RimGeoMechGeometrySelectionItem() override;
void setFromSelectionItem( const RiuGeoMechSelectionItem* selectionItem );
void setFromSelectionItem( const RimGeoMechGeometrySelectionItem* selectionItem );
QString geometrySelectionText() const;
RimGeoMechCase* geoMechCase() const;
ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake
+2
View File
@@ -124,6 +124,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimCameraPosition.h
${CMAKE_CURRENT_LIST_DIR}/RimWellTargetCandidatesGenerator.h
${CMAKE_CURRENT_LIST_DIR}/RimRegularGridCase.h
${CMAKE_CURRENT_LIST_DIR}/RimGeometrySelectionItem.cpp
)
set(SOURCE_GROUP_SOURCE_FILES
@@ -248,6 +249,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimCameraPosition.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellTargetCandidatesGenerator.cpp
${CMAKE_CURRENT_LIST_DIR}/RimRegularGridCase.cpp
${CMAKE_CURRENT_LIST_DIR}/RimGeometrySelectionItem.cpp
)
if(RESINSIGHT_USE_QT_CHARTS)
ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
+10
View File
@@ -67,6 +67,16 @@ void RimEclipseGeometrySelectionItem::setFromSelectionItem( const RiuEclipseSele
m_eclipseCase = selectionItem->m_resultDefinition->eclipseCase();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseGeometrySelectionItem::setFromSelectionItem( RimEclipseGeometrySelectionItem* selectionItem )
{
m_eclipseCase = selectionItem->eclipseCase();
m_gridIndex = selectionItem->m_gridIndex();
m_cellIndex = selectionItem->m_cellIndex();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.h
+4 -1
View File
@@ -18,6 +18,8 @@
#pragma once
#include "RimGeometrySelectionItem.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmProxyValueField.h"
@@ -31,7 +33,7 @@ class RigGridBase;
///
///
//==================================================================================================
class RimEclipseGeometrySelectionItem : public caf::PdmObject
class RimEclipseGeometrySelectionItem : public RimGeometrySelectionItem_OBSOLETE
{
CAF_PDM_HEADER_INIT;
@@ -40,6 +42,7 @@ public:
~RimEclipseGeometrySelectionItem() override;
void setFromSelectionItem( const RiuEclipseSelectionItem* selectionItem );
void setFromSelectionItem( RimEclipseGeometrySelectionItem* selectionItem );
void setFromCaseGridAndIJK( RimEclipseCase* eclipseCase, size_t gridIndex, size_t i, size_t j, size_t k );
QString geometrySelectionText() const;
ApplicationLibCode/ProjectDataModel/RimGeometrySelectionItem.cpp
+35
View File
@@ -0,0 +1,35 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil 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 <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimGeometrySelectionItem.h"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimGeometrySelectionItem_OBSOLETE, "GeometrySelectionItem" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeometrySelectionItem_OBSOLETE::RimGeometrySelectionItem_OBSOLETE()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeometrySelectionItem_OBSOLETE::~RimGeometrySelectionItem_OBSOLETE()
{
}
ApplicationLibCode/ProjectDataModel/RimGeometrySelectionItem.h
+30
View File
@@ -0,0 +1,30 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil 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 <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmObject.h"
class RimGeometrySelectionItem_OBSOLETE : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimGeometrySelectionItem_OBSOLETE();
~RimGeometrySelectionItem_OBSOLETE() override;
};
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
+24 -13
View File
@@ -64,18 +64,26 @@ RimGridTimeHistoryCurve::RimGridTimeHistoryCurve()
CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "EclipseResultDefinition", "Eclipse Result Definition" );
m_eclipseResultDefinition.uiCapability()->setUiTreeChildrenHidden( true );
m_eclipseResultDefinition = new RimEclipseResultDefinition;
CAF_PDM_InitFieldNoDefault( &m_geoMechResultDefinition, "GeoMechResultDefinition", "GeoMech Result Definition" );
m_geoMechResultDefinition.uiCapability()->setUiTreeChildrenHidden( true );
m_geoMechResultDefinition = new RimGeoMechResultDefinition;
CAF_PDM_InitFieldNoDefault( &m_eclipseDataSource, "EclipseDataSource", "Eclipse Data Source" );
m_eclipseDataSource.uiCapability()->setUiTreeChildrenHidden( true );
m_eclipseDataSource = new RimEclipseGeometrySelectionItem;
CAF_PDM_InitFieldNoDefault( &m_geoMechDataSource, "GeoMechDataSource", "Geomechanical Data Source" );
m_geoMechDataSource.uiCapability()->setUiTreeChildrenHidden( true );
m_geoMechDataSource = new RimGeoMechGeometrySelectionItem;
CAF_PDM_InitField( &m_plotAxis, "PlotAxis", caf::AppEnum<RiaDefines::PlotAxis>( RiaDefines::PlotAxis::PLOT_AXIS_LEFT ), "Axis" );
CAF_PDM_InitFieldNoDefault( &m_geometrySelectionItem_OBSOLETE, "GeometrySelectionItem", "Geometry Selection" );
m_geometrySelectionItem_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_geometrySelectionItem_OBSOLETE.xmlCapability()->setIOWritable( false );
setDeletable( true );
}
@@ -93,24 +101,20 @@ void RimGridTimeHistoryCurve::setFromSelectionItem( const RiuSelectionItem* sele
{
if ( const RiuEclipseSelectionItem* eclSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>( selectionItem ) )
{
m_eclipseDataSource = new RimEclipseGeometrySelectionItem;
m_eclipseDataSource->setFromSelectionItem( eclSelectionItem );
if ( updateResultDefinition && eclSelectionItem->m_resultDefinition )
{
if ( !m_eclipseResultDefinition() ) m_eclipseResultDefinition = new RimEclipseResultDefinition;
m_eclipseResultDefinition->simpleCopy( eclSelectionItem->m_resultDefinition );
}
}
if ( const RiuGeoMechSelectionItem* geoMechSelectionItem = dynamic_cast<const RiuGeoMechSelectionItem*>( selectionItem ) )
{
m_geoMechDataSource = new RimGeoMechGeometrySelectionItem;
m_geoMechDataSource->setFromSelectionItem( geoMechSelectionItem );
if ( updateResultDefinition && geoMechSelectionItem->m_resultDefinition )
{
if ( !m_geoMechResultDefinition ) m_geoMechResultDefinition = new RimGeoMechResultDefinition;
m_geoMechResultDefinition->setGeoMechCase( geoMechSelectionItem->m_resultDefinition->geoMechCase() );
m_geoMechResultDefinition->setResultAddress( geoMechSelectionItem->m_resultDefinition->resultAddress() );
}
@@ -129,14 +133,9 @@ void RimGridTimeHistoryCurve::setFromEclipseCellAndResult( RimEclipseCase*
size_t k,
const RigEclipseResultAddress& resAddr )
{
delete m_eclipseResultDefinition();
delete m_geoMechResultDefinition();
m_eclipseResultDefinition = new RimEclipseResultDefinition;
m_eclipseResultDefinition->setEclipseCase( eclCase );
m_eclipseResultDefinition->setFromEclipseResultAddress( resAddr );
m_eclipseDataSource = new RimEclipseGeometrySelectionItem;
m_eclipseDataSource->setFromCaseGridAndIJK( eclCase, gridIdx, i, j, k );
}
@@ -574,15 +573,13 @@ void RimGridTimeHistoryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUi
eclipseGeomSelectionItem()->uiOrdering( uiConfigName, *dataSource );
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup( "Result" );
if ( eclipseGeomSelectionItem() )
if ( eclipseGeomSelectionItem() && m_eclipseResultDefinition->eclipseCase() )
{
CVF_ASSERT( m_eclipseResultDefinition() );
m_eclipseResultDefinition->uiOrdering( uiConfigName, *group1 );
}
if ( geoMechGeomSelectionItem() )
if ( geoMechGeomSelectionItem() && m_geoMechResultDefinition->geoMechCase() )
{
CVF_ASSERT( m_geoMechResultDefinition() );
m_geoMechResultDefinition->uiOrdering( uiConfigName, *group1 );
}
@@ -610,6 +607,20 @@ void RimGridTimeHistoryCurve::initAfterRead()
{
RimPlotCurve::initAfterRead();
// Convert old geometry selection item to new data source
// This change was introduced in 2025.03
// When this class is removed, the inheritance of RimGeometrySelectionItem_OBSOLETE should be removed as well
// The project files will then work as expected
RimGeometrySelectionItem_OBSOLETE* obj = m_geometrySelectionItem_OBSOLETE();
if ( auto eclipseObject = dynamic_cast<RimEclipseGeometrySelectionItem*>( obj ) )
{
m_eclipseDataSource->setFromSelectionItem( eclipseObject );
}
else if ( auto geoMechObject = dynamic_cast<RimGeoMechGeometrySelectionItem*>( obj ) )
{
m_geoMechDataSource->setFromSelectionItem( geoMechObject );
}
updateResultDefinitionFromCase();
}
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.h
+4
View File
@@ -21,6 +21,8 @@
#include "RiaDefines.h"
#include "RimGeometrySelectionItem.h"
#include "cafPdmChildField.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
@@ -106,4 +108,6 @@ private:
caf::PdmChildField<RimEclipseGeometrySelectionItem*> m_eclipseDataSource;
caf::PdmChildField<RimGeoMechGeometrySelectionItem*> m_geoMechDataSource;
caf::PdmChildField<RimGeometrySelectionItem_OBSOLETE*> m_geometrySelectionItem_OBSOLETE;
};