Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r6801 -r6964 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 6801) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 6964) @@ -49,7 +49,7 @@ { private string profileName; - private DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification; + private DamProjectCalculationSpecification damProjectCalculationSpecificationSpecification; private Scenario scenario; private SoilProfile1D soilProfile; private double? localPipingExitPointX; @@ -214,17 +214,17 @@ } [Browsable(false)] - public DamFailureMechanismeCalculationSpecification DamFailureMechanismeCalculation // moet vanuit invoer komen + public DamProjectCalculationSpecification DamProjectCalculationSpecification // moet vanuit invoer komen { get { - return damFailureMechanismeCalculationSpecification; + return damProjectCalculationSpecificationSpecification; } set { // Clone the specification to ensure a non-changeable version. - damFailureMechanismeCalculationSpecification = value.Clone(); - if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) + damProjectCalculationSpecificationSpecification = value.Clone(); + if (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) { redesignedSurfaceLine = RedesignedSurfaceLine2; } @@ -241,7 +241,7 @@ { get { - return damFailureMechanismeCalculationSpecification?.ToString() ?? ""; + return damProjectCalculationSpecificationSpecification?.ToString() ?? ""; } } @@ -1319,7 +1319,7 @@ return soilProfile; } - FailureMechanismSystemType failureMechanismSystemType = damFailureMechanismeCalculationSpecification.FailureMechanismSystemType; + FailureMechanismSystemType failureMechanismSystemType = damProjectCalculationSpecificationSpecification.FailureMechanismSystemType; var fileName = ""; if (failureMechanismSystemType == FailureMechanismSystemType.Piping && File.Exists(PipingResultFile)) @@ -1370,7 +1370,7 @@ return redesignedSurfaceLine; } - FailureMechanismSystemType failureMechanismSystemType = damFailureMechanismeCalculationSpecification.FailureMechanismSystemType; + FailureMechanismSystemType failureMechanismSystemType = damProjectCalculationSpecificationSpecification.FailureMechanismSystemType; var fileName = ""; if (failureMechanismSystemType == FailureMechanismSystemType.Piping && File.Exists(PipingResultFile)) @@ -1411,7 +1411,7 @@ { get { - FailureMechanismSystemType failureMechanismSystemType = damFailureMechanismeCalculationSpecification.FailureMechanismSystemType; + FailureMechanismSystemType failureMechanismSystemType = damProjectCalculationSpecificationSpecification.FailureMechanismSystemType; var fileName = ""; if ((failureMechanismSystemType == FailureMechanismSystemType.StabilityInside || failureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) && File.Exists(GetDesignResultFile())) @@ -1467,7 +1467,7 @@ get { double? res = null; - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + switch (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityOutside: case FailureMechanismSystemType.StabilityInside: @@ -1497,7 +1497,7 @@ get { double? res = null; - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + switch (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityOutside: case FailureMechanismSystemType.StabilityInside: @@ -1522,7 +1522,7 @@ get { double? res = null; - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + switch (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityOutside: res = RequiredSafetyFactorStabilityOuterSlope; @@ -1549,7 +1549,7 @@ get { double? res = null; - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + switch (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: res = StabilityShoulderHeight; @@ -1573,7 +1573,7 @@ get { double? res = null; - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + switch (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: res = StabilityToeAtPolderX; @@ -1597,7 +1597,7 @@ get { double? res = null; - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + switch (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: res = StabilityToeAtPolderZ; @@ -1619,10 +1619,10 @@ { get { - if (damFailureMechanismeCalculationSpecification != null && - damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) + if (damProjectCalculationSpecificationSpecification != null && + damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) { - return damFailureMechanismeCalculationSpecification.PipingModelType; + return damProjectCalculationSpecificationSpecification.PipingModelType; } return null; @@ -1639,9 +1639,9 @@ get { double? res = null; - if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) + if (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) { - switch (damFailureMechanismeCalculationSpecification.PipingModelType) + switch (damProjectCalculationSpecificationSpecification.PipingModelType) { case PipingModelType.Bligh: res = BlighPipingFactor; @@ -1844,9 +1844,9 @@ get { double? res = null; - if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) + if (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping) { - switch (damFailureMechanismeCalculationSpecification.PipingModelType) + switch (damProjectCalculationSpecificationSpecification.PipingModelType) { case PipingModelType.Bligh: res = BlighHCritical; @@ -1998,7 +1998,7 @@ /// public void OpenCalculationFile() { - if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside or FailureMechanismSystemType.StabilityOutside) + if (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside or FailureMechanismSystemType.StabilityOutside) { if (File.Exists(InputFile)) { @@ -2051,31 +2051,27 @@ public bool IsVisible(string property) { - if (damFailureMechanismeCalculationSpecification == null) - { - return false; - } switch (property) { case "StabilityModel": - return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + return damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || - damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside; case "PipingModel": - return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + return damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping; case "PipingFactor": - return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + return damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping; case "HCritical": - return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + return damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping; case "OpenCalculationFile": - return (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + return (damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || - damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == + damProjectCalculationSpecificationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside); default: return true;