mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4951 Summary Plot Template : Remove obsolete template pointer
This commit is contained in:
parent
a1e40524bc
commit
2dfa6b9d9f
@ -203,8 +203,6 @@ RimSummaryPlot::RimSummaryPlot()
|
|||||||
CAF_PDM_InitField( &m_isAutoZoom_OBSOLETE, "AutoZoom", true, "Auto Zoom", "", "", "" );
|
CAF_PDM_InitField( &m_isAutoZoom_OBSOLETE, "AutoZoom", true, "Auto Zoom", "", "", "" );
|
||||||
RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_isAutoZoom_OBSOLETE );
|
RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_isAutoZoom_OBSOLETE );
|
||||||
|
|
||||||
CAF_PDM_InitFieldNoDefault( &m_plotTemplate, "PlotTemplate", "Template", "", "", "" );
|
|
||||||
|
|
||||||
CAF_PDM_InitFieldNoDefault( &m_textCurveSetEditor,
|
CAF_PDM_InitFieldNoDefault( &m_textCurveSetEditor,
|
||||||
"SummaryPlotFilterTextCurveSetEditor",
|
"SummaryPlotFilterTextCurveSetEditor",
|
||||||
"Text Filter Curve Creator",
|
"Text Filter Curve Creator",
|
||||||
@ -1348,26 +1346,6 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlot::calculateValueOptions( const caf::
|
|||||||
options.push_back( caf::PdmOptionItemInfo( text, value ) );
|
options.push_back( caf::PdmOptionItemInfo( text, value ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( fieldNeedingOptions == &m_plotTemplate )
|
|
||||||
{
|
|
||||||
options.push_back( caf::PdmOptionItemInfo( "None", nullptr ) );
|
|
||||||
|
|
||||||
auto rootPlotTemplate = RiaApplication::instance()->project()->rootPlotTemlateItem();
|
|
||||||
if ( rootPlotTemplate )
|
|
||||||
{
|
|
||||||
std::vector<caf::PdmObject*> allTemplates;
|
|
||||||
{
|
|
||||||
RimPlotTemplateFileItem fileItem;
|
|
||||||
rootPlotTemplate->descendantsIncludingThisFromClassKeyword( fileItem.classKeyword(), allTemplates );
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( auto t : allTemplates )
|
|
||||||
{
|
|
||||||
caf::PdmOptionItemInfo optionItem( t->uiName(), t );
|
|
||||||
options.push_back( optionItem );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return options;
|
return options;
|
||||||
}
|
}
|
||||||
@ -1697,7 +1675,6 @@ void RimSummaryPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
|
|||||||
}
|
}
|
||||||
|
|
||||||
mainOptions->add( &m_normalizeCurveYValues );
|
mainOptions->add( &m_normalizeCurveYValues );
|
||||||
mainOptions->add( &m_plotTemplate );
|
|
||||||
|
|
||||||
RimViewWindow::defineUiOrdering( uiConfigName, uiOrdering );
|
RimViewWindow::defineUiOrdering( uiConfigName, uiOrdering );
|
||||||
|
|
||||||
@ -1940,22 +1917,6 @@ void RimSummaryPlot::showLegend( bool enable )
|
|||||||
m_showLegend = enable;
|
m_showLegend = enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
///
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
void RimSummaryPlot::setPlotTemplate( RimPlotTemplateFileItem* plotTemplate )
|
|
||||||
{
|
|
||||||
m_plotTemplate = plotTemplate;
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
///
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
RimPlotTemplateFileItem* RimSummaryPlot::plotTemplate() const
|
|
||||||
{
|
|
||||||
return m_plotTemplate();
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -156,9 +156,6 @@ public:
|
|||||||
bool isNormalizationEnabled();
|
bool isNormalizationEnabled();
|
||||||
void showLegend( bool enable );
|
void showLegend( bool enable );
|
||||||
|
|
||||||
void setPlotTemplate( RimPlotTemplateFileItem* plotTemplate );
|
|
||||||
RimPlotTemplateFileItem* plotTemplate() const;
|
|
||||||
|
|
||||||
void handleKeyPressEvent( QKeyEvent* keyEvent );
|
void handleKeyPressEvent( QKeyEvent* keyEvent );
|
||||||
virtual RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const;
|
virtual RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const;
|
||||||
virtual std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar();
|
virtual std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar();
|
||||||
@ -245,8 +242,6 @@ private:
|
|||||||
caf::PdmChildField<RimPlotAxisProperties*> m_bottomAxisProperties;
|
caf::PdmChildField<RimPlotAxisProperties*> m_bottomAxisProperties;
|
||||||
caf::PdmChildField<RimSummaryTimeAxisProperties*> m_timeAxisProperties;
|
caf::PdmChildField<RimSummaryTimeAxisProperties*> m_timeAxisProperties;
|
||||||
|
|
||||||
caf::PdmPtrField<RimPlotTemplateFileItem*> m_plotTemplate;
|
|
||||||
|
|
||||||
caf::PdmChildField<RimSummaryPlotFilterTextCurveSetEditor*> m_textCurveSetEditor;
|
caf::PdmChildField<RimSummaryPlotFilterTextCurveSetEditor*> m_textCurveSetEditor;
|
||||||
|
|
||||||
QPointer<RiuSummaryQwtPlot> m_plotWidget;
|
QPointer<RiuSummaryQwtPlot> m_plotWidget;
|
||||||
|
Loading…
Reference in New Issue
Block a user