From f3a824eeefcdc88f8129ed769c994c9ba16f5db6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 22 Feb 2021 15:04:10 +0100 Subject: [PATCH] #7361 Janitor : Remove obsolete fields --- .../CellFilters/RimEclipsePropertyFilter.cpp | 15 --- .../CellFilters/RimEclipsePropertyFilter.h | 11 -- .../ProjectDataModel/Flow/RimWellPltPlot.cpp | 12 -- .../ProjectDataModel/Flow/RimWellPltPlot.h | 2 - .../ProjectDataModel/Flow/RimWellRftPlot.cpp | 12 -- .../ProjectDataModel/Flow/RimWellRftPlot.h | 2 - .../GridCrossPlots/RimGridCrossPlot.cpp | 12 -- .../GridCrossPlots/RimGridCrossPlot.h | 2 - .../ProjectDataModel/Rim3dView.cpp | 20 --- .../ProjectDataModel/Rim3dView.h | 2 - .../ProjectDataModel/RimDepthTrackPlot.cpp | 8 -- .../ProjectDataModel/RimDepthTrackPlot.h | 1 - .../ProjectDataModel/RimEclipseCase.cpp | 12 -- .../ProjectDataModel/RimEclipseCase.h | 7 -- .../ProjectDataModel/RimEclipseInputCase.cpp | 4 - .../ProjectDataModel/RimEclipseInputCase.h | 3 - .../ProjectDataModel/RimEclipseResultCase.cpp | 21 ---- .../ProjectDataModel/RimEclipseResultCase.h | 5 - .../RimEclipseResultDefinition.cpp | 52 -------- .../RimEclipseResultDefinition.h | 5 - .../ProjectDataModel/RimEclipseView.cpp | 8 -- .../ProjectDataModel/RimEclipseView.h | 1 - .../RimGeoMechResultDefinition.cpp | 10 -- .../RimGeoMechResultDefinition.h | 3 - .../ProjectDataModel/RimNameConfig.cpp | 14 --- .../ProjectDataModel/RimNameConfig.h | 2 - .../RimSimWellInViewCollection.cpp | 118 ------------------ .../RimSimWellInViewCollection.h | 9 -- .../ProjectDataModel/RimWellLogTrack.cpp | 31 +---- .../ProjectDataModel/RimWellLogTrack.h | 4 - .../ProjectDataModel/RimWellPath.cpp | 22 ---- .../ProjectDataModel/RimWellPath.h | 5 - .../Summary/RimSummaryPlot.cpp | 52 -------- .../ProjectDataModel/Summary/RimSummaryPlot.h | 7 -- .../Summary/RimSummaryTimeAxisProperties.cpp | 27 +--- .../Summary/RimSummaryTimeAxisProperties.h | 4 - 36 files changed, 3 insertions(+), 522 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp index 39c0e5f4d0..e551ea976a 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp @@ -45,17 +45,6 @@ #include // Needed for HUGE_VAL on Linux -namespace caf -{ // Obsolete stuff -template <> -void caf::AppEnum::setUp() -{ - addItem( RimEclipsePropertyFilter::RANGE_FILTER_REGION, "RANGE_FILTER_REGION", "Range filter cells" ); - addItem( RimEclipsePropertyFilter::GLOBAL_REGION, "GLOBAL_REGION", "All cells" ); - setDefault( RimEclipsePropertyFilter::RANGE_FILTER_REGION ); -} -} // namespace caf - CAF_PDM_SOURCE_INIT( RimEclipsePropertyFilter, "CellPropertyFilter" ); //-------------------------------------------------------------------------------------------------- @@ -65,9 +54,6 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter() { CAF_PDM_InitObject( "Cell Property Filter", ":/CellFilter_Values.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &obsoleteField_evaluationRegion, "EvaluationRegion", "Evaluation Region", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_evaluationRegion ); - CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition", "", "", "" ); m_resultDefinition = new RimEclipseResultDefinition(); m_resultDefinition->enableDeltaResults( true ); @@ -148,7 +134,6 @@ void RimEclipsePropertyFilter::fieldChangedByUi( const caf::PdmFieldHandle* chan // clang-format off if ( &m_lowerBound == changedField || &m_upperBound == changedField - || &obsoleteField_evaluationRegion == changedField || &m_isActive == changedField || &m_filterMode == changedField || &m_selectedCategoryValues == changedField diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.h b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.h index 6e007ea1f6..874ea880d9 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.h +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.h @@ -84,15 +84,4 @@ private: double m_minimumResultValue; double m_maximumResultValue; - -public: - // Obsolete stuff - enum EvaluationRegionType - { - RANGE_FILTER_REGION, - GLOBAL_REGION - }; - -private: - caf::PdmField> obsoleteField_evaluationRegion; }; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 981f725a41..726843021b 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -99,10 +99,6 @@ RimWellPltPlot::RimWellPltPlot() { CAF_PDM_InitObject( "Well Allocation Plot", ":/WellFlowPlot16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "WellLog", "", "", "" ); - m_wellLogPlot_OBSOLETE.uiCapability()->setUiHidden( true ); - m_wellLogPlot_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_wellPathName, "WellName", "Well Name", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SourcesInternal", "Sources Internal", "", "", "" ); @@ -1031,14 +1027,6 @@ void RimWellPltPlot::initAfterRead() { RimViewWindow::initAfterRead(); - if ( m_wellLogPlot_OBSOLETE ) - { - RimWellLogPlot& wellLogPlot = dynamic_cast( *this ); - wellLogPlot = std::move( *m_wellLogPlot_OBSOLETE.value() ); - delete m_wellLogPlot_OBSOLETE; - m_wellLogPlot_OBSOLETE = nullptr; - } - RimWellLogPlot::initAfterRead(); // Postpone init until data has been loaded diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h index e8ec7c4b74..4d0c74de0d 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h @@ -121,8 +121,6 @@ private: caf::PdmField> m_selectedTimeSteps; - caf::PdmChildField m_wellLogPlot_OBSOLETE; - caf::PdmField m_useStandardConditionCurves; caf::PdmField m_useReservoirConditionCurves; caf::PdmField>> m_phases; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 6dfc593649..ecd1bf551a 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -89,10 +89,6 @@ RimWellRftPlot::RimWellRftPlot() CAF_PDM_InitField( &m_showEnsembleCurves, "ShowEnsembleCurves", true, "Show Ensemble Curves", "", "", "" ); CAF_PDM_InitField( &m_showErrorInObservedData, "ShowErrorObserved", true, "Show Observed Data Error", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "Well Log", "", "", "" ); - m_wellLogPlot_OBSOLETE.uiCapability()->setUiHidden( true ); - m_wellLogPlot_OBSOLETE.xmlCapability()->setIOWritable( false ); - m_depthType = RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH; CAF_PDM_InitFieldNoDefault( &m_wellPathNameOrSimWellName, "WellName", "Well Name", "", "", "" ); @@ -1101,14 +1097,6 @@ void RimWellRftPlot::onLoadDataAndUpdate() //-------------------------------------------------------------------------------------------------- void RimWellRftPlot::initAfterRead() { - if ( m_wellLogPlot_OBSOLETE ) - { - RimWellLogPlot& wellLogPlot = dynamic_cast( *this ); - wellLogPlot = std::move( *m_wellLogPlot_OBSOLETE.value() ); - delete m_wellLogPlot_OBSOLETE; - m_wellLogPlot_OBSOLETE = nullptr; - } - RimWellLogPlot::initAfterRead(); } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h index 472dfdc66c..106b8f4667 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h @@ -160,6 +160,4 @@ private: std::map m_dataSourceColors; std::map m_timeStepSymbols; bool m_isOnLoad; - - caf::PdmChildField m_wellLogPlot_OBSOLETE; }; diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index a54b3ec7b5..aebf1de334 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -55,7 +55,6 @@ RimGridCrossPlot::RimGridCrossPlot() CAF_PDM_InitObject( "Grid Cross Plot", ":/SummaryXPlotLight16x16.png", "", "" ); CAF_PDM_InitField( &m_showInfoBox, "ShowInfoBox", true, "Show Info Box", "", "", "" ); - CAF_PDM_InitField( &m_showLegend_OBSOLETE, "ShowLegend", false, "Show Legend", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "Name Config", "", "", "" ); m_nameConfig.uiCapability()->setUiTreeHidden( true ); @@ -505,17 +504,6 @@ void RimGridCrossPlot::onLoadDataAndUpdate() updateInfoBox(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimGridCrossPlot::initAfterRead() -{ - if ( m_showLegend_OBSOLETE() ) - { - setLegendsVisible( true ); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h index fa6f2a7166..e1e9c45bff 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h @@ -111,7 +111,6 @@ public: protected: void deleteViewWidget() override; void onLoadDataAndUpdate() override; - void initAfterRead() override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; @@ -152,7 +151,6 @@ private slots: private: caf::PdmField m_showInfoBox; - caf::PdmField m_showLegend_OBSOLETE; caf::PdmChildField m_nameConfig; caf::PdmChildField m_yAxisProperties; diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp index 634dcdecce..b332b97f91 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp @@ -102,9 +102,6 @@ Rim3dView::Rim3dView( void ) CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); m_nameConfig = new RimViewNameConfig(); - CAF_PDM_InitField( &m_name_OBSOLETE, "UserDescription", QString( "" ), "Name", "", "", "" ); - m_name_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", "" ); m_cameraPosition.uiCapability()->setUiHidden( true ); @@ -326,23 +323,6 @@ void Rim3dView::updateViewWidgetAfterCreation() m_viewer->update(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void Rim3dView::initAfterRead() -{ - RimViewWindow::initAfterRead(); - - if ( !m_name_OBSOLETE().isEmpty() ) - { - nameConfig()->setCustomName( m_name_OBSOLETE() ); - nameConfig()->setAddCaseName( false ); - nameConfig()->setAddAggregationType( false ); - nameConfig()->setAddProperty( false ); - nameConfig()->setAddSampleSpacing( false ); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.h b/ApplicationLibCode/ProjectDataModel/Rim3dView.h index d494869e97..f903626f8f 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dView.h +++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.h @@ -233,7 +233,6 @@ protected: virtual QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) override; - void initAfterRead() override; void setupBeforeSave() override; // Overridden ViewWindow methods: @@ -295,7 +294,6 @@ private: // Fields caf::PdmField m_id; - caf::PdmField m_name_OBSOLETE; caf::PdmChildField m_nameConfig; caf::PdmField m_disableLighting; caf::PdmField m_cameraPosition; diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index 8be66e6571..01757e958f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -90,9 +90,6 @@ RimDepthTrackPlot::RimDepthTrackPlot() m_commonDataSource.xmlCapability()->disableIO(); m_commonDataSource = new RimWellLogCurveCommonDataSource; - CAF_PDM_InitScriptableField( &m_showPlotWindowTitle_OBSOLETE, "ShowTitleInPlot", false, "Show Title", "", "", "" ); - m_showPlotWindowTitle_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" ); m_plotWindowTitle.xmlCapability()->setIOWritable( false ); @@ -907,11 +904,6 @@ void RimDepthTrackPlot::initAfterRead() m_depthAxisGridVisibility = AXIS_GRID_MAJOR_AND_MINOR; } - if ( m_showPlotWindowTitle_OBSOLETE() ) - { - m_showPlotTitle = true; - } - if ( !m_plotWindowTitle().isEmpty() ) { m_nameConfig->setCustomName( m_plotWindowTitle ); diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h index a4f40601b0..e75748ec70 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h @@ -161,7 +161,6 @@ protected: caf::PdmChildField m_commonDataSource; bool m_commonDataSourceEnabled; - caf::PdmField m_showPlotWindowTitle_OBSOLETE; caf::PdmField m_plotWindowTitle; caf::PdmField> m_depthType; caf::PdmField> m_depthUnit; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp index c08cdad069..29de5647d4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp @@ -117,13 +117,6 @@ RimEclipseCase::RimEclipseCase() m_inputPropertyCollection = new RimEclipseInputPropertyCollection; m_inputPropertyCollection->parentField()->uiCapability()->setUiHidden( true ); - // Obsolete fields - CAF_PDM_InitFieldNoDefault( &m_filesContainingFaults_OBSOLETE, "FilesContainingFaults", "", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_filesContainingFaults_OBSOLETE ); - - CAF_PDM_InitField( &m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_caseName_OBSOLETE ); - // Init m_matrixModelResults = new RimReservoirCellResultsStorage; @@ -285,11 +278,6 @@ void RimEclipseCase::initAfterRead() { contourMap->setEclipseCase( this ); } - - if ( caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty() ) - { - caseUserDescription = m_caseName_OBSOLETE; - } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h index 7abff8f47a..0a903e95eb 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h @@ -153,11 +153,4 @@ private: caf::PdmChildField m_matrixModelResults; caf::PdmChildField m_fractureModelResults; - - // Obsolete fields -protected: - caf::PdmField m_caseName_OBSOLETE; - -private: - caf::PdmField> m_filesContainingFaults_OBSOLETE; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp index c2476b65d5..1560de449f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -60,10 +60,6 @@ RimEclipseInputCase::RimEclipseInputCase() m_additionalFiles.registerGetMethod( this, &RimEclipseInputCase::additionalFiles ); m_additionalFiles.uiCapability()->setUiReadOnly( true ); m_additionalFiles.xmlCapability()->setIOWritable( false ); - - CAF_PDM_InitFieldNoDefault( &m_additionalFilenames_OBSOLETE, "AdditionalFileNames", "Additional Files", "", "", "" ); - m_additionalFilenames_OBSOLETE.uiCapability()->setUiReadOnly( true ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_additionalFilenames_OBSOLETE ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.h index be0a7f92fb..4d45c92067 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.h @@ -68,7 +68,4 @@ private: private: // Fields caf::PdmProxyValueField> m_additionalFiles; - - // Obsolete fields - caf::PdmField> m_additionalFilenames_OBSOLETE; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index 51615966f0..e18b4b097f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -81,10 +81,6 @@ RimEclipseResultCase::RimEclipseResultCase() m_flowDiagSolutions.uiCapability()->setUiTreeHidden( true ); m_flowDiagSolutions.uiCapability()->setUiTreeChildrenHidden( true ); - // Obsolete, unused field - CAF_PDM_InitField( &caseDirectory, "CaseFolder", QString(), "Directory", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &caseDirectory ); - m_flipXAxis.xmlCapability()->setIOWritable( true ); // flipXAxis.uiCapability()->setUiHidden(true); m_flipYAxis.xmlCapability()->setIOWritable( true ); @@ -590,23 +586,6 @@ bool RimEclipseResultCase::hasSourSimFile() return !m_sourSimFileName().path().isEmpty(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimEclipseResultCase::initAfterRead() -{ - RimEclipseCase::initAfterRead(); - - // Convert from old (9.0.2) way of storing the case file - if ( gridFileName().isEmpty() ) - { - if ( !this->m_caseName_OBSOLETE().isEmpty() && !caseDirectory().isEmpty() ) - { - setGridFileName( QDir::fromNativeSeparators( caseDirectory() ) + "/" + m_caseName_OBSOLETE() + ".EGRID" ); - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h index 7f334752ba..cc3bdfc319 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h @@ -85,8 +85,6 @@ private: private: cvf::ref createMockModel( QString modelName ); - void initAfterRead() override; - void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; cvf::ref m_flowDagSolverInterface; @@ -98,9 +96,6 @@ private: caf::PdmChildArrayField m_flowDiagSolutions; caf::PdmField m_sourSimFileName; - // Obsolete field - caf::PdmField caseDirectory; - bool m_gridAndWellDataIsReadFromFile; bool m_activeCellInfoIsReadFromFile; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 9ae176c492..316f008e8c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -137,11 +137,6 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe CAF_PDM_InitField( &m_divideByCellFaceArea, "DivideByCellFaceArea", false, "Divide By Area", "", "", "" ); - // One single tracer list has been split into injectors and producers. - // The old list is defined as injectors and we'll have to move any producers in old projects. - CAF_PDM_InitFieldNoDefault( &m_selectedTracers_OBSOLETE, "SelectedTracers", "Tracers", "", "", "" ); - m_selectedTracers_OBSOLETE.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInjectorTracers, "SelectedInjectorTracers", "Injector Tracers", "", "", "" ); m_selectedInjectorTracers.uiCapability()->setUiHidden( true ); @@ -1150,8 +1145,6 @@ int RimEclipseResultDefinition::caseDiffIndex() const //-------------------------------------------------------------------------------------------------- void RimEclipseResultDefinition::loadResult() { - ensureProcessingOfObsoleteFields(); - if ( isFlowDiagOrInjectionFlooding() ) return; // Will load automatically on access if ( m_eclipseCase ) @@ -1647,14 +1640,6 @@ void RimEclipseResultDefinition::defineEditorAttribute( const caf::PdmFieldHandl } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimEclipseResultDefinition::onEditorWidgetsCreated() -{ - ensureProcessingOfObsoleteFields(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -2701,43 +2686,6 @@ bool RimEclipseResultDefinition::addPerCellFaceOptionsForVariableUiField() const return true; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimEclipseResultDefinition::ensureProcessingOfObsoleteFields() -{ - if ( m_flowSolution() && !m_selectedTracers_OBSOLETE().empty() ) - { - std::vector selectedTracers; - selectedTracers.swap( m_selectedTracers_OBSOLETE.v() ); - - std::set allInjectorTracers = setOfTracersOfType( true ); - std::set allProducerTracers = setOfTracersOfType( false ); - - std::vector selectedInjectorTracers; - std::vector selectedProducerTracers; - for ( const QString& tracerName : selectedTracers ) - { - if ( allInjectorTracers.count( tracerName ) ) - { - selectedInjectorTracers.push_back( tracerName ); - } - if ( allProducerTracers.count( tracerName ) ) - { - selectedProducerTracers.push_back( tracerName ); - } - } - if ( !selectedInjectorTracers.empty() ) - { - setSelectedInjectorTracers( selectedInjectorTracers ); - } - if ( !selectedProducerTracers.empty() ) - { - setSelectedProducerTracers( selectedProducerTracers ); - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h index d0252f3bf8..a3942a9dc2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -152,7 +152,6 @@ protected: void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override; - void onEditorWidgetsCreated() override; protected: caf::PdmField> m_resultType; @@ -192,8 +191,6 @@ protected: caf::PdmPointer m_eclipseCase; - caf::PdmField> m_selectedTracers_OBSOLETE; - private: struct TracerComp { @@ -243,8 +240,6 @@ private: bool showDerivedResultsFirstInVariableUiField() const; bool addPerCellFaceOptionsForVariableUiField() const; - void ensureProcessingOfObsoleteFields(); - QString getInputPropertyFileName( const QString& resultName ) const; private: diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index 6184c978a1..3bdb1e97df 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -185,9 +185,6 @@ RimEclipseView::RimEclipseView() m_propertyFilterCollection.uiCapability()->setUiHidden( true ); // Visualization fields - CAF_PDM_InitField( &m_showMainGrid_OBSOLETE, "ShowMainGrid", true, "Show Main Grid", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_showMainGrid_OBSOLETE ); - CAF_PDM_InitField( &m_showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "" ); CAF_PDM_InitField( &m_showInvalidCells, "ShowInvalidCells", false, "Show Invalid Cells", "", "", "" ); @@ -1087,11 +1084,6 @@ void RimEclipseView::initAfterRead() this->cellResult()->setReservoirView( this ); this->cellEdgeResult()->setReservoirView( this ); - if ( !m_showMainGrid_OBSOLETE() ) - { - gridCollection()->setMainGridActive( false ); - } - this->updateUiIconFromToggleField(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.h b/ApplicationLibCode/ProjectDataModel/RimEclipseView.h index bea112197c..f7d33bd50a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.h @@ -207,7 +207,6 @@ private: private: caf::PdmField m_showInvalidCells; caf::PdmField m_showInactiveCells; - caf::PdmField m_showMainGrid_OBSOLETE; caf::PdmChildField m_cellResult; caf::PdmChildField m_cellEdgeResult; diff --git a/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp index 3642156433..fcfdd1bfe4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp @@ -129,11 +129,6 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition( void ) "" ); m_compactionRefLayerUiField.xmlCapability()->disableIO(); - // OBSOLETE FIELDS - CAF_PDM_InitField( &m_isTimeLapseResult_OBSOLETE, "IsTimeLapseResult", true, "TimeLapseResult", "", "", "" ); - m_isTimeLapseResult_OBSOLETE.xmlCapability()->setIOWritable( false ); - m_isTimeLapseResult_OBSOLETE.uiCapability()->setUiHidden( true ); - m_isChangedByField = false; m_addWellPathDerivedResults = false; } @@ -560,11 +555,6 @@ QString RimGeoMechResultDefinition::composeFieldCompString( const QString& resul //-------------------------------------------------------------------------------------------------- void RimGeoMechResultDefinition::initAfterRead() { - if ( !m_isTimeLapseResult_OBSOLETE() ) - { - m_timeLapseBaseTimestep = RigFemResultAddress::noTimeLapseValue(); - } - if ( m_resultComponentName == "STM" || m_resultComponentName == "SEM" ) m_resultComponentName = "SM"; m_resultPositionTypeUiField = m_resultPositionType; diff --git a/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.h b/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.h index 6ac8d705d2..185c860b00 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.h +++ b/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.h @@ -135,9 +135,6 @@ private: caf::PdmField m_compactionRefLayerUiField; caf::PdmPointer m_geomCase; - // Obsolete Data Fields - caf::PdmField m_isTimeLapseResult_OBSOLETE; - bool m_isChangedByField; bool m_addWellPathDerivedResults; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp index 0649d1ba58..81808817f8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp @@ -35,10 +35,8 @@ RimNameConfig::RimNameConfig( const QString& customName ) { CAF_PDM_InitObject( "Curve Name Generator", "", "", "" ); - CAF_PDM_InitField( &m_isUsingAutoName_OBSOLETE, "IsUsingAutoName", true, "Add Automatic Name Tags", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_customName, "CustomCurveName", "Custom Name Part", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_autoName, "AutoCurveName", "Full Name", "", "", "" ); - m_isUsingAutoName_OBSOLETE.xmlCapability()->setIOWritable( false ); m_autoName.registerGetMethod( this, &RimNameConfig::autoName ); m_autoName.xmlCapability()->disableIO(); m_autoName.uiCapability()->setUiReadOnly( true ); @@ -147,15 +145,3 @@ void RimNameConfig::updateAllSettings() pdmObject->updateConnectedEditors(); } } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimNameConfig::initAfterRead() -{ - // Now we just switch them all individually. - if ( !m_isUsingAutoName_OBSOLETE() ) - { - doEnableAllAutoNameTags( false ); - } -} diff --git a/ApplicationLibCode/ProjectDataModel/RimNameConfig.h b/ApplicationLibCode/ProjectDataModel/RimNameConfig.h index 62d20ccf0e..933abc8c71 100644 --- a/ApplicationLibCode/ProjectDataModel/RimNameConfig.h +++ b/ApplicationLibCode/ProjectDataModel/RimNameConfig.h @@ -61,13 +61,11 @@ protected: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; QString autoName() const; virtual void updateAllSettings(); - void initAfterRead() override; private: virtual void doEnableAllAutoNameTags( bool enable ) = 0; private: - caf::PdmField m_isUsingAutoName_OBSOLETE; caf::PdmField m_customName; caf::PdmProxyValueField m_autoName; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 573999184e..a33c6c035e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -53,31 +53,6 @@ #include -namespace caf -{ -// OBSOLETE enum -template <> -void RimSimWellInViewCollection::WellVisibilityEnum::setUp() -{ - addItem( RimSimWellInViewCollection::PIPES_FORCE_ALL_OFF, "FORCE_ALL_OFF", "All Off" ); - addItem( RimSimWellInViewCollection::PIPES_INDIVIDUALLY, "ALL_ON", "Individual" ); - addItem( RimSimWellInViewCollection::PIPES_OPEN_IN_VISIBLE_CELLS, "OPEN_IN_VISIBLE_CELLS", "Visible cells filtered" ); - addItem( RimSimWellInViewCollection::PIPES_FORCE_ALL_ON, "FORCE_ALL_ON", "All On" ); -} -} // namespace caf - -namespace caf -{ -// OBSOLETE enum -template <> -void RimSimWellInViewCollection::WellCellsRangeFilterEnum::setUp() -{ - addItem( RimSimWellInViewCollection::RANGE_ADD_NONE, "FORCE_ALL_OFF", "All Off" ); - addItem( RimSimWellInViewCollection::RANGE_ADD_INDIVIDUAL, "ALL_ON", "Individually" ); - addItem( RimSimWellInViewCollection::RANGE_ADD_ALL, "FORCE_ALL_ON", "All On" ); -} -} // namespace caf - namespace caf { template <> @@ -276,31 +251,6 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() cvf::Color3f defaultWellDiskColor = cvf::Color3::OLIVE; CAF_PDM_InitField( &wellDiskColor, "WellDiskColor", defaultWellDiskColor, "Well Disk Color", "", "", "" ); - CAF_PDM_InitField( &obsoleteField_wellPipeVisibility, - "GlobalWellPipeVisibility", - WellVisibilityEnum( PIPES_INDIVIDUALLY ), - "Global well pipe visibility", - "", - "", - "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_wellPipeVisibility ); - - CAF_PDM_InitField( &obsoleteField_wellCellsToRangeFilterMode, - "GlobalWellCellVisibility", - WellCellsRangeFilterEnum( RANGE_ADD_INDIVIDUAL ), - "Add cells to range filter", - "", - "", - "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_wellCellsToRangeFilterMode ); - - CAF_PDM_InitField( &obsoleteField_showWellHead, "ShowWellHead", true, "Show Well Head", "", "", "" ); - CAF_PDM_InitField( &obsoleteField_showWellLabel, "ShowWellLabel", true, "Show Well Label", "", "", "" ); - CAF_PDM_InitField( &obsoleteField_showWellCellFence, "ShowWellFences", false, "Show Well Cell Fence", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_showWellHead ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_showWellLabel ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_showWellCellFence ); - CAF_PDM_InitField( &m_showWellCommunicationLines, "ShowWellCommunicationLines", false, "Communication Lines", "", "", "" ); m_reservoirView = nullptr; @@ -879,74 +829,6 @@ caf::PdmFieldHandle* RimSimWellInViewCollection::objectToggleField() return &isActive; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSimWellInViewCollection::initAfterRead() -{ - if ( obsoleteField_wellPipeVisibility() == PIPES_OPEN_IN_VISIBLE_CELLS ) - { - showWellsIntersectingVisibleCells = true; - } - else if ( obsoleteField_wellPipeVisibility() == PIPES_FORCE_ALL_OFF ) - { - showWellsIntersectingVisibleCells = false; - - for ( RimSimWellInView* w : wells ) - { - w->showWellPipe = false; - } - } - else if ( obsoleteField_wellPipeVisibility() == PIPES_FORCE_ALL_ON ) - { - showWellsIntersectingVisibleCells = false; - - for ( RimSimWellInView* w : wells ) - { - w->showWellPipe = true; - } - } - - if ( obsoleteField_wellCellsToRangeFilterMode() == RANGE_ADD_NONE ) - { - for ( RimSimWellInView* w : wells ) - { - w->showWellCells = false; - } - } - else if ( obsoleteField_wellCellsToRangeFilterMode() == RANGE_ADD_ALL ) - { - for ( RimSimWellInView* w : wells ) - { - w->showWellCells = true; - } - } - - if ( !obsoleteField_showWellLabel() ) - { - for ( RimSimWellInView* w : wells ) - { - w->showWellLabel = false; - } - } - - if ( !obsoleteField_showWellHead() ) - { - for ( RimSimWellInView* w : wells ) - { - w->showWellHead = false; - } - } - - if ( obsoleteField_showWellCellFence() ) - { - for ( RimSimWellInView* w : wells ) - { - w->showWellCellFence = true; - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h index 5cdc302f58..83489f0df2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h @@ -172,7 +172,6 @@ protected: bool* useOptionsOnly ) override; caf::PdmFieldHandle* objectToggleField() override; - void initAfterRead() override; private: void calculateWellGeometryVisibility( size_t frameIndex ); @@ -206,12 +205,4 @@ private: caf::PdmField m_wellDiskShowQuantityLabels; caf::PdmField m_wellDiskshowLabelsBackground; caf::PdmField m_wellDiskScaleFactor; - - // Obsolete fields - caf::PdmField obsoleteField_wellPipeVisibility; - caf::PdmField obsoleteField_wellCellsToRangeFilterMode; - - caf::PdmField obsoleteField_showWellLabel; - caf::PdmField obsoleteField_showWellHead; - caf::PdmField obsoleteField_showWellCellFence; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp index a06dae07a7..945082b634 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp @@ -207,19 +207,12 @@ RimWellLogTrack::RimWellLogTrack() CAF_PDM_InitFieldNoDefault( &m_regionAnnotationType, "AnnotationType", "Region Annotations", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_regionAnnotationDisplay, "RegionDisplay", "Region Display", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_colorShadingPalette_OBSOLETE, "ColorShadingPalette", "Colors", "", "", "" ); - m_colorShadingPalette_OBSOLETE.xmlCapability()->setIOWritable( false ); - m_colorShadingPalette_OBSOLETE = RimRegularLegendConfig::ColorRangesType::UNDEFINED; - m_colorShadingPalette_OBSOLETE.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_colorShadingLegend, "ColorShadingLegend", "Colors", "", "", "" ); m_colorShadingLegend = RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::NORMAL ); CAF_PDM_InitField( &m_colorShadingTransparency, "ColorShadingTransparency", 50, "Color Transparency", "", "", "" ); m_colorShadingTransparency.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_showFormations_OBSOLETE, "ShowFormations", false, "Show Lines", "", "", "" ); - m_showFormations_OBSOLETE.xmlCapability()->setIOWritable( false ); CAF_PDM_InitField( &m_showRegionLabels, "ShowFormationLabels", true, "Show Labels", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_formationSource, "FormationSource", "Source", "", "", "" ); @@ -273,10 +266,6 @@ RimWellLogTrack::RimWellLogTrack() m_resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_resultDefinition = new RimEclipseResultDefinition; - CAF_PDM_InitField( &m_show_OBSOLETE, "Show", false, "Show Plot", "", "", "" ); - m_show_OBSOLETE.uiCapability()->setUiHidden( true ); - m_show_OBSOLETE.xmlCapability()->setIOWritable( false ); - m_formationsForCaseWithSimWellOnly = false; } @@ -595,7 +584,7 @@ void RimWellLogTrack::fieldChangedByUi( const caf::PdmFieldHandle* changedField, } else if ( changedField == &m_regionAnnotationType || changedField == &m_regionAnnotationDisplay || changedField == &m_formationSource || changedField == &m_colorShadingTransparency || - changedField == &m_colorShadingPalette_OBSOLETE || changedField == &m_colorShadingLegend ) + changedField == &m_colorShadingLegend ) { if ( changedField == &m_formationSource && m_formationSource == WELL_PICK_FILTER ) { @@ -1817,13 +1806,6 @@ void RimWellLogTrack::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering //-------------------------------------------------------------------------------------------------- void RimWellLogTrack::initAfterRead() { - if ( m_showFormations_OBSOLETE() && - m_regionAnnotationType() == RiuPlotAnnotationTool::RegionAnnotationType::NO_ANNOTATIONS ) - { - m_regionAnnotationType = RiuPlotAnnotationTool::RegionAnnotationType::FORMATION_ANNOTATIONS; - m_regionAnnotationDisplay = RiuPlotAnnotationTool::DARK_LINES; - } - if ( m_regionAnnotationType() == RiuPlotAnnotationTool::RegionAnnotationType::RESULT_PROPERTY_ANNOTATIONS ) { RimEclipseCase* eclipseCase = dynamic_cast( m_formationCase.value() ); @@ -1835,16 +1817,6 @@ void RimWellLogTrack::initAfterRead() m_xAxisGridVisibility = RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR; } - if ( m_show_OBSOLETE ) - { - m_showWindow = true; - } - - if ( m_colorShadingPalette_OBSOLETE() != RimRegularLegendConfig::ColorRangesType::UNDEFINED ) - { - m_colorShadingLegend = RimRegularLegendConfig::mapToColorLegend( m_colorShadingPalette_OBSOLETE() ); - } - for ( auto curve : m_curves ) { connectCurveSignals( curve ); @@ -2456,7 +2428,6 @@ void RimWellLogTrack::setFormationFieldsUiReadOnly( bool readOnly /*= true*/ ) m_formationLevel.uiCapability()->setUiReadOnly( readOnly ); m_showformationFluids.uiCapability()->setUiReadOnly( readOnly ); m_colorShadingTransparency.uiCapability()->setUiReadOnly( readOnly ); - m_colorShadingPalette_OBSOLETE.uiCapability()->setUiReadOnly( readOnly ); m_colorShadingLegend.uiCapability()->setUiReadOnly( readOnly ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.h b/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.h index 3cde526a8b..4f70305ece 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.h +++ b/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.h @@ -346,10 +346,6 @@ private: caf::PdmField m_overburdenHeight; caf::PdmField m_underburdenHeight; - caf::PdmField m_showFormations_OBSOLETE; - caf::PdmField m_show_OBSOLETE; - caf::PdmField m_colorShadingPalette_OBSOLETE; - std::vector> m_wellPathAttributePlotObjects; bool m_formationsForCaseWithSimWellOnly; diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp index d2e9b59cbf..fc0bb135f8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp @@ -121,9 +121,6 @@ RimWellPath::RimWellPath() CAF_PDM_InitFieldNoDefault( &m_wellPathFormationFilePath, "WellPathFormationFilePath", "File Path", "", "", "" ); m_wellPathFormationFilePath.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_wellLogFile_OBSOLETE, "WellLogFile", "Well Log File", "", "", "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_wellLogFile_OBSOLETE ); - CAF_PDM_InitFieldNoDefault( &m_wellPathAttributes, "WellPathAttributes", "Casing Design Rubbish", "", "", "" ); m_wellPathAttributes = new RimWellPathAttributeCollection; m_wellPathAttributes->uiCapability()->setUiTreeHidden( true ); @@ -136,11 +133,6 @@ RimWellPath::RimWellPath() //-------------------------------------------------------------------------------------------------- RimWellPath::~RimWellPath() { - if ( m_wellLogFile_OBSOLETE() ) - { - delete m_wellLogFile_OBSOLETE; - } - for ( const auto& file : m_wellLogFiles() ) { delete file; @@ -459,20 +451,6 @@ QList RimWellPath::calculateValueOptions( const caf::Pdm return options; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimWellPath::initAfterRead() -{ - RimWellLogFile* wellLogFile = m_wellLogFile_OBSOLETE(); - m_wellLogFile_OBSOLETE = nullptr; - - if ( wellLogFile != nullptr ) - { - m_wellLogFiles.push_back( wellLogFile ); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPath.h b/ApplicationLibCode/ProjectDataModel/RimWellPath.h index 36ea5da87e..5c707b4dd8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPath.h +++ b/ApplicationLibCode/ProjectDataModel/RimWellPath.h @@ -159,7 +159,6 @@ protected: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) override; - void initAfterRead() override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override; @@ -196,8 +195,4 @@ private: // Geometry and data cvf::ref m_wellPathGeometry; cvf::ref m_wellPathFormations; - - // Obsolete fields - - caf::PdmChildField m_wellLogFile_OBSOLETE; }; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 87a844dd91..f406eb46f8 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -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 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; - } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index 645dc3067c..240581972c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -275,11 +275,4 @@ private: bool m_isCrossPlot; std::unique_ptr m_nameHelperAllCurves; - - // Obsolete fields - caf::PdmChildArrayField m_summaryCurves_OBSOLETE; - caf::PdmChildArrayField m_curveFilters_OBSOLETE; - caf::PdmField m_isAutoZoom_OBSOLETE; - - caf::PdmField m_showLegend_OBSOLETE; }; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index d59dc6d29e..c26809422d 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -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(); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h index 9c2250a3fe..ca592ab561 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h @@ -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 m_timeFormat; caf::PdmField m_majorTickmarkCount; caf::PdmChildArrayField m_annotations; - - caf::PdmField m_visibleDateTimeRangeMin_OBSOLETE; - caf::PdmField m_visibleDateTimeRangeMax_OBSOLETE; };