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

#1806 Ensure time steps are calculated when opening project with saved flow characteristics plot

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-08-21 13:09:06 +02:00
parent cf87e7f312
commit 6c0f4fa0c0
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Application/RiaApplication.cpp
View File

@ -1705,6 +1705,7 @@ RiuMainPlotWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
if (!m_mainPlotWindow) if (!m_mainPlotWindow)
{ {
createMainPlotWindow(); createMainPlotWindow();
m_mainPlotWindow->initializeGuiNewProjectLoaded();
loadAndUpdatePlotData(); loadAndUpdatePlotData();
} }

26
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@ -71,6 +71,8 @@ RimFlowCharacteristicsPlot::RimFlowCharacteristicsPlot()
CAF_PDM_InitFieldNoDefault(&m_timeStepSelectionType, "TimeSelectionType", "Time Steps", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_timeStepSelectionType, "TimeSelectionType", "Time Steps", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_selectedTimeSteps, "SelectedTimeSteps", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_selectedTimeSteps, "SelectedTimeSteps", "", "", "", "");
m_selectedTimeSteps.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_selectedTimeStepsUi, "SelectedTimeStepsUi", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_applyTimeSteps, "ApplyTimeSteps", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_applyTimeSteps, "ApplyTimeSteps", "", "", "", "");
m_applyTimeSteps.xmlCapability()->setIOWritable(false); m_applyTimeSteps.xmlCapability()->setIOWritable(false);
m_applyTimeSteps.xmlCapability()->setIOReadable(false); m_applyTimeSteps.xmlCapability()->setIOReadable(false);
@ -198,9 +200,9 @@ QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(
} }
} }
} }
else if ( fieldNeedingOptions == &m_selectedTimeSteps ) else if ( fieldNeedingOptions == &m_selectedTimeStepsUi )
{ {
if ( m_flowDiagSolution ) if ( m_flowDiagSolution && m_case )
{ {
QStringList timeStepDates = m_case->timeStepStrings(); QStringList timeStepDates = m_case->timeStepStrings();
std::vector<int> calculatedTimeSteps = m_flowDiagSolution()->flowDiagResults()->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL); std::vector<int> calculatedTimeSteps = m_flowDiagSolution()->flowDiagResults()->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL);
@ -283,7 +285,7 @@ void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::Pdm
if (m_timeStepSelectionType == SELECTED) if (m_timeStepSelectionType == SELECTED)
{ {
timeStepsGroup->add(&m_selectedTimeSteps); timeStepsGroup->add(&m_selectedTimeStepsUi);
timeStepsGroup->add(&m_applyTimeSteps); timeStepsGroup->add(&m_applyTimeSteps);
} }
} }
@ -367,10 +369,11 @@ void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (m_flowDiagSolution) if (m_flowDiagSolution)
{ {
// Compute any missing time steps from selected // Compute any missing time steps from selected
for (int tsIdx : m_selectedTimeSteps()) for (int tsIdx : m_selectedTimeStepsUi())
{ {
m_flowDiagSolution()->flowDiagResults()->maxAbsPairFlux(tsIdx); m_flowDiagSolution()->flowDiagResults()->maxAbsPairFlux(tsIdx);
} }
m_selectedTimeSteps = m_selectedTimeStepsUi;
} }
m_applyTimeSteps = false; m_applyTimeSteps = false;
} }
@ -409,9 +412,9 @@ void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* cha
} }
else else
{ {
if (!m_selectedTimeSteps().empty()) if (!m_selectedTimeStepsUi().empty())
{ {
timeStep = m_selectedTimeSteps()[0]; timeStep = m_selectedTimeStepsUi()[0];
} }
} }
@ -473,16 +476,11 @@ void RimFlowCharacteristicsPlot::loadDataAndUpdate()
if (m_timeStepSelectionType == SELECTED) if (m_timeStepSelectionType == SELECTED)
{ {
// Find set intersection of selected and available time steps for (int tsIdx : m_selectedTimeSteps())
std::set<int> calculatedTimeStepsSet;
calculatedTimeStepsSet.insert(calculatedTimesteps.begin(), calculatedTimesteps.end());
calculatedTimesteps.clear();
auto selectedTimeSteps = m_selectedTimeSteps();
for (int tsIdx : selectedTimeSteps)
{ {
if (calculatedTimeStepsSet.count(tsIdx)) calculatedTimesteps.push_back(tsIdx); m_flowDiagSolution()->flowDiagResults()->maxAbsPairFlux(tsIdx);
} }
calculatedTimesteps = m_selectedTimeSteps();
} }
m_currentlyPlottedTimeSteps = calculatedTimesteps; m_currentlyPlottedTimeSteps = calculatedTimesteps;

1
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h
View File

@ -90,6 +90,7 @@ private:
caf::PdmPtrField<RimFlowDiagSolution*> m_flowDiagSolution; caf::PdmPtrField<RimFlowDiagSolution*> m_flowDiagSolution;
caf::PdmField<caf::AppEnum<TimeSelectionType> > m_timeStepSelectionType; caf::PdmField<caf::AppEnum<TimeSelectionType> > m_timeStepSelectionType;
caf::PdmField<std::vector<int> > m_selectedTimeSteps; caf::PdmField<std::vector<int> > m_selectedTimeSteps;
caf::PdmField<std::vector<int> > m_selectedTimeStepsUi;
caf::PdmField<bool> m_applyTimeSteps; caf::PdmField<bool> m_applyTimeSteps;
caf::PdmField<bool> m_showLegend; caf::PdmField<bool> m_showLegend;
caf::PdmField<double> m_maxPvFraction; caf::PdmField<double> m_maxPvFraction;

2
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@ -85,8 +85,6 @@ RiuMainPlotWindow::RiuMainPlotWindow()
m_dragDropInterface = std::unique_ptr<caf::PdmUiDragDropInterface>(new RiuDragDrop()); m_dragDropInterface = std::unique_ptr<caf::PdmUiDragDropInterface>(new RiuDragDrop());
initializeGuiNewProjectLoaded();
// Enabling the line below will activate the undo stack // Enabling the line below will activate the undo stack
// When enableUndoCommandSystem is set false, all commands are executed and deleted immediately // When enableUndoCommandSystem is set false, all commands are executed and deleted immediately
//caf::CmdExecCommandManager::instance()->enableUndoCommandSystem(true); //caf::CmdExecCommandManager::instance()->enableUndoCommandSystem(true);