Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml
===================================================================
diff -u -r1648 -r1652
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml (.../OperationalSet2.xml) (revision 1648)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml (.../OperationalSet2.xml) (revision 1652)
@@ -1,28 +1,28 @@
-
+
-
+
-
+
-
+
@@ -175,7 +175,7 @@
-
+
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs
===================================================================
diff -u -r1598 -r1652
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs (.../SensorTimeSeriesProcessor.cs) (revision 1598)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs (.../SensorTimeSeriesProcessor.cs) (revision 1652)
@@ -187,7 +187,7 @@
// Calculate all project files
if (calculateAllAtOnce)
CalculationHelper.CalculateMStabProjects(stabilityWorkingPath, stabilityExePath);
- foreach (var entry in series.Entries)
+ foreach (TimeSerieEntry entry in series.Entries)
{
entryCount++;
try
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs
===================================================================
diff -u -r1639 -r1652
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1639)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1652)
@@ -172,6 +172,7 @@
{
if (CalculationParameters.CalculationModules.Stability)
{
+ ReadUserSettingsSlipCircleDefinition(CalculationParameters.MStabParameters.SlipCircleDefinition);
DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside;
DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters =
CalculationParameters.MStabParameters;
@@ -232,5 +233,33 @@
Logger.LogError("Could not export Fews xml file", e);
}
}
+ ///
+ /// Reads the user settings of the slip circle definition.
+ ///
+ /// The slip circle definition.
+ public void ReadUserSettingsSlipCircleDefinition(SlipCircleDefinition slipCircleDefinition)
+ {
+ if (slipCircleDefinition == null)
+ {
+ slipCircleDefinition = new SlipCircleDefinition();
+ }
+ slipCircleDefinition.GridSizeDetermination = Properties.Settings.Default.SlipCircleGridSizeDetermination;
+ slipCircleDefinition.UpliftVanTangentLinesDefinition = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDefinition;
+ slipCircleDefinition.UpliftVanTangentLinesDistance = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDistance;
+ slipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount;
+ slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance;
+ slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount;
+ slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance;
+ slipCircleDefinition.UpliftVanRightGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount;
+ slipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance;
+ slipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount;
+ slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance;
+ slipCircleDefinition.BishopTangentLinesDefinition = Properties.Settings.Default.SlipCircleBishopTangentLinesDefinition;
+ slipCircleDefinition.BishopTangentLinesDistance = Properties.Settings.Default.SlipCircleBishopTangentLinesDistance;
+ slipCircleDefinition.BishopGridVerticalPointCount = Properties.Settings.Default.SlipCircleBishopGridVerticalPointCount;
+ slipCircleDefinition.BishopGridVerticalPointDistance = Properties.Settings.Default.SlipCircleBishopGridVerticalPointDistance;
+ slipCircleDefinition.BishopGridHorizontalPointCount = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointCount;
+ slipCircleDefinition.BishopGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointDistance;
+ }
}
}