Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r6669 -r6726
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6669)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6726)
@@ -214,6 +214,7 @@
+
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs
===================================================================
diff -u -r6436 -r6726
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 6726)
@@ -37,6 +37,8 @@
InitializeComponent();
BindSupport.BindTextAndValue(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod);
+ BindSupport.BindTextAndValue(SearchMethodPanelControl, IsRunUpliftVanOnlyWhenUpliftLabel, IsRunUpliftVanOnlyWhenUpliftCheckBox, p => p.IsRunUpliftVanOnlyWhenUplift);
+
BindSupport.BindTextAndValue(CircleDefinitionPanelControl, UpliftVanGridCreationLabel, UpliftVanGridCreationComboBox, p => p.UpliftVanGridSizeDetermination);
BindSupport.BindTextAndValue(CircleDefinitionPanelControl, BishopSearchAreaCreationLabel, BishopSearchAreaCreationComboBox, p => p.BishopSearchAreaDetermination);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r6436 -r6726
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 6726)
@@ -526,13 +526,17 @@
{
Model = StabilityModelType.UpliftVan;
SearchMethod = StabilitySearchMethod.BeeSwarm;
+ IsRunUpliftVanOnlyWhenUplift = true;
gridPosition = StabilityGridPosition.Right;
SlipCircleDefinition = new SlipCircleDefinition();
}
[Label("Model")] public StabilityModelType Model { get; set; }
public StabilitySearchMethod SearchMethod { get; set; }
+
+ public bool IsRunUpliftVanOnlyWhenUplift { get; set; }
+
public string ProjectFileName { get; set; }
[Validate] public SlipCircleDefinition SlipCircleDefinition { get; set; }
@@ -554,6 +558,7 @@
{
Model = mstabParameters.Model;
SearchMethod = mstabParameters.SearchMethod;
+ IsRunUpliftVanOnlyWhenUplift = mstabParameters.IsRunUpliftVanOnlyWhenUplift;
GridPosition = mstabParameters.GridPosition;
ProjectFileName = mstabParameters.ProjectFileName;
@@ -587,7 +592,9 @@
{
switch (property)
{
- case "SearchMethod": return Location.DamProjectType == DamProjectType.Design;
+ case "SearchMethod":
+ case "IsRunUpliftVanOnlyWhenUplift":
+ return Location.DamProjectType == DamProjectType.Design;
case "GridPosition": return false; // position depends on failuremechanisme type (inside or outside)
case "ZonesType": return false; // Is set per location!
default: return true;
@@ -600,6 +607,7 @@
{
case "Model": return true;
case "SearchMethod":
+ case "IsRunUpliftVanOnlyWhenUplift":
return
(SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs
===================================================================
diff -u -r6439 -r6726
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 6439)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 6726)
@@ -102,6 +102,8 @@
this.SearchMethodPanelControl = new DevExpress.XtraEditors.PanelControl();
this.SearchMethodLabel = new DevExpress.XtraEditors.LabelControl();
this.SearchMethodCombobox = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.IsRunUpliftVanOnlyWhenUpliftLabel = new DevExpress.XtraEditors.LabelControl();
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox = new DevExpress.XtraEditors.CheckEdit();
((System.ComponentModel.ISupportInitialize)(this.StabilityGroupControl)).BeginInit();
this.StabilityGroupControl.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.CircleDefinitionPanelControl)).BeginInit();
@@ -126,6 +128,7 @@
((System.ComponentModel.ISupportInitialize)(this.SearchMethodPanelControl)).BeginInit();
this.SearchMethodPanelControl.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchMethodCombobox.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize) (this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Properties)).BeginInit();
this.SuspendLayout();
//
// StabilityGroupControl
@@ -599,6 +602,8 @@
this.SearchMethodPanelControl.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.SearchMethodPanelControl.Controls.Add(this.SearchMethodLabel);
this.SearchMethodPanelControl.Controls.Add(this.SearchMethodCombobox);
+ this.SearchMethodPanelControl.Controls.Add(this.IsRunUpliftVanOnlyWhenUpliftLabel);
+ this.SearchMethodPanelControl.Controls.Add(this.IsRunUpliftVanOnlyWhenUpliftCheckBox);
this.SearchMethodPanelControl.Dock = System.Windows.Forms.DockStyle.Top;
this.SearchMethodPanelControl.Location = new System.Drawing.Point(2, 24);
this.SearchMethodPanelControl.Name = "SearchMethodPanelControl";
@@ -625,6 +630,25 @@
this.SearchMethodCombobox.Size = new System.Drawing.Size(85, 22);
this.SearchMethodCombobox.TabIndex = 2;
//
+ // IsRunUpliftVanOnlyWhenUpliftLabel
+ //
+ this.IsRunUpliftVanOnlyWhenUpliftLabel.Location = new System.Drawing.Point(6, 42);
+ this.IsRunUpliftVanOnlyWhenUpliftLabel.Margin = new System.Windows.Forms.Padding(4);
+ this.IsRunUpliftVanOnlyWhenUpliftLabel.Name = "IsRunUpliftVanOnlyWhenUpliftLabel";
+ this.IsRunUpliftVanOnlyWhenUpliftLabel.Size = new System.Drawing.Size(146, 13);
+ this.IsRunUpliftVanOnlyWhenUpliftLabel.TabIndex = 3;
+ this.IsRunUpliftVanOnlyWhenUpliftLabel.Text = "IsRunUpliftVanOnlyWhenUplift";
+ //
+ // IsRunUpliftVanOnlyWhenUpliftCheckBox
+ //
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right));
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Location = new System.Drawing.Point(233, 39);
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Name = "IsRunUpliftVanOnlyWhenUpliftCheckBox";
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Properties.Caption = "";
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Size = new System.Drawing.Size(74, 20);
+ this.IsRunUpliftVanOnlyWhenUpliftCheckBox.TabIndex = 4;
+ //
// DamProjectCalculationOptionsPropertyControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -658,6 +682,7 @@
this.SearchMethodPanelControl.ResumeLayout(false);
this.SearchMethodPanelControl.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchMethodCombobox.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -668,6 +693,8 @@
private DevExpress.XtraEditors.PanelControl SearchMethodPanelControl;
private DevExpress.XtraEditors.LabelControl SearchMethodLabel;
private DevExpress.XtraEditors.ComboBoxEdit SearchMethodCombobox;
+ private DevExpress.XtraEditors.LabelControl IsRunUpliftVanOnlyWhenUpliftLabel;
+ private DevExpress.XtraEditors.CheckEdit IsRunUpliftVanOnlyWhenUpliftCheckBox;
private DevExpress.XtraEditors.PanelControl CircleDefinitionPanelControl;
private DevExpress.XtraEditors.SpinEdit GridHorizontalPointDistanceBishopEdit;
private DevExpress.XtraEditors.LabelControl GridHorizontalPointDistanceBishopLabel;