Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs =================================================================== diff -u -r5595 -r5706 --- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 5595) +++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 5706) @@ -188,7 +188,7 @@ slipCircleDefinition = new SlipCircleDefinition(); } - slipCircleDefinition.GridSizeDetermination = Settings.Default.SlipCircleGridSizeDetermination; + slipCircleDefinition.UpliftVanGridSizeDetermination = Settings.Default.SlipCircleUpliftVanGridSizeDetermination; slipCircleDefinition.UpliftVanTangentLinesDefinition = Settings.Default.SlipCircleUpliftVanTangentLinesDefinition; slipCircleDefinition.UpliftVanTangentLinesDistance = Settings.Default.SlipCircleUpliftVanTangentLinesDistance; slipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount; @@ -199,7 +199,7 @@ slipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance; slipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount; slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance; - slipCircleDefinition.BishopTangentLinesDefinition = Settings.Default.SlipCircleBishopTangentLinesDefinition; + slipCircleDefinition.BishopSearchAreaDetermination = Settings.Default.SlipCircleBishopSearchAreaDetermination; slipCircleDefinition.BishopTangentLinesDistance = Settings.Default.SlipCircleBishopTangentLinesDistance; slipCircleDefinition.BishopGridVerticalPointCount = Settings.Default.SlipCircleBishopGridVerticalPointCount; slipCircleDefinition.BishopGridVerticalPointDistance = Settings.Default.SlipCircleBishopGridVerticalPointDistance; Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.Designer.cs =================================================================== diff -u -r4161 -r5706 --- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 4161) +++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 5706) @@ -87,28 +87,28 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("OnBoundaryLines")] - public global::Deltares.Dam.Data.TangentLinesDefinition SlipCircleBishopTangentLinesDefinition { + [global::System.Configuration.DefaultSettingValueAttribute("0.25")] + public double SlipCircleBishopTangentLinesDistance { get { - return ((global::Deltares.Dam.Data.TangentLinesDefinition)(this["SlipCircleBishopTangentLinesDefinition"])); + return ((double)(this["SlipCircleBishopTangentLinesDistance"])); } } [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0.25")] - public double SlipCircleBishopTangentLinesDistance { + [global::System.Configuration.DefaultSettingValueAttribute("Specified")] + public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleBishopSearchAreaDetermination { get { - return ((double)(this["SlipCircleBishopTangentLinesDistance"])); + return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleBishopSearchAreaDetermination"])); } } [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Specified")] - public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleGridSizeDetermination { + public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleUpliftVanGridSizeDetermination { get { - return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleGridSizeDetermination"])); + return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleUpliftVanGridSizeDetermination"])); } } Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/SensorModelRunner.cs =================================================================== diff -u -r4127 -r5706 --- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/SensorModelRunner.cs (.../SensorModelRunner.cs) (revision 4127) +++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/SensorModelRunner.cs (.../SensorModelRunner.cs) (revision 5706) @@ -37,7 +37,7 @@ slipCircleDefinition = new SlipCircleDefinition(); } - slipCircleDefinition.GridSizeDetermination = Settings.Default.SlipCircleGridSizeDetermination; + slipCircleDefinition.UpliftVanGridSizeDetermination = Settings.Default.SlipCircleUpliftVanGridSizeDetermination; slipCircleDefinition.UpliftVanTangentLinesDefinition = Settings.Default.SlipCircleUpliftVanTangentLinesDefinition; slipCircleDefinition.UpliftVanTangentLinesDistance = Settings.Default.SlipCircleUpliftVanTangentLinesDistance; slipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount; @@ -48,7 +48,7 @@ slipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance; slipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount; slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance; - slipCircleDefinition.BishopTangentLinesDefinition = Settings.Default.SlipCircleBishopTangentLinesDefinition; + slipCircleDefinition.BishopSearchAreaDetermination = Settings.Default.SlipCircleBishopSearchAreaDetermination; slipCircleDefinition.BishopTangentLinesDistance = Settings.Default.SlipCircleBishopTangentLinesDistance; slipCircleDefinition.BishopGridVerticalPointCount = Settings.Default.SlipCircleBishopGridVerticalPointCount; slipCircleDefinition.BishopGridVerticalPointDistance = Settings.Default.SlipCircleBishopGridVerticalPointDistance;