Always use auto title in preview plot

This commit is contained in:
Magne Sjaastad 2023-11-22 11:08:58 +01:00
parent 8fbc532149
commit 00cb4e3252
2 changed files with 0 additions and 38 deletions

View File

@ -98,10 +98,6 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi()
m_previewPlot = std::make_unique<RimSummaryPlot>(); m_previewPlot = std::make_unique<RimSummaryPlot>();
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", "" ); CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "" );
m_applyButtonField = false; m_applyButtonField = false;
m_applyButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_applyButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
@ -263,12 +259,6 @@ void RicSummaryPlotEditorUi::fieldChangedByUi( const caf::PdmFieldHandle* change
m_previewPlot->loadDataAndUpdate(); m_previewPlot->loadDataAndUpdate();
m_appearanceApplyButton = false; 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() ); uiOrdering.addNewGroupWithKeyword( "Plot and Curve Name Configuration", RiuSummaryCurveDefinitionKeywords::nameConfig() );
autoNameGroup->setCollapsedByDefault(); autoNameGroup->setCollapsedByDefault();
autoNameGroup->add( &m_useAutoPlotTitleProxy );
m_curveNameConfig->uiOrdering( uiConfigName, *autoNameGroup ); m_curveNameConfig->uiOrdering( uiConfigName, *autoNameGroup );
// Fields to be displayed directly in UI // Fields to be displayed directly in UI
@ -705,8 +693,6 @@ void RicSummaryPlotEditorUi::updateTargetPlot()
newCurveSet->setParentPlotNoReplot( m_targetPlot->plotWidget() ); newCurveSet->setParentPlotNoReplot( m_targetPlot->plotWidget() );
} }
m_targetPlot->enableAutoPlotTitle( m_useAutoPlotTitleProxy() );
m_targetPlot->loadDataAndUpdate(); m_targetPlot->loadDataAndUpdate();
m_targetPlot->updateConnectedEditors(); m_targetPlot->updateConnectedEditors();
@ -915,25 +901,6 @@ void RicSummaryPlotEditorUi::selectionEditorFieldChanged()
syncPreviewCurvesFromUiSelection(); 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();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -103,9 +103,6 @@ private:
bool isObservedData( RimSummaryCase* sumCase ) const; bool isObservedData( RimSummaryCase* sumCase ) const;
void selectionEditorFieldChanged(); void selectionEditorFieldChanged();
void proxyEnablePlotAutoTitle( const bool& enable );
bool proxyPlotAutoTitle() const;
void setInitialCurveVisibility( const RimSummaryPlot* targetPlot ); void setInitialCurveVisibility( const RimSummaryPlot* targetPlot );
private: private:
@ -113,8 +110,6 @@ private:
std::unique_ptr<RimSummaryPlot> m_previewPlot; std::unique_ptr<RimSummaryPlot> m_previewPlot;
caf::PdmProxyValueField<bool> m_useAutoPlotTitleProxy;
caf::PdmField<bool> m_useAutoAppearanceAssignment; caf::PdmField<bool> m_useAutoAppearanceAssignment;
caf::PdmField<bool> m_appearanceApplyButton; caf::PdmField<bool> m_appearanceApplyButton;
caf::PdmField<AppearanceTypeAppEnum> m_caseAppearanceType; caf::PdmField<AppearanceTypeAppEnum> m_caseAppearanceType;