Remove description-field from RimPlotWindow

* Leave it to sub-classes to deal with this
This commit is contained in:
Gaute Lindkvist
2019-11-13 11:44:54 +01:00
parent f6126497e7
commit 81db22586d
23 changed files with 155 additions and 172 deletions

View File

@@ -104,8 +104,9 @@ RimWellLogPlot::RimWellLogPlot()
m_maxAvailableDepth = -HUGE_VAL;
m_commonDataSourceEnabled = true;
m_showTitleInPlot = false;
m_columnCountEnum = RimGridPlotWindow::COLUMNS_UNLIMITED;
setMultiPlotTitleVisible( false );
}
//--------------------------------------------------------------------------------------------------
@@ -152,14 +153,6 @@ QWidget* RimWellLogPlot::createPlotWidget( QWidget* mainWindowParent /*= nullptr
return createViewWidget( mainWindowParent );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogPlot::fullPlotTitle() const
{
return createAutoName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -315,7 +308,7 @@ void RimWellLogPlot::uiOrderingForDepthAxis( caf::PdmUiOrdering& uiOrdering )
//--------------------------------------------------------------------------------------------------
void RimWellLogPlot::uiOrderingForPlotLayout( caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_showTitleInPlot );
uiOrdering.add( &m_showPlotWindowTitle );
m_nameConfig->uiOrdering( "", uiOrdering );
uiOrdering.add( &m_showIndividualPlotTitles );
RimPlotWindow::uiOrderingForPlotLayout( uiOrdering );
@@ -416,7 +409,8 @@ QWidget* RimWellLogPlot::createViewWidget( QWidget* mainWindowParent )
void RimWellLogPlot::performAutoNameUpdate()
{
updateCommonDataSource();
updatePlotTitle();
setMultiPlotTitle( m_nameConfig->name() );
updatePlotTitleInWidgets();
}
//--------------------------------------------------------------------------------------------------
@@ -532,14 +526,6 @@ void RimWellLogPlot::updatePlotNames()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimWellLogPlot::userDescriptionField()
{
return m_nameConfig->nameField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -650,9 +636,9 @@ void RimWellLogPlot::initAfterRead()
RimGridPlotWindow::initAfterRead();
updateCommonDataSource();
if ( !m_description().isEmpty() )
if ( !m_plotWindowTitle().isEmpty() )
{
m_nameConfig->setCustomName( m_description() );
m_nameConfig->setCustomName( m_plotWindowTitle() );
}
if ( m_depthAxisGridVisibility() == AXIS_GRID_MINOR )