Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs =================================================================== diff -u -r2089 -r2631 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs (.../CalculationParametersAssembler.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs (.../CalculationParametersAssembler.cs) (revision 2631) @@ -109,34 +109,59 @@ // This line is needed, so old files (with identifier Stability i.s.o. StabilityInside) still can be processed XElement element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityElementName); if (element != null) + { calculationModules.StabilityInside = int.Parse(element.Value) != 0; + } element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityInsideElementName); if (element != null) + { calculationModules.StabilityInside = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityOutsideElementName); if (element != null) + { calculationModules.StabilityOutside = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingWtiElementName); if (element != null) + { calculationModules.PipingWti = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingBlighElementName); if (element != null) + { calculationModules.PipingBligh = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingSellmeijerElementName); if (element != null) + { calculationModules.PipingSellmeijer = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingSellmeijerProbabilisticElementName); if (element != null) + { calculationModules.PipingSellmeijerProbabilistic = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingIJkdijkElementName); if (element != null) + { calculationModules.PipingIJkdijk = int.Parse(element.Value) != 0; + } + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlOvertoppingElementName); if (element != null) + { calculationModules.Overtopping = int.Parse(element.Value) != 0; + } - calculationParameters.CalculationModules = calculationModules;; + calculationParameters.CalculationModules = calculationModules; } @@ -147,51 +172,61 @@ MStabParameters mstabParameters = new MStabParameters(); XElement element; - - element = mstabParametersElement.Element( - CalculationParametersAssembler.XmlMStabIsCalculateAllStabilityProjectsAtOnceElementName); + + element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabIsCalculateAllStabilityProjectsAtOnceElementName); if (element != null) + { mstabParameters.IsCalculateAllStabilityProjectsAtOnce = int.Parse(element.Value) != 0; + } - element = - mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabCalculationModelElementName); + element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabCalculationModelElementName); if (element != null) - mstabParameters.Model = (MStabModelType)Enum.Parse(typeof (MStabModelType), element.Value, true); + { + mstabParameters.Model = (MStabModelType)Enum.Parse(typeof(MStabModelType), element.Value, true); + } element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabShearStrengthElementName); if (element != null) - mstabParameters.ShearStrength = (MStabShearStrength) - Enum.Parse(typeof (MStabShearStrength), element.Value, true); + { + mstabParameters.ShearStrength = (MStabShearStrength)Enum.Parse(typeof(MStabShearStrength), element.Value, true); + } element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabSearchMethodElementName); if (element != null) - mstabParameters.SearchMethod = (MStabSearchMethod) - Enum.Parse(typeof (MStabSearchMethod), element.Value, true); + { + mstabParameters.SearchMethod = (MStabSearchMethod)Enum.Parse(typeof(MStabSearchMethod), element.Value, true); + } element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabProbabilisticElementName); if (element != null) + { mstabParameters.IsProbabilistic = int.Parse(element.Value) != 0; + } element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabUseZonesElementName); mstabParameters.CalculationOptions = new MStabCalculationOptions(); mstabParameters.CalculationOptions.ZonesType = MStabZonesType.NoZones; if (element != null) { int useZones = int.Parse(element.Value); - mstabParameters.CalculationOptions.ZonesType = (MStabZonesType) useZones; + mstabParameters.CalculationOptions.ZonesType = (MStabZonesType)useZones; } - element = mstabParametersElement.Element( - CalculationParametersAssembler.XmlMStabIsOverrulePLLineCreationMethodName); + element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabIsOverrulePLLineCreationMethodName); if (element != null) + { mstabParameters.IsOverrulePLLineCreationMethod = int.Parse(element.Value) != 0; + } - element = - mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabPLLineCreationMethodname); + element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabPLLineCreationMethodname); if (element != null) + { mstabParameters.PLLineCreationMethod = (PLLineCreationMethod)Enum.Parse(typeof(PLLineCreationMethod), element.Value, true); + } else + { mstabParameters.PLLineCreationMethod = PLLineCreationMethod.None; + } calculationParameters.MStabParameters = mstabParameters; }