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

#1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends.

Browse Source 
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
This commit is contained in:
Jacob Støren
2017-04-04 16:08:42 +02:00
parent fb88c7e216
commit 6c7dfdca7b
19 changed files with 131 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt
View File

@@ -34,8 +34,8 @@ add_library( ${PROJECT_NAME}
RigFemPartGrid.cpp
RigFemResultAddress.h
RigFemResultPosEnum.h
RimGeoMechTopologyItem.h
RimGeoMechTopologyItem.cpp
RimGeoMechGeometrySelectionItem.h
RimGeoMechGeometrySelectionItem.cpp
)
target_link_libraries( ${PROJECT_NAME} LibCore cafTensor ResultStatisticsCache)

33
ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechTopologyItem.cpp → ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
View File

@@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimGeoMechTopologyItem.h"
#include "RimGeoMechGeometrySelectionItem.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
@@ -25,40 +25,39 @@
#include "RiuSelectionManager.h"
CAF_PDM_SOURCE_INIT(RimGeoMechTopologyItem, "RimGeoMechTopologyItem");
CAF_PDM_SOURCE_INIT(RimGeoMechGeometrySelectionItem, "GeoMechGeometrySelectionItem");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechTopologyItem::RimGeoMechTopologyItem()
RimGeoMechGeometrySelectionItem::RimGeoMechGeometrySelectionItem()
{
CAF_PDM_InitObject("GeoMech Topology Item", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_geoMechCase, "GeoMechCase", "Geo Mech Case", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_gridIndex, "m_gridIndex", "m_gridIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellIndex, "m_cellIndex", "m_cellIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_elementFace, "m_elementFace", "m_elementFace", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_hasIntersectionTriangle, "m_hasIntersectionTriangle", "m_hasIntersectionTriangle", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_intersectionTriangle_0, "m_intersectionTriangle_0", "m_intersectionTriangle_0", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_intersectionTriangle_1, "m_intersectionTriangle_1", "m_intersectionTriangle_1", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_intersectionTriangle_2, "m_intersectionTriangle_2", "m_intersectionTriangle_2", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_localIntersectionPoint, "m_localIntersectionPoint", "m_localIntersectionPoint", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_gridIndex, "m_gridIndex", "GridIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellIndex, "m_cellIndex", "CellIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_elementFace, "m_elementFace", "ElementFace", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_hasIntersectionTriangle, "m_hasIntersectionTriangle", "HasIntersectionTriangle", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_intersectionTriangle_0, "m_intersectionTriangle_0", "IntersectionTriangle_0", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_intersectionTriangle_1, "m_intersectionTriangle_1", "IntersectionTriangle_1", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_intersectionTriangle_2, "m_intersectionTriangle_2", "IntersectionTriangle_2", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_localIntersectionPoint, "m_localIntersectionPoint", "LocalIntersectionPoint", "", "", "");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechTopologyItem::~RimGeoMechTopologyItem()
RimGeoMechGeometrySelectionItem::~RimGeoMechGeometrySelectionItem()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechTopologyItem::setFromSelectionItem(const RiuGeoMechSelectionItem* selectionItem)
void RimGeoMechGeometrySelectionItem::setFromSelectionItem(const RiuGeoMechSelectionItem* selectionItem)
{
m_geoMechCase = selectionItem->m_view->geoMechCase();
@@ -76,7 +75,7 @@ void RimGeoMechTopologyItem::setFromSelectionItem(const RiuGeoMechSelectionItem*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGeoMechTopologyItem::topologyText() const
QString RimGeoMechGeometrySelectionItem::geometrySelectionText() const
{
QString text;
@@ -93,7 +92,7 @@ QString RimGeoMechTopologyItem::topologyText() const
text += ", ";
text += QString("Grid index %1").arg(m_gridIndex);
text += ", ";
text += RigTimeHistoryResultAccessor::topologyText(m_geoMechCase->eclipseCaseData(), m_gridIndex, m_cellIndex);
text += RigTimeHistoryResultAccessor::geometrySelectionText(m_geoMechCase->eclipseCaseData(), m_gridIndex, m_cellIndex);
*/
return text;
@@ -102,7 +101,7 @@ QString RimGeoMechTopologyItem::topologyText() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechCase* RimGeoMechTopologyItem::geoMechCase() const
RimGeoMechCase* RimGeoMechGeometrySelectionItem::geoMechCase() const
{
return m_geoMechCase;
}

10
ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechTopologyItem.h → ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RimPickingTopologyItem.h"
#include "RimGeometrySelectionItem.h"
#include "cafPdmField.h"
#include "cafPdmFieldCvfVec3d.h"
@@ -31,16 +31,16 @@ class RimGeoMechCase;
///
///
//==================================================================================================
class RimGeoMechTopologyItem : public RimPickingTopologyItem
class RimGeoMechGeometrySelectionItem : public RimGeometrySelectionItem
{
CAF_PDM_HEADER_INIT;
public:
RimGeoMechTopologyItem();
virtual ~RimGeoMechTopologyItem() override;
RimGeoMechGeometrySelectionItem();
virtual ~RimGeoMechGeometrySelectionItem() override;
void setFromSelectionItem(const RiuGeoMechSelectionItem* selectionItem);
virtual QString topologyText() const override;
virtual QString geometrySelectionText() const override;
RimGeoMechCase* geoMechCase() const;
public:

8
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@@ -88,8 +88,8 @@ ${CEE_CURRENT_LIST_DIR}RimPropertyFilter.h
${CEE_CURRENT_LIST_DIR}RimNamedObject.h
${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.h
${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.h
${CEE_CURRENT_LIST_DIR}RimPickingTopologyItem.h
${CEE_CURRENT_LIST_DIR}RimEclipseTopologyItem.h
${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h
${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
)
set (SOURCE_GROUP_SOURCE_FILES
@@ -176,8 +176,8 @@ ${CEE_CURRENT_LIST_DIR}RimPropertyFilter.cpp
${CEE_CURRENT_LIST_DIR}RimNamedObject.cpp
${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.cpp
${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.cpp
${CEE_CURRENT_LIST_DIR}RimPickingTopologyItem.cpp
${CEE_CURRENT_LIST_DIR}RimEclipseTopologyItem.cpp
${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp
${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
)
list(APPEND CODE_HEADER_FILES

31
ApplicationCode/ProjectDataModel/RimEclipseTopologyItem.cpp → ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
View File

@@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimEclipseTopologyItem.h"
#include "RimEclipseGeometrySelectionItem.h"
#include "RigTimeHistoryResultAccessor.h"
@@ -26,34 +26,33 @@
#include "RiuSelectionManager.h"
CAF_PDM_SOURCE_INIT(RimEclipseTopologyItem, "RimEclipseTopologyItem");
CAF_PDM_SOURCE_INIT(RimEclipseGeometrySelectionItem, "EclipseGeometrySelectionItem");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseTopologyItem::RimEclipseTopologyItem()
RimEclipseGeometrySelectionItem::RimEclipseGeometrySelectionItem()
{
CAF_PDM_InitObject("Eclipse Topoloty Item", "", "", "");
CAF_PDM_InitObject("Eclipse Geometry Selection Item", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_eclipseCase, "EclipseCase", "Eclipse Case", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_gridIndex, "m_gridIndex", "m_gridIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellIndex, "m_cellIndex", "m_cellIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_localIntersectionPoint, "m_localIntersectionPoint", "m_localIntersectionPoint", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_eclipseCase, "EclipseCase", "Eclipse Case", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_gridIndex, "GridIndex", "m_gridIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellIndex, "CellIndex", "m_cellIndex", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_localIntersectionPoint, "LocalIntersectionPoint", "m_localIntersectionPoint", "", "", "");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseTopologyItem::~RimEclipseTopologyItem()
RimEclipseGeometrySelectionItem::~RimEclipseGeometrySelectionItem()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseTopologyItem::setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem)
void RimEclipseGeometrySelectionItem::setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem)
{
m_gridIndex = selectionItem->m_gridIndex;
m_cellIndex = selectionItem->m_cellIndex;
@@ -65,7 +64,7 @@ void RimEclipseTopologyItem::setFromSelectionItem(const RiuEclipseSelectionItem*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimEclipseTopologyItem::topologyText() const
QString RimEclipseGeometrySelectionItem::geometrySelectionText() const
{
QString text;
@@ -81,7 +80,7 @@ QString RimEclipseTopologyItem::topologyText() const
text += ", ";
text += QString("Grid index %1").arg(m_gridIndex);
text += ", ";
text += RigTimeHistoryResultAccessor::topologyText(m_eclipseCase->eclipseCaseData(), m_gridIndex, m_cellIndex);
text += RigTimeHistoryResultAccessor::geometrySelectionText(m_eclipseCase->eclipseCaseData(), m_gridIndex, m_cellIndex);
return text;
}
@@ -89,7 +88,7 @@ QString RimEclipseTopologyItem::topologyText() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseCase* RimEclipseTopologyItem::eclipseCase() const
RimEclipseCase* RimEclipseGeometrySelectionItem::eclipseCase() const
{
return m_eclipseCase;
}
@@ -97,7 +96,7 @@ RimEclipseCase* RimEclipseTopologyItem::eclipseCase() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimEclipseTopologyItem::gridIndex() const
size_t RimEclipseGeometrySelectionItem::gridIndex() const
{
return m_gridIndex;
}
@@ -105,7 +104,7 @@ size_t RimEclipseTopologyItem::gridIndex() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimEclipseTopologyItem::cellIndex() const
size_t RimEclipseGeometrySelectionItem::cellIndex() const
{
return m_cellIndex;
}

10
ApplicationCode/ProjectDataModel/RimEclipseTopologyItem.h → ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RimPickingTopologyItem.h"
#include "RimGeometrySelectionItem.h"
#include "cafPdmField.h"
#include "cafPdmFieldCvfVec3d.h"
@@ -31,16 +31,16 @@ class RiuEclipseSelectionItem;
///
///
//==================================================================================================
class RimEclipseTopologyItem : public RimPickingTopologyItem
class RimEclipseGeometrySelectionItem : public RimGeometrySelectionItem
{
CAF_PDM_HEADER_INIT;
public:
RimEclipseTopologyItem();
virtual ~RimEclipseTopologyItem() override;
RimEclipseGeometrySelectionItem();
virtual ~RimEclipseGeometrySelectionItem() override;
void setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem);
virtual QString topologyText() const override;
virtual QString geometrySelectionText() const override;
RimEclipseCase* eclipseCase() const;
size_t gridIndex() const;

8
ApplicationCode/ProjectDataModel/RimPickingTopologyItem.cpp → ApplicationCode/ProjectDataModel/RimGeometrySelectionItem.cpp
View File

@@ -16,23 +16,23 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimPickingTopologyItem.h"
#include "RimGeometrySelectionItem.h"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimPickingTopologyItem, "RimPickingTopologyItem");
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimGeometrySelectionItem, "GeometrySelectionItem");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPickingTopologyItem::RimPickingTopologyItem()
RimGeometrySelectionItem::RimGeometrySelectionItem()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPickingTopologyItem::~RimPickingTopologyItem()
RimGeometrySelectionItem::~RimGeometrySelectionItem()
{
}

8
ApplicationCode/ProjectDataModel/RimPickingTopologyItem.h → ApplicationCode/ProjectDataModel/RimGeometrySelectionItem.h
View File

@@ -20,13 +20,13 @@
#include "cafPdmObject.h"
class RimPickingTopologyItem : public caf::PdmObject
class RimGeometrySelectionItem : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimPickingTopologyItem();
virtual ~RimPickingTopologyItem();
RimGeometrySelectionItem();
virtual ~RimGeometrySelectionItem();
virtual QString topologyText() const = 0;
virtual QString geometrySelectionText() const = 0;
};

108
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@@ -28,10 +28,10 @@
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseResultDefinition.h"
#include "RimEclipseTopologyItem.h"
#include "RimEclipseGeometrySelectionItem.h"
#include "RimEclipseView.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechTopologyItem.h"
#include "RimGeoMechGeometrySelectionItem.h"
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechView.h"
#include "RimProject.h"
@@ -45,7 +45,7 @@
#include "qwt_plot.h"
CAF_PDM_SOURCE_INIT(RimGridTimeHistoryCurve, "TimeHistoryCurve");
CAF_PDM_SOURCE_INIT(RimGridTimeHistoryCurve, "GridTimeHistoryCurve");
//--------------------------------------------------------------------------------------------------
///
@@ -54,9 +54,9 @@ RimGridTimeHistoryCurve::RimGridTimeHistoryCurve()
{
CAF_PDM_InitObject("Grid Time History Curve", ":/SummaryCurve16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_topologyText, "TopologyText", "Topology Reference", "", "", "");
m_topologyText.registerGetMethod(this, &RimGridTimeHistoryCurve::topologyText);
m_topologyText.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_geometrySelectionText, "GeometrySelectionText", "Cell Reference", "", "", "");
m_geometrySelectionText.registerGetMethod(this, &RimGridTimeHistoryCurve::geometrySelectionText);
m_geometrySelectionText.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_eclipseResultDefinition, "EclipseResultDefinition", "Eclipse Result definition", "", "", "");
m_eclipseResultDefinition.uiCapability()->setUiHidden(true);
@@ -66,9 +66,9 @@ RimGridTimeHistoryCurve::RimGridTimeHistoryCurve()
m_geoMechResultDefinition.uiCapability()->setUiHidden(true);
m_geoMechResultDefinition.uiCapability()->setUiTreeChildrenHidden(true);
CAF_PDM_InitFieldNoDefault(&m_pickingTopologyItem, "PickingTopologyItem", "Picking Topology Item", "", "", "");
m_pickingTopologyItem.uiCapability()->setUiTreeHidden(true);
m_pickingTopologyItem.uiCapability()->setUiTreeChildrenHidden(true);
CAF_PDM_InitFieldNoDefault(&m_geometrySelectionItem, "GeometrySelectionItem", "Geometry Selection", "", "", "");
m_geometrySelectionItem.uiCapability()->setUiTreeHidden(true);
m_geometrySelectionItem.uiCapability()->setUiTreeChildrenHidden(true);
CAF_PDM_InitField(&m_plotAxis, "PlotAxis", caf::AppEnum< RimDefines::PlotAxis >(RimDefines::PLOT_AXIS_LEFT), "Axis", "", "", "");
}
@@ -85,9 +85,9 @@ RimGridTimeHistoryCurve::~RimGridTimeHistoryCurve()
//--------------------------------------------------------------------------------------------------
void RimGridTimeHistoryCurve::setFromSelectionItem(const RiuSelectionItem* selectionItem)
{
if (m_pickingTopologyItem())
if (m_geometrySelectionItem())
{
delete m_pickingTopologyItem();
delete m_geometrySelectionItem();
}
if (m_eclipseResultDefinition())
@@ -103,10 +103,10 @@ void RimGridTimeHistoryCurve::setFromSelectionItem(const RiuSelectionItem* selec
const RiuEclipseSelectionItem* eclSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(selectionItem);
if (eclSelectionItem)
{
RimEclipseTopologyItem* topologyItem = new RimEclipseTopologyItem;
m_pickingTopologyItem = topologyItem;
RimEclipseGeometrySelectionItem* geomSelectionItem = new RimEclipseGeometrySelectionItem;
m_geometrySelectionItem = geomSelectionItem;
topologyItem->setFromSelectionItem(eclSelectionItem);
geomSelectionItem->setFromSelectionItem(eclSelectionItem);
if (eclSelectionItem->m_view)
{
@@ -118,10 +118,10 @@ void RimGridTimeHistoryCurve::setFromSelectionItem(const RiuSelectionItem* selec
const RiuGeoMechSelectionItem* geoMechSelectionItem = dynamic_cast<const RiuGeoMechSelectionItem*>(selectionItem);
if (geoMechSelectionItem)
{
RimGeoMechTopologyItem* topologyItem = new RimGeoMechTopologyItem;
m_pickingTopologyItem = topologyItem;
RimGeoMechGeometrySelectionItem* geomSelectionItem = new RimGeoMechGeometrySelectionItem;
m_geometrySelectionItem = geomSelectionItem;
topologyItem->setFromSelectionItem(geoMechSelectionItem);
geomSelectionItem->setFromSelectionItem(geoMechSelectionItem);
if (geoMechSelectionItem->m_view)
{
@@ -159,7 +159,7 @@ std::vector<double> RimGridTimeHistoryCurve::yValues() const
{
std::vector<double> values;
RimEclipseTopologyItem* eclTopItem = eclipseTopologyItem();
RimEclipseGeometrySelectionItem* eclTopItem = eclipseGeomSelectionItem();
if (eclTopItem && eclTopItem->eclipseCase())
{
size_t cellIndex = eclTopItem->cellIndex();
@@ -176,7 +176,7 @@ std::vector<double> RimGridTimeHistoryCurve::yValues() const
values = RigTimeHistoryResultAccessor::timeHistoryValues(eclTopItem->eclipseCase()->eclipseCaseData(), m_eclipseResultDefinition(), gridIndex, cellIndex, timeStepDates.size());
}
if (geoMechTopologyItem() && geoMechTopologyItem()->geoMechCase())
if (geoMechGeomSelectionItem() && geoMechGeomSelectionItem()->geoMechCase())
{
std::unique_ptr<RiuFemTimeHistoryResultAccessor> timeHistResultAccessor = femTimeHistoryResultAccessor();
@@ -194,7 +194,7 @@ std::vector<double> RimGridTimeHistoryCurve::yValues() const
//--------------------------------------------------------------------------------------------------
QString RimGridTimeHistoryCurve::quantityName() const
{
RimEclipseTopologyItem* eclTopItem = eclipseTopologyItem();
RimEclipseGeometrySelectionItem* eclTopItem = eclipseGeomSelectionItem();
if (eclTopItem)
{
CVF_ASSERT(m_eclipseResultDefinition());
@@ -202,11 +202,11 @@ QString RimGridTimeHistoryCurve::quantityName() const
return m_eclipseResultDefinition->resultVariableUiName();
}
if (geoMechTopologyItem())
if (geoMechGeomSelectionItem())
{
CVF_ASSERT(m_geoMechResultDefinition());
RimGeoMechTopologyItem* geoMechTopItem = geoMechTopologyItem();
RimGeoMechGeometrySelectionItem* geoMechTopItem = geoMechGeomSelectionItem();
std::unique_ptr<RiuFemTimeHistoryResultAccessor> timeHistResultAccessor = femTimeHistoryResultAccessor();
QString text;
@@ -239,13 +239,13 @@ QString RimGridTimeHistoryCurve::quantityName() const
//--------------------------------------------------------------------------------------------------
QString RimGridTimeHistoryCurve::caseName() const
{
RimEclipseTopologyItem* eclTopItem = eclipseTopologyItem();
RimEclipseGeometrySelectionItem* eclTopItem = eclipseGeomSelectionItem();
if (eclTopItem && eclTopItem->eclipseCase())
{
return eclTopItem->eclipseCase()->caseUserDescription();
}
RimGeoMechTopologyItem* geoMechTopItem = geoMechTopologyItem();
RimGeoMechGeometrySelectionItem* geoMechTopItem = geoMechGeomSelectionItem();
if (geoMechTopItem && geoMechTopItem->geoMechCase())
{
return geoMechTopItem->geoMechCase()->caseUserDescription();
@@ -263,7 +263,7 @@ QString RimGridTimeHistoryCurve::createCurveAutoName()
text += quantityName();
QString topoText = topologyText();
QString topoText = geometrySelectionText();
if (!topoText.isEmpty())
{
@@ -297,13 +297,13 @@ void RimGridTimeHistoryCurve::onLoadDataAndUpdate()
std::vector<time_t> dateTimes;
std::vector<double> values;
RimEclipseTopologyItem* eclTopItem = eclipseTopologyItem();
RimEclipseGeometrySelectionItem* eclTopItem = eclipseGeomSelectionItem();
if (eclTopItem && eclTopItem->eclipseCase())
{
m_eclipseResultDefinition->loadResult();
}
RimGeoMechTopologyItem* geoMechTopItem = geoMechTopologyItem();
RimGeoMechGeometrySelectionItem* geoMechTopItem = geoMechGeomSelectionItem();
if (geoMechTopItem && geoMechTopItem->geoMechCase())
{
m_geoMechResultDefinition->loadResult();
@@ -360,7 +360,7 @@ std::vector<time_t> RimGridTimeHistoryCurve::timeStepValues() const
{
std::vector<time_t> dateTimes;
RimEclipseTopologyItem* eclTopItem = eclipseTopologyItem();
RimEclipseGeometrySelectionItem* eclTopItem = eclipseGeomSelectionItem();
if (eclTopItem && eclTopItem->eclipseCase())
{
RimReservoirCellResultsStorage* cellResStorage = m_eclipseResultDefinition->currentGridCellResults();
@@ -374,7 +374,7 @@ std::vector<time_t> RimGridTimeHistoryCurve::timeStepValues() const
}
}
RimGeoMechTopologyItem* geoMechTopItem = geoMechTopologyItem();
RimGeoMechGeometrySelectionItem* geoMechTopItem = geoMechGeomSelectionItem();
if (geoMechTopItem && geoMechTopItem->geoMechCase())
{
std::unique_ptr<RiuFemTimeHistoryResultAccessor> timeHistResultAccessor = femTimeHistoryResultAccessor();
@@ -411,17 +411,17 @@ void RimGridTimeHistoryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiO
{
RimPlotCurve::updateOptionSensitivity();
uiOrdering.add(&m_topologyText);
uiOrdering.add(&m_geometrySelectionText);
// Fields declared in RimResultDefinition
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
if (eclipseTopologyItem())
if (eclipseGeomSelectionItem())
{
CVF_ASSERT(m_eclipseResultDefinition());
m_eclipseResultDefinition->uiOrdering(uiConfigName, *group1);
}
if (geoMechTopologyItem())
if (geoMechGeomSelectionItem())
{
CVF_ASSERT(m_geoMechResultDefinition());
m_geoMechResultDefinition->uiOrdering(uiConfigName, *group1);
@@ -463,9 +463,9 @@ void RimGridTimeHistoryCurve::fieldChangedByUi(const caf::PdmFieldHandle* change
//--------------------------------------------------------------------------------------------------
RigMainGrid* RimGridTimeHistoryCurve::mainGrid()
{
if (eclipseTopologyItem() && eclipseTopologyItem()->eclipseCase() && eclipseTopologyItem()->eclipseCase()->eclipseCaseData())
if (eclipseGeomSelectionItem() && eclipseGeomSelectionItem()->eclipseCase() && eclipseGeomSelectionItem()->eclipseCase()->eclipseCaseData())
{
return eclipseTopologyItem()->eclipseCase()->eclipseCaseData()->mainGrid();
return eclipseGeomSelectionItem()->eclipseCase()->eclipseCaseData()->mainGrid();
}
return nullptr;
@@ -474,21 +474,21 @@ RigMainGrid* RimGridTimeHistoryCurve::mainGrid()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseTopologyItem* RimGridTimeHistoryCurve::eclipseTopologyItem() const
RimEclipseGeometrySelectionItem* RimGridTimeHistoryCurve::eclipseGeomSelectionItem() const
{
RimPickingTopologyItem* pickItem = m_pickingTopologyItem();
RimGeometrySelectionItem* pickItem = m_geometrySelectionItem();
return dynamic_cast<RimEclipseTopologyItem*>(pickItem);
return dynamic_cast<RimEclipseGeometrySelectionItem*>(pickItem);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechTopologyItem* RimGridTimeHistoryCurve::geoMechTopologyItem() const
RimGeoMechGeometrySelectionItem* RimGridTimeHistoryCurve::geoMechGeomSelectionItem() const
{
RimPickingTopologyItem* pickItem = m_pickingTopologyItem();
RimGeometrySelectionItem* pickItem = m_geometrySelectionItem();
return dynamic_cast<RimGeoMechTopologyItem*>(pickItem);
return dynamic_cast<RimGeoMechGeometrySelectionItem*>(pickItem);
}
//--------------------------------------------------------------------------------------------------
@@ -496,43 +496,43 @@ RimGeoMechTopologyItem* RimGridTimeHistoryCurve::geoMechTopologyItem() const
//--------------------------------------------------------------------------------------------------
void RimGridTimeHistoryCurve::updateResultDefinitionFromCase()
{
if (eclipseTopologyItem())
if (eclipseGeomSelectionItem())
{
CVF_ASSERT(m_eclipseResultDefinition());
m_eclipseResultDefinition->setEclipseCase(eclipseTopologyItem()->eclipseCase());
m_eclipseResultDefinition->setEclipseCase(eclipseGeomSelectionItem()->eclipseCase());
}
if (geoMechTopologyItem())
if (geoMechGeomSelectionItem())
{
CVF_ASSERT(m_geoMechResultDefinition());
m_geoMechResultDefinition->setGeoMechCase(geoMechTopologyItem()->geoMechCase());
m_geoMechResultDefinition->setGeoMechCase(geoMechGeomSelectionItem()->geoMechCase());
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGridTimeHistoryCurve::topologyText() const
QString RimGridTimeHistoryCurve::geometrySelectionText() const
{
QString text;
if (eclipseTopologyItem() && m_pickingTopologyItem())
if (eclipseGeomSelectionItem() && m_geometrySelectionItem())
{
text = m_pickingTopologyItem->topologyText();
text = m_geometrySelectionItem->geometrySelectionText();
}
else if (geoMechTopologyItem())
else if (geoMechGeomSelectionItem())
{
std::unique_ptr<RiuFemTimeHistoryResultAccessor> timeHistResultAccessor = femTimeHistoryResultAccessor();
if (timeHistResultAccessor)
{
text = timeHistResultAccessor->topologyText();
text = timeHistResultAccessor->geometrySelectionText();
}
}
else
{
text = "No topology";
text = "No Geometry";
}
return text;
@@ -563,11 +563,11 @@ std::unique_ptr<RiuFemTimeHistoryResultAccessor> RimGridTimeHistoryCurve::femTim
{
std::unique_ptr<RiuFemTimeHistoryResultAccessor> timeHistResultAccessor;
if ( geoMechTopologyItem()
&& geoMechTopologyItem()->geoMechCase()
&& geoMechTopologyItem()->geoMechCase()->geoMechData())
if ( geoMechGeomSelectionItem()
&& geoMechGeomSelectionItem()->geoMechCase()
&& geoMechGeomSelectionItem()->geoMechCase()->geoMechData())
{
RimGeoMechTopologyItem* geoMechTopItem = geoMechTopologyItem();
RimGeoMechGeometrySelectionItem* geoMechTopItem = geoMechGeomSelectionItem();
if (geoMechTopItem->m_hasIntersectionTriangle)
{
std::array<cvf::Vec3f, 3> intersectionTriangle;

16
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h
View File

@@ -30,10 +30,10 @@
class RigMainGrid;
class RimEclipseCase;
class RimEclipseResultDefinition;
class RimEclipseTopologyItem;
class RimEclipseGeometrySelectionItem;
class RimGeoMechResultDefinition;
class RimGeoMechTopologyItem;
class RimPickingTopologyItem;
class RimGeoMechGeometrySelectionItem;
class RimGeometrySelectionItem;
class RiuFemTimeHistoryResultAccessor;
class RiuSelectionItem;
@@ -72,21 +72,21 @@ protected:
private:
RigMainGrid* mainGrid();
RimEclipseTopologyItem* eclipseTopologyItem() const;
RimGeoMechTopologyItem* geoMechTopologyItem() const;
RimEclipseGeometrySelectionItem* eclipseGeomSelectionItem() const;
RimGeoMechGeometrySelectionItem* geoMechGeomSelectionItem() const;
void updateResultDefinitionFromCase();
QString topologyText() const;
QString geometrySelectionText() const;
void updateQwtPlotAxis();
std::unique_ptr<RiuFemTimeHistoryResultAccessor> femTimeHistoryResultAccessor() const;
private:
caf::PdmProxyValueField<QString> m_topologyText;
caf::PdmProxyValueField<QString> m_geometrySelectionText;
caf::PdmChildField<RimEclipseResultDefinition*> m_eclipseResultDefinition;
caf::PdmChildField<RimGeoMechResultDefinition*> m_geoMechResultDefinition;
caf::PdmChildField<RimPickingTopologyItem*> m_pickingTopologyItem;
caf::PdmChildField<RimGeometrySelectionItem*> m_geometrySelectionItem;
caf::PdmField< caf::AppEnum< RimDefines::PlotAxis > > m_plotAxis;
};

2
ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp
View File

@@ -57,7 +57,7 @@ std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues(RigEclipseCa
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigTimeHistoryResultAccessor::topologyText(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex)
QString RigTimeHistoryResultAccessor::geometrySelectionText(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex)
{
QString text;

2
ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h
View File

@@ -30,7 +30,7 @@ class RimEclipseResultDefinition;
class RigTimeHistoryResultAccessor
{
public:
static QString topologyText(RigEclipseCaseData* eclipseCaseData, size_t m_gridIndex, size_t m_cellIndex);
static QString geometrySelectionText(RigEclipseCaseData* eclipseCaseData, size_t m_gridIndex, size_t m_cellIndex);
static std::vector<double> timeHistoryValues(RigEclipseCaseData* eclipseCaseData, RimEclipseResultDefinition* resultDefinition, size_t gridIndex, size_t cellIndex, size_t timeStepCount);
};

4
ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp
View File

@@ -89,7 +89,7 @@ QString RiuFemResultTextBuilder::mainResultText()
if (!text.isEmpty()) text += "\n";
QString topoText = this->topologyText("\n");
QString topoText = this->geometrySelectionText("\n");
text += topoText;
appendDetails(text, formationDetails());
text += "\n";
@@ -102,7 +102,7 @@ QString RiuFemResultTextBuilder::mainResultText()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuFemResultTextBuilder::topologyText(QString itemSeparator)
QString RiuFemResultTextBuilder::geometrySelectionText(QString itemSeparator)
{
QString text;

2
ApplicationCode/UserInterface/RiuFemResultTextBuilder.h
View File

@@ -49,7 +49,7 @@ public:
QString mainResultText();
QString topologyText(QString itemSeparator);
QString geometrySelectionText(QString itemSeparator);
private:
void appendDetails(QString& text, const QString& details);

2
ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.cpp
View File

@@ -74,7 +74,7 @@ RiuFemTimeHistoryResultAccessor::RiuFemTimeHistoryResultAccessor(RigGeoMechCaseD
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuFemTimeHistoryResultAccessor::topologyText() const
QString RiuFemTimeHistoryResultAccessor::geometrySelectionText() const
{
QString text;

2
ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h
View File

@@ -46,7 +46,7 @@ public:
const cvf::Vec3d& intersectionPoint,
const std::array<cvf::Vec3f, 3>& m_intersectionTriangle);
QString topologyText() const;
QString geometrySelectionText() const;
std::vector<double> timeHistoryValues() const;
int closestNodeId() const { return m_closestNodeId; }

4
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@@ -113,7 +113,7 @@ QString RiuResultTextBuilder::mainResultText()
text += "\n";
}
QString topoText = this->topologyText("\n");
QString topoText = this->geometrySelectionText("\n");
text += topoText;
appendDetails(text, formationDetails());
text += "\n";
@@ -134,7 +134,7 @@ QString RiuResultTextBuilder::mainResultText()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuResultTextBuilder::topologyText(QString itemSeparator)
QString RiuResultTextBuilder::geometrySelectionText(QString itemSeparator)
{
QString text;

2
ApplicationCode/UserInterface/RiuResultTextBuilder.h
View File

@@ -47,7 +47,7 @@ public:
QString mainResultText();
QString topologyText(QString itemSeparator);
QString geometrySelectionText(QString itemSeparator);
private:
void appendDetails(QString& text, const QString& details);

8
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@@ -123,7 +123,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec
curveName += ", ";
curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex);
curveName += ", ";
curveName += RigTimeHistoryResultAccessor::topologyText(eclipseView->eclipseCase()->eclipseCaseData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex);
curveName += RigTimeHistoryResultAccessor::geometrySelectionText(eclipseView->eclipseCase()->eclipseCaseData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex);
std::vector<double> timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->eclipseCase()->eclipseCaseData(), eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex, timeStepDates.size());
@@ -191,7 +191,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuGeoMechSelec
}
curveName.append("\n");
curveName.append(timeHistResultAccessor->topologyText());
curveName.append(timeHistResultAccessor->geometrySelectionText());
std::vector<double> timeHistoryValues = timeHistResultAccessor->timeHistoryValues();
@@ -274,7 +274,7 @@ void RiuSelectionChangedHandler::updateResultInfo(const RiuSelectionItem* itemAd
resultInfo = textBuilder.mainResultText();
pickInfo = textBuilder.topologyText(", ");
pickInfo = textBuilder.geometrySelectionText(", ");
}
else if (itemAdded->type() == RiuSelectionItem::GEOMECH_SELECTION_OBJECT)
{
@@ -288,7 +288,7 @@ void RiuSelectionChangedHandler::updateResultInfo(const RiuSelectionItem* itemAd
resultInfo = textBuilder.mainResultText();
pickInfo = textBuilder.topologyText(", ");
pickInfo = textBuilder.geometrySelectionText(", ");
}
}