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

#1977 Curve Calculator : Add button box to dialogs

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-12 09:28:34 +02:00
parent e95b9a66a5
commit 650e29d6d5
3 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp
View File

@@ -61,24 +61,28 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed
{
if (changedField == &m_button)
{
RiuSummaryCurveDefSelectionDialog dlg(nullptr);
{
std::vector<RiaSummaryCurveDefinition> sumCasePairs;
sumCasePairs.push_back(RiaSummaryCurveDefinition(m_case(), m_summaryAddress->address()));
dlg.summaryAddressSelection()->setSelectedCurveDefinitions(sumCasePairs);
dlg.summaryAddressSelection()->updateConnectedEditors();
}
if (dlg.exec() == QDialog::Accepted)
{
std::vector<RiaSummaryCurveDefinition> sumCasePairs = dlg.summaryAddressSelection()->selectedCurveDefinitions();
if (sumCasePairs.size() == 1)
RiuSummaryCurveDefSelectionDialog dlg(nullptr);
{
m_case = sumCasePairs[0].summaryCase();
m_summaryAddress->setAddress(sumCasePairs[0].summaryAddress());
std::vector<RiaSummaryCurveDefinition> sumCasePairs;
sumCasePairs.push_back(RiaSummaryCurveDefinition(m_case(), m_summaryAddress->address()));
dlg.summaryAddressSelection()->setSelectedCurveDefinitions(sumCasePairs);
dlg.summaryAddressSelection()->updateConnectedEditors();
}
if (dlg.exec() == QDialog::Accepted)
{
std::vector<RiaSummaryCurveDefinition> sumCasePairs = dlg.summaryAddressSelection()->selectedCurveDefinitions();
if (sumCasePairs.size() == 1)
{
m_case = sumCasePairs[0].summaryCase();
m_summaryAddress->setAddress(sumCasePairs[0].summaryAddress());
}
}
}
this->updateConnectedEditors();
}
}
@@ -87,7 +91,21 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed
//--------------------------------------------------------------------------------------------------
QString RimCalculationVariable::summaryAddressDisplayString() const
{
return "test";
QString caseName;
if (m_case()) caseName = m_case->shortName();
QString summaryCurvename = QString::fromStdString(m_summaryAddress()->address().uiText());
QString txt;
if (!caseName.isEmpty())
{
txt = caseName;
txt += " : ";
}
txt += summaryCurvename;
return txt;
}
//--------------------------------------------------------------------------------------------------