Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs =================================================================== diff -u -r2445 -r2496 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 2445) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 2496) @@ -64,6 +64,10 @@ this.NameValue = new DevExpress.XtraEditors.TextEdit(); this.NameLabel = new DevExpress.XtraEditors.LabelControl(); this.PiezometricGroupControl = new DevExpress.XtraEditors.GroupControl(); + this.HeadPL4Edit = new DevExpress.XtraEditors.SpinEdit(); + this.HeadPL4Label = new DevExpress.XtraEditors.LabelControl(); + this.HeadPL3Edit = new DevExpress.XtraEditors.SpinEdit(); + this.HeadPL3Label = new DevExpress.XtraEditors.LabelControl(); this.HeadPL2Edit = new DevExpress.XtraEditors.SpinEdit(); this.HeadPL2Label = new DevExpress.XtraEditors.LabelControl(); this.DesignGroupControl = new DevExpress.XtraEditors.GroupControl(); @@ -107,6 +111,8 @@ ((System.ComponentModel.ISupportInitialize)(this.NameValue.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PiezometricGroupControl)).BeginInit(); this.PiezometricGroupControl.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.HeadPL4Edit.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeadPL3Edit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HeadPL2Edit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DesignGroupControl)).BeginInit(); this.DesignGroupControl.SuspendLayout(); @@ -307,6 +313,10 @@ // // PiezometricGroupControl // + this.PiezometricGroupControl.Controls.Add(this.HeadPL4Edit); + this.PiezometricGroupControl.Controls.Add(this.HeadPL4Label); + this.PiezometricGroupControl.Controls.Add(this.HeadPL3Edit); + this.PiezometricGroupControl.Controls.Add(this.HeadPL3Label); this.PiezometricGroupControl.Controls.Add(this.HeadPL2Edit); this.PiezometricGroupControl.Controls.Add(this.HeadPL2Label); this.PiezometricGroupControl.Dock = System.Windows.Forms.DockStyle.Top; @@ -316,6 +326,62 @@ this.PiezometricGroupControl.TabIndex = 48; this.PiezometricGroupControl.Text = "Piezometric heights"; // + // HeadPL4Edit + // + this.HeadPL4Edit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.HeadPL4Edit.EditValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.HeadPL4Edit.EnterMoveNextControl = true; + this.HeadPL4Edit.Location = new System.Drawing.Point(154, 80); + this.HeadPL4Edit.Name = "HeadPL4Edit"; + this.HeadPL4Edit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; + this.HeadPL4Edit.Properties.EditFormat.FormatString = "F3"; + this.HeadPL4Edit.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; + this.HeadPL4Edit.Properties.HideSelection = false; + this.HeadPL4Edit.Properties.ValidateOnEnterKey = true; + this.HeadPL4Edit.Size = new System.Drawing.Size(119, 20); + this.HeadPL4Edit.TabIndex = 13; + // + // HeadPL4Label + // + this.HeadPL4Label.Location = new System.Drawing.Point(12, 83); + this.HeadPL4Label.Name = "HeadPL4Label"; + this.HeadPL4Label.Size = new System.Drawing.Size(45, 13); + this.HeadPL4Label.TabIndex = 12; + this.HeadPL4Label.Text = "Head PL4"; + // + // HeadPL3Edit + // + this.HeadPL3Edit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.HeadPL3Edit.EditValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.HeadPL3Edit.EnterMoveNextControl = true; + this.HeadPL3Edit.Location = new System.Drawing.Point(154, 54); + this.HeadPL3Edit.Name = "HeadPL3Edit"; + this.HeadPL3Edit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; + this.HeadPL3Edit.Properties.EditFormat.FormatString = "F3"; + this.HeadPL3Edit.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; + this.HeadPL3Edit.Properties.HideSelection = false; + this.HeadPL3Edit.Properties.ValidateOnEnterKey = true; + this.HeadPL3Edit.Size = new System.Drawing.Size(119, 20); + this.HeadPL3Edit.TabIndex = 11; + // + // HeadPL3Label + // + this.HeadPL3Label.Location = new System.Drawing.Point(12, 57); + this.HeadPL3Label.Name = "HeadPL3Label"; + this.HeadPL3Label.Size = new System.Drawing.Size(45, 13); + this.HeadPL3Label.TabIndex = 10; + this.HeadPL3Label.Text = "Head PL3"; + // // HeadPL2Edit // this.HeadPL2Edit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -743,6 +809,8 @@ ((System.ComponentModel.ISupportInitialize)(this.PiezometricGroupControl)).EndInit(); this.PiezometricGroupControl.ResumeLayout(false); this.PiezometricGroupControl.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.HeadPL4Edit.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeadPL3Edit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HeadPL2Edit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DesignGroupControl)).EndInit(); this.DesignGroupControl.ResumeLayout(false); @@ -777,6 +845,10 @@ private DevExpress.XtraEditors.TextEdit NameValue; private DevExpress.XtraEditors.LabelControl NameLabel; private DevExpress.XtraEditors.GroupControl PiezometricGroupControl; + private DevExpress.XtraEditors.SpinEdit HeadPL4Edit; + private DevExpress.XtraEditors.LabelControl HeadPL4Label; + private DevExpress.XtraEditors.SpinEdit HeadPL3Edit; + private DevExpress.XtraEditors.LabelControl HeadPL3Label; private DevExpress.XtraEditors.SpinEdit HeadPL2Edit; private DevExpress.XtraEditors.LabelControl HeadPL2Label; private DevExpress.XtraEditors.SpinEdit YEdit; Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs =================================================================== diff -u -r2445 -r2496 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 2445) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 2496) @@ -44,6 +44,8 @@ BindSupport.BindTextValueAndUnit(this, this.PolderLevelLabel, this.PolderLevelEdit, typeof (Location), "PolderLevel"); BindSupport.BindTextValueAndUnit(this, this.HeadPL2Label, this.HeadPL2Edit, typeof (Location), "HeadPL2"); + BindSupport.BindTextValueAndUnit(this, this.HeadPL3Label, this.HeadPL3Edit, typeof (Location), "HeadPl3"); + BindSupport.BindTextValueAndUnit(this, this.HeadPL4Label, this.HeadPL4Edit, typeof (Location), "HeadPl4"); BindSupport.BindTextValueAndUnit(this, this.TrafficLoadLabel, this.TrafficLoadEdit, typeof (Location), "TrafficLoad"); BindSupport.BindTextValueAndUnit(this, this.TL_DegreeOfConsolidationLabel, this.TL_DegreeOfConsolidationEdit, typeof(Location), "TL_DegreeOfConsolidation");