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

#1805 Flow Characteristics Plot: Make "Selected" time steps default

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-08-21 11:25:40 +02:00
parent ff8494e764
commit 37e25da692
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,8 @@ namespace caf
void AppEnum< RimFlowCharacteristicsPlot::TimeSelectionType >::setUp() void AppEnum< RimFlowCharacteristicsPlot::TimeSelectionType >::setUp()
{ {
addItem(RimFlowCharacteristicsPlot::ALL_AVAILABLE, "ALL_AVAILABLE", "All available"); addItem(RimFlowCharacteristicsPlot::ALL_AVAILABLE, "ALL_AVAILABLE", "All available");
addItem(RimFlowCharacteristicsPlot::SELECT_AVAILABLE, "SELECT_AVAILABLE", "Select"); addItem(RimFlowCharacteristicsPlot::SELECTED, "SELECTED", "Selected");
setDefault(RimFlowCharacteristicsPlot::ALL_AVAILABLE); setDefault(RimFlowCharacteristicsPlot::SELECTED);
} }
} }
@ -279,7 +279,7 @@ void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::Pdm
uiOrdering.add(&m_flowDiagSolution); uiOrdering.add(&m_flowDiagSolution);
uiOrdering.add(&m_timeStepSelectionType); uiOrdering.add(&m_timeStepSelectionType);
if (m_timeStepSelectionType == SELECT_AVAILABLE) if (m_timeStepSelectionType == SELECTED)
{ {
uiOrdering.add(&m_selectedTimeSteps); uiOrdering.add(&m_selectedTimeSteps);
uiOrdering.add(&m_applyTimeSteps); uiOrdering.add(&m_applyTimeSteps);
@ -462,7 +462,7 @@ void RimFlowCharacteristicsPlot::loadDataAndUpdate()
RigFlowDiagResults* flowResult = m_flowDiagSolution->flowDiagResults(); RigFlowDiagResults* flowResult = m_flowDiagSolution->flowDiagResults();
std::vector<int> calculatedTimesteps = flowResult->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL); std::vector<int> calculatedTimesteps = flowResult->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL);
if (m_timeStepSelectionType == SELECT_AVAILABLE) if (m_timeStepSelectionType == SELECTED)
{ {
// Find set intersection of selected and available time steps // Find set intersection of selected and available time steps
std::set<int> calculatedTimeStepsSet; std::set<int> calculatedTimeStepsSet;

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

@ -69,7 +69,7 @@ public:
enum TimeSelectionType enum TimeSelectionType
{ {
ALL_AVAILABLE, ALL_AVAILABLE,
SELECT_AVAILABLE SELECTED,
}; };
protected: protected: