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

#5019 WIP: Made fields in IntersectionHandle protected

Browse Source
This commit is contained in:
Jacob Støren
2019-11-12 15:10:41 +01:00
parent 8fb3fbc097
commit 9ed3d8babc
11 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp
View File

@@ -99,7 +99,7 @@ void RicAppendIntersectionFeatureCmd::redo()
CVF_ASSERT( m_intersectionCollection );
RimIntersection* intersection = new RimIntersection();
intersection->name = QString( "Intersection" );
intersection->setName( "Intersection" );
m_intersectionCollection->appendIntersectionAndUpdate( intersection );
RimGridView* view = nullptr;

4
ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
View File

@@ -105,8 +105,8 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
{
CVF_ASSERT( m_intersectionCollection );
RimIntersection* intersection = new RimIntersection();
intersection->name = "Azimuth and Dip";
RimIntersection* intersection = new RimIntersection();
intersection->setName( "Azimuth and Dip" );
intersection->type = RimIntersection::CS_AZIMUTHLINE;
intersection->inputTwoAzimuthPointsFromViewerEnabled = true;

4
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
View File

@@ -103,8 +103,8 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
{
CVF_ASSERT( m_intersectionCollection );
RimIntersection* intersection = new RimIntersection();
intersection->name = "Polyline";
RimIntersection* intersection = new RimIntersection();
intersection->setName( "Polyline" );
intersection->type = RimIntersection::CS_POLYLINE;
intersection->inputPolyLineFromViewerEnabled = true;

6
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp
View File

@@ -102,9 +102,9 @@ void RicNewSimWellIntersectionCmd::redo()
CVF_ASSERT( m_simWell );
RimIntersection* intersection = new RimIntersection();
intersection->name = m_simWell->name;
intersection->type = RimIntersection::CS_SIMULATION_WELL;
intersection->simulationWell = m_simWell;
intersection->setName( m_simWell->name );
intersection->type = RimIntersection::CS_SIMULATION_WELL;
intersection->simulationWell = m_simWell;
m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );
}

6
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@@ -109,9 +109,9 @@ void RicNewWellPathIntersectionFeatureCmd::redo()
CVF_ASSERT( m_wellPath );
RimIntersection* intersection = new RimIntersection();
intersection->name = m_wellPath->name();
intersection->type = RimIntersection::CS_WELL_PATH;
intersection->wellPath = m_wellPath;
intersection->setName( m_wellPath->name() );
intersection->type = RimIntersection::CS_WELL_PATH;
intersection->wellPath = m_wellPath;
m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );
}

4
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp
View File

@@ -89,8 +89,8 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked )
RimIntersection* intersection = dynamic_cast<RimIntersection*>(
intersectionObjects[i]->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
QString nameOfCopy = QString( "Copy of " ) + intersection->name;
intersection->name = nameOfCopy;
QString nameOfCopy = QString( "Copy of " ) + intersection->name();
intersection->setName( nameOfCopy );
if ( i == intersectionObjects.size() - 1 )
{

2
ApplicationCode/Commands/RicHideIntersectionFeature.cpp
View File

@@ -68,7 +68,7 @@ void RicHideIntersectionFeature::onActionTriggered( bool isChecked )
RimIntersection* intersection = dynamic_cast<RimIntersection*>( generalSelectionItem->m_object );
if ( intersection )
{
intersection->isActive = false;
intersection->setActive( false );
intersection->updateConnectedEditors();
activeView->scheduleCreateDisplayModelAndRedraw();