Index: src/Deltares.DSoilModel.Forms/SegmentControl.cs =================================================================== diff -u -r6 -r76 --- src/Deltares.DSoilModel.Forms/SegmentControl.cs (.../SegmentControl.cs) (revision 6) +++ src/Deltares.DSoilModel.Forms/SegmentControl.cs (.../SegmentControl.cs) (revision 76) @@ -24,24 +24,21 @@ BindSupport.BindTextAndValue(this, FillMaterialLabel, FillMaterialComboBox, a => a.DefaultFillMaterialName); BindSupport.Bind(this, ZonesCheckEdit, a => a.CreateSettlementZones, BindingType.LabelAndValue); BindSupport.Bind(this, GeometriesGridControl, typeof(SoilSegment), "StochasticSoilModel.StochasticSoilProfiles"); - BindSupport.Bind(this, SegmentPointsGridViewControl, a => a.Points); BindSupport.Bind(this, CptsGridViewControl, a => a.Cpts); BindSupport.Bind(this, BoringsGridViewControl, a => a.Borings); BindSupport.Bind(this, CPTsGroupControl, a => a.Cpts, BindingType.Visibility); BindSupport.Bind(this, BoringsGroupControl, a => a.Borings, BindingType.Visibility); BindSupport.Bind(this, StartConversionButton, a => a.Replace1DProfilesByCreating2DProfiles()); IdentificationGroupControl.Text = "IdentificationGroupControl"; ProfilesGroupControl.Text = "ProfilesGroupControl"; - SegmentPointsGroupControl.Text = "SegmentPointsGroupControl"; CPTsGroupControl.Text = "SegmentCptsGroupControl"; BoringsGroupControl.Text = "SegmentBoringsGroupControl"; StartConversionButton.Text = "StartConversionButton"; LocalizationSupport.RegisterAndTranslate(typeof(SegmentControl), IdentificationGroupControl, ProfilesGroupControl, - SegmentPointsGroupControl, CPTsGroupControl, BoringsGroupControl, StartConversionButton); + CPTsGroupControl, BoringsGroupControl, StartConversionButton); GeometriesGridControl.PropertyEditorReactionType = PropertyEditorReactionType.Ignore; - SegmentPointsGridViewControl.PropertyEditorReactionType = PropertyEditorReactionType.Ignore; CptsGridViewControl.PropertyEditorReactionType = PropertyEditorReactionType.Ignore; BoringsGridViewControl.PropertyEditorReactionType = PropertyEditorReactionType.Ignore; Index: src/Deltares.DSoilModel.Forms/SegmentControl.designer.cs =================================================================== diff -u -r6 -r76 --- src/Deltares.DSoilModel.Forms/SegmentControl.designer.cs (.../SegmentControl.designer.cs) (revision 6) +++ src/Deltares.DSoilModel.Forms/SegmentControl.designer.cs (.../SegmentControl.designer.cs) (revision 76) @@ -39,8 +39,6 @@ this.NameLabel = new DevExpress.XtraEditors.LabelControl(); this.ProfilesGroupControl = new DevExpress.XtraEditors.GroupControl(); this.GeometriesGridControl = new Deltares.Standard.Forms.DExpress.GridViewControl(); - this.SegmentPointsGroupControl = new DevExpress.XtraEditors.GroupControl(); - this.SegmentPointsGridViewControl = new Deltares.Standard.Forms.DExpress.GridViewControl(); this.CPTsGroupControl = new DevExpress.XtraEditors.GroupControl(); this.CptsGridViewControl = new Deltares.Standard.Forms.DExpress.GridViewControl(); this.BoringsGroupControl = new DevExpress.XtraEditors.GroupControl(); @@ -53,8 +51,6 @@ ((System.ComponentModel.ISupportInitialize)(this.NameEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ProfilesGroupControl)).BeginInit(); this.ProfilesGroupControl.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.SegmentPointsGroupControl)).BeginInit(); - this.SegmentPointsGroupControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.CPTsGroupControl)).BeginInit(); this.CPTsGroupControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.BoringsGroupControl)).BeginInit(); @@ -73,101 +69,95 @@ this.IdentificationGroupControl.Controls.Add(this.NameLabel); this.IdentificationGroupControl.Dock = System.Windows.Forms.DockStyle.Top; this.IdentificationGroupControl.Location = new System.Drawing.Point(0, 0); - this.IdentificationGroupControl.Margin = new System.Windows.Forms.Padding(4); this.IdentificationGroupControl.Name = "IdentificationGroupControl"; - this.IdentificationGroupControl.Size = new System.Drawing.Size(379, 167); + this.IdentificationGroupControl.Size = new System.Drawing.Size(284, 136); this.IdentificationGroupControl.TabIndex = 8; this.IdentificationGroupControl.Text = "Identification"; // // ZonesCheckEdit // - this.ZonesCheckEdit.Location = new System.Drawing.Point(19, 130); + this.ZonesCheckEdit.Location = new System.Drawing.Point(14, 106); + this.ZonesCheckEdit.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.ZonesCheckEdit.Name = "ZonesCheckEdit"; this.ZonesCheckEdit.Properties.Caption = "Use zones"; - this.ZonesCheckEdit.Size = new System.Drawing.Size(129, 20); + this.ZonesCheckEdit.Size = new System.Drawing.Size(97, 19); this.ZonesCheckEdit.TabIndex = 67; // // StartConversionButton // this.StartConversionButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.StartConversionButton.Location = new System.Drawing.Point(209, 127); + this.StartConversionButton.Location = new System.Drawing.Point(157, 103); + this.StartConversionButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.StartConversionButton.Name = "StartConversionButton"; - this.StartConversionButton.Size = new System.Drawing.Size(149, 23); + this.StartConversionButton.Size = new System.Drawing.Size(112, 19); this.StartConversionButton.TabIndex = 66; this.StartConversionButton.Text = "Start Conversion of 1D to 2D"; // // FillMaterialLabel // - this.FillMaterialLabel.Location = new System.Drawing.Point(21, 100); - this.FillMaterialLabel.Margin = new System.Windows.Forms.Padding(4); + this.FillMaterialLabel.Location = new System.Drawing.Point(16, 81); this.FillMaterialLabel.Name = "FillMaterialLabel"; - this.FillMaterialLabel.Size = new System.Drawing.Size(67, 16); + this.FillMaterialLabel.Size = new System.Drawing.Size(53, 13); this.FillMaterialLabel.TabIndex = 65; this.FillMaterialLabel.Text = "Fill material"; // // FillMaterialComboBox // this.FillMaterialComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FillMaterialComboBox.Location = new System.Drawing.Point(209, 97); - this.FillMaterialComboBox.Margin = new System.Windows.Forms.Padding(4); + this.FillMaterialComboBox.Location = new System.Drawing.Point(157, 79); this.FillMaterialComboBox.Name = "FillMaterialComboBox"; this.FillMaterialComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.FillMaterialComboBox.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.FillMaterialComboBox.Size = new System.Drawing.Size(149, 22); + this.FillMaterialComboBox.Size = new System.Drawing.Size(112, 20); this.FillMaterialComboBox.TabIndex = 64; // // SurfaceLineLabel // - this.SurfaceLineLabel.Location = new System.Drawing.Point(21, 70); - this.SurfaceLineLabel.Margin = new System.Windows.Forms.Padding(4); + this.SurfaceLineLabel.Location = new System.Drawing.Point(16, 57); this.SurfaceLineLabel.Name = "SurfaceLineLabel"; - this.SurfaceLineLabel.Size = new System.Drawing.Size(68, 16); + this.SurfaceLineLabel.Size = new System.Drawing.Size(56, 13); this.SurfaceLineLabel.TabIndex = 63; this.SurfaceLineLabel.Text = "Surface line"; // // SurfaceLineComboBox // this.SurfaceLineComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.SurfaceLineComboBox.Location = new System.Drawing.Point(209, 67); - this.SurfaceLineComboBox.Margin = new System.Windows.Forms.Padding(4); + this.SurfaceLineComboBox.Location = new System.Drawing.Point(157, 54); this.SurfaceLineComboBox.Name = "SurfaceLineComboBox"; this.SurfaceLineComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.SurfaceLineComboBox.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.SurfaceLineComboBox.Size = new System.Drawing.Size(149, 22); + this.SurfaceLineComboBox.Size = new System.Drawing.Size(112, 20); this.SurfaceLineComboBox.TabIndex = 62; // // NameEdit // this.NameEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.NameEdit.Location = new System.Drawing.Point(209, 37); - this.NameEdit.Margin = new System.Windows.Forms.Padding(4); + this.NameEdit.Location = new System.Drawing.Point(157, 30); this.NameEdit.Name = "NameEdit"; - this.NameEdit.Size = new System.Drawing.Size(149, 22); + this.NameEdit.Size = new System.Drawing.Size(112, 20); this.NameEdit.TabIndex = 13; // // NameLabel // - this.NameLabel.Location = new System.Drawing.Point(21, 41); - this.NameLabel.Margin = new System.Windows.Forms.Padding(4); + this.NameLabel.Location = new System.Drawing.Point(16, 33); this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(33, 16); + this.NameLabel.Size = new System.Drawing.Size(27, 13); this.NameLabel.TabIndex = 6; this.NameLabel.Text = "Name"; // // ProfilesGroupControl // this.ProfilesGroupControl.Controls.Add(this.GeometriesGridControl); this.ProfilesGroupControl.Dock = System.Windows.Forms.DockStyle.Top; - this.ProfilesGroupControl.Location = new System.Drawing.Point(0, 167); - this.ProfilesGroupControl.Margin = new System.Windows.Forms.Padding(4); + this.ProfilesGroupControl.Location = new System.Drawing.Point(0, 136); this.ProfilesGroupControl.Name = "ProfilesGroupControl"; - this.ProfilesGroupControl.Size = new System.Drawing.Size(379, 250); + this.ProfilesGroupControl.Size = new System.Drawing.Size(284, 203); this.ProfilesGroupControl.TabIndex = 10; this.ProfilesGroupControl.Text = "Geometries"; // @@ -177,55 +167,25 @@ this.GeometriesGridControl.AllowAddDeleteOnly = false; this.GeometriesGridControl.AllowedUserColumnFilters = null; this.GeometriesGridControl.AllowInserts = true; + this.GeometriesGridControl.AllowUserColumnFilterEdit = true; this.GeometriesGridControl.CurrentContext = null; this.GeometriesGridControl.Dock = System.Windows.Forms.DockStyle.Fill; this.GeometriesGridControl.EnableMasterViewMode = true; this.GeometriesGridControl.HideUnusedColumns = false; - this.GeometriesGridControl.Location = new System.Drawing.Point(2, 24); - this.GeometriesGridControl.Margin = new System.Windows.Forms.Padding(4); + this.GeometriesGridControl.Location = new System.Drawing.Point(2, 21); this.GeometriesGridControl.Name = "GeometriesGridControl"; this.GeometriesGridControl.SendSelectionChanged = true; this.GeometriesGridControl.ShowToolbar = true; - this.GeometriesGridControl.Size = new System.Drawing.Size(375, 224); + this.GeometriesGridControl.Size = new System.Drawing.Size(280, 180); this.GeometriesGridControl.TabIndex = 0; // - // SegmentPointsGroupControl - // - this.SegmentPointsGroupControl.Controls.Add(this.SegmentPointsGridViewControl); - this.SegmentPointsGroupControl.Dock = System.Windows.Forms.DockStyle.Top; - this.SegmentPointsGroupControl.Location = new System.Drawing.Point(0, 417); - this.SegmentPointsGroupControl.Margin = new System.Windows.Forms.Padding(4); - this.SegmentPointsGroupControl.Name = "SegmentPointsGroupControl"; - this.SegmentPointsGroupControl.Size = new System.Drawing.Size(379, 200); - this.SegmentPointsGroupControl.TabIndex = 11; - this.SegmentPointsGroupControl.Text = "Points"; - // - // SegmentPointsGridViewControl - // - this.SegmentPointsGridViewControl.AdjustHeightToFit = false; - this.SegmentPointsGridViewControl.AllowAddDeleteOnly = false; - this.SegmentPointsGridViewControl.AllowedUserColumnFilters = null; - this.SegmentPointsGridViewControl.AllowInserts = true; - this.SegmentPointsGridViewControl.CurrentContext = null; - this.SegmentPointsGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.SegmentPointsGridViewControl.EnableMasterViewMode = true; - this.SegmentPointsGridViewControl.HideUnusedColumns = false; - this.SegmentPointsGridViewControl.Location = new System.Drawing.Point(2, 24); - this.SegmentPointsGridViewControl.Margin = new System.Windows.Forms.Padding(4); - this.SegmentPointsGridViewControl.Name = "SegmentPointsGridViewControl"; - this.SegmentPointsGridViewControl.SendSelectionChanged = false; - this.SegmentPointsGridViewControl.ShowToolbar = true; - this.SegmentPointsGridViewControl.Size = new System.Drawing.Size(375, 174); - this.SegmentPointsGridViewControl.TabIndex = 0; - // // CPTsGroupControl // this.CPTsGroupControl.Controls.Add(this.CptsGridViewControl); this.CPTsGroupControl.Dock = System.Windows.Forms.DockStyle.Top; - this.CPTsGroupControl.Location = new System.Drawing.Point(0, 617); - this.CPTsGroupControl.Margin = new System.Windows.Forms.Padding(4); + this.CPTsGroupControl.Location = new System.Drawing.Point(0, 339); this.CPTsGroupControl.Name = "CPTsGroupControl"; - this.CPTsGroupControl.Size = new System.Drawing.Size(379, 181); + this.CPTsGroupControl.Size = new System.Drawing.Size(284, 147); this.CPTsGroupControl.TabIndex = 12; this.CPTsGroupControl.Text = "CPTs"; // @@ -235,26 +195,25 @@ this.CptsGridViewControl.AllowAddDeleteOnly = false; this.CptsGridViewControl.AllowedUserColumnFilters = null; this.CptsGridViewControl.AllowInserts = true; + this.CptsGridViewControl.AllowUserColumnFilterEdit = true; this.CptsGridViewControl.CurrentContext = null; this.CptsGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill; this.CptsGridViewControl.EnableMasterViewMode = true; this.CptsGridViewControl.HideUnusedColumns = false; - this.CptsGridViewControl.Location = new System.Drawing.Point(2, 24); - this.CptsGridViewControl.Margin = new System.Windows.Forms.Padding(4); + this.CptsGridViewControl.Location = new System.Drawing.Point(2, 21); this.CptsGridViewControl.Name = "CptsGridViewControl"; this.CptsGridViewControl.SendSelectionChanged = false; this.CptsGridViewControl.ShowToolbar = true; - this.CptsGridViewControl.Size = new System.Drawing.Size(375, 155); + this.CptsGridViewControl.Size = new System.Drawing.Size(280, 124); this.CptsGridViewControl.TabIndex = 0; // // BoringsGroupControl // this.BoringsGroupControl.Controls.Add(this.BoringsGridViewControl); this.BoringsGroupControl.Dock = System.Windows.Forms.DockStyle.Top; - this.BoringsGroupControl.Location = new System.Drawing.Point(0, 798); - this.BoringsGroupControl.Margin = new System.Windows.Forms.Padding(4); + this.BoringsGroupControl.Location = new System.Drawing.Point(0, 486); this.BoringsGroupControl.Name = "BoringsGroupControl"; - this.BoringsGroupControl.Size = new System.Drawing.Size(379, 188); + this.BoringsGroupControl.Size = new System.Drawing.Size(284, 153); this.BoringsGroupControl.TabIndex = 13; this.BoringsGroupControl.Text = "Borings"; // @@ -264,31 +223,29 @@ this.BoringsGridViewControl.AllowAddDeleteOnly = false; this.BoringsGridViewControl.AllowedUserColumnFilters = null; this.BoringsGridViewControl.AllowInserts = true; + this.BoringsGridViewControl.AllowUserColumnFilterEdit = true; this.BoringsGridViewControl.CurrentContext = null; this.BoringsGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill; this.BoringsGridViewControl.EnableMasterViewMode = true; this.BoringsGridViewControl.HideUnusedColumns = false; - this.BoringsGridViewControl.Location = new System.Drawing.Point(2, 24); - this.BoringsGridViewControl.Margin = new System.Windows.Forms.Padding(4); + this.BoringsGridViewControl.Location = new System.Drawing.Point(2, 21); this.BoringsGridViewControl.Name = "BoringsGridViewControl"; this.BoringsGridViewControl.SendSelectionChanged = false; this.BoringsGridViewControl.ShowToolbar = true; - this.BoringsGridViewControl.Size = new System.Drawing.Size(375, 162); + this.BoringsGridViewControl.Size = new System.Drawing.Size(280, 130); this.BoringsGridViewControl.TabIndex = 0; // // SegmentControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.Controls.Add(this.BoringsGroupControl); this.Controls.Add(this.CPTsGroupControl); - this.Controls.Add(this.SegmentPointsGroupControl); this.Controls.Add(this.ProfilesGroupControl); this.Controls.Add(this.IdentificationGroupControl); - this.Margin = new System.Windows.Forms.Padding(4); this.Name = "SegmentControl"; - this.Size = new System.Drawing.Size(379, 1051); + this.Size = new System.Drawing.Size(284, 854); ((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).EndInit(); this.IdentificationGroupControl.ResumeLayout(false); this.IdentificationGroupControl.PerformLayout(); @@ -298,8 +255,6 @@ ((System.ComponentModel.ISupportInitialize)(this.NameEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ProfilesGroupControl)).EndInit(); this.ProfilesGroupControl.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.SegmentPointsGroupControl)).EndInit(); - this.SegmentPointsGroupControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.CPTsGroupControl)).EndInit(); this.CPTsGroupControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.BoringsGroupControl)).EndInit(); @@ -315,8 +270,6 @@ private DevExpress.XtraEditors.TextEdit NameEdit; private DevExpress.XtraEditors.GroupControl ProfilesGroupControl; private Deltares.Standard.Forms.DExpress.GridViewControl GeometriesGridControl; - private DevExpress.XtraEditors.GroupControl SegmentPointsGroupControl; - private Standard.Forms.DExpress.GridViewControl SegmentPointsGridViewControl; private DevExpress.XtraEditors.GroupControl CPTsGroupControl; private Standard.Forms.DExpress.GridViewControl CptsGridViewControl; private DevExpress.XtraEditors.GroupControl BoringsGroupControl;