Index: dam engine/branches/Initial Source/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r303 -r330 --- dam engine/branches/Initial Source/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 303) +++ dam engine/branches/Initial Source/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 330) @@ -223,7 +223,6 @@ private bool redesignDikeShoulder = true; private double rwBankProtectionBottomLevel = 0; private double scenarioRiverLevel = 0; - private double? scenarioRiverLevelLow = null; private Segment segment; private SensorLocation sensorData; private double sheetPileLength = 0; @@ -2878,211 +2877,8 @@ }; } - #region IVisibleEnabled Members + - public bool IsEnabled(string property) - { - return true; - } - - public bool IsVisible(string property) - { - bool isPrimaryCalamity = (DamType == DamType.Primary && DamProjectType == DamProjectType.Calamity); - // bool isPrimaryDesign = (this.DamType == DamType.Primary && Location.DamProjectType == Data.DamProjectType.Design); - bool isRegionalCalamity = (DamType == DamType.Regional && DamProjectType == DamProjectType.Calamity); - bool isRegionalAssesment = (DamType == DamType.Regional && DamProjectType == DamProjectType.Assessment); - bool isRegionalDesign = (DamType == DamType.Regional && DamProjectType == DamProjectType.Design); - var arePlLineCreationExpertKnowledgeParametersNeeded = ArePlLineCreationExpertKnowledgeParametersNeeded(); - bool arePlLineCreationExpertKnowledgeParametersDrySituationNeeded = (PLLineCreationMethod == PLLineCreationMethod.ExpertKnowledgeRRD || - PLLineCreationMethod == PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD) && isRegionalAssesment; - var isDesign = IsDesign(); - bool isRegional = (DamType == DamType.Regional); - - // TODO: These string literals below should be replaced with the constants define in LocationParameterNames - switch (property) - { - case "DikeMaterialType": - return isRegional; - case "DetrimentFactor": - return isPrimaryCalamity || isRegionalCalamity || isRegionalDesign || isRegionalAssesment; - - case "BoezemLevelTp": - return isRegionalAssesment; // formerly known as MBP - case "BoezemLevelHbp": - return isRegionalAssesment; // formerly known as BP-GWS - case "BoezemLevelLbp": - return isRegionalAssesment; // formerly known as BP-GLW - - case "ShoulderEmbankmentMaterial": - return isDesign; - case "StabilityShoulderGrowSlope": - return isDesign; - case "StabilityShoulderGrowDeltaX": - return isDesign; - case "StabilitySlopeAdaptionDeltaX": - return isDesign; - case "UpliftCriterionStability": - return !isDesign; - case "UpliftCriterionPiping": - return !isDesign; - case "PlLineOffsetBelowDikeToeAtPolder": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PlLineOffsetBelowDikeTopAtPolder": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PlLineOffsetBelowDikeTopAtRiver": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PlLineOffsetBelowShoulderBaseInside": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PLLineOffsetDryBelowDikeToeAtPolder": - return arePlLineCreationExpertKnowledgeParametersDrySituationNeeded; - case "PLLineOffsetDryBelowDikeTopAtPolder": - return arePlLineCreationExpertKnowledgeParametersDrySituationNeeded; - case "PLLineOffsetDryBelowDikeTopAtRiver": - return arePlLineCreationExpertKnowledgeParametersDrySituationNeeded; - case "PLLineOffsetDryBelowShoulderBaseInside": - return arePlLineCreationExpertKnowledgeParametersDrySituationNeeded; - case "PlLineOffsetBelowDikeCrestMiddle": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PlLineOffsetFactorBelowShoulderCrest": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PlLineOffsetDryBelowDikeCrestMiddle": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "PlLineOffsetDryFactorBelowShoulderCrest": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "UsePlLineOffsetBelowDikeCrestMiddle": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "UsePlLineOffsetFactorBelowShoulderCrest": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "UsePlLineOffsetDryBelowDikeCrestMiddle": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "UsePlLineOffsetDryFactorBelowShoulderCrest": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "IntrusionVerticalWaterPressure": return true; - case "PolderLevelLow": - return isRegionalAssesment; - case "DredgingDepth": - return isRegionalAssesment; - case "SheetPileLength": - return isRegionalAssesment; - case "RwBankProtectionBottomLevel": - return isRegionalAssesment; - case "RedesignDikeHeight": - return isDesign; - case "DikeTableHeight": - return false; - case "RedesignDikeShoulder": - return isDesign; - case "StabilityDesignMethod": - return !isRegionalAssesment; - case "SlopeAdaptionStartCotangent": - return !isRegionalAssesment; - case "SlopeAdaptionEndCotangent": - return !isRegionalAssesment; - case "SlopeAdaptionStepCotangent": - return !isRegionalAssesment; - - // these will always be shown - case "Name": - return true; - case "XRd": - return true; - case "YRd": - return true; - case "DamType": - return true; - case "DikeRingId": - return true; - case "SegmentId": - return true; - case "Description": - return true; - case "TrafficLoad": - return true; - case "PolderLevel": - return true; - case "HeadPL2": - return true; - case "DampingFactorPL3": - return true; - case "DampingFactorPL4": - return true; - case "PenetrationLength": - return true; - case "SlopeDampingPiezometricHeightPolderSide": - return true; - case "PLLineCreationMethod": - return true; - case "MinimalCircleDepth": - return true; - case "StabilityZoneType": - return true; - case "DikeEmbankmentMaterial": - return true; - - // these will never be shown - case "RiverLevel": - return false; // Probably obsolete, because it is defined in the scenario - case "ScenarioRiverLevelLow": - return false; // Probably obsolete, because it is defined in the scenario - case "DistanceToEntryPoint": - return false; - case "LevelReductionInside": - return false; - case "LevelReductionOutside": - return false; - case "LayerHeightDistribution": - return false; - case "LayerHeightDeviation": - return false; - case "ModelFactorRequiredProbabilityOfFailurePiping": - return false; - case "RequiredProbabilityOfFailureStabilityInnerSlope": - return false; - case "RequiredProbabilityOfFailureStabilityOuterSlope": - return false; - case "ModelFactorRequiredSafetyFactorPiping": - return false; // Probably obsolete, because it is defined in the scenario - case "ModelFactorRequiredSafetyFactorStabilityInnerSlope": - return false; // Probably obsolete, because it is defined in the scenario - case "ModelFactorRequiredSafetyFactorStabilityOuterSlope": - return false; // Probably obsolete, because it is defined in the scenario - case "HasSensorData": - return false; - case "XRdDikeLine": - return false; - case "IsUseOriginalPLLineAssignments": - return false; - // The following design parameters are only visible for design option and when that design option does not involve the special Rijnland option. - case "NewDikeTopWidth": - case "UseNewDikeTopWidth": - case "NewDikeSlopeInside": - case "UseNewDikeSlopeInside": - case "NewDikeSlopeOutside": - case "UseNewDikeSlopeOutside": - case "NewShoulderTopSlope": - case "UseNewShoulderTopSlope": - case "NewShoulderBaseSlope": - case "UseNewShoulderBaseSlope": - case "NewMaxHeightShoulderAsFraction": - case "UseNewMaxHeightShoulderAsFraction": - case "NewMinDistanceDikeToeStartDitch": - case "UseNewMinDistanceDikeToeStartDitch": - case "UseNewDitchDefinition": - case "NewWidthDitchBottom": - case "NewDepthDitch": - case "NewSlopeAngleDitch": - return isDesign && StabilityDesignMethod != StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption; - - // Next will only be shown if not Design as then they are part of the scenarios - case "HeadPl3": - return !isDesign; - case "HeadPl4": - return !isDesign; - default: - return true; - } - } - private bool IsDesign() { bool isDesign = (DamProjectType == DamProjectType.Design); @@ -3097,9 +2893,8 @@ PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; return arePlLineCreationExpertKnowledgeParametersNeeded; } + - #endregion - public override string ToString() { return Name;