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

#7361 Janitor : Remove obsolete fields

Browse Source
This commit is contained in:
Magne Sjaastad
2021-02-22 15:04:10 +01:00
parent 65e6c5005a
commit f3a824eeef
36 changed files with 3 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -198,16 +198,6 @@ RimSummaryPlot::RimSummaryPlot()
m_textCurveSetEditor.uiCapability()->setUiTreeHidden( true );
m_textCurveSetEditor = new RimSummaryPlotFilterTextCurveSetEditor;
// Obsolete fields
CAF_PDM_InitField( &m_isAutoZoom_OBSOLETE, "AutoZoom", true, "Auto Zoom", "", "", "" );
RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_isAutoZoom_OBSOLETE );
CAF_PDM_InitField( &m_showLegend_OBSOLETE, "ShowLegend", true, "Legend", "", "", "" );
m_showLegend_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitFieldNoDefault( &m_curveFilters_OBSOLETE, "SummaryCurveFilters", "", "", "", "" );
m_curveFilters_OBSOLETE.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitFieldNoDefault( &m_summaryCurves_OBSOLETE, "SummaryCurves", "", "", "", "" );
m_summaryCurves_OBSOLETE.uiCapability()->setUiTreeHidden( true );
m_isCrossPlot = false;
m_nameHelperAllCurves.reset( new RimSummaryPlotNameHelper );
@@ -224,8 +214,6 @@ RimSummaryPlot::~RimSummaryPlot()
cleanupBeforeClose();
m_summaryCurves_OBSOLETE.deleteAllChildObjects();
m_curveFilters_OBSOLETE.deleteAllChildObjects();
delete m_summaryCurveCollection;
delete m_ensembleCurveSetCollection;
}
@@ -1938,52 +1926,12 @@ void RimSummaryPlot::initAfterRead()
{
RimViewWindow::initAfterRead();
// Move summary curves from obsolete storage to the new curve collection
std::vector<RimSummaryCurve*> curvesToMove;
for ( auto& curveFilter : m_curveFilters_OBSOLETE )
{
const auto& tmpCurves = curveFilter->curves();
curvesToMove.insert( curvesToMove.end(), tmpCurves.begin(), tmpCurves.end() );
curveFilter->clearCurvesWithoutDelete();
}
m_curveFilters_OBSOLETE.clear();
curvesToMove.insert( curvesToMove.end(), m_summaryCurves_OBSOLETE.begin(), m_summaryCurves_OBSOLETE.end() );
m_summaryCurves_OBSOLETE.clear();
for ( const auto& curve : curvesToMove )
{
m_summaryCurveCollection->addCurve( curve );
}
if ( !m_isAutoZoom_OBSOLETE() )
{
setAutoScaleXEnabled( false );
setAutoScaleYEnabled( false );
}
for ( auto curve : summaryCurves() )
{
connectCurveSignals( curve );
}
updateStackedCurveData();
RimProject* proj = nullptr;
this->firstAncestorOrThisOfType( proj );
if ( proj )
{
if ( proj->isProjectFileVersionEqualOrOlderThan( "2017.0.0" ) )
{
m_useAutoPlotTitle = false;
}
}
if ( m_showLegend_OBSOLETE() )
{
m_showPlotLegends = true;
}
}
//--------------------------------------------------------------------------------------------------

7
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -275,11 +275,4 @@ private:
bool m_isCrossPlot;
std::unique_ptr<RimSummaryPlotNameHelper> m_nameHelperAllCurves;
// Obsolete fields
caf::PdmChildArrayField<RimSummaryCurve*> m_summaryCurves_OBSOLETE;
caf::PdmChildArrayField<RimSummaryCurveFilter_OBSOLETE*> m_curveFilters_OBSOLETE;
caf::PdmField<bool> m_isAutoZoom_OBSOLETE;
caf::PdmField<bool> m_showLegend_OBSOLETE;
};

27
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@@ -28,7 +28,9 @@
#include "cafPdmUiDateEditor.h"
#include "cafPdmUiLineEditor.h"
#include "cafPdmUiTimeEditor.h"
#include "cvfAssert.h"
#include "qwt_date.h"
namespace caf
@@ -118,12 +120,6 @@ RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "", "", "", "" );
m_annotations.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_visibleDateTimeRangeMax_OBSOLETE, "VisibleRangeMax", "Max", "", "", "" );
m_visibleDateTimeRangeMax_OBSOLETE.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_visibleDateTimeRangeMin_OBSOLETE, "VisibleRangeMin", "Min", "", "", "" );
m_visibleDateTimeRangeMin_OBSOLETE.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );
}
//--------------------------------------------------------------------------------------------------
@@ -676,25 +672,6 @@ void RimSummaryTimeAxisProperties::fieldChangedByUi( const caf::PdmFieldHandle*
rimSummaryPlot->updateAxes();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryTimeAxisProperties::initAfterRead()
{
QDateTime maxDateTime = m_visibleDateTimeRangeMax_OBSOLETE();
QDateTime minDateTime = m_visibleDateTimeRangeMin_OBSOLETE();
if ( maxDateTime.isValid() )
{
m_visibleDateRangeMax = maxDateTime.date();
m_visibleTimeRangeMax = maxDateTime.time();
}
if ( minDateTime.isValid() )
{
m_visibleDateRangeMin = minDateTime.date();
m_visibleTimeRangeMin = minDateTime.time();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h
View File

@@ -114,7 +114,6 @@ protected:
bool* useOptionsOnly ) override;
caf::PdmFieldHandle* objectToggleField() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void initAfterRead() override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
@@ -150,7 +149,4 @@ private:
caf::PdmField<QString> m_timeFormat;
caf::PdmField<LegendTickmarkCountEnum> m_majorTickmarkCount;
caf::PdmChildArrayField<RimPlotAxisAnnotation*> m_annotations;
caf::PdmField<QDateTime> m_visibleDateTimeRangeMin_OBSOLETE;
caf::PdmField<QDateTime> m_visibleDateTimeRangeMax_OBSOLETE;
};