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

#4951 Summary Plot Template : Remove obsolete template pointer

Browse Source
This commit is contained in:
Magne Sjaastad 2019-10-30 10:45:15 +01:00
parent a1e40524bc
commit 2dfa6b9d9f
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -203,8 +203,6 @@ RimSummaryPlot::RimSummaryPlot()
CAF_PDM_InitField( &m_isAutoZoom_OBSOLETE, "AutoZoom", true, "Auto Zoom", "", "", "" );
RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_isAutoZoom_OBSOLETE );
CAF_PDM_InitFieldNoDefault( &m_plotTemplate, "PlotTemplate", "Template", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_textCurveSetEditor,
"SummaryPlotFilterTextCurveSetEditor",
"Text Filter Curve Creator",
@ -1348,26 +1346,6 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlot::calculateValueOptions( const caf::
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;
}
@ -1697,7 +1675,6 @@ void RimSummaryPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
}
mainOptions->add( &m_normalizeCurveYValues );
mainOptions->add( &m_plotTemplate );
RimViewWindow::defineUiOrdering( uiConfigName, uiOrdering );
@ -1940,22 +1917,6 @@ void RimSummaryPlot::showLegend( bool enable )
m_showLegend = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::setPlotTemplate( RimPlotTemplateFileItem* plotTemplate )
{
m_plotTemplate = plotTemplate;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotTemplateFileItem* RimSummaryPlot::plotTemplate() const
{
return m_plotTemplate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@ -156,9 +156,6 @@ public:
bool isNormalizationEnabled();
void showLegend( bool enable );
void setPlotTemplate( RimPlotTemplateFileItem* plotTemplate );
RimPlotTemplateFileItem* plotTemplate() const;
void handleKeyPressEvent( QKeyEvent* keyEvent );
virtual RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const;
virtual std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar();
@ -245,8 +242,6 @@ private:
caf::PdmChildField<RimPlotAxisProperties*> m_bottomAxisProperties;
caf::PdmChildField<RimSummaryTimeAxisProperties*> m_timeAxisProperties;
caf::PdmPtrField<RimPlotTemplateFileItem*> m_plotTemplate;
caf::PdmChildField<RimSummaryPlotFilterTextCurveSetEditor*> m_textCurveSetEditor;
QPointer<RiuSummaryQwtPlot> m_plotWidget;