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

Refactor delete operations for pdm objects.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-05-18 16:02:27 +02:00
committed by Magne Sjaastad
parent 80ee1256e7
commit c366e85682
90 changed files with 474 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp
View File

@@ -53,6 +53,8 @@ RimAsciiDataCurve::RimAsciiDataCurve()
m_symbolSkipPixelDistance = 10.0f;
m_curveThickness = 2;
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp
View File

@@ -91,6 +91,8 @@ RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection()
setNameAsReadOnly();
setName( "Delta Ensemble" );
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@@ -63,6 +63,8 @@ RimEnsembleCurveFilter::RimEnsembleCurveFilter()
m_deleteButton = false;
m_deleteButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
m_deleteButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------

12
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@@ -20,6 +20,7 @@
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryPlot.h"
#include <cafPdmUiPushButtonEditor.h>
#include <cafPdmUiTableViewEditor.h>
@@ -241,6 +242,17 @@ caf::PdmFieldHandle* RimEnsembleCurveFilterCollection::objectToggleField()
return &m_active;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects )
{
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfType( plot );
if ( plot ) plot->loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.h
View File

@@ -53,6 +53,9 @@ private:
caf::PdmFieldHandle* objectToggleField() override;
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
private:
caf::PdmField<bool> m_active;
caf::PdmChildArrayField<RimEnsembleCurveFilter*> m_filters;

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -165,6 +165,8 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false );
m_yValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------

11
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp
View File

@@ -337,3 +337,14 @@ caf::PdmFieldHandle* RimEnsembleCurveSetCollection::objectToggleField()
{
return &m_showCurves;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSetCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects )
{
RimSummaryPlot* plot = nullptr;
this->firstAncestorOrThisOfType( plot );
if ( plot ) plot->updateConnectedEditors();
}

3
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h
View File

@@ -66,6 +66,9 @@ public:
std::vector<RimEnsembleCurveSet*> curveSetsForSourceStepping() const;
RimSummaryPlotSourceStepping* sourceSteppingObject() const;
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
private:
caf::PdmFieldHandle* objectToggleField() override;

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -138,6 +138,8 @@ RimSummaryCurve::RimSummaryCurve()
m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_xValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false );
m_xValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -2049,6 +2049,16 @@ size_t RimSummaryPlot::curveCount() const
return m_summaryCurveCollection->curves().size() + m_gridTimeHistoryCurves.size() + m_asciiDataCurves.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryPlot::isDeletable() const
{
RimMultiPlot* plotWindow = nullptr;
firstAncestorOrThisOfType( plotWindow );
return plotWindow == nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -181,6 +181,8 @@ public:
void deleteViewWidget() override;
void initAfterRead() override;
bool isDeletable() const override;
private:
RiuQwtPlotWidget* doCreatePlotViewWidget( QWidget* mainWindowParent = nullptr ) override;

14
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
View File

@@ -18,6 +18,9 @@
#include "RimSummaryPlotCollection.h"
#include "RiaGuiApplication.h"
#include "RiuPlotMainWindow.h"
#include "RimProject.h"
#include "RimSummaryPlot.h"
@@ -103,3 +106,14 @@ void RimSummaryPlotCollection::removeSummaryPlot( RimSummaryPlot* summaryPlot )
{
summaryPlots.removeChildObject( summaryPlot );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlotCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects )
{
updateSummaryNameHasChanged();
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
mainPlotWindow->updateSummaryPlotToolBar();
}

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
View File

@@ -46,4 +46,7 @@ public:
void summaryPlotItemInfos( QList<caf::PdmOptionItemInfo>* optionInfos ) const;
void removeSummaryPlot( RimSummaryPlot* summaryPlot );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
};