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

#5116 Remove checkable property for well measurement collection.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-01-10 11:08:04 +01:00
parent 3bb325c4ee
commit 33693932b6
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp
View File

@ -33,7 +33,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurementCollection, "WellMeasurements" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellMeasurementCollection::RimWellMeasurementCollection() RimWellMeasurementCollection::RimWellMeasurementCollection()
{ {
CAF_PDM_InitObject( "Well Measurement", "", "", "" ); CAF_PDM_InitObject( "Well Measurements", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_measurements, "Measurements", "Well Measurements", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_measurements, "Measurements", "Well Measurements", "", "", "" );
m_measurements.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_measurements.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
@ -42,8 +42,6 @@ RimWellMeasurementCollection::RimWellMeasurementCollection()
CAF_PDM_InitFieldNoDefault( &m_importedFiles, "ImportedFiles", "Imported Files", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_importedFiles, "ImportedFiles", "Imported Files", "", "", "" );
m_importedFiles.uiCapability()->setUiTreeHidden( true ); m_importedFiles.uiCapability()->setUiTreeHidden( true );
this->setName( "Well Measurements" );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -174,22 +172,6 @@ void RimWellMeasurementCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering&
uiTreeOrdering.skipRemainingChildren( true ); 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();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

7
ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.h
View File

@ -17,8 +17,6 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "RimCheckableNamedObject.h"
#include "cafPdmChildArrayField.h" #include "cafPdmChildArrayField.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
@ -30,7 +28,7 @@ class RimWellMeasurementFilePath;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RimWellMeasurementCollection : public RimCheckableNamedObject class RimWellMeasurementCollection : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
@ -59,9 +57,6 @@ protected:
caf::PdmUiEditorAttribute* attribute ) override; caf::PdmUiEditorAttribute* attribute ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
private: private:
caf::PdmChildArrayField<RimWellMeasurement*> m_measurements; caf::PdmChildArrayField<RimWellMeasurement*> m_measurements;