Remove WBS parameter track color coding

This commit is contained in:
Gaute Lindkvist
2020-05-25 08:59:00 +02:00
parent 8370bd901e
commit 3f889afd4a
3 changed files with 4 additions and 22 deletions

View File

@@ -259,7 +259,6 @@ void RicNewWellBoreStabilityPlotFeature::createParametersTrack( RimWellBoreStabi
paramCurvesTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR ); paramCurvesTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR );
paramCurvesTrack->setFormationWellPath( wellPath ); paramCurvesTrack->setFormationWellPath( wellPath );
paramCurvesTrack->setFormationCase( geoMechCase ); paramCurvesTrack->setFormationCase( geoMechCase );
paramCurvesTrack->setAnnotationType( RiuPlotAnnotationTool::CURVE_ANNOTATIONS );
paramCurvesTrack->setShowRegionLabels( true ); paramCurvesTrack->setShowRegionLabels( true );
paramCurvesTrack->setShowWindow( false ); paramCurvesTrack->setShowWindow( false );
std::set<RigWbsParameter> parameters = RigWbsParameter::allParameters(); std::set<RigWbsParameter> parameters = RigWbsParameter::allParameters();

View File

@@ -132,10 +132,9 @@ void AppEnum<RigWellPathFormations::FormationLevel>::setUp()
template <> template <>
void AppEnum<RiuPlotAnnotationTool::RegionAnnotationType>::setUp() void AppEnum<RiuPlotAnnotationTool::RegionAnnotationType>::setUp()
{ {
addItem( RiuPlotAnnotationTool::NO_ANNOTATIONS, "NO_ANNOTATIONS", "No Annotations" ); addItem( RiuPlotAnnotationTool::RegionAnnotationType::NO_ANNOTATIONS, "NO_ANNOTATIONS", "No Annotations" );
addItem( RiuPlotAnnotationTool::FORMATION_ANNOTATIONS, "FORMATIONS", "Formations" ); addItem( RiuPlotAnnotationTool::RegionAnnotationType::FORMATION_ANNOTATIONS, "FORMATIONS", "Formations" );
addItem( RiuPlotAnnotationTool::CURVE_ANNOTATIONS, "CURVE_DATA", "Curve Data Annotations" ); setDefault( RiuPlotAnnotationTool::RegionAnnotationType::NO_ANNOTATIONS );
setDefault( RiuPlotAnnotationTool::NO_ANNOTATIONS );
} }
template <> template <>
@@ -943,22 +942,6 @@ QList<caf::PdmOptionItemInfo> RimWellLogTrack::calculateValueOptions( const caf:
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_regionAnnotationType )
{
options.push_back( caf::PdmOptionItemInfo( RegionAnnotationTypeEnum::uiText( RiuPlotAnnotationTool::NO_ANNOTATIONS ),
RiuPlotAnnotationTool::NO_ANNOTATIONS ) );
options.push_back(
caf::PdmOptionItemInfo( RegionAnnotationTypeEnum::uiText( RiuPlotAnnotationTool::FORMATION_ANNOTATIONS ),
RiuPlotAnnotationTool::FORMATION_ANNOTATIONS ) );
RimWellBoreStabilityPlot* wellBoreStabilityPlot = nullptr;
this->firstAncestorOrThisOfType( wellBoreStabilityPlot );
if ( wellBoreStabilityPlot )
{
options.push_back(
caf::PdmOptionItemInfo( RegionAnnotationTypeEnum::uiText( RiuPlotAnnotationTool::CURVE_ANNOTATIONS ),
RiuPlotAnnotationTool::CURVE_ANNOTATIONS ) );
}
}
if ( fieldNeedingOptions == &m_formationWellPathForSourceCase ) if ( fieldNeedingOptions == &m_formationWellPathForSourceCase )
{ {
RimTools::wellPathOptionItems( &options ); RimTools::wellPathOptionItems( &options );

View File

@@ -37,7 +37,7 @@ public:
{ {
NO_ANNOTATIONS = 0, NO_ANNOTATIONS = 0,
FORMATION_ANNOTATIONS = 1, FORMATION_ANNOTATIONS = 1,
CURVE_ANNOTATIONS = 2 // Used to have Wbs-parameter coding as 2
}; };
enum RegionDisplay enum RegionDisplay
{ {