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

#1886 Curve creator. Set target plot from edit summary curve command

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-09-15 13:37:52 +02:00
parent 388dcd3552
commit 9f47226049
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp
View File

@ -29,6 +29,7 @@
#include <QAction>
#include "cvfAssert.h"
#include "cafSelectionManager.h"
CAF_CMD_SOURCE_INIT(RicEditSummaryCurves, "RicEditSummaryCurves");
@ -57,6 +58,14 @@ void RicEditSummaryCurves::onActionTriggered(bool isChecked)
if (!m_dialogWithSplitter->isVisible())
m_dialogWithSplitter->show();
// Set target plot
std::vector<RimSummaryPlot*> plots;
caf::SelectionManager::instance()->objectsByType(&plots);
if (plots.size() == 1)
{
m_curveCreator->setTargetPlot(plots.front());
}
}
//--------------------------------------------------------------------------------------------------

35
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -158,6 +158,7 @@ RicSummaryCurveCreator::RicSummaryCurveCreator() : m_identifierFieldsMap(
CAF_PDM_InitFieldNoDefault(m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][2]->pdmField(), "BlockLgrVectors", "Block Vectors", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_previewPlot, "PreviewPlot", "PreviewPlot", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_targetPlot, "TargetPlot", "TargetPlot", "", "", "");
CAF_PDM_InitField(&m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_caseAppearanceType, "CaseAppearanceType", "Case", "", "", "");
@ -212,7 +213,11 @@ RicSummaryCurveCreator::~RicSummaryCurveCreator()
void RicSummaryCurveCreator::setTargetPlot(RimSummaryPlot* targetPlot)
{
m_targetPlot = targetPlot;
if (targetPlot != nullptr)
{
populateCurveCreator(*targetPlot);
updateConnectedEditors();
}
}
//--------------------------------------------------------------------------------------------------
@ -847,7 +852,7 @@ void RicSummaryCurveCreator::populateCurveCreator(const RimSummaryPlot& sourceSu
for (const auto& curve : sourceSummaryPlot.summaryCurves())
{
// Select case if not already selected
if (std::find(m_selectedCases.begin(), m_selectedCases.end(), curve->summaryCase()) != m_selectedCases.end())
if (std::find(m_selectedCases.begin(), m_selectedCases.end(), curve->summaryCase()) == m_selectedCases.end())
{
m_selectedCases.push_back(curve->summaryCase());
}
@ -855,11 +860,31 @@ void RicSummaryCurveCreator::populateCurveCreator(const RimSummaryPlot& sourceSu
auto identifierAndFieldList = m_identifierFieldsMap[curve->summaryAddress().category()];
for (const auto& identifierAndField : identifierAndFieldList)
{
auto& pdmField = *identifierAndField->pdmField();
auto currentSelections = pdmField();
currentSelections.push_back(QString::fromStdString(curve->summaryAddress().uiText(identifierAndField->summaryIdentifier())));
QString uiText = QString::fromStdString(curve->summaryAddress().uiText(identifierAndField->summaryIdentifier()));
const auto& currentSelectionVector = identifierAndField->pdmField()->v();
if (std::find(currentSelectionVector.begin(), currentSelectionVector.end(), uiText) == currentSelectionVector.end())
{
std::vector<QString> newSelectionVector(currentSelectionVector.begin(), currentSelectionVector.end());
newSelectionVector.push_back(uiText);
(*identifierAndField->pdmField()) = newSelectionVector;
}
}
// Copy curve object to the preview plot
RimSummaryCurve* curveCopy = dynamic_cast<RimSummaryCurve*>(curve->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(curveCopy);
m_previewPlot->addCurve(curveCopy);
// Resolve references after object has been inserted into the project data model
curveCopy->resolveReferencesRecursively();
// The curve creator is not a descendant of the project, and need to be set manually
curveCopy->setSummaryCase(curve->summaryCase());
curveCopy->initAfterReadRecursively();
curveCopy->loadDataAndUpdate();
}
m_previewPlot->updateConnectedEditors();
}