Index: DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r4527 -r4531
--- DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj (.../Deltares.Dam.Application.csproj) (revision 4527)
+++ DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj (.../Deltares.Dam.Application.csproj) (revision 4531)
@@ -31,12 +31,24 @@
..\..\..\lib\DevExpress\DevExpress.Data.v23.1.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.Drawing.v23.1.dll
+
+
+ ..\..\..\lib\DevExpress\DevExpress.Images.v23.1.dll
+
..\..\..\lib\DevExpress\DevExpress.Printing.v23.1.Core.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.RichEdit.v23.1.Core.dll
+
..\..\..\lib\DevExpress\DevExpress.Utils.v23.1.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.Utils.v23.1.UI.dll
+
..\..\..\lib\DevExpress\DevExpress.XtraBars.v23.1.dll
@@ -52,15 +64,36 @@
..\..\..\lib\DevExpress\DevExpress.XtraEditors.v23.1.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraGauges.v23.1.Core.dll
+
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraGauges.v23.1.Win.dll
+
..\..\..\lib\DevExpress\DevExpress.XtraGrid.v23.1.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraLayout.v23.1.dll
+
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraNavBar.v23.1.dll
+
..\..\..\lib\DevExpress\DevExpress.XtraPrinting.v23.1.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraReports.v23.1.dll
+
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraRichEdit.v23.1.dll
+
..\..\..\lib\DevExpress\DevExpress.XtraTreeList.v23.1.dll
+
+ ..\..\..\lib\DevExpress\DevExpress.XtraVerticalGrid.v23.1.dll
+
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs
===================================================================
diff -u -r4527 -r4531
--- DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 4527)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 4531)
@@ -386,12 +386,17 @@
{
CurrentSoilProfile = locationJob.Location.GetSoilSurfaceProfile(FailureMechanismType, index, out probability);
GeometryProbabilities = locationJob.Location.GetGeometryProbabilities(FailureMechanismType);
- if (csvExportData != null && (csvExportData.StabilityProfileName != CurrentSoilProfile.SoilProfile.Name))
+ CsvExportData locResults = csvExportData;
+ if (locResults != null && (locResults.StabilityProfileName != CurrentSoilProfile.SoilProfile.Name))
{
for (var i = 0; i < GeometryProbabilitiesCount; i++)
{
- if (GeometryProbabilities[i].SoilGeometryName == csvExportData.StabilityProfileName)
+ if (csvExportData == null)
{
+ int k = 1;
+ }
+ if (GeometryProbabilities[i].SoilGeometryName == locResults.StabilityProfileName)
+ {
CurrentSoilProfile = locationJob.Location.GetSoilSurfaceProfile(FailureMechanismType, i, out probability);
index = i;
}
@@ -552,6 +557,11 @@
else if (sender is CsvExportData data)
{
csvExportData = data;
+ if (csvExportData == null)
+ {
+ int k = 1;
+ }
+
LoadLocation();
}
else if (sender is WaterBoard)
@@ -587,6 +597,11 @@
{
csvExportData = locationJob.GetDesignResultByProfileScenarioAndCalculationName(CurrentSoilProfile.SoilProfile.Name,
"1", LocationJob.CurrentCalculation);
+
+ if (csvExportData == null)
+ {
+ int k = 1;
+ }
}
}
}
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r4511 -r4531
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4511)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4531)
@@ -151,13 +151,12 @@
}
[Test]
- [Category("Work_In_Progress")]
[TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")]
- // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
+ [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")]
public void CanLoadVersion_15_1_1_3(string projectFilename, string expectedSoilbaseName, string locationName)
{
const string dataFolder = @"..\..\..\..\..\data\Dam\V 15.1.1.3\";
- string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
+ string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
{
@@ -196,7 +195,7 @@
[Test]
[Category("Work_In_Progress")]
[TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")]
- // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
+ [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")]// #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
public void CanLoadVersion_18_1_3(string projectFilename, string expectedSoilbaseName, string locationName)
{
const string dataFolder = @"..\..\..\..\..\data\Dam\V 18.1.3\";
@@ -364,7 +363,7 @@
PolderLevel = -1.3,
HeadPl2 = -1.3,
HeadPl3 = -1.6,
- HeadPl4 = null,
+ HeadPl4 = 0.98,
PlLineOffsetBelowDikeTopAtRiver = 0.5, // actual value
PlLineOffsetBelowDikeTopAtPolder = 1.5, // actual value
PlLineOffsetBelowShoulderBaseInside = 0.1,