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 : Hide Edit header, hide new/delete variable buttons

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-13 13:47:01 +02:00
parent dffaf8ed25
commit 15f71c29fa
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
View File

@ -171,8 +171,8 @@ void RicSummaryCurveCalculator::defineUiOrdering(QString uiConfigName, caf::PdmU
group->add(&m_parseExpression); group->add(&m_parseExpression);
group->add(&m_calculateExpression); group->add(&m_calculateExpression);
group->add(&m_newVariable); // group->add(&m_newVariable);
group->add(&m_deleteVariable); // group->add(&m_deleteVariable);
} }
} }

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
View File

@ -92,6 +92,8 @@ void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiIte
m_pdmTableView->setListField(nullptr); m_pdmTableView->setListField(nullptr);
m_firstRowRightLayout->addWidget(m_pdmTableView); m_firstRowRightLayout->addWidget(m_pdmTableView);
m_pdmTableView->tableView()->resizeColumnsToContents();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

15
ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp
View File

@ -28,6 +28,7 @@
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTableView.h" #include "cafPdmUiTableView.h"
#include "RimCalculation.h"
CAF_PDM_SOURCE_INIT(RimCalculationVariable, "RimCalculationVariable"); CAF_PDM_SOURCE_INIT(RimCalculationVariable, "RimCalculationVariable");
@ -40,8 +41,9 @@ RimCalculationVariable::RimCalculationVariable()
CAF_PDM_InitObject("RimCalculationVariable", ":/octave.png", "RimCalculationVariable", ""); CAF_PDM_InitObject("RimCalculationVariable", ":/octave.png", "RimCalculationVariable", "");
CAF_PDM_InitFieldNoDefault(&m_name, "VariableName", "Variable Name", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_name, "VariableName", "Variable Name", "", "", "");
m_name.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_button, "PushButton", "Edit ", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_button, "PushButton", "", "", "", "");
m_button.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName()); m_button.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
m_button.xmlCapability()->disableIO(); m_button.xmlCapability()->disableIO();
@ -77,6 +79,8 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed
{ {
if (changedField == &m_button) if (changedField == &m_button)
{ {
bool updateContainingEditor = false;
{ {
RiuSummaryCurveDefSelectionDialog dlg(nullptr); RiuSummaryCurveDefSelectionDialog dlg(nullptr);
{ {
@ -94,11 +98,18 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed
{ {
m_case = sumCasePairs[0].summaryCase(); m_case = sumCasePairs[0].summaryCase();
m_summaryAddress->setAddress(sumCasePairs[0].summaryAddress()); m_summaryAddress->setAddress(sumCasePairs[0].summaryAddress());
updateContainingEditor = true;
} }
} }
} }
this->updateConnectedEditors(); if (updateContainingEditor)
{
RimCalculation* rimCalculation = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimCalculation);
rimCalculation->updateConnectedEditors();
}
} }
} }