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

#7128 VFP Plot: fix delete functionality.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-12-21 19:43:36 +01:00
parent 4414b61efd
commit ba372f7fbe
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimVfpPlot.cpp
View File

@ -135,6 +135,8 @@ RimVfpPlot::RimVfpPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimVfpPlot::~RimVfpPlot() RimVfpPlot::~RimVfpPlot()
{ {
removeMdiWindowFromMdiArea();
deleteViewWidget();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

27
ApplicationCode/ProjectDataModel/RimVfpPlotCollection.cpp
View File

@ -60,7 +60,15 @@ void RimVfpPlotCollection::addPlot( RimVfpPlot* newPlot )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RimVfpPlot*> RimVfpPlotCollection::plots() void RimVfpPlotCollection::insertPlot( RimVfpPlot* vfpPlot, size_t index )
{
m_vfpPlots.insert( index, vfpPlot );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimVfpPlot*> RimVfpPlotCollection::plots() const
{ {
return m_vfpPlots.childObjects(); return m_vfpPlots.childObjects();
} }
@ -72,3 +80,20 @@ void RimVfpPlotCollection::deleteAllChildObjects()
{ {
m_vfpPlots.deleteAllChildObjects(); m_vfpPlots.deleteAllChildObjects();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimVfpPlotCollection::plotCount() const
{
return m_vfpPlots.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimVfpPlotCollection::removePlot( RimVfpPlot* vfpPlot )
{
m_vfpPlots.removeChildObject( vfpPlot );
updateAllRequiredEditors();
}

13
ApplicationCode/ProjectDataModel/RimVfpPlotCollection.h
View File

@ -17,16 +17,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "RimAbstractPlotCollection.h"
#include "RimVfpPlot.h"
#include "cafPdmChildArrayField.h" #include "cafPdmChildArrayField.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
class RimVfpPlot;
//================================================================================================== //==================================================================================================
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimVfpPlotCollection : public caf::PdmObject class RimVfpPlotCollection : public caf::PdmObject, public RimTypedPlotCollection<RimVfpPlot>
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
@ -35,9 +36,13 @@ public:
~RimVfpPlotCollection() override; ~RimVfpPlotCollection() override;
void addPlot( RimVfpPlot* newPlot ); void addPlot( RimVfpPlot* newPlot );
std::vector<RimVfpPlot*> plots(); std::vector<RimVfpPlot*> plots() const;
void deleteAllChildObjects(); void deleteAllChildObjects();
size_t plotCount() const final;
void insertPlot( RimVfpPlot* vfpPlot, size_t index ) final;
void removePlot( RimVfpPlot* vfpPlot ) final;
private: private:
caf::PdmChildArrayField<RimVfpPlot*> m_vfpPlots; caf::PdmChildArrayField<RimVfpPlot*> m_vfpPlots;
}; };