From 15f71c29fa90020abe3f9c4401e0f9c70bb085d6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 13 Oct 2017 13:47:01 +0200 Subject: [PATCH] #1977 Curve Calculator : Hide Edit header, hide new/delete variable buttons --- .../RicSummaryCurveCalculator.cpp | 4 ++-- .../RicSummaryCurveCalculatorEditor.cpp | 2 ++ .../ProjectDataModel/RimCalculationVariable.cpp | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp index 7c0c7e4f33..a8f06d6a8f 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp @@ -171,8 +171,8 @@ void RicSummaryCurveCalculator::defineUiOrdering(QString uiConfigName, caf::PdmU group->add(&m_parseExpression); group->add(&m_calculateExpression); - group->add(&m_newVariable); - group->add(&m_deleteVariable); +// group->add(&m_newVariable); +// group->add(&m_deleteVariable); } } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp index 4163ed9647..3b97d1fa13 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp @@ -92,6 +92,8 @@ void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiIte m_pdmTableView->setListField(nullptr); m_firstRowRightLayout->addWidget(m_pdmTableView); + + m_pdmTableView->tableView()->resizeColumnsToContents(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp index 91657f40a5..8104d9ab7f 100644 --- a/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp +++ b/ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp @@ -28,6 +28,7 @@ #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiTableView.h" +#include "RimCalculation.h" CAF_PDM_SOURCE_INIT(RimCalculationVariable, "RimCalculationVariable"); @@ -40,8 +41,9 @@ RimCalculationVariable::RimCalculationVariable() CAF_PDM_InitObject("RimCalculationVariable", ":/octave.png", "RimCalculationVariable", ""); 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.xmlCapability()->disableIO(); @@ -77,6 +79,8 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed { if (changedField == &m_button) { + bool updateContainingEditor = false; + { RiuSummaryCurveDefSelectionDialog dlg(nullptr); { @@ -94,11 +98,18 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed { m_case = sumCasePairs[0].summaryCase(); m_summaryAddress->setAddress(sumCasePairs[0].summaryAddress()); + + updateContainingEditor = true; } } } - this->updateConnectedEditors(); + if (updateContainingEditor) + { + RimCalculation* rimCalculation = nullptr; + this->firstAncestorOrThisOfTypeAsserted(rimCalculation); + rimCalculation->updateConnectedEditors(); + } } }