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

118
ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@@ -53,31 +53,6 @@
#include <set>
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;
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------