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 Move RimIntersectionHandle to separate files Use in RimIntersectionBox

Browse Source
This commit is contained in:
Jacob Støren
2019-11-12 16:58:26 +01:00
parent 9ed3d8babc
commit 612332cbbc
17 changed files with 358 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp
View File

@@ -54,7 +54,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered( bool isChecked )
if ( coll )
{
RimIntersectionBox* intersectionBox = new RimIntersectionBox();
intersectionBox->name = QString( "Intersection Box" );
intersectionBox->setName( "Intersection Box" );
coll->appendIntersectionBoxAndUpdate( intersectionBox );

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxAtPosFeature.cpp
View File

@@ -59,7 +59,7 @@ void RicIntersectionBoxAtPosFeature::onActionTriggered( bool isChecked )
CVF_ASSERT( coll );
RimIntersectionBox* intersectionBox = new RimIntersectionBox();
intersectionBox->name = QString( "Intersection box" );
intersectionBox->setName( "Intersection box" );
coll->appendIntersectionBoxAndUpdate( intersectionBox );

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionFeatureImpl.cpp
View File

@@ -44,7 +44,7 @@ void RicIntersectionFeatureImpl::createIntersectionBoxSlize( const QString&
cvf::Vec3d domainCoord = activeView->viewer()->viewerCommands()->lastPickPositionInDomainCoords();
RimIntersectionBox* intersectionBox = new RimIntersectionBox();
intersectionBox->name = name;
intersectionBox->setName( name );
coll->appendIntersectionBoxNoUpdate( intersectionBox );
intersectionBox->setToDefaultSizeSlice( plane, domainCoord );

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

@@ -111,8 +111,8 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked )
intersectionBoxObjects[i]->xmlCapability()->copyByXmlSerialization(
caf::PdmDefaultObjectFactory::instance() ) );
QString nameOfCopy = QString( "Copy of " ) + intersectionBox->name;
intersectionBox->name = nameOfCopy;
QString nameOfCopy = QString( "Copy of " ) + intersectionBox->name();
intersectionBox->setName(nameOfCopy);
if ( i == intersectionBoxObjects.size() - 1 )
{

2
ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
View File

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