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

Rename RimIntersectionHandle to RimIntersection

Browse Source
This commit is contained in:
Jacob Støren 2019-11-26 13:26:37 +01:00
parent 0a358941fb
commit 06596673dc
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.h
View File

@ -38,7 +38,7 @@ class RivTernaryScalarMapper;
class RimCellEdgeColors;
class RimEclipseCellColors;
class RimBoxIntersection;
class RimIntersectionHandle;
class RimIntersection;
class RimEclipseView;
class RimGeoMechView;
class RimEclipseResultDefinition;

4
ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp
View File

@ -26,7 +26,7 @@
#include "RimGeoMechCellColors.h"
#include "RimGeoMechView.h"
#include "RimGridView.h"
#include "RimIntersectionHandle.h"
#include "RimIntersection.h"
#include "RimIntersectionResultDefinition.h"
#include "RimRegularLegendConfig.h"
#include "RimTernaryLegendConfig.h"
@ -51,7 +51,7 @@
void RivIntersectionResultsColoringTools::calculateIntersectionResultColors(
size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle,
RimIntersection* rimIntersectionHandle,
const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
const cvf::ScalarMapper* explicitScalarColorMapper,
const RivTernaryScalarMapper* explicitTernaryColorMapper,

4
ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.h
View File

@ -24,7 +24,7 @@
class RimEclipseResultDefinition;
class RimGeoMechResultDefinition;
class RimIntersectionHandle;
class RimIntersection;
class RivIntersectionGeometryGeneratorIF;
class RivTernaryScalarMapper;
@ -45,7 +45,7 @@ class RivIntersectionResultsColoringTools
public:
static void calculateIntersectionResultColors( size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle,
RimIntersection* rimIntersectionHandle,
const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
const cvf::ScalarMapper* explicitScalarColorMapper,
const RivTernaryScalarMapper* explicitTernaryColorMapper,

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -87,7 +87,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileChannel.h
${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.h
${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.h
${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.h
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionHandle.h
${CMAKE_CURRENT_LIST_DIR}/RimIntersection.h
${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.h
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.h
@ -232,7 +232,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileChannel.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.cpp
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionHandle.cpp
${CMAKE_CURRENT_LIST_DIR}/RimIntersection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.cpp

2
ApplicationCode/ProjectDataModel/RimBoxIntersection.cpp
View File

@ -486,7 +486,7 @@ void RimBoxIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder
//--------------------------------------------------------------------------------------------------
void RimBoxIntersection::initAfterRead()
{
RimIntersectionHandle::initAfterRead();
RimIntersection::initAfterRead();
updateVisibility();
}

4
ApplicationCode/ProjectDataModel/RimBoxIntersection.h
View File

@ -21,7 +21,7 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "RimIntersectionHandle.h"
#include "RimIntersection.h"
#include "cvfBoundingBox.h"
#include "cvfVector3.h"
@ -43,7 +43,7 @@ class ModelBasicList;
//
//
//==================================================================================================
class RimBoxIntersection : public QObject, public RimIntersectionHandle
class RimBoxIntersection : public QObject, public RimIntersection
{
Q_OBJECT;

2
ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp
View File

@ -352,7 +352,7 @@ QList<caf::PdmOptionItemInfo> RimExtrudedCurveIntersection::calculateValueOption
}
else
{
options = RimIntersectionHandle::calculateValueOptions( fieldNeedingOptions, useOptionsOnly );
options = RimIntersection::calculateValueOptions( fieldNeedingOptions, useOptionsOnly );
}
return options;

4
ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h
View File

@ -27,7 +27,7 @@
#include "cvfObject.h"
#include "cvfVector3.h"
#include "RimIntersectionHandle.h"
#include "RimIntersection.h"
class RimWellPath;
class RivExtrudedCurveIntersectionPartMgr;
@ -47,7 +47,7 @@ class PdmUiPushButtonEditorAttribute;
//
//
//==================================================================================================
class RimExtrudedCurveIntersection : public RimIntersectionHandle
class RimExtrudedCurveIntersection : public RimIntersection
{
CAF_PDM_HEADER_INIT;

34
ApplicationCode/ProjectDataModel/RimIntersectionHandle.cpp → ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimIntersectionHandle.h"
#include "RimIntersection.h"
#include "RigEclipseCaseData.h"
#include "RigFemPartCollection.h"
@ -31,12 +31,12 @@
#include "RimIntersectionResultsDefinitionCollection.h"
#include "RivHexGridIntersectionTools.h"
CAF_PDM_SOURCE_INIT( RimIntersectionHandle, "RimIntersectionHandle" );
CAF_PDM_SOURCE_INIT( RimIntersection, "RimIntersectionHandle" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionHandle::RimIntersectionHandle()
RimIntersection::RimIntersection()
{
CAF_PDM_InitField( &m_name, "UserDescription", QString( "Intersection Name" ), "Name", "", "", "" );
CAF_PDM_InitField( &m_isActive, "Active", true, "Active", "", "", "" );
@ -49,12 +49,12 @@ RimIntersectionHandle::RimIntersectionHandle()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionHandle::~RimIntersectionHandle() {}
RimIntersection::~RimIntersection() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimIntersectionHandle::name() const
QString RimIntersection::name() const
{
return m_name();
}
@ -62,7 +62,7 @@ QString RimIntersectionHandle::name() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionHandle::setName( const QString& newName )
void RimIntersection::setName( const QString& newName )
{
m_name = newName;
}
@ -70,7 +70,7 @@ void RimIntersectionHandle::setName( const QString& newName )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimIntersectionHandle::isActive() const
bool RimIntersection::isActive() const
{
return m_isActive();
}
@ -78,7 +78,7 @@ bool RimIntersectionHandle::isActive() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionHandle::setActive( bool isActive )
void RimIntersection::setActive( bool isActive )
{
m_isActive = isActive;
}
@ -86,7 +86,7 @@ void RimIntersectionHandle::setActive( bool isActive )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimIntersectionHandle::isInactiveCellsVisible() const
bool RimIntersection::isInactiveCellsVisible() const
{
return m_showInactiveCells;
}
@ -94,7 +94,7 @@ bool RimIntersectionHandle::isInactiveCellsVisible() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionResultDefinition* RimIntersectionHandle::activeSeparateResultDefinition()
RimIntersectionResultDefinition* RimIntersection::activeSeparateResultDefinition()
{
updateDefaultSeparateDataSource();
@ -116,7 +116,7 @@ RimIntersectionResultDefinition* RimIntersectionHandle::activeSeparateResultDefi
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimIntersectionHandle::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
@ -140,7 +140,7 @@ QList<caf::PdmOptionItemInfo>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimIntersectionHandle::userDescriptionField()
caf::PdmFieldHandle* RimIntersection::userDescriptionField()
{
return &m_name;
}
@ -148,14 +148,14 @@ caf::PdmFieldHandle* RimIntersectionHandle::userDescriptionField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimIntersectionHandle::objectToggleField()
caf::PdmFieldHandle* RimIntersection::objectToggleField()
{
return &m_isActive;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionHandle::initAfterRead()
void RimIntersection::initAfterRead()
{
updateDefaultSeparateDataSource();
}
@ -163,7 +163,7 @@ void RimIntersectionHandle::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionHandle::defineSeparateDataSourceUi( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
void RimIntersection::defineSeparateDataSourceUi( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
QString inactiveText;
if ( !this->activeSeparateResultDefinition() )
@ -183,7 +183,7 @@ void RimIntersectionHandle::defineSeparateDataSourceUi( QString uiConfigName, ca
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionHandle::updateDefaultSeparateDataSource()
void RimIntersection::updateDefaultSeparateDataSource()
{
if ( m_separateDataSource() == nullptr )
{
@ -206,7 +206,7 @@ void RimIntersectionHandle::updateDefaultSeparateDataSource()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RivIntersectionHexGridInterface> RimIntersectionHandle::createHexGridInterface()
cvf::ref<RivIntersectionHexGridInterface> RimIntersection::createHexGridInterface()
{
RimIntersectionResultDefinition* resDef = activeSeparateResultDefinition();
if ( resDef && resDef->activeCase() )

6
ApplicationCode/ProjectDataModel/RimIntersectionHandle.h → ApplicationCode/ProjectDataModel/RimIntersection.h
View File

@ -27,13 +27,13 @@
class RimIntersectionResultDefinition;
class RivIntersectionHexGridInterface;
class RimIntersectionHandle : public caf::PdmObject
class RimIntersection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimIntersectionHandle();
~RimIntersectionHandle() override;
RimIntersection();
~RimIntersection() override;
QString name() const;
void setName( const QString& newName );