Fisheye: Tag 6892 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeJobImporterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs =================================================================== diff -u -r6858 -r6892 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 6858) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 6892) @@ -30,13 +30,6 @@ public class ConfigurationManagerTest { [Test] - public void ReturnsCorrectAvailableDamProjectTypes() - { - ICollection projectTypes = ConfigurationManager.Instance.GetAvailableDamProjectTypes(); - Assert.That(projectTypes.Count, Is.EqualTo(2)); - } - - [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanisms() { ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType.Design); @@ -59,16 +52,5 @@ ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.StabilityOutside); Assert.That(stabilityOutsideModels.Count, Is.EqualTo(1), "DamClassicStability: Incorrect number of models for deterministic stability outside calculation"); } - - [Test] - public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForDamLiveOption() - { - ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.Piping); - Assert.That(pipingModels.Count, Is.EqualTo(1), "Incorrect number of models for deterministic piping calculation"); - ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside); - Assert.That(stabilityInsideModels.Count, Is.EqualTo(2), "Incorrect number of models for deterministic stability inside calculation"); - ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityOutside); - Assert.That(stabilityOutsideModels.Count, Is.EqualTo(1), "Incorrect number of models for deterministic stability outside calculation"); - } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r6882 -r6892 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 6882) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 6892) @@ -55,7 +55,6 @@ private readonly FeatureRepository backgroundRepository; private IList featureList; private IList segments; - private string waterLevelTimeSeriesFileName; private IList locations; @@ -100,21 +99,6 @@ public virtual string MapForSoilGeometries2D { get; set; } - [Label("Waterlevel timeseries filename")] - public string WaterLevelTimeSeriesFileName - { - get - { - return waterLevelTimeSeriesFileName; - } - set - { - DataEventPublisher.BeforeChange(this, "WaterLevelTimeSeriesFileName"); - waterLevelTimeSeriesFileName = value; - DataEventPublisher.AfterChange(this, "WaterLevelTimeSeriesFileName"); - } - } - public void FillFeatureList() { foreach (IFeature feature in backgroundRepository.Features) @@ -490,7 +474,6 @@ { switch (property) { - case "WaterLevelTimeSeriesFileName": return Location.DamProjectType == DamProjectType.DamLiveConfiguration; default: return true; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r6880 -r6892 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6880) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6892) @@ -387,36 +387,6 @@ } } - /// - /// Imports the water level time series. - /// - public void ImportWaterLevelTimeSeries() - { - if (DamProjectData.DamProjectCalculationSpecification == null) - { - return; - } - - string file = DamProjectData.Dike.WaterLevelTimeSeriesFileName; - - // check if file exists - if (!file.HasValidStringValue()) - { - return; - } - - if (!File.Exists(file)) - { - return; - } - - // load file - TimeSerieCollection fewsInputTimeSerieCollection = TimeSerieCollection.LoadFromFile(file); - var dikeJob = DamProjectData.DikeJob as DikeJob; - DikeJobImporter.ImportWaterlevels(dikeJob, fewsInputTimeSerieCollection); - DamProjectData.InputTimeSerieCollection = fewsInputTimeSerieCollection; - } - public void DeleteResults() { DeleteResultData(); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6873 -r6892 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6873) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6892) @@ -196,8 +196,6 @@ - Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs =================================================================== diff -u -r6880 -r6892 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6880) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6892) @@ -41,7 +41,9 @@ private DataSourceContainer dataSourceContainer; [Test] - public void ImportDikeOnlyCsvFiles1D() + [TestCase(DamProjectType.Design)] + [TestCase(DamProjectType.DamLiveConfiguration)] + public void ImportDikeOnlyCsvFiles1D(DamProjectType damProjectType) { const double cTolerance = 0.0001; const string definitionFilename = @".\TestData\CSVData\Full1DProject\Import.defx"; @@ -50,7 +52,7 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + damProjectType, null, out List _); // Check Dike @@ -159,7 +161,7 @@ List logMessages; using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -184,7 +186,7 @@ List logMessages; using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -210,7 +212,7 @@ List logMessages; using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -236,7 +238,7 @@ using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -253,7 +255,9 @@ } [Test] - public void ImportDikeOnlyCsvFiles2D() + [TestCase(DamProjectType.Design)] + [TestCase(DamProjectType.DamLiveConfiguration)] + public void ImportDikeOnlyCsvFiles2D(DamProjectType damProjectType) { const string definitionFilename = @".\TestData\CSVData\Full2DProject\Import.defx"; const string projectFilename = @".\TestData\TestWithGeometries2D.damx"; @@ -264,7 +268,7 @@ damProject.DamProjectData.Dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _); + damProjectType, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); // Save the data @@ -295,7 +299,7 @@ using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _); + DamProjectType.Design, null, out List _); // Check Dike Assert.That(dike, Is.Not.Null); @@ -313,10 +317,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _)) + DamProjectType.Design, null, out List _)) using (Dike referenceDike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _)) + DamProjectType.Design, null, out List _)) { // If profiles are defined as relative profiles, new absolute profiles will be generated for each location if (dataSourceContainer.IsImportAsRelativeProfiles) @@ -400,7 +404,7 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _)) + DamProjectType.Design, null, out List _)) { // Check Dike Assert.That(dike, Is.Not.Null); Fisheye: Tag 6892 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeJobImporter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r6858 -r6892 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 6858) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 6892) @@ -61,19 +61,6 @@ [field: ThreadStatic] public static ConfigurationManager Instance { get; } = new ConfigurationManager(); /// - /// Gets the available dam project types. - /// - /// - public ICollection GetAvailableDamProjectTypes() - { - return new[] - { - DamProjectType.DamLiveConfiguration, - DamProjectType.Design - }; - } - - /// /// Gets the available failure mechanisms. /// /// Type of the dam project. @@ -164,10 +151,5 @@ this[DamProjectType.Design, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; - - this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; - this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.UpliftVan] = ConfigurationStatus.Available; - this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; - this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r6888 -r6892 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6888) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6892) @@ -31,7 +31,6 @@ using Deltares.Dam.Data; using Deltares.Dam.Data.DamEngineIo; using Deltares.Dam.Data.DataPlugins.Configuration; -using Deltares.Dam.Data.IO; using Deltares.Dam.Data.License; using Deltares.Dam.Data.Sensors; using Deltares.Dam.Data.UISupport; @@ -50,7 +49,6 @@ using Deltares.Standard.Forms; using Deltares.Standard.Forms.DExpress; using Deltares.Standard.Forms.Maps; -using Deltares.Standard.IO.Xml; using Deltares.Standard.Language; using Deltares.Standard.Logging; using Deltares.Standard.Specifications; @@ -87,13 +85,6 @@ HideUnusedColumns = true }; - private readonly GridViewControl calculationsControl = new GridViewControl - { - Name = "Calculations", - ShowToolbar = true, - HideUnusedColumns = true - }; - private readonly GridViewControl designCalculationsControl = new GridViewControl { Name = "DesignCalculations", @@ -270,8 +261,6 @@ lastDesignResult = null; - // Read the Waterlevel Timeseries - damProject.ImportWaterLevelTimeSeries(); // Find the view|Image menu option BarItemLink imagesItem = mainForm.ViewMenu.ItemLinks.First(bi => bi.Item.Name.Equals("ImageMenu")); if (projectData.DamProjectType == DamProjectType.DamLiveConfiguration) @@ -727,7 +716,10 @@ mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), LogManager.Messages, null); } - SetProperControlsAfterDesignCalculation(); + if (damProject.DamProjectData.DamProjectType == DamProjectType.Design) + { + SetProperControlsAfterDesignCalculation(); + } } private void SetProperControlsAfterDesignCalculation() @@ -846,18 +838,6 @@ } } } - else if (sender == damProject.DamProjectData.Dike) - { - try - { - damProject.ImportWaterLevelTimeSeries(); - //locationJobSymbol.Update(damProject.DamProjectData.LocationJobs); - } - catch (TimeSerieSchemaValidationException exception) - { - LocalizedMessageBox.ShowError(this, exception.Message); - } - } else if (sender == currentLocationJob && sender != null) { DataEventPublisher.AfterChange(this, "CurrentLocationJob"); Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs =================================================================== diff -u -r6858 -r6892 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs (.../LocationJobSymbol.cs) (revision 6858) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs (.../LocationJobSymbol.cs) (revision 6892) @@ -19,9 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; -using System.Drawing; using System.Xml.Serialization; using Deltares.Dam.Data; using Deltares.Standard; @@ -44,8 +41,6 @@ DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange; } - public LocationJob CurrentLocationJob { get; private set; } - [XmlIgnore] public string CurrentProfileName { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs =================================================================== diff -u -r6858 -r6892 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 6858) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 6892) @@ -198,8 +198,6 @@ [XmlIgnore] [Browsable(false)] public static string CurrentCalculation { get; set; } = ""; - [XmlIgnore] [Browsable(false)] public static DateTime CurrentTime { get; set; } = DateTime.Today; - [XmlIgnore] [Browsable(false)] public static DamProjectType DamProjectType { get; set; } = DamProjectType.Design; [XmlIgnore]