Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r6220 -r6260 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6220) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6260) @@ -74,12 +74,6 @@ Wti2017 } -public enum PLLineAssignment -{ - NoPLLines, - ExpertKnowledge -} - public enum SoilProfileType { SoilProfile1D, Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6220 -r6260 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6220) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6260) @@ -173,9 +173,7 @@ - - + @@ -826,13 +824,7 @@ - - - + - + nl-NL="Gegevens zijn nog niet geïmporteerd"/> \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r5705 -r6260 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 5705) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 6260) @@ -109,13 +109,6 @@ set { pipingModelType = value; - if (pipingModelType != PipingModelType.Wti2017 && pipingModelType != PipingModelType.Bligh) - { - pipingModelType = PipingModelType.Wti2017; - LogManager.Add(new LogMessage(LogMessageType.Warning, failureMechanismSystemType, - LocalizationManager.GetTranslatedText(GetType(), "ReplaceOldPipingModel"))); - } - if (failureMechanismSystemType == FailureMechanismSystemType.Piping) { CalculationModel = pipingModelType; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r6220 -r6260 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6220) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6260) @@ -299,7 +299,6 @@ damProjectData.VersionInfo.InitVersionInfoAfterRead(); string damProjectVersion = damProjectVersionXmlHandler.GetDamProjectVersion(); - UpdateVersionInfoForNonVersionedFiles(damProjectVersion); damProjectVersion = GetMainVersion(damProjectVersion); if (damProjectVersion != null) { @@ -312,18 +311,11 @@ currentProgramVersion = GetMainVersion(currentProgramVersion); if (!currentProgramVersion.Equals(damProjectVersion)) { - if (IsOutDatedFileSupported(damProjectData)) - { - damProjectData.ClearResults(); - } - else - { - ClearProject(); - string message = - LocalizationManager.GetTranslatedText(this, "UnsupportedDamProjectFile"); - LogManager.Messages.Add(new LogMessage(LogMessageType.Error, DamProjectData, - message)); - } + ClearProject(); + string message = + LocalizationManager.GetTranslatedText(this, "UnsupportedDamProjectFile"); + LogManager.Messages.Add(new LogMessage(LogMessageType.Error, DamProjectData, + message)); } } } @@ -333,7 +325,6 @@ if (!damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Any()) { damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(new DamFailureMechanismeCalculationSpecification()); - UpdateForOlderProjects(); } if (damProjectData != null) @@ -510,72 +501,8 @@ return fullVersion; } - - /// Updates the current file version for non-versioned files (projects created with DAM 19.1 or earlier) - /// - /// Set FileVersion to 0 (for DAM versions 18.1.3 and earlier). - /// Set FileVersion to 1 (for DAM version 19.1.1) - /// FileVersion 2 is the first versioned file (for DAM version 20.1.1) - /// - /// - private void UpdateVersionInfoForNonVersionedFiles(string fileVersion) - { - if (DamProjectData.VersionInfo.FileVersionAsRead == 0) - { - // If FileVersionAsRead = 0 then project was written with program version 19.1 or earlier. - // For projects created with versions < 19.1 (e.g. 18.1.3) we keep the FileVersionAsRead on 0 - // For projects created with version = 19.1 set the FileVersionAsRead on 1 - if (GetMainVersion(fileVersion) == "19.1") - { - DamProjectData.VersionInfo.FileVersionAsRead = 1; - } - } - } - - private static bool IsOutDatedFileSupported(DamProjectData projectData) - { - List calculationSpecifications = projectData.DamProjectCalculationSpecification.DamCalculationSpecifications; - foreach (DamFailureMechanismeCalculationSpecification calculationSpecification in calculationSpecifications) - { - if (calculationSpecification.CalculationModel is MStabModelType && - (calculationSpecification.StabilityModelType != MStabModelType.UpliftVan && - calculationSpecification.StabilityModelType != MStabModelType.Bishop && - calculationSpecification.StabilityModelType != MStabModelType.BishopUpliftVan)) - { - return false; - } - } - - return true; - } - + /// - /// Updates older projects for missing data or changed data model. - /// - private void UpdateForOlderProjects() - { - UpdateMStabParametersSlipCircleDefinition(); - } - - /// - /// Updates the MStab parameters slip circle definition. - /// For older projects, when slip circle definition was not yet defined we have to provide the default values - /// - private void UpdateMStabParametersSlipCircleDefinition() - { - foreach (DamFailureMechanismeCalculationSpecification damCalculationSpecification in damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications) - { - if (damCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) - { - if (damCalculationSpecification.IsSlipCircleDefinitionUndefined()) - { - damCalculationSpecification.ReadUserSettingsSlipCircleDefinition(); - } - } - } - } - - /// /// Copies the 2D-geometries. /// /// The original mapname.