Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r3625 -r3655 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 3625) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 3655) @@ -489,34 +489,6 @@ } } - public class MStabZoneAreas : IAssignable, ICloneable - { - public double DikeTableHeight { get; set; } - public double DikeTableWidth { get; set; } - public double XCoordinateDikeTopAtRiver { get; set; } - public double XCoordinateDikeTopAtPolder { get; set; } - public double XCoordinateStartRestProfile { get; set; } - public double SafetyFactorZone1A { get; set; } - public double SafetyFactorZone1B { get; set; } - public void Assign(MStabZoneAreas mstabZoneAreas) - { - this.DikeTableHeight = mstabZoneAreas.DikeTableHeight; - this.DikeTableWidth = mstabZoneAreas.DikeTableWidth; - this.XCoordinateDikeTopAtRiver = mstabZoneAreas.XCoordinateDikeTopAtRiver; - this.XCoordinateDikeTopAtPolder = mstabZoneAreas.XCoordinateDikeTopAtPolder; - this.XCoordinateStartRestProfile = mstabZoneAreas.XCoordinateStartRestProfile; - this.SafetyFactorZone1A = mstabZoneAreas.SafetyFactorZone1A; - this.SafetyFactorZone1B = mstabZoneAreas.SafetyFactorZone1B; - } - - public MStabZoneAreas Clone() - { - var mstabZoneAreas = new MStabZoneAreas(); - mstabZoneAreas.Assign(this); - return mstabZoneAreas; - } - } - public class MStabForbiddenZone : IAssignable, ICloneable { public bool IsXEntryMinUsed { get; set; } @@ -638,7 +610,6 @@ this.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; this.Model = MStabModelType.UpliftVan; this.SearchMethod = MStabSearchMethod.Grid; - this.ZoneAreas = null; this.gridPosition = MStabGridPosition.Right; this.CalculationOptions = new MStabCalculationOptions(); this.GeometryCreationOptions = new MStabGeometryCreationOptions(); @@ -668,7 +639,6 @@ public bool IsProbabilistic { get; set; } public string ProjectFileName { get; set; } public string SoilDatabaseName { get; set; } - public MStabZoneAreas ZoneAreas { get; set; } public MStabForbiddenZone ForbiddenZone { get; set; } public MStabGeometryCreationOptions GeometryCreationOptions { get; set; } public SheetPiling SheetPiling { get; set; } @@ -697,14 +667,6 @@ this.GridPosition = mstabParameters.GridPosition; this.ProjectFileName = mstabParameters.ProjectFileName; this.SoilDatabaseName = mstabParameters.SoilDatabaseName; - if (this.ZoneAreas != null) - { - this.ZoneAreas.Assign(mstabParameters.ZoneAreas); - } - else - { - this.ZoneAreas = null; - } if (this.ForbiddenZone != null) { this.ForbiddenZone.Assign(mstabParameters.ForbiddenZone); @@ -768,8 +730,6 @@ public MStabParameters Clone() { var mstabParameters = new MStabParameters(); - if (this.ZoneAreas != null) - mstabParameters.ZoneAreas = this.ZoneAreas.Clone(); if (this.ForbiddenZone != null) mstabParameters.ForbiddenZone = this.ForbiddenZone.Clone(); if (this.GeometryCreationOptions != null) Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r3533 -r3655 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 3533) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 3655) @@ -696,6 +696,11 @@ DamXmlSerialization.SaveOutputAsXmlFile(outputFilename, output); #endif } + else + { + LogManager.Add(new LogMessage(LogMessageType.Error, typeof(EngineInterface), string.Format("{0}", validationMessages))); + } + } catch (Exception e) { Index: DamClients/DamUI/trunk/src/Dam/Tests/MStabParametersTest.cs =================================================================== diff -u -r3527 -r3655 --- DamClients/DamUI/trunk/src/Dam/Tests/MStabParametersTest.cs (.../MStabParametersTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/MStabParametersTest.cs (.../MStabParametersTest.cs) (revision 3655) @@ -43,7 +43,6 @@ Assert.That(parameters.PLLineCreationMethod, Is.EqualTo(PLLineCreationMethod.ExpertKnowledgeRRD)); Assert.That(parameters.Model, Is.EqualTo(MStabModelType.UpliftVan)); Assert.That(parameters.SearchMethod, Is.EqualTo(MStabSearchMethod.Grid)); - Assert.That(parameters.ZoneAreas, Is.Null); Assert.That(parameters.GridPosition, Is.EqualTo(MStabGridPosition.Right)); Assert.That(parameters.CalculationOptions, Is.Not.Null); Assert.That(parameters.GeometryCreationOptions, Is.Not.Null); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r3629 -r3655 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3629) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3655) @@ -562,11 +562,8 @@ /// The input zone type no zones /// public const int InputZoneTypeNoZones = 0; + /// - /// The input zone type zone areas - /// - public const int InputZoneTypeZoneAreas = 1; - /// /// The input zone types forbidden zones /// public const int InputZoneTypesForbiddenZones = 2;