From 00cb4e3252ba41589d3e71b844cead5acacece6f Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 22 Nov 2023 11:08:58 +0100 Subject: [PATCH] Always use auto title in preview plot --- .../RicSummaryPlotEditorUi.cpp | 33 ------------------- .../RicSummaryPlotEditorUi.h | 5 --- 2 files changed, 38 deletions(-) diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp index 82dc74aaed..640ee96553 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp @@ -98,10 +98,6 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi() m_previewPlot = std::make_unique(); - CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title" ); - m_useAutoPlotTitleProxy.registerGetMethod( this, &RicSummaryPlotEditorUi::proxyPlotAutoTitle ); - m_useAutoPlotTitleProxy.registerSetMethod( this, &RicSummaryPlotEditorUi::proxyEnablePlotAutoTitle ); - CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "" ); m_applyButtonField = false; m_applyButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); @@ -263,12 +259,6 @@ void RicSummaryPlotEditorUi::fieldChangedByUi( const caf::PdmFieldHandle* change m_previewPlot->loadDataAndUpdate(); m_appearanceApplyButton = false; } - else if ( changedField == &m_useAutoPlotTitleProxy ) - { - m_previewPlot->updatePlotTitle(); - - m_previewPlot->summaryCurveCollection()->updateConnectedEditors(); - } } //-------------------------------------------------------------------------------------------------- @@ -328,8 +318,6 @@ void RicSummaryPlotEditorUi::defineUiOrdering( QString uiConfigName, caf::PdmUiO uiOrdering.addNewGroupWithKeyword( "Plot and Curve Name Configuration", RiuSummaryCurveDefinitionKeywords::nameConfig() ); autoNameGroup->setCollapsedByDefault(); - autoNameGroup->add( &m_useAutoPlotTitleProxy ); - m_curveNameConfig->uiOrdering( uiConfigName, *autoNameGroup ); // Fields to be displayed directly in UI @@ -705,8 +693,6 @@ void RicSummaryPlotEditorUi::updateTargetPlot() newCurveSet->setParentPlotNoReplot( m_targetPlot->plotWidget() ); } - m_targetPlot->enableAutoPlotTitle( m_useAutoPlotTitleProxy() ); - m_targetPlot->loadDataAndUpdate(); m_targetPlot->updateConnectedEditors(); @@ -915,25 +901,6 @@ void RicSummaryPlotEditorUi::selectionEditorFieldChanged() syncPreviewCurvesFromUiSelection(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RicSummaryPlotEditorUi::proxyEnablePlotAutoTitle( const bool& enable ) -{ - m_previewPlot->enableAutoPlotTitle( enable ); - m_previewPlot->setPlotTitleVisible( enable ); - m_previewPlot->updateCurveNames(); - m_previewPlot->loadDataAndUpdate(); -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RicSummaryPlotEditorUi::proxyPlotAutoTitle() const -{ - return m_previewPlot->autoPlotTitle(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h index b0d179dde3..893815274e 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h @@ -103,9 +103,6 @@ private: bool isObservedData( RimSummaryCase* sumCase ) const; void selectionEditorFieldChanged(); - - void proxyEnablePlotAutoTitle( const bool& enable ); - bool proxyPlotAutoTitle() const; void setInitialCurveVisibility( const RimSummaryPlot* targetPlot ); private: @@ -113,8 +110,6 @@ private: std::unique_ptr m_previewPlot; - caf::PdmProxyValueField m_useAutoPlotTitleProxy; - caf::PdmField m_useAutoAppearanceAssignment; caf::PdmField m_appearanceApplyButton; caf::PdmField m_caseAppearanceType;