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

#1999 Curve calc. Curve creator now uses CurveDefSelection component

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-10-23 11:41:16 +02:00
parent ec53855cd4
commit 8276d92ce7
10 changed files with 118 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@@ -186,6 +186,7 @@ RiuSummaryCurveDefSelection::RiuSummaryCurveDefSelection() : m_identifierFieldsM
m_selectedSummaryCategories.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_currentSummaryCategory.uiCapability()->setUiHidden(true);
m_multiSelectionMode = false;
}
//--------------------------------------------------------------------------------------------------
@@ -237,6 +238,22 @@ std::vector<RiaSummaryCurveDefinition> RiuSummaryCurveDefSelection::selectedCurv
return caseAndAddressVector;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelection::setMultiSelectionMode(bool multiSelectionMode)
{
m_multiSelectionMode = multiSelectionMode;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelection::setFieldChangedHandler(const std::function<void()>& handlerFunc)
{
m_toggleChangedHandler = handlerFunc;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -316,6 +333,10 @@ std::set<RifEclipseSummaryAddress> RiuSummaryCurveDefSelection::findPossibleSumm
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (m_toggleChangedHandler != nullptr)
{
m_toggleChangedHandler();
}
}
//--------------------------------------------------------------------------------------------------
@@ -806,7 +827,7 @@ void RiuSummaryCurveDefSelection::defineEditorAttribute(const caf::PdmFieldHandl
attrib->showToggleAllCheckbox = false;
}
attrib->singleSelectionMode = true;
attrib->singleSelectionMode = !m_multiSelectionMode;
}
}

7
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.h
View File

@@ -28,6 +28,7 @@
#include "cafPdmPtrArrayField.h"
#include "cafPdmPtrField.h"
#include <functional>
#define OBSERVED_DATA_AVALUE_POSTFIX "_OBSDATA"
@@ -50,6 +51,8 @@ public:
void setSelectedCurveDefinitions(const std::vector<RiaSummaryCurveDefinition>& curveDefinitions);
std::vector<RiaSummaryCurveDefinition> selectedCurveDefinitions() const;
void setMultiSelectionMode(bool multiSelectionMode);
void setFieldChangedHandler(const std::function<void()>& handlerFunc);
private:
class SummaryIdentifierAndField
@@ -116,4 +119,8 @@ private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>> m_currentSummaryCategory;
std::map<RifEclipseSummaryAddress::SummaryVarCategory, std::vector<SummaryIdentifierAndField*>> m_identifierFieldsMap;
bool m_multiSelectionMode;
std::function<void()> m_toggleChangedHandler;
};