Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6726 -r6734 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6726) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6734) @@ -214,7 +214,7 @@ - + Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs =================================================================== diff -u -r6726 -r6734 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 6726) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 6734) @@ -102,8 +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(); + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel = new DevExpress.XtraEditors.LabelControl(); + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox = new DevExpress.XtraEditors.CheckEdit(); ((System.ComponentModel.ISupportInitialize)(this.StabilityGroupControl)).BeginInit(); this.StabilityGroupControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.CircleDefinitionPanelControl)).BeginInit(); @@ -128,7 +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(); + ((System.ComponentModel.ISupportInitialize) (this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Properties)).BeginInit(); this.SuspendLayout(); // // StabilityGroupControl @@ -602,8 +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.Controls.Add(this.IsUpliftVanRunOnlyWhenUpliftOccursLabel); + this.SearchMethodPanelControl.Controls.Add(this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox); this.SearchMethodPanelControl.Dock = System.Windows.Forms.DockStyle.Top; this.SearchMethodPanelControl.Location = new System.Drawing.Point(2, 24); this.SearchMethodPanelControl.Name = "SearchMethodPanelControl"; @@ -630,24 +630,24 @@ this.SearchMethodCombobox.Size = new System.Drawing.Size(85, 22); this.SearchMethodCombobox.TabIndex = 2; // - // IsRunUpliftVanOnlyWhenUpliftLabel + // IsUpliftVanRunOnlyWhenUpliftOccursLabel // - 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"; + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel.Location = new System.Drawing.Point(6, 42); + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel.Margin = new System.Windows.Forms.Padding(4); + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel.Name = "IsUpliftVanRunOnlyWhenUpliftOccursLabel"; + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel.Size = new System.Drawing.Size(146, 13); + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel.TabIndex = 3; + this.IsUpliftVanRunOnlyWhenUpliftOccursLabel.Text = "IsUpliftVanRunOnlyWhenUpliftOccurs"; // - // IsRunUpliftVanOnlyWhenUpliftCheckBox + // IsUpliftVanRunOnlyWhenUpliftOccursCheckBox // - 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; + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)); + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Location = new System.Drawing.Point(233, 39); + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Margin = new System.Windows.Forms.Padding(4); + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Name = "IsUpliftVanRunOnlyWhenUpliftOccursCheckBox"; + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Properties.Caption = ""; + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Size = new System.Drawing.Size(74, 20); + this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.TabIndex = 4; // // DamProjectCalculationOptionsPropertyControl // @@ -682,7 +682,7 @@ this.SearchMethodPanelControl.ResumeLayout(false); this.SearchMethodPanelControl.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.SearchMethodCombobox.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.IsRunUpliftVanOnlyWhenUpliftCheckBox.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.IsUpliftVanRunOnlyWhenUpliftOccursCheckBox.Properties)).EndInit(); this.ResumeLayout(false); } @@ -693,8 +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.LabelControl IsUpliftVanRunOnlyWhenUpliftOccursLabel; + private DevExpress.XtraEditors.CheckEdit IsUpliftVanRunOnlyWhenUpliftOccursCheckBox; private DevExpress.XtraEditors.PanelControl CircleDefinitionPanelControl; private DevExpress.XtraEditors.SpinEdit GridHorizontalPointDistanceBishopEdit; private DevExpress.XtraEditors.LabelControl GridHorizontalPointDistanceBishopLabel; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r6726 -r6734 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 6726) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 6734) @@ -526,7 +526,7 @@ { Model = StabilityModelType.UpliftVan; SearchMethod = StabilitySearchMethod.BeeSwarm; - IsRunUpliftVanOnlyWhenUplift = true; + IsUpliftVanRunOnlyWhenUpliftOccurs = true; gridPosition = StabilityGridPosition.Right; SlipCircleDefinition = new SlipCircleDefinition(); } @@ -535,7 +535,7 @@ public StabilitySearchMethod SearchMethod { get; set; } - public bool IsRunUpliftVanOnlyWhenUplift { get; set; } + public bool IsUpliftVanRunOnlyWhenUpliftOccurs { get; set; } public string ProjectFileName { get; set; } [Validate] public SlipCircleDefinition SlipCircleDefinition { get; set; } @@ -558,7 +558,7 @@ { Model = mstabParameters.Model; SearchMethod = mstabParameters.SearchMethod; - IsRunUpliftVanOnlyWhenUplift = mstabParameters.IsRunUpliftVanOnlyWhenUplift; + IsUpliftVanRunOnlyWhenUpliftOccurs = mstabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs; GridPosition = mstabParameters.GridPosition; ProjectFileName = mstabParameters.ProjectFileName; @@ -593,7 +593,7 @@ switch (property) { case "SearchMethod": - case "IsRunUpliftVanOnlyWhenUplift": + case "IsUpliftVanRunOnlyWhenUpliftOccurs": 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! @@ -607,7 +607,7 @@ { case "Model": return true; case "SearchMethod": - case "IsRunUpliftVanOnlyWhenUplift": + case "IsUpliftVanRunOnlyWhenUpliftOccurs": return (SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) && Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs =================================================================== diff -u -r6726 -r6734 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 6726) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 6734) @@ -37,7 +37,7 @@ InitializeComponent(); BindSupport.BindTextAndValue(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod); - BindSupport.BindTextAndValue(SearchMethodPanelControl, IsRunUpliftVanOnlyWhenUpliftLabel, IsRunUpliftVanOnlyWhenUpliftCheckBox, p => p.IsRunUpliftVanOnlyWhenUplift); + BindSupport.BindTextAndValue(SearchMethodPanelControl, IsUpliftVanRunOnlyWhenUpliftOccursLabel, IsUpliftVanRunOnlyWhenUpliftOccursCheckBox, p => p.IsUpliftVanRunOnlyWhenUpliftOccurs); BindSupport.BindTextAndValue(CircleDefinitionPanelControl, UpliftVanGridCreationLabel, UpliftVanGridCreationComboBox, p => p.UpliftVanGridSizeDetermination);