Index: DamClients/DamUI/trunk/src/Dam/Forms/DamGeometryEditor.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/Dam/Forms/DamGeometryEditor.cs (.../DamGeometryEditor.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamGeometryEditor.cs (.../DamGeometryEditor.cs) (revision 6750) @@ -95,13 +95,6 @@ { switch (LocationJob.DamProjectType) { - case DamProjectType.Calamity: - return new[] - { - FailureMechanismSystemType.StabilityInside, - FailureMechanismSystemType.StabilityOutside, - FailureMechanismSystemType.Piping - }; case DamProjectType.Design: { if (DamProjectCalculationSpecification.SelectedAnalysisType == AnalysisType.NoAdaption) Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 6750) @@ -96,18 +96,11 @@ #region IPropertyControl Members - public bool IsVisible => - damProjectData != null && - (damProjectData.DamProjectType == DamProjectType.Calamity || - damProjectData.DamProjectType == DamProjectType.Design || - damProjectData.DamProjectType == DamProjectType.DamLiveConfiguration); + public bool IsVisible => damProjectData is { DamProjectType: DamProjectType.Design }; public object SelectedObject { - get - { - return damProjectData; - } + get => damProjectData; set { var data = value as DamProjectData; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r6728 -r6750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 6728) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 6750) @@ -48,10 +48,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out List _); // Check Dike @@ -154,10 +154,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -181,10 +181,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -209,10 +209,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -236,10 +236,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -265,10 +265,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); damProject.DamProjectData.WaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _); + dikeList, DamProjectType.DamLiveConfiguration, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); // Save the data @@ -297,10 +297,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, out List _); + DamProjectType.DamLiveConfiguration, null, out List _); // Check Dike Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); @@ -318,13 +318,13 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, + IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _).ToList(); using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _)) + dikeList, DamProjectType.DamLiveConfiguration, null, out List _)) using (WaterBoard referenceWaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _)) + dikeList, DamProjectType.DamLiveConfiguration, null, out List _)) { // If profiles are defined as relative profiles, new absolute profiles will be generated for each location if (dataSourceContainer.IsImportAsRelativeProfiles) @@ -404,7 +404,7 @@ try { LocalizationManager.CurrentLanguage = LanguageType.English; - Assert.That(() => WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, out _), + Assert.That(() => WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _), Throws.InstanceOf().With.Message.EqualTo("DataLocation is empty. Perhaps the data source type is not supported.")); } finally @@ -422,10 +422,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = - WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, + WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _).ToList(); using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _)) + dikeList, DamProjectType.DamLiveConfiguration, null, out List _)) { // Check Dike Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r6540 -r6750 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6540) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6750) @@ -133,7 +133,6 @@ private readonly LocationPropertyControl locationPropertyControl = new LocationPropertyControl(); private readonly DamSurfaceLineControl damSurfaceLineControl = new DamSurfaceLineControl(); private readonly DamProjectCalculationSpecificationPropertyControl damProjectCalculationSpecificationPropertyControl = new DamProjectCalculationSpecificationPropertyControl(); - private readonly WaterBoardPropertyControl waterBoardPropertyControl = new WaterBoardPropertyControl(); private readonly BarButtonItem showCalculationOptionsItem = new BarButtonItem(); private readonly MapEditor mapControl = new MapEditor(); private MainForm mainForm; @@ -347,7 +346,7 @@ return damProject != null && damProject.DamProjectData != null && damProject.DamProjectData.LocationJobs != null && - (damProject.DamProjectData.DamProjectType == DamProjectType.Calamity || + (damProject.DamProjectData.DamProjectType == DamProjectType.DamLiveConfiguration || damProject.DamProjectData.DamProjectType == DamProjectType.Design) && damProject.DamProjectData.LocationJobs.Count > 0; default: return true; @@ -482,9 +481,6 @@ dpc.BuildPropertyControlTabForTypes(new LocationScenariosControl(), typeof(Location), typeof(LocationJob)); dpc.BuildPropertyControlTabForTypes(damSurfaceLineControl, typeof(SurfaceLine2), typeof(CharacteristicPoint), typeof(LocationJob)); - progressDelegate = waterBoardPropertyControl.DoProgress; - dpc.BuildPropertyControlTabForTypes(waterBoardPropertyControl, - typeof(WaterBoard), typeof(WaterBoardJob), typeof(DamProjectData)); dpc.BuildPropertyControlTabForTypes(new DikePropertyControl(), typeof(Dike), typeof(DikeJob)); dpc.BuildPropertyControlTabForTypes(damProjectCalculationSpecificationPropertyControl, typeof(DamProjectData)); dpc.BuildPropertyControlTabForTypes(designCalculationPropertyControl, typeof(CsvExportData), typeof(LocationJob)); @@ -799,20 +795,7 @@ LogManager.Messages.AddRange(damProject.DamProjectData.CalculationMessages); mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), LogManager.Messages, null); } - - switch (damProject.DamProjectData.DamProjectType) - { - case DamProjectType.Calamity: - { - SetProperControlsAfterCalamityCalculation(); - break; - } - case DamProjectType.Design: - { - SetProperControlsAfterDesignCalculation(); - break; - } - } + SetProperControlsAfterDesignCalculation(); } private void SetProperControlsAfterDesignCalculation() @@ -839,29 +822,6 @@ } } - private void SetProperControlsAfterCalamityCalculation() - { - if (damProject.DamProjectData.GetFirstLocationJobWithCalamityResults() != null) - { - mainForm.SetAsActiveTable(locationsControl); - LocationResult res = - damProject.DamProjectData.GetFirstLocationJobWithCalamityResults().GetFirstLocationResultWithStabilityTimeSerie(); - if (res != null && - res.StabilityTimeSerie.GetNearestBasisFileName(locationJobSymbol.CurrentDateTime) != "") - { - // Make sure the image tab is activated to show the resulting wmf-file (if any) - mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), res.StabilityTimeSerie); - mainForm.SetAsActiveTabOnMainPanel(mainForm.DynamicImageControl); - // Selecting the LocationJob makes sure of proper selected location - mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), - damProject.DamProjectData.GetFirstLocationJobWithCalamityResults()); - // Set chart as active tab as this is the only control that actually displays the results next to the wmf-pictures - // displayed on the image tab - mainForm.SetAsActiveChart(locationChart); - } - } - } - [Label("Clear Results")] private void ClearResults() { @@ -1026,22 +986,9 @@ { Location location = locationJob.Location; DataEventPublisher.SelectionChanged(location, PropertyEditorReactionType.Ignore); - if (damProject.DamProjectData.DamProjectType == DamProjectType.Calamity) + if (damProject.DamProjectData.DamProjectType == DamProjectType.DamLiveConfiguration) { - lastLocationResult = locationJob.GetLocationResultWithStabilityTimeSerie(location.Name); - if (lastLocationResult == null) - { - lastLocationResult = locationJob.GetFirstLocationResultWithStabilityTimeSerie(); - } - - if (lastLocationResult != null) - { - ShowLocationImage(lastLocationResult.StabilityTimeSerie, locationJobSymbol.CurrentDateTime); - } - else - { - ShowLocationImage(null, locationJobSymbol.CurrentDateTime); - } + ShowLocationImage(null, locationJobSymbol.CurrentDateTime); } if (damProject.DamProjectData.DamProjectType == DamProjectType.Design) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 6750) @@ -68,7 +68,7 @@ { return new[] { - DamProjectType.Calamity, + DamProjectType.DamLiveConfiguration, DamProjectType.Design }; } @@ -165,13 +165,9 @@ this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; - this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; - this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.UpliftVan] = ConfigurationStatus.Available; - this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; - this[DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = 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/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs =================================================================== diff -u -r6702 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6702) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6750) @@ -43,7 +43,7 @@ private readonly List jobs = new List(); private WaterBoard waterBoard; private WaterBoardJob waterBoardJob; - private DamProjectType damProjectType = DamProjectType.Calamity; + private DamProjectType damProjectType = DamProjectType.Design; private string damDataSourceFileName = ""; private List designCalculations; @@ -417,35 +417,6 @@ } } - public LocationJob GetFirstLocationJobWithCalamityResults() - { - foreach (LocationJob locationJob in LocationJobs) - { - if (locationJob.HasLocationResults) - { - return locationJob; - } - } - - return null; - } - - [Validate] - public ValidationResult[] ValidateEnoughLocationJobs() - { - if (SelectedLocationJobs.Count == 0) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "NoLocationsSelected"), - this) - }; - } - - return new ValidationResult[0]; - } - public void DeleteResults() { LogManager.Messages.Clear(); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6734 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6734) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6750) @@ -197,7 +197,6 @@ nl-NL="Specificatie DAM berekening"/> - Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/WaterBoardPropertyControl.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/WaterBoardPropertyControl.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 6750) @@ -69,9 +69,9 @@ DataSourceContainer dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List importLogMessages; - IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, out importLogMessages).ToList(); + IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out importLogMessages).ToList(); damProject.DamProjectData.WaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _); + dikeList, DamProjectType.DamLiveConfiguration, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); Dike dike = damProject.DamProjectData.WaterBoard.Dikes.First(); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj =================================================================== diff -u -r6696 -r6750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 6696) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 6750) @@ -28,12 +28,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/WaterBoardPropertyControl.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/CalamityTests.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 6750) @@ -61,13 +61,13 @@ } [Test] - public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForCalamityOption() + public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForDamLiveOption() { - ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.Piping); + 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.Calamity, FailureMechanismSystemType.StabilityInside); + 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.Calamity, FailureMechanismSystemType.StabilityOutside); + 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"); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r6722 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6722) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6750) @@ -980,7 +980,7 @@ [ReadOnly(true)] [Validate] public List Scenarios { get; } = new List(); - [Browsable(false)] [XmlIgnore] public static DamProjectType DamProjectType { get; set; } = DamProjectType.Calamity; + [Browsable(false)] [XmlIgnore] public static DamProjectType DamProjectType { get; set; } = DamProjectType.Design; /// /// Assemble a list of key/value pairs with the relevant parameters for the location Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs (.../LocationJobSymbol.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs (.../LocationJobSymbol.cs) (revision 6750) @@ -163,31 +163,6 @@ } } - public Image GetSymbol(object data, bool selected) - { - var locationJob = data as LocationJob; - CurrentLocationJob = locationJob; - if (locationJob != null) - { - DamProjectType damProjectType = damProjectData.DamProjectType; - - if (damProjectType == DamProjectType.Calamity) - { - if (!locationJob.HasLocationResults) - { - return GetImage(GetColor(DamGlobalConstants.NoRunValue), selected); - } - - DateTime dateTime = CurrentDateTime; - TimeSerie timeSerie = locationJob.LocationResult.StabilityTimeSerie; - double value = timeSerie.GetValue(dateTime); - return GetImage(GetColor(value), selected); - } - } - - return GetImage(Color.Black, selected); - } - public void Update(IEnumerable locationJobs) { minDateTime = DateTime.MaxValue; @@ -276,7 +251,7 @@ { case "CurrentView": case "CurrentDateTime": - return DamProjectData.DamProjectType == DamProjectType.Calamity; + return DamProjectData.DamProjectType == DamProjectType.DamLiveConfiguration; case "CurrentProfileName": return false; case "CurrentScenarioName": return false; case "CurrentCalculation": return false; @@ -297,7 +272,7 @@ { case "CurrentView": case "CurrentDateTime": - return DamProjectData != null && DamProjectData.DamProjectType == DamProjectType.Calamity && + return DamProjectData != null && DamProjectData.DamProjectType == DamProjectType.DamLiveConfiguration && DamProjectData.LocationJobs != null && DamProjectData.LocationJobs.Count > 0; case "CurrentProfileName": return false; case "CurrentScenarioName": return false; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs (.../DAMNewProjectData.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs (.../DAMNewProjectData.cs) (revision 6750) @@ -174,7 +174,6 @@ return new[] { DamProjectType.Design, - DamProjectType.Calamity, DamProjectType.DamLiveConfiguration }; default: Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6750) @@ -35,7 +35,6 @@ public enum DamProjectType { - Calamity, Design, DamLiveConfiguration } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6750) @@ -38,15 +38,15 @@ { [Test] [TestCase(InputDamProjectType.Design, DamProjectType.Design)] - [TestCase(InputDamProjectType.Operational, DamProjectType.Calamity)] + [TestCase(InputDamProjectType.Operational, DamProjectType.DamLiveConfiguration)] public void CanConvertToDamProjectType(InputDamProjectType inputDamProjectType, DamProjectType damProjectType) { Assert.That(ConversionHelper.ConvertToDamProjectType(inputDamProjectType), Is.EqualTo(damProjectType)); } [Test] [TestCase(DamProjectType.Design, InputDamProjectType.Design)] - [TestCase(DamProjectType.Calamity, InputDamProjectType.Operational)] + [TestCase(DamProjectType.DamLiveConfiguration, InputDamProjectType.Operational)] public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType) { Assert.That(ConversionHelper.ConvertToInputDamProjectType(damProjectType), Is.EqualTo(inputDamProjectType)); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs =================================================================== diff -u -r6667 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs (.../WaterBoard.cs) (revision 6667) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs (.../WaterBoard.cs) (revision 6750) @@ -254,7 +254,7 @@ switch (property) { case "SelectedDike": return VisibleEnabledProvider != null && VisibleEnabledProvider.IsVisible(this, "SelectedDike"); - case "WaterLevelTimeSeriesFileName": return Location.DamProjectType == DamProjectType.Calamity; + case "WaterLevelTimeSeriesFileName": return Location.DamProjectType == DamProjectType.DamLiveConfiguration; default: return true; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r6436 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6750) @@ -104,7 +104,7 @@ InputDamProjectType.Design, DamProjectType.Design }, { - InputDamProjectType.Operational, DamProjectType.Calamity + InputDamProjectType.Operational, DamProjectType.DamLiveConfiguration } }; return translationTable[inputDamProjectType]; @@ -117,18 +117,13 @@ /// Type of the input object. public static InputDamProjectType ConvertToInputDamProjectType(DamProjectType damProjectType) { - if (damProjectType == DamProjectType.DamLiveConfiguration) - { - damProjectType = DamProjectType.Calamity; - } - var translationTable = new Dictionary { { DamProjectType.Design, InputDamProjectType.Design }, { - DamProjectType.Calamity, InputDamProjectType.Operational + DamProjectType.DamLiveConfiguration, InputDamProjectType.Operational } }; return translationTable[damProjectType]; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs =================================================================== diff -u -r6705 -r6750 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 6705) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 6750) @@ -157,17 +157,6 @@ { get { - if (DamProjectType == DamProjectType.Calamity) - { - if (HasLocationResults) - { - TimeSerie timeSerie = LocationResult.StabilityTimeSerie; - return timeSerie.GetValue(CurrentTime); - } - - return DamGlobalConstants.NoRunValue; - } - if (DamProjectType == DamProjectType.Design) { return GetLowestRealSafetyFactorFromDesignScenarios(); @@ -211,7 +200,7 @@ [XmlIgnore] [Browsable(false)] public static DateTime CurrentTime { get; set; } = DateTime.Today; - [XmlIgnore] [Browsable(false)] public static DamProjectType DamProjectType { get; set; } = DamProjectType.Calamity; + [XmlIgnore] [Browsable(false)] public static DamProjectType DamProjectType { get; set; } = DamProjectType.Design; [XmlIgnore] [Browsable(false)] @@ -261,31 +250,6 @@ } } - public LocationResult GetLocationResultWithStabilityTimeSerie(string locationName) - { - LocationResult result = null; - if (locationResult != null && locationResult.StabilityTimeSerie != null && - locationResult.StabilityTimeSerie.LocationId == locationName && - locationResult.StabilityTimeSerie.Entries != null && locationResult.StabilityTimeSerie.Entries.Count > 1) - { - result = locationResult; - } - - return result; - } - - public LocationResult GetFirstLocationResultWithStabilityTimeSerie() - { - LocationResult result = null; - if (locationResult != null && locationResult.StabilityTimeSerie != null && - locationResult.StabilityTimeSerie.Entries != null && locationResult.StabilityTimeSerie.Entries.Count > 1) - { - result = locationResult; - } - - return result; - } - public CsvExportData GetFirstDesignResult() { if (HasDesignScenarioResults) Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/locations.csv'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.damx'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/Geometries/10_10_SingaporeCrossSection.stix =================================================================== diff -u -r6302 -r6750 Binary files differ Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/segments.csv'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.defx'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/Geometries/8_8_SingaporeCrossSection.stix =================================================================== diff -u -r6302 -r6750 Binary files differ Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/scenarios.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/Geometries/3_3_SingaporeCrossSection.stix =================================================================== diff -u -r6302 -r6750 Binary files differ Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/aquifers.csv'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/soils.csv'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/characteristicpoints.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/Geometries/Section1_SingaporeCrossSection.stix =================================================================== diff -u -r6302 -r6750 Binary files differ Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/surfacelines.csv'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/modelparameters.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/csv files/Geometries/Section3_SingaporeCrossSection.stix =================================================================== diff -u -r6302 -r6750 Binary files differ Fisheye: Tag 6750 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/WaterLevelTimerSeries.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.geometries2D.0/10_10_SingaporeCrossSection.stix =================================================================== diff -u -r6307 -r6750 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.geometries2D.0/8_8_SingaporeCrossSection.stix =================================================================== diff -u -r6307 -r6750 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.geometries2D.0/Section3_SingaporeCrossSection.stix =================================================================== diff -u -r6307 -r6750 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.geometries2D.0/3_3_SingaporeCrossSection.stix =================================================================== diff -u -r6307 -r6750 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/Calamity/PulauTekongCalamity.geometries2D.0/Section1_SingaporeCrossSection.stix =================================================================== diff -u -r6307 -r6750 Binary files differ