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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp
View File

@@ -38,7 +38,7 @@ RimWellPathAttributeCollection::RimWellPathAttributeCollection()
m_attributes.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
m_attributes.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_attributes.uiCapability()->setCustomContextMenuEnabled( true );
this->setName( "Casing Design" );
setName( "Casing Design" );
}
//--------------------------------------------------------------------------------------------------
@@ -58,7 +58,7 @@ void RimWellPathAttributeCollection::updateAllReferringTracks()
{
track->loadDataAndUpdate();
}
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ void RimWellPathAttributeCollection::insertAttribute( RimWellPathAttribute* inse
else
m_attributes.push_back( attribute );
this->updateAllReferringTracks();
updateAllReferringTracks();
}
//--------------------------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr
m_attributes.removeChild( attributeToDelete );
delete attributeToDelete;
this->updateAllReferringTracks();
updateAllReferringTracks();
}
//--------------------------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr
void RimWellPathAttributeCollection::deleteAllAttributes()
{
m_attributes.deleteChildren();
this->updateAllReferringTracks();
updateAllReferringTracks();
}
//--------------------------------------------------------------------------------------------------
@@ -163,10 +163,10 @@ void RimWellPathAttributeCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderin
//--------------------------------------------------------------------------------------------------
void RimWellPathAttributeCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
if ( changedField == this->objectToggleField() )
if ( changedField == objectToggleField() )
{
RimProject* proj = RimProject::current();
proj->scheduleCreateDisplayModelAndRedrawAllViews();
this->updateAllReferringTracks();
updateAllReferringTracks();
}
}