From 33693932b68b8ea172afd5bdefba08285dd12bcc Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 10 Jan 2020 11:08:04 +0100 Subject: [PATCH] #5116 Remove checkable property for well measurement collection. --- .../RimWellMeasurementCollection.cpp | 20 +------------------ .../RimWellMeasurementCollection.h | 7 +------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp index dde87875bd..ff21d8a5aa 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp @@ -33,7 +33,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurementCollection, "WellMeasurements" ); //-------------------------------------------------------------------------------------------------- RimWellMeasurementCollection::RimWellMeasurementCollection() { - CAF_PDM_InitObject( "Well Measurement", "", "", "" ); + CAF_PDM_InitObject( "Well Measurements", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_measurements, "Measurements", "Well Measurements", "", "", "" ); m_measurements.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); @@ -42,8 +42,6 @@ RimWellMeasurementCollection::RimWellMeasurementCollection() CAF_PDM_InitFieldNoDefault( &m_importedFiles, "ImportedFiles", "Imported Files", "", "", "" ); m_importedFiles.uiCapability()->setUiTreeHidden( true ); - - this->setName( "Well Measurements" ); } //-------------------------------------------------------------------------------------------------- @@ -174,22 +172,6 @@ void RimWellMeasurementCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering.skipRemainingChildren( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimWellMeasurementCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, - const QVariant& oldValue, - const QVariant& newValue ) -{ - if ( changedField == &m_isChecked ) - { - RimProject* proj; - this->firstAncestorOrThisOfTypeAsserted( proj ); - proj->scheduleCreateDisplayModelAndRedrawAllViews(); - this->updateAllReferringTracks(); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.h b/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.h index 794bf39136..5f5eaf58a5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.h @@ -17,8 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RimCheckableNamedObject.h" - #include "cafPdmChildArrayField.h" #include "cafPdmField.h" #include "cafPdmObject.h" @@ -30,7 +28,7 @@ class RimWellMeasurementFilePath; //================================================================================================== /// //================================================================================================== -class RimWellMeasurementCollection : public RimCheckableNamedObject +class RimWellMeasurementCollection : public caf::PdmObject { CAF_PDM_HEADER_INIT; @@ -59,9 +57,6 @@ protected: caf::PdmUiEditorAttribute* attribute ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; - void fieldChangedByUi( const caf::PdmFieldHandle* changedField, - const QVariant& oldValue, - const QVariant& newValue ) override; private: caf::PdmChildArrayField m_measurements;