Index: dam clients/DamUI/trunk/src/Dam.sln =================================================================== diff -u -r290 -r291 --- dam clients/DamUI/trunk/src/Dam.sln (.../Dam.sln) (revision 290) +++ dam clients/DamUI/trunk/src/Dam.sln (.../Dam.sln) (revision 291) @@ -32,8 +32,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LumenWorks.Framework.IO", "Tools\LumenWorks.Framework.IO\LumenWorks.Framework.IO.csproj", "{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.AssessmentMechanism", "Deltares.AssessmentMechanism\Deltares.AssessmentMechanism.csproj", "{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Data", "Dam\Data\Deltares.Dam.Data.csproj", "{F1CD9620-15CF-41F8-AF70-5AE004A50F60}" @@ -45,8 +43,6 @@ .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DeltaModel", "Deltares.DeltaModel\Deltares.DeltaModel.csproj", "{4599EA18-543F-419C-BB0B-E554F9FDD126}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Forms", "Dam\Forms\Deltares.Dam.Forms.csproj", "{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Application", "Dam\Application\Deltares.Dam.Application.csproj", "{03810024-8D4D-4726-9C4A-4A6886651CAB}" @@ -81,10 +77,6 @@ {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.Build.0 = Debug|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.ActiveCfg = Release|x86 {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.Build.0 = Release|x86 - {AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Debug|x86.ActiveCfg = Debug|x86 - {AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Debug|x86.Build.0 = Debug|x86 - {AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Release|x86.ActiveCfg = Release|x86 - {AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Release|x86.Build.0 = Release|x86 {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86 {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86 {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86 @@ -93,10 +85,6 @@ {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86 {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86 {F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86 - {4599EA18-543F-419C-BB0B-E554F9FDD126}.Debug|x86.ActiveCfg = Debug|x86 - {4599EA18-543F-419C-BB0B-E554F9FDD126}.Debug|x86.Build.0 = Debug|x86 - {4599EA18-543F-419C-BB0B-E554F9FDD126}.Release|x86.ActiveCfg = Release|x86 - {4599EA18-543F-419C-BB0B-E554F9FDD126}.Release|x86.Build.0 = Release|x86 {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.ActiveCfg = Debug|x86 {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.Build.0 = Debug|x86 {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Release|x86.ActiveCfg = Release|x86 @@ -153,10 +141,8 @@ {6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958} {62CC2363-893F-4ECD-BCD6-AA7150AD6918} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9} {E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770} - {AABFB557-DC0C-41EF-9B41-B84EEBF541BB} = {31A32A36-649A-41A8-9F43-6A6193C04770} {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770} {F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {31A32A36-649A-41A8-9F43-6A6193C04770} - {4599EA18-543F-419C-BB0B-E554F9FDD126} = {31A32A36-649A-41A8-9F43-6A6193C04770} {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC} {03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8} {CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918} Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/Translations.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/ScenarioSubject.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/IHasDikeLocationInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/DikeLocationInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/AssessmentScenario.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/AssessmentScenarioManager.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/AssessmentCalculation.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/ScenarioValidationResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/Properties/AssemblyInfo.cs.svn'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/Deltares.AssessmentMechanism.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.AssessmentMechanism/AssessmentCalculationResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentMaterial.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/Hole.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/ControllerJudgementType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentCastedType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RoughnessDescription.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RevetmentCrossSection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/YesNoQuestionMark.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/Translations.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RoughnessZone.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentCrossSection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/TopLayerType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentLayerType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AsphaltRegion.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DikeSection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/IHasSchematizedSurfaceLine.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/Properties/AssemblyInfo.cs.svn'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentRegionWaterSystemType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RoughnessCrossSection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DikeLinePoint.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DesignValue.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/MaterialType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AsphaltDescription.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AsphaltRegionWaterSystemType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AsphaltCrossSection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/HydraulicBoundary.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DeltaModel.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentRegion.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DikeLocation.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RoughnessSegment.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentLayer.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: dam clients/DamUI/trunk/src/Deltares.DeltaModel/x86/SQLite.Interop.dll =================================================================== diff -u -r236 -r291 Binary files differ Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RoughnessType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AquoImporter.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AsphaltZone.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DikeCrossSection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AsphaltSegment.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/ClayQualityType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/ClayPosition.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AllProbabilityDefinition.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/UpperTransitionConstructionType.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: dam clients/DamUI/trunk/src/Deltares.DeltaModel/x64/SQLite.Interop.dll =================================================================== diff -u -r236 -r291 Binary files differ Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DikeLine.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentProfile.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DeltaModelFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/AquoFieldDefinition.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentTopLayerData.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/WindHydraulicBoundary.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/DikeLineProbabilityDefinition.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/Deltares.DeltaModel.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/SurfaceLineRevetmentSegment.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/BlockRevetmentSegment.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/Structure.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/RevetmentSegment.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 291 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Deltares.DeltaModel/SurfaceLineGeometryPoint.cs'. Fisheye: No comparison available. Pass `N' to diff?