Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r932 -r934 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 932) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 934) @@ -48,7 +48,7 @@ ValidateInput(input); var damProjectData = new DamProjectData(); - // Currently do nothing with input.ProjectWorkingPath + damProjectData.ProjectWorkingPath = input.ProjectWorkingPath; damProjectData.WaterBoard = new WaterBoard(); damProjectData.WaterBoard.Dikes = new List(); Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r932 -r934 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 932) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 934) @@ -652,7 +652,7 @@ try { - Input input = FillXmlInputFromDamUi.CreateInput(damProject.DamProjectData, damProject.ProjectMap); + Input input = FillXmlInputFromDamUi.CreateInput(damProject.DamProjectData); // Next 2 lines for debugging const string inputFilename = "InputFile.xml"; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs =================================================================== diff -u -r932 -r934 --- DamClients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 932) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 934) @@ -52,7 +52,7 @@ Assert.AreEqual(1, dike.Locations.Count); damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel; - DamEngine.Io.XmlInput.Input input = FillXmlInputFromDamUi.CreateInput(damProjectData, ""); + DamEngine.Io.XmlInput.Input input = FillXmlInputFromDamUi.CreateInput(damProjectData); string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); var damEnginInterface = new EngineInterface(inputXml); Index: DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs =================================================================== diff -u -r875 -r934 --- DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs (.../branches/CalcualtionIncluded/src/Dam/Data/DamProjectData.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs (.../trunk/src/Dam/Data/DamProjectData.cs) (revision 934) @@ -1,30 +1,42 @@ -//----------------------------------------------------------------------- -// -// Copyright (c) 2011 Deltares. All rights reserved. -// -// J. Bokma -// j.bokma@deltares.nl -// 02-02-2011 -// n.a. -//----------------------------------------------------------------------- +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. using System; using System.Collections; using System.ComponentModel; using System.Linq; using System.Xml.Serialization; +using System.Collections.Generic; using Deltares.Dam.Data.Sensors; +using Deltares.Standard; using Deltares.Standard.Attributes; using Deltares.Standard.EventPublisher; using Deltares.Standard.Language; using Deltares.Standard.Logging; using Deltares.Standard.Project; using Deltares.Standard.Validation; +using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage; namespace Deltares.Dam.Data { - using Deltares.Standard; - using System.Collections.Generic; public class DamProjectData : Project, IDomain, IDisposable { @@ -54,6 +66,8 @@ this.damProjectCalculationSpecification = new DamProjectCalculationSpecification(); } + public string ProjectWorkingPath; + /// /// Toplevel object to hold waterboard data /// @@ -169,6 +183,7 @@ /// public void ClearResults() { + designCalculations.Clear(); foreach (LocationJob locationJob in this.LocationJobs) { locationJob.LocationResult = new LocationResult(); @@ -257,6 +272,9 @@ } [XmlIgnore] + public List CalculationMessages { get; set; } + + [XmlIgnore] [ReadOnly(true)] public List DesignCalculations { @@ -269,6 +287,10 @@ return designCalculations; } + set + { + designCalculations = value; + } } [ReadOnly(true)] Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r932 -r934 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 932) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 934) @@ -44,14 +44,15 @@ { const AnalysisType expectedAnalysisType = AnalysisType.AdaptGeometry; const AnalysisType notExpectedAnalysisType = AnalysisType.NoAdaption; + [Test] public void CanWriteAndReadDamProjectDataToXmlFile() { const string inputFilename = "InputFile.xml"; DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); // Write input file - Input input = FillXmlInputFromDamUi.CreateInput(expectedDamProjectData, ""); + Input input = FillXmlInputFromDamUi.CreateInput(expectedDamProjectData); DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input); // Init static that is to be loaded with not expected value @@ -70,7 +71,7 @@ DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); // Write input string - Input input = FillXmlInputFromDamUi.CreateInput(expectedDamProjectData, ""); + Input input = FillXmlInputFromDamUi.CreateInput(expectedDamProjectData); string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); // Init static that is to be loaded with not expected value @@ -85,6 +86,7 @@ private DamProjectData CreateExampleDamProjectData() { var damProjectData = new DamProjectData(); + damProjectData.ProjectWorkingPath = @"D:\TestDamFolder\Sub"; FillAnalysisSpecification(damProjectData); FillStabilityParameters(damProjectData); damProjectData.WaterBoard = new WaterBoard(); @@ -181,6 +183,8 @@ { var location = new Location(); location.Name = "Location " + (i + 1).ToString(); + location.XSoilGeometry2DOrigin = 1.0 * i + 0.01; + location.SoildatabaseName = "ASoildb.mdb"; location.PLLineCreationMethod = (PLLineCreationMethod) i; location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i; location.PolderLevel = 1.0 * i + 0.11; @@ -248,7 +252,6 @@ location.StabilityDesignMethod = StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption; dike.Locations.Add(location); - dike.Locations.Add(location); } } Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r932 -r934 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 932) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 934) @@ -41,14 +41,14 @@ /// The dam project data. /// The project map. /// - public static Input CreateInput(DamProjectData damProjectData, string projectMap) + public static Input CreateInput(DamProjectData damProjectData) { ValidateDamProjectData(damProjectData); Input input = new Input(); Dike dike = damProjectData.WaterBoard.Dikes[0]; - input.ProjectWorkingPath = projectMap; + input.ProjectWorkingPath = damProjectData.ProjectWorkingPath; TransferAnalysisSpecification(damProjectData, input); TransferStabilityParameters(damProjectData, input); Index: DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs =================================================================== diff -u -r932 -r934 --- DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs (.../DamProject.cs) (revision 932) +++ DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs (.../DamProject.cs) (revision 934) @@ -50,6 +50,7 @@ private string projectFileName; private DamProjectData damProjectData; private DamProjectSettings damProjectSettings; + private string projectMap = ""; public static ProjectPathLocation ProjectWorkingPathLocation = ProjectPathLocation.InApplicationMap; public static string UserWorkingPath = DamProject.GetNewTempDirectory(); public static string ProjectMapWorkingPath = DamProject.GetNewTempDirectory(); @@ -79,7 +80,15 @@ } } - public string ProjectMap = ""; + public string ProjectMap + { + get { return projectMap; } + set + { + projectMap = value; + damProjectData.ProjectWorkingPath = value; + } + } public string ProjectFileName {