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

#2975 Ensemble Curve Set: Call updateConnectedEditors on collection

Browse Source
This commit is contained in:
Magne Sjaastad
2018-06-01 15:38:48 +02:00
parent ea7c5b6a76
commit 58ba0b2882
2 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ApplicationCode/Commands/SummaryPlotCommands/RicPasteEnsembleCurveSetFeature.cpp
View File

@@ -24,10 +24,7 @@
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
//#include "RimSummaryCurve.h"
//#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h"
//#include "RimSummaryCrossPlot.h"
#include "cafPdmDefaultObjectFactory.h"
#include "cafPdmDocument.h"
@@ -38,32 +35,29 @@
#include <QAction>
CAF_CMD_SOURCE_INIT(RicPasteEnsembleCurveSetFeature, "RicPasteEnsembleCurveSetFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RicPasteEnsembleCurveSetFeature::copyCurveSetAndAddToCollection(RimEnsembleCurveSet *sourceCurveSet)
RimEnsembleCurveSet*
RicPasteEnsembleCurveSetFeature::copyCurveSetAndAddToCollection(RimEnsembleCurveSetCollection* curveSetCollection,
const RimEnsembleCurveSet* sourceCurveSet)
{
RimSummaryPlot* plot = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryPlot*>();
RimEnsembleCurveSetCollection* coll = caf::firstAncestorOfTypeFromSelectedObject<RimEnsembleCurveSetCollection*>();
CVF_ASSERT(curveSetCollection);
RimEnsembleCurveSet* newCurveSet = dynamic_cast<RimEnsembleCurveSet*>(sourceCurveSet->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
RimEnsembleCurveSet* newCurveSet = dynamic_cast<RimEnsembleCurveSet*>(
sourceCurveSet->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(newCurveSet);
if (!coll) coll = plot->ensembleCurveSetCollection();
coll->addCurveSet(newCurveSet);
curveSetCollection->addCurveSet(newCurveSet);
// Resolve references after object has been inserted into the project data model
newCurveSet->resolveReferencesRecursively();
newCurveSet->initAfterReadRecursively();
newCurveSet->loadDataAndUpdate(true);
newCurveSet->loadDataAndUpdate(false);
newCurveSet->updateConnectedEditors();
coll->updateConnectedEditors();
return newCurveSet;
}
@@ -74,7 +68,7 @@ bool RicPasteEnsembleCurveSetFeature::isCommandEnabled()
{
caf::PdmObject* destinationObject = dynamic_cast<caf::PdmObject*>(caf::SelectionManager::instance()->selectedItem());
RimSummaryPlot* plot;
RimSummaryPlot* plot = nullptr;
RimEnsembleCurveSetCollection* coll = nullptr;
destinationObject->firstAncestorOrThisOfType(plot);
destinationObject->firstAncestorOrThisOfType(coll);
@@ -83,10 +77,11 @@ bool RicPasteEnsembleCurveSetFeature::isCommandEnabled()
return false;
}
if (ensembleCurveSetsOnClipboard().size() == 0)
if (ensembleCurveSetsOnClipboard().empty())
{
return false;
}
return true;
}
@@ -95,12 +90,30 @@ bool RicPasteEnsembleCurveSetFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicPasteEnsembleCurveSetFeature::onActionTriggered(bool isChecked)
{
std::vector<caf::PdmPointer<RimEnsembleCurveSet> > sourceObjects = RicPasteEnsembleCurveSetFeature::ensembleCurveSetsOnClipboard();
std::vector<caf::PdmPointer<RimEnsembleCurveSet>> sourceObjects =
RicPasteEnsembleCurveSetFeature::ensembleCurveSetsOnClipboard();
if (sourceObjects.empty()) return;
for (size_t i = 0; i < sourceObjects.size(); i++)
RimSummaryPlot* plot = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryPlot*>();
RimEnsembleCurveSetCollection* coll = caf::firstAncestorOfTypeFromSelectedObject<RimEnsembleCurveSetCollection*>();
if (!coll && plot)
{
copyCurveSetAndAddToCollection(sourceObjects[i]);
coll = plot->ensembleCurveSetCollection();
}
if (!coll) return;
for (const auto& sourceObject : sourceObjects)
{
copyCurveSetAndAddToCollection(coll, sourceObject);
}
if (plot)
{
plot->updateAll();
}
coll->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------

14
ApplicationCode/Commands/SummaryPlotCommands/RicPasteEnsembleCurveSetFeature.h
View File

@@ -24,6 +24,7 @@
#include <vector>
class RimEnsembleCurveSet;
class RimEnsembleCurveSetCollection;
//==================================================================================================
///
@@ -32,14 +33,13 @@ class RicPasteEnsembleCurveSetFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
public:
static RimEnsembleCurveSet* copyCurveSetAndAddToCollection(RimEnsembleCurveSet *sourceCurveSet);
private:
bool isCommandEnabled() override;
void onActionTriggered(bool isChecked) override;
void setupActionLook(QAction* actionToSetup) override;
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
static RimEnsembleCurveSet* copyCurveSetAndAddToCollection(RimEnsembleCurveSetCollection* coll,
const RimEnsembleCurveSet* sourceCurveSet);
static std::vector<caf::PdmPointer<RimEnsembleCurveSet>> ensembleCurveSetsOnClipboard();
};