Browse Source

处理bug-测量结果多夹杂物种类时无法下拉

cxs 3 years ago
parent
commit
dfbccc3425

+ 3 - 1
OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureResultWindow.Designer.cs

@@ -332,6 +332,8 @@
             // 
             this.dg_Info.AllowUserToAddRows = false;
             this.dg_Info.AllowUserToDeleteRows = false;
+            this.dg_Info.AllowUserToResizeColumns = false;
+            this.dg_Info.AllowUserToResizeRows = false;
             this.dg_Info.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
@@ -358,11 +360,11 @@
             dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
             dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
             this.dg_Info.DefaultCellStyle = dataGridViewCellStyle6;
-            this.dg_Info.Enabled = false;
             this.dg_Info.Location = new System.Drawing.Point(8, 73);
             this.dg_Info.Margin = new System.Windows.Forms.Padding(2);
             this.dg_Info.Name = "dg_Info";
             this.dg_Info.ReadOnly = true;
+            this.dg_Info.RowHeadersVisible = false;
             this.dg_Info.RowTemplate.Height = 24;
             this.dg_Info.Size = new System.Drawing.Size(1073, 593);
             this.dg_Info.TabIndex = 54;

+ 6 - 0
OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureResultWindow.cs

@@ -98,6 +98,12 @@ namespace OTSMeasureApp
 
             CheckForIllegalCrossThreadCalls = false;
              log = NLog.LogManager.GetCurrentClassLogger();
+
+            for(int i=0;i< dg_Info.ColumnCount;i++)
+            {
+                dg_Info.Columns[i].SortMode = DataGridViewColumnSortMode.NotSortable;
+            }
+            dg_Info.RowHeadersDefaultCellStyle.Padding = new Padding(dg_Info.RowHeadersWidth);
         }
 
         private void OTSMeasureResultWindow_SizeChanged(object sender, EventArgs e)

+ 14 - 15
OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -168,7 +168,7 @@
             this.rbMenu.BorderMode = System.Windows.Forms.RibbonWindowMode.InsideWindow;
             this.rbMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.rbMenu.Location = new System.Drawing.Point(0, 0);
-            this.rbMenu.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.rbMenu.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -201,7 +201,7 @@
             this.rbMenu.QuickAcessToolbar.Image = null;
             this.rbMenu.QuickAcessToolbar.Tag = null;
             this.rbMenu.QuickAcessToolbar.ToolTipImage = null;
-            this.rbMenu.Size = new System.Drawing.Size(1277, 130);
+            this.rbMenu.Size = new System.Drawing.Size(1703, 130);
             this.rbMenu.TabIndex = 0;
             this.rbMenu.Tabs.Add(this.rbTabHome);
             this.rbMenu.Tabs.Add(this.rbTabView);
@@ -668,7 +668,6 @@
             this.rbPause.ToolTip = null;
             this.rbPause.ToolTipImage = null;
             this.rbPause.ToolTipTitle = null;
-          
             this.rbPause.Click += new System.EventHandler(this.rbPause_Click);
             // 
             // rbStop
@@ -849,11 +848,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 671);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 841);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(3, 0, 19, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1277, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(1703, 30);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -861,20 +860,20 @@
             // 
             this.TSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.TSGrayVal.Name = "TSGrayVal";
-            this.TSGrayVal.Size = new System.Drawing.Size(48, 21);
+            this.TSGrayVal.Size = new System.Drawing.Size(58, 24);
             this.TSGrayVal.Text = "灰度值";
             // 
             // STSemCoordinate
             // 
             this.STSemCoordinate.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.STSemCoordinate.Name = "STSemCoordinate";
-            this.STSemCoordinate.Size = new System.Drawing.Size(62, 21);
+            this.STSemCoordinate.Size = new System.Drawing.Size(75, 24);
             this.STSemCoordinate.Text = "SEM坐标";
             // 
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(54, 21);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(65, 24);
             this.toolStripStatusLabel1.Text = "IsReady";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.toolStripStatusLabel1.Visible = false;
@@ -889,9 +888,9 @@
             this.dockPanel.DockLeftPortion = 0.21D;
             this.dockPanel.DockRightPortion = 0.27D;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1277, 541);
+            this.dockPanel.Size = new System.Drawing.Size(1703, 711);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -968,9 +967,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1277, 697);
+            this.ClientSize = new System.Drawing.Size(1703, 871);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -978,8 +977,8 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.MinimumSize = new System.Drawing.Size(679, 501);
+            this.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.MinimumSize = new System.Drawing.Size(899, 615);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";