Index: src/Deltares.DSoilModel.Forms/BoringLookupControl.cs =================================================================== diff -u -r117 -r250 --- src/Deltares.DSoilModel.Forms/BoringLookupControl.cs (.../BoringLookupControl.cs) (revision 117) +++ src/Deltares.DSoilModel.Forms/BoringLookupControl.cs (.../BoringLookup1DControl.cs) (revision 250) @@ -6,26 +6,32 @@ namespace Deltares.DSoilModel.Forms { - public partial class BoringLookupControl : UserControl, IPropertyControl + /// + /// Control for Lookup (bridge) object. In geometry editor you see the Lookup objects when boring is added to geometry. + /// + public partial class BoringLookup1DControl : UserControl, IPropertyControl { - private BoringLookup2D boringLookup; + private BoringLookup1D boringLookup; - public BoringLookupControl() + /// + /// Constructor + /// + public BoringLookup1DControl() { InitializeComponent(); const string caption = "Boring Lookup"; ((IPropertyControl)this).Name = LocalizationManager.GetTranslatedText(this, caption); - - BindSupport.BindTextValueAndUnit(this, XLabel, XEdit, typeof(BoringLookup2D), "Xlocal"); - OffsetGroupControl.Text = caption; - LocalizationSupport.RegisterAndTranslate(typeof(CPTControl), OffsetGroupControl); + FormsSupport.RepairRightAnchoredControls(this); } #region IPropertyControl Members + /// + /// Gets or sets the object to be displayed in the property window. + /// public object SelectedObject { get @@ -34,7 +40,7 @@ } set { - var lookup = value as BoringLookup2D; + var lookup = value as BoringLookup1D; if (lookup != null) { boringLookup = lookup; @@ -44,6 +50,10 @@ } } + + /// + /// Whether or not the property control should be displayed. + /// public bool IsVisible { get Index: src/Deltares.DSoilModel.Forms/BoringLookupControl.Designer.cs =================================================================== diff -u -r6 -r250 --- src/Deltares.DSoilModel.Forms/BoringLookupControl.Designer.cs (.../BoringLookupControl.Designer.cs) (revision 6) +++ src/Deltares.DSoilModel.Forms/BoringLookupControl.Designer.cs (.../BoringLookup1DControl.Designer.cs) (revision 250) @@ -1,6 +1,6 @@ namespace Deltares.DSoilModel.Forms { - partial class BoringLookupControl + partial class BoringLookup1DControl { /// /// Required designer variable. @@ -28,52 +28,9 @@ /// private void InitializeComponent() { - this.OffsetGroupControl = new DevExpress.XtraEditors.GroupControl(); - this.XLabel = new DevExpress.XtraEditors.LabelControl(); - this.XEdit = new DevExpress.XtraEditors.SpinEdit(); - this.BoringControl = new BoringControl(); - ((System.ComponentModel.ISupportInitialize)(this.OffsetGroupControl)).BeginInit(); - this.OffsetGroupControl.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.XEdit.Properties)).BeginInit(); + this.BoringControl = new Deltares.DSoilModel.Forms.BoringControl(); this.SuspendLayout(); // - // OffsetGroupControl - // - this.OffsetGroupControl.Controls.Add(this.XLabel); - this.OffsetGroupControl.Controls.Add(this.XEdit); - this.OffsetGroupControl.Dock = System.Windows.Forms.DockStyle.Top; - this.OffsetGroupControl.Location = new System.Drawing.Point(0, 0); - this.OffsetGroupControl.Name = "OffsetGroupControl"; - this.OffsetGroupControl.Size = new System.Drawing.Size(260, 68); - this.OffsetGroupControl.TabIndex = 8; - this.OffsetGroupControl.Text = "Boring Lookup"; - // - // XLabel - // - this.XLabel.Location = new System.Drawing.Point(16, 33); - this.XLabel.Name = "XLabel"; - this.XLabel.Size = new System.Drawing.Size(43, 13); - this.XLabel.TabIndex = 6; - this.XLabel.Text = "X Offset "; - // - // XEdit - // - this.XEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.XEdit.EditValue = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.XEdit.EnterMoveNextControl = true; - this.XEdit.Location = new System.Drawing.Point(150, 30); - this.XEdit.Name = "XEdit"; - this.XEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; - this.XEdit.Properties.EditFormat.FormatString = "F3"; - this.XEdit.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; - this.XEdit.Properties.HideSelection = false; - this.XEdit.Size = new System.Drawing.Size(100, 20); - this.XEdit.TabIndex = 7; - // // BoringControl // this.BoringControl.Dock = System.Windows.Forms.DockStyle.Fill; @@ -83,27 +40,19 @@ this.BoringControl.Size = new System.Drawing.Size(260, 531); this.BoringControl.TabIndex = 9; // - // BoringLookupControl + // BoringLookup2DControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.BoringControl); - this.Controls.Add(this.OffsetGroupControl); - this.Name = "BoringLookupControl"; + this.Name = "BoringLookup2DControl"; this.Size = new System.Drawing.Size(260, 599); - ((System.ComponentModel.ISupportInitialize)(this.OffsetGroupControl)).EndInit(); - this.OffsetGroupControl.ResumeLayout(false); - this.OffsetGroupControl.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.XEdit.Properties)).EndInit(); this.ResumeLayout(false); } #endregion - private DevExpress.XtraEditors.GroupControl OffsetGroupControl; - private DevExpress.XtraEditors.LabelControl XLabel; - private DevExpress.XtraEditors.SpinEdit XEdit; private BoringControl BoringControl; } Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj =================================================================== diff -u -r248 -r250 --- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj (.../Deltares.DSoilModel.Forms.csproj) (revision 248) +++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj (.../Deltares.DSoilModel.Forms.csproj) (revision 250) @@ -193,6 +193,12 @@ CenterCrestLocationPropertyControl.cs + + UserControl + + + BoringLookup1DControl.cs + UserControl @@ -298,6 +304,9 @@ CenterCrestLocationPropertyControl.cs + + BoringLookup1DControl.cs + CPTControl.cs Designer Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs =================================================================== diff -u -r249 -r250 --- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 249) +++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 250) @@ -894,6 +894,7 @@ mainForm.DynamicPropertyControl.BuildDelayedPropertyControlsForType(typeof(Boring), () => new BoringControl()); mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new BoringLookup2DControl(), typeof(BoringLookup2D)); + mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new BoringLookup1DControl(), typeof(BoringLookup1D)); mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => PropertyControlFactory.GetPropertyControl(), typeof(BoringLayer)); mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => PropertyControlFactory.GetPropertyControl(), typeof(SoilSurfaceProfile));