Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r5682 -r5705 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5682) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5705) @@ -144,8 +144,6 @@ } } - public TangentLinesDefinition BishopTangentLinesDefinition { get; set; } - [Format("F2")] [Unit(UnitType.Length)] [Minimum(0.01)] @@ -164,7 +162,9 @@ } } - public GridSizeDetermination GridSizeDetermination { get; set; } + public GridSizeDetermination UpliftVanGridSizeDetermination { get; set; } + + public GridSizeDetermination BishopSearchAreaDetermination { get; set; } [Unit(UnitType.None)] [Minimum(1)] @@ -383,9 +383,7 @@ XCoordinateLastUpliftPoint = slipCircleDefinition.XCoordinateLastUpliftPoint; UpliftVanTangentLinesDefinition = slipCircleDefinition.UpliftVanTangentLinesDefinition; UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance; - BishopTangentLinesDefinition = slipCircleDefinition.BishopTangentLinesDefinition; - BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; - GridSizeDetermination = slipCircleDefinition.GridSizeDetermination; + UpliftVanGridSizeDetermination = slipCircleDefinition.UpliftVanGridSizeDetermination; UpliftVanLeftGridVerticalPointCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount; UpliftVanLeftGridVerticalPointDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance; UpliftVanLeftGridHorizontalPointCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount; @@ -394,6 +392,8 @@ UpliftVanRightGridVerticalPointDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance; UpliftVanRightGridHorizontalPointCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount; UpliftVanRightGridHorizontalPointDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance; + BishopSearchAreaDetermination = slipCircleDefinition.BishopSearchAreaDetermination; + BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; BishopGridVerticalPointCount = slipCircleDefinition.BishopGridVerticalPointCount; BishopGridVerticalPointDistance = slipCircleDefinition.BishopGridVerticalPointDistance; BishopGridHorizontalPointCount = slipCircleDefinition.BishopGridHorizontalPointCount; @@ -416,8 +416,9 @@ switch (property) { - case "GridSizeDetermination": return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan() || IsStabiltyBishop(); // Uplift Van + case "GridSizeDetermination": + return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); case "UpliftVanTangentLinesDefinition": return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); case "UpliftVanTangentLinesDistance": @@ -440,7 +441,7 @@ return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); // Bishop - case "BishopTangentLinesDefinition": + case "BishopSearchAreaDetermination": return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); case "BishopTangentLinesDistance": return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); @@ -471,35 +472,35 @@ case "UpliftVanTangentLinesDistance": return UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified; case "UpliftVanLeftGridVerticalPointCount": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanLeftGridVerticalPointDistance": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanLeftGridHorizontalPointCount": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanLeftGridHorizontalPointDistance": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanRightGridVerticalPointCount": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanRightGridVerticalPointDistance": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanRightGridHorizontalPointCount": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "UpliftVanRightGridHorizontalPointDistance": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; // Bishop case "BishopTangentLinesDefinition": return true; case "BishopTangentLinesDistance": - return BishopTangentLinesDefinition == TangentLinesDefinition.Specified; + return BishopSearchAreaDetermination == GridSizeDetermination.Specified; case "BishopGridVerticalPointCount": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "BishopGridVerticalPointDistance": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "BishopGridHorizontalPointCount": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; case "BishopGridHorizontalPointDistance": - return GridSizeDetermination == GridSizeDetermination.Specified; + return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified; default: return true; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r5469 -r5705 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 5469) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 5705) @@ -323,9 +323,8 @@ SlipCircleDefinition slipCircleDefinition = curSpec.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition; if (slipCircleDefinition != null) { - input.StabilityParameters.GridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.GridSizeDetermination); - input.StabilityParameters.BishopTangentLinesDefinitionSpecified = true; - input.StabilityParameters.BishopTangentLinesDefinition = ConversionHelper.ConvertToInputTangentLinesDefinition(slipCircleDefinition.BishopTangentLinesDefinition); + input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination); + input.StabilityParameters.BishopSearchAreaDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.BishopSearchAreaDetermination); input.StabilityParameters.BishopTangentLinesDistanceSpecified = true; input.StabilityParameters.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; input.StabilityParameters.BishopGridVerticalPointsCountSpecified = true; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r5469 -r5705 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 5469) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 5705) @@ -254,13 +254,9 @@ curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod); curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); SlipCircleDefinition slipCircleDefinition = curStabParamas.SlipCircleDefinition; - slipCircleDefinition.GridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.GridDetermination); + slipCircleDefinition.UpliftVanGridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.UpliftVanGridDetermination); + slipCircleDefinition.BishopSearchAreaDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.BishopSearchAreaDetermination); - if (input.StabilityParameters.BishopTangentLinesDefinitionSpecified) - { - slipCircleDefinition.BishopTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.BishopTangentLinesDefinition); - } - if (input.StabilityParameters.BishopTangentLinesDistanceSpecified) { slipCircleDefinition.BishopTangentLinesDistance = input.StabilityParameters.BishopTangentLinesDistance; Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs =================================================================== diff -u -r5682 -r5705 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 5682) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 5705) @@ -91,12 +91,12 @@ this.LeftGridVerticalPointCountUVLabel = new DevExpress.XtraEditors.LabelControl(); this.DistanceTangentLinesBishopEdit = new DevExpress.XtraEditors.SpinEdit(); this.DistanceTangentLinesBishopLabel = new DevExpress.XtraEditors.LabelControl(); - this.TangentLineBishopComboBox = new DevExpress.XtraEditors.ComboBoxEdit(); - this.TangentLineBishopLabel = new DevExpress.XtraEditors.LabelControl(); + this.BishopSearchAreaCreationComboBox = new DevExpress.XtraEditors.ComboBoxEdit(); + this.BishopSearchAreaCreationLabel = new DevExpress.XtraEditors.LabelControl(); this.DistanceTangentLinesUVEdit = new DevExpress.XtraEditors.SpinEdit(); this.DistanceTangentLinesUVLabel = new DevExpress.XtraEditors.LabelControl(); - this.GridCreationComboBox = new DevExpress.XtraEditors.ComboBoxEdit(); - this.GridCreationLabel = new DevExpress.XtraEditors.LabelControl(); + this.UpliftVanGridCreationComboBox = new DevExpress.XtraEditors.ComboBoxEdit(); + this.UpliftVanGridCreationLabel = new DevExpress.XtraEditors.LabelControl(); this.TangentLineUpliftVanComboBox = new DevExpress.XtraEditors.ComboBoxEdit(); this.TangentLineUpliftVanLabel = new DevExpress.XtraEditors.LabelControl(); this.SearchMethodPanelControl = new DevExpress.XtraEditors.PanelControl(); @@ -119,9 +119,9 @@ ((System.ComponentModel.ISupportInitialize)(this.LeftGridVerticalPointDistanceUVEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftGridVerticalPointCountUVEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DistanceTangentLinesBishopEdit.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.TangentLineBishopComboBox.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.BishopSearchAreaCreationComboBox.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DistanceTangentLinesUVEdit.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.GridCreationComboBox.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.UpliftVanGridCreationComboBox.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.TangentLineUpliftVanComboBox.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.SearchMethodPanelControl)).BeginInit(); this.SearchMethodPanelControl.SuspendLayout(); @@ -169,12 +169,12 @@ this.CircleDefinitionPanelControl.Controls.Add(this.LeftGridVerticalPointCountUVLabel); this.CircleDefinitionPanelControl.Controls.Add(this.DistanceTangentLinesBishopEdit); this.CircleDefinitionPanelControl.Controls.Add(this.DistanceTangentLinesBishopLabel); - this.CircleDefinitionPanelControl.Controls.Add(this.TangentLineBishopComboBox); - this.CircleDefinitionPanelControl.Controls.Add(this.TangentLineBishopLabel); + this.CircleDefinitionPanelControl.Controls.Add(this.BishopSearchAreaCreationComboBox); + this.CircleDefinitionPanelControl.Controls.Add(this.BishopSearchAreaCreationLabel); this.CircleDefinitionPanelControl.Controls.Add(this.DistanceTangentLinesUVEdit); this.CircleDefinitionPanelControl.Controls.Add(this.DistanceTangentLinesUVLabel); - this.CircleDefinitionPanelControl.Controls.Add(this.GridCreationComboBox); - this.CircleDefinitionPanelControl.Controls.Add(this.GridCreationLabel); + this.CircleDefinitionPanelControl.Controls.Add(this.UpliftVanGridCreationComboBox); + this.CircleDefinitionPanelControl.Controls.Add(this.UpliftVanGridCreationLabel); this.CircleDefinitionPanelControl.Controls.Add(this.TangentLineUpliftVanComboBox); this.CircleDefinitionPanelControl.Controls.Add(this.TangentLineUpliftVanLabel); this.CircleDefinitionPanelControl.Dock = System.Windows.Forms.DockStyle.Fill; @@ -508,25 +508,25 @@ this.DistanceTangentLinesBishopLabel.TabIndex = 169; this.DistanceTangentLinesBishopLabel.Text = "DistanceTangentLinesUV"; // - // TangentLineBishopComboBox + // BishopSearchAreaCreationComboBox // - this.TangentLineBishopComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.TangentLineBishopComboBox.Location = new System.Drawing.Point(233, 72); - this.TangentLineBishopComboBox.Margin = new System.Windows.Forms.Padding(4); - this.TangentLineBishopComboBox.Name = "TangentLineBishopComboBox"; - this.TangentLineBishopComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + this.BishopSearchAreaCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BishopSearchAreaCreationComboBox.Location = new System.Drawing.Point(233, 72); + this.BishopSearchAreaCreationComboBox.Margin = new System.Windows.Forms.Padding(4); + this.BishopSearchAreaCreationComboBox.Name = "BishopSearchAreaCreationComboBox"; + this.BishopSearchAreaCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.TangentLineBishopComboBox.Size = new System.Drawing.Size(85, 22); - this.TangentLineBishopComboBox.TabIndex = 166; + this.BishopSearchAreaCreationComboBox.Size = new System.Drawing.Size(85, 22); + this.BishopSearchAreaCreationComboBox.TabIndex = 166; // - // TangentLineBishopLabel + // BishopSearchAreaCreationLabel // - this.TangentLineBishopLabel.Location = new System.Drawing.Point(6, 75); - this.TangentLineBishopLabel.Margin = new System.Windows.Forms.Padding(4); - this.TangentLineBishopLabel.Name = "TangentLineBishopLabel"; - this.TangentLineBishopLabel.Size = new System.Drawing.Size(97, 16); - this.TangentLineBishopLabel.TabIndex = 167; - this.TangentLineBishopLabel.Text = "Tangent lines UV"; + this.BishopSearchAreaCreationLabel.Location = new System.Drawing.Point(6, 75); + this.BishopSearchAreaCreationLabel.Margin = new System.Windows.Forms.Padding(4); + this.BishopSearchAreaCreationLabel.Name = "BishopSearchAreaCreationLabel"; + this.BishopSearchAreaCreationLabel.Size = new System.Drawing.Size(97, 16); + this.BishopSearchAreaCreationLabel.TabIndex = 167; + this.BishopSearchAreaCreationLabel.Text = "Tangent lines UV"; // // DistanceTangentLinesUVEdit // @@ -553,25 +553,25 @@ this.DistanceTangentLinesUVLabel.TabIndex = 165; this.DistanceTangentLinesUVLabel.Text = "DistanceTangentLinesUV"; // - // GridCreationComboBox + // UpliftVanGridCreationComboBox // - this.GridCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.GridCreationComboBox.Location = new System.Drawing.Point(233, 138); - this.GridCreationComboBox.Margin = new System.Windows.Forms.Padding(4); - this.GridCreationComboBox.Name = "GridCreationComboBox"; - this.GridCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + this.UpliftVanGridCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.UpliftVanGridCreationComboBox.Location = new System.Drawing.Point(233, 138); + this.UpliftVanGridCreationComboBox.Margin = new System.Windows.Forms.Padding(4); + this.UpliftVanGridCreationComboBox.Name = "UpliftVanGridCreationComboBox"; + this.UpliftVanGridCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.GridCreationComboBox.Size = new System.Drawing.Size(85, 22); - this.GridCreationComboBox.TabIndex = 162; + this.UpliftVanGridCreationComboBox.Size = new System.Drawing.Size(85, 22); + this.UpliftVanGridCreationComboBox.TabIndex = 162; // - // GridCreationLabel + // UpliftVanGridCreationLabel // - this.GridCreationLabel.Location = new System.Drawing.Point(6, 141); - this.GridCreationLabel.Margin = new System.Windows.Forms.Padding(4); - this.GridCreationLabel.Name = "GridCreationLabel"; - this.GridCreationLabel.Size = new System.Drawing.Size(73, 16); - this.GridCreationLabel.TabIndex = 163; - this.GridCreationLabel.Text = "Grid creation"; + this.UpliftVanGridCreationLabel.Location = new System.Drawing.Point(6, 141); + this.UpliftVanGridCreationLabel.Margin = new System.Windows.Forms.Padding(4); + this.UpliftVanGridCreationLabel.Name = "UpliftVanGridCreationLabel"; + this.UpliftVanGridCreationLabel.Size = new System.Drawing.Size(73, 16); + this.UpliftVanGridCreationLabel.TabIndex = 163; + this.UpliftVanGridCreationLabel.Text = "Grid creation"; // // TangentLineUpliftVanComboBox // @@ -649,9 +649,9 @@ ((System.ComponentModel.ISupportInitialize)(this.LeftGridVerticalPointDistanceUVEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftGridVerticalPointCountUVEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DistanceTangentLinesBishopEdit.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.TangentLineBishopComboBox.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.BishopSearchAreaCreationComboBox.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DistanceTangentLinesUVEdit.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.GridCreationComboBox.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.UpliftVanGridCreationComboBox.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.TangentLineUpliftVanComboBox.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.SearchMethodPanelControl)).EndInit(); this.SearchMethodPanelControl.ResumeLayout(false); @@ -694,12 +694,12 @@ private DevExpress.XtraEditors.LabelControl LeftGridVerticalPointCountUVLabel; private DevExpress.XtraEditors.SpinEdit DistanceTangentLinesBishopEdit; private DevExpress.XtraEditors.LabelControl DistanceTangentLinesBishopLabel; - private DevExpress.XtraEditors.ComboBoxEdit TangentLineBishopComboBox; - private DevExpress.XtraEditors.LabelControl TangentLineBishopLabel; + private DevExpress.XtraEditors.ComboBoxEdit BishopSearchAreaCreationComboBox; + private DevExpress.XtraEditors.LabelControl BishopSearchAreaCreationLabel; private DevExpress.XtraEditors.SpinEdit DistanceTangentLinesUVEdit; private DevExpress.XtraEditors.LabelControl DistanceTangentLinesUVLabel; - private DevExpress.XtraEditors.ComboBoxEdit GridCreationComboBox; - private DevExpress.XtraEditors.LabelControl GridCreationLabel; + private DevExpress.XtraEditors.ComboBoxEdit UpliftVanGridCreationComboBox; + private DevExpress.XtraEditors.LabelControl UpliftVanGridCreationLabel; private DevExpress.XtraEditors.ComboBoxEdit TangentLineUpliftVanComboBox; private DevExpress.XtraEditors.LabelControl TangentLineUpliftVanLabel; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs =================================================================== diff -u -r4127 -r5705 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 4127) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 5705) @@ -124,14 +124,23 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Automatic")] - 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"])); } } [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Automatic")] + public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleBishopSearchAreaDetermination { + get { + return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleBishopSearchAreaDetermination"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("36")] public int SlipCircleUpliftVanLeftGridVerticalPointCount { get { @@ -258,15 +267,6 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("OnBoundaryLines")] - public global::Deltares.Dam.Data.TangentLinesDefinition SlipCircleBishopTangentLinesDefinition { - get { - return ((global::Deltares.Dam.Data.TangentLinesDefinition)(this["SlipCircleBishopTangentLinesDefinition"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0.25")] public double SlipCircleBishopTangentLinesDistance { get { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs =================================================================== diff -u -r5631 -r5705 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 5631) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 5705) @@ -144,7 +144,7 @@ } /// - /// Performs test BM04Opdrijven05 situation with soil layers aboven and below the phreatic line 1D + /// Performs test BM04Opdrijven05 situation with soil layers above and below the phreatic line 1D /// [Test] [Category("Slow")] Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs =================================================================== diff -u -r5571 -r5705 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 5571) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 5705) @@ -37,9 +37,9 @@ InitializeComponent(); BindSupport.BindTextAndValue(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, GridCreationLabel, GridCreationComboBox, p => p.GridSizeDetermination); + BindSupport.BindTextAndValue(CircleDefinitionPanelControl, UpliftVanGridCreationLabel, UpliftVanGridCreationComboBox, p => p.UpliftVanGridSizeDetermination); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, TangentLineBishopLabel, TangentLineBishopComboBox, p => p.BishopTangentLinesDefinition); + BindSupport.BindTextAndValue(CircleDefinitionPanelControl, BishopSearchAreaCreationLabel, BishopSearchAreaCreationComboBox, p => p.BishopSearchAreaDetermination); BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, DistanceTangentLinesBishopLabel, DistanceTangentLinesBishopEdit, p => p.BishopTangentLinesDistance); BindSupport.BindTextAndValue(CircleDefinitionPanelControl, TangentLineUpliftVanLabel, TangentLineUpliftVanComboBox, p => p.UpliftVanTangentLinesDefinition); BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, DistanceTangentLinesUVLabel, DistanceTangentLinesUVEdit, p => p.UpliftVanTangentLinesDistance); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r5469 -r5705 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5469) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5705) @@ -1007,12 +1007,12 @@ SearchMethod = MStabSearchMethod.Grid, SlipCircleDefinition = new SlipCircleDefinition { - GridSizeDetermination = GridSizeDetermination.Specified, + UpliftVanGridSizeDetermination = GridSizeDetermination.Specified, + BishopSearchAreaDetermination = GridSizeDetermination.Specified, BishopGridHorizontalPointCount = 4, BishopGridHorizontalPointDistance = 1.2, BishopGridVerticalPointCount = 5, BishopGridVerticalPointDistance = 1.1, - BishopTangentLinesDefinition = TangentLinesDefinition.Specified, BishopTangentLinesDistance = 0.25, UpliftVanLeftGridHorizontalPointCount = 6, UpliftVanLeftGridHorizontalPointDistance = 0.7, Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r4539 -r5705 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 5705) @@ -225,9 +225,9 @@ FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Settings.Default.SlipCircleUpliftVanTangentLinesDefinition; FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Settings.Default.SlipCircleUpliftVanTangentLinesDistance; - FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDefinition = Settings.Default.SlipCircleBishopTangentLinesDefinition; + FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopSearchAreaDetermination = Settings.Default.SlipCircleBishopSearchAreaDetermination; FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Settings.Default.SlipCircleBishopTangentLinesDistance; - FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.GridSizeDetermination = Settings.Default.SlipCircleGridSizeDetermination; + FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanGridSizeDetermination = Settings.Default.SlipCircleUpliftVanGridSizeDetermination; FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount; FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance; FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount;