Add a preview button to the national standard interface

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -3,8 +3,6 @@ using OTS.WinFormsUI.Docking;
 using OTSCLRINTERFACE;
 using OTSDataType;
 using OTSIncAGraph.Controls;
-using OTSMeasureApp._0_OTSModel.OTSDataType;
-using OTSMeasureApp._4_OTSSamplespaceGraphicsPanel;
 using OTSMeasureApp._5_OTSMeasureStatuImageFun;
 using OTSModelSharp;
 using OTSModelSharp.ServiceCenter;
@@ -1763,12 +1761,29 @@ namespace OTSMeasureApp
         #region 显示标尺
         public void RulerInit()
         {
-            control_Ruler.ShowString = "100um";
-            control_Ruler.Value=100;
+            //control_Ruler.ShowString = "100um";
             int realwidth= m_MeasureAppForm.m_ProjRstData.GetWorkingSample().GetSEMDataMsr().GetScanFieldSize();
             double width = GetZoomedImageRect(picBox).Width;
-            f_ruler_size = width*100 /realwidth ;
-            control_Ruler.SetValue((int)f_ruler_size);
+            f_ruler_size = width /realwidth ;
+            double length = f_ruler_size;
+            for (int i=1;i<2000;i=i*2)
+            {
+                length = f_ruler_size * i;
+                if (length > width/15)
+                {
+                    if(i >1000)
+                    {
+                        control_Ruler.ShowString = (i/1000).ToString()+ "mm";
+                    }
+                    else
+                    {
+                        control_Ruler.ShowString = i.ToString() + "um";
+                    }
+                    break;
+                }
+            }
+            control_Ruler.Value= length;
+            control_Ruler.SetValue((int)length);
         }
         private void pictureBox1_MouseWheel(object sender, MouseEventArgs e)
         {

OTSIncAReportApp/1-UI/GBCalculate/ChineseStandardABCDDS.cs

@@ -1,16 +1,21 @@
-using System;
+using DevExpress.Export.Xl;
+using OTSCLRINTERFACE;
+using OTSCommon;
+using OTSIncAReportApp;
+using OTSIncAReportApp._1_UI.OTSTemplateDesigner;
+using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSIncAReportApp.OTSTemplateDesigner;
+using OTSIncAReportApp.ReportTemplate;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Data;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using OTSCLRINTERFACE;
-
-using System.Collections;
-using OTSCommon;
 
 namespace OTSIncAReportGB
 {
@@ -448,7 +453,7 @@ namespace OTSIncAReportGB
                     str_result = "";
                 }
             }
-
+            button_preview.Location = new Point(Gview_gzA.Location.X + Gview_gzA.Width + 20, Gview_gzA.Location.Y-10);
             Invalidate();
 
         }
@@ -868,5 +873,33 @@ namespace OTSIncAReportGB
         }
         #endregion
 
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        private void button_preview_Click(object sender, EventArgs e)
+        {
+            Cursor.Current = Cursors.WaitCursor;
+
+            MemoryManagementClass.FlushMemory(); 
+            Cursor.Current = Cursors.WaitCursor;
+        }
     }
 }

OTSIncAReportApp/1-UI/GBCalculate/ChineseStandardABCDDS.designer.cs

@@ -66,17 +66,18 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.button_preview = new System.Windows.Forms.Button();
+            this.log_5_1 = new System.Windows.Forms.Label();
+            this.log_4_1 = new System.Windows.Forms.Label();
+            this.log_3_1 = new System.Windows.Forms.Label();
+            this.log_2_1 = new System.Windows.Forms.Label();
+            this.log_1_1 = new System.Windows.Forms.Label();
+            this.log_5 = new System.Windows.Forms.Label();
             this.log_4 = new System.Windows.Forms.Label();
             this.log_3 = new System.Windows.Forms.Label();
             this.log_2 = new System.Windows.Forms.Label();
             this.log_1 = new System.Windows.Forms.Label();
             this.pictureBox5 = new System.Windows.Forms.PictureBox();
-            this.log_5 = new System.Windows.Forms.Label();
-            this.log_1_1 = new System.Windows.Forms.Label();
-            this.log_2_1 = new System.Windows.Forms.Label();
-            this.log_3_1 = new System.Windows.Forms.Label();
-            this.log_4_1 = new System.Windows.Forms.Label();
-            this.log_5_1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzA)).BeginInit();
             this.contextMenuStrip_A.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzB)).BeginInit();
@@ -420,6 +421,7 @@
             // 
             this.panel1.AutoScroll = true;
             this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.panel1.Controls.Add(this.button_preview);
             this.panel1.Controls.Add(this.log_5_1);
             this.panel1.Controls.Add(this.log_4_1);
             this.panel1.Controls.Add(this.log_3_1);
@@ -448,6 +450,82 @@
             this.panel1.Size = new System.Drawing.Size(1054, 1010);
             this.panel1.TabIndex = 12;
             // 
+            // button_preview
+            // 
+            this.button_preview.Location = new System.Drawing.Point(961, 3);
+            this.button_preview.Name = "button_preview";
+            this.button_preview.Size = new System.Drawing.Size(90, 32);
+            this.button_preview.TabIndex = 27;
+            this.button_preview.Text = "报表预览";
+            this.button_preview.UseVisualStyleBackColor = true;
+            this.button_preview.Click += new System.EventHandler(this.button_preview_Click);
+            // 
+            // log_5_1
+            // 
+            this.log_5_1.AutoSize = true;
+            this.log_5_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_5_1.ForeColor = System.Drawing.Color.Red;
+            this.log_5_1.Location = new System.Drawing.Point(51, 960);
+            this.log_5_1.Name = "log_5_1";
+            this.log_5_1.Size = new System.Drawing.Size(55, 16);
+            this.log_5_1.TabIndex = 26;
+            this.log_5_1.Text = "label9";
+            // 
+            // log_4_1
+            // 
+            this.log_4_1.AutoSize = true;
+            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_4_1.ForeColor = System.Drawing.Color.Red;
+            this.log_4_1.Location = new System.Drawing.Point(51, 924);
+            this.log_4_1.Name = "log_4_1";
+            this.log_4_1.Size = new System.Drawing.Size(55, 16);
+            this.log_4_1.TabIndex = 25;
+            this.log_4_1.Text = "label9";
+            // 
+            // log_3_1
+            // 
+            this.log_3_1.AutoSize = true;
+            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_3_1.ForeColor = System.Drawing.Color.Red;
+            this.log_3_1.Location = new System.Drawing.Point(51, 888);
+            this.log_3_1.Name = "log_3_1";
+            this.log_3_1.Size = new System.Drawing.Size(55, 16);
+            this.log_3_1.TabIndex = 24;
+            this.log_3_1.Text = "label8";
+            // 
+            // log_2_1
+            // 
+            this.log_2_1.AutoSize = true;
+            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_2_1.ForeColor = System.Drawing.Color.Red;
+            this.log_2_1.Location = new System.Drawing.Point(51, 852);
+            this.log_2_1.Name = "log_2_1";
+            this.log_2_1.Size = new System.Drawing.Size(55, 16);
+            this.log_2_1.TabIndex = 23;
+            this.log_2_1.Text = "label7";
+            // 
+            // log_1_1
+            // 
+            this.log_1_1.AutoSize = true;
+            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_1_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1_1.Location = new System.Drawing.Point(51, 816);
+            this.log_1_1.Name = "log_1_1";
+            this.log_1_1.Size = new System.Drawing.Size(55, 16);
+            this.log_1_1.TabIndex = 22;
+            this.log_1_1.Text = "label6";
+            // 
+            // log_5
+            // 
+            this.log_5.AutoSize = true;
+            this.log_5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_5.ForeColor = System.Drawing.Color.Red;
+            this.log_5.Location = new System.Drawing.Point(51, 942);
+            this.log_5.Name = "log_5";
+            this.log_5.Size = new System.Drawing.Size(55, 16);
+            this.log_5.TabIndex = 21;
+            this.log_5.Text = "label9";
+            // 
             // log_4
             // 
             this.log_4.AutoSize = true;
@@ -455,7 +533,7 @@
             this.log_4.ForeColor = System.Drawing.Color.Red;
             this.log_4.Location = new System.Drawing.Point(51, 906);
             this.log_4.Name = "log_4";
-            this.log_4.Size = new System.Drawing.Size(56, 16);
+            this.log_4.Size = new System.Drawing.Size(55, 16);
             this.log_4.TabIndex = 20;
             this.log_4.Text = "label9";
             // 
@@ -466,7 +544,7 @@
             this.log_3.ForeColor = System.Drawing.Color.Red;
             this.log_3.Location = new System.Drawing.Point(51, 870);
             this.log_3.Name = "log_3";
-            this.log_3.Size = new System.Drawing.Size(56, 16);
+            this.log_3.Size = new System.Drawing.Size(55, 16);
             this.log_3.TabIndex = 19;
             this.log_3.Text = "label8";
             // 
@@ -477,7 +555,7 @@
             this.log_2.ForeColor = System.Drawing.Color.Red;
             this.log_2.Location = new System.Drawing.Point(51, 834);
             this.log_2.Name = "log_2";
-            this.log_2.Size = new System.Drawing.Size(56, 16);
+            this.log_2.Size = new System.Drawing.Size(55, 16);
             this.log_2.TabIndex = 18;
             this.log_2.Text = "label7";
             // 
@@ -488,7 +566,7 @@
             this.log_1.ForeColor = System.Drawing.Color.Red;
             this.log_1.Location = new System.Drawing.Point(51, 798);
             this.log_1.Name = "log_1";
-            this.log_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1.Size = new System.Drawing.Size(55, 16);
             this.log_1.TabIndex = 17;
             this.log_1.Text = "label6";
             // 
@@ -501,72 +579,6 @@
             this.pictureBox5.TabIndex = 11;
             this.pictureBox5.TabStop = false;
             // 
-            // log_5
-            // 
-            this.log_5.AutoSize = true;
-            this.log_5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.log_5.ForeColor = System.Drawing.Color.Red;
-            this.log_5.Location = new System.Drawing.Point(51, 942);
-            this.log_5.Name = "log_5";
-            this.log_5.Size = new System.Drawing.Size(56, 16);
-            this.log_5.TabIndex = 21;
-            this.log_5.Text = "label9";
-            // 
-            // log_1_1
-            // 
-            this.log_1_1.AutoSize = true;
-            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.log_1_1.ForeColor = System.Drawing.Color.Red;
-            this.log_1_1.Location = new System.Drawing.Point(51, 816);
-            this.log_1_1.Name = "log_1_1";
-            this.log_1_1.Size = new System.Drawing.Size(56, 16);
-            this.log_1_1.TabIndex = 22;
-            this.log_1_1.Text = "label6";
-            // 
-            // log_2_1
-            // 
-            this.log_2_1.AutoSize = true;
-            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.log_2_1.ForeColor = System.Drawing.Color.Red;
-            this.log_2_1.Location = new System.Drawing.Point(51, 852);
-            this.log_2_1.Name = "log_2_1";
-            this.log_2_1.Size = new System.Drawing.Size(56, 16);
-            this.log_2_1.TabIndex = 23;
-            this.log_2_1.Text = "label7";
-            // 
-            // log_3_1
-            // 
-            this.log_3_1.AutoSize = true;
-            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.log_3_1.ForeColor = System.Drawing.Color.Red;
-            this.log_3_1.Location = new System.Drawing.Point(51, 888);
-            this.log_3_1.Name = "log_3_1";
-            this.log_3_1.Size = new System.Drawing.Size(56, 16);
-            this.log_3_1.TabIndex = 24;
-            this.log_3_1.Text = "label8";
-            // 
-            // log_4_1
-            // 
-            this.log_4_1.AutoSize = true;
-            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.log_4_1.ForeColor = System.Drawing.Color.Red;
-            this.log_4_1.Location = new System.Drawing.Point(51, 924);
-            this.log_4_1.Name = "log_4_1";
-            this.log_4_1.Size = new System.Drawing.Size(56, 16);
-            this.log_4_1.TabIndex = 25;
-            this.log_4_1.Text = "label9";
-            // 
-            // log_5_1
-            // 
-            this.log_5_1.AutoSize = true;
-            this.log_5_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.log_5_1.ForeColor = System.Drawing.Color.Red;
-            this.log_5_1.Location = new System.Drawing.Point(51, 960);
-            this.log_5_1.Name = "log_5_1";
-            this.log_5_1.Size = new System.Drawing.Size(56, 16);
-            this.log_5_1.TabIndex = 26;
-            this.log_5_1.Text = "label9";
-            // 
             // ChineseStandardABCDDS
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -642,5 +654,6 @@
         private System.Windows.Forms.Label log_3_1;
         private System.Windows.Forms.Label log_2_1;
         private System.Windows.Forms.Label log_1_1;
+        private System.Windows.Forms.Button button_preview;
     }
 }

OTSIncAReportApp/1-UI/GBCalculate/ChineseStandardABCDDS.resx

@@ -136,7 +136,7 @@
   <data name="pictureBox5.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAKoAAAAfCAYAAAB3cVZEAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAABhBJREFUeF7tmI1NZDEMhGmBGmiBHiiBGmiBDuiADqiACmiABuiAHvb0oTU3O2s7
+        wQAADsEBuJFr7QAABhBJREFUeF7tmI1NZDEMhGmBGmiBHiiBGmiBDuiADqiACmiABuiAHvb0oTU3O2s7
         eYvQ3ZMykgW8OI5/xk7urg4LCzvAIurCr+Lt7e3w+Ph4uLu7O1xdXZ3I7e3t4eHh4UtnhEXUhV8B5Lu5
         uTkjZyUQ+f39/bj7HEOifnx8pB1xfX399e35+fnw+fl51D4Ha53DdBX2OUeB05n+SJ6eno4W/gIf8BN/
         8Vv1+Zad77i/vz/ZxySoQJFCj/MuBXY4hxzp2eQTf15eXo6ap/AYZ4Q8KDRnrkeOu5qTT90zK/hd1aEk

OTSIncAReportApp/1-UI/GBCalculate/NationalStandardMethodTwo.cs

@@ -491,7 +491,7 @@ namespace OTSIncAReportGB
               
 
             }
-
+            button_preview.Location = new Point(Gview_gzA.Location.X + Gview_gzA.Width + 20, Gview_gzA.Location.Y - 10);
             Invalidate();
 
         }
@@ -1112,6 +1112,10 @@ namespace OTSIncAReportGB
         }
         #endregion
 
+        private void button_preview_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }
 

OTSIncAReportApp/1-UI/GBCalculate/NationalStandardMethodTwo.designer.cs

@@ -30,6 +30,11 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NationalStandardMethodTwo));
             this.panel1 = new System.Windows.Forms.Panel();
+            this.log_5_1 = new System.Windows.Forms.Label();
+            this.log_4_1 = new System.Windows.Forms.Label();
+            this.log_3_1 = new System.Windows.Forms.Label();
+            this.log_2_1 = new System.Windows.Forms.Label();
+            this.log_1_1 = new System.Windows.Forms.Label();
             this.log_5 = new System.Windows.Forms.Label();
             this.log_4 = new System.Windows.Forms.Label();
             this.log_3 = new System.Windows.Forms.Label();
@@ -48,11 +53,7 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.Gview_gzA = new System.Windows.Forms.DataGridView();
-            this.log_5_1 = new System.Windows.Forms.Label();
-            this.log_4_1 = new System.Windows.Forms.Label();
-            this.log_3_1 = new System.Windows.Forms.Label();
-            this.log_2_1 = new System.Windows.Forms.Label();
-            this.log_1_1 = new System.Windows.Forms.Label();
+            this.button_preview = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzDS)).BeginInit();
@@ -67,6 +68,7 @@
             // 
             this.panel1.AutoScroll = true;
             this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.panel1.Controls.Add(this.button_preview);
             this.panel1.Controls.Add(this.log_5_1);
             this.panel1.Controls.Add(this.log_4_1);
             this.panel1.Controls.Add(this.log_3_1);
@@ -96,6 +98,61 @@
             this.panel1.Size = new System.Drawing.Size(1009, 1147);
             this.panel1.TabIndex = 0;
             // 
+            // log_5_1
+            // 
+            this.log_5_1.AutoSize = true;
+            this.log_5_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_5_1.ForeColor = System.Drawing.Color.Red;
+            this.log_5_1.Location = new System.Drawing.Point(86, 1106);
+            this.log_5_1.Name = "log_5_1";
+            this.log_5_1.Size = new System.Drawing.Size(55, 16);
+            this.log_5_1.TabIndex = 27;
+            this.log_5_1.Text = "label6";
+            // 
+            // log_4_1
+            // 
+            this.log_4_1.AutoSize = true;
+            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_4_1.ForeColor = System.Drawing.Color.Red;
+            this.log_4_1.Location = new System.Drawing.Point(86, 1070);
+            this.log_4_1.Name = "log_4_1";
+            this.log_4_1.Size = new System.Drawing.Size(55, 16);
+            this.log_4_1.TabIndex = 26;
+            this.log_4_1.Text = "label9";
+            // 
+            // log_3_1
+            // 
+            this.log_3_1.AutoSize = true;
+            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_3_1.ForeColor = System.Drawing.Color.Red;
+            this.log_3_1.Location = new System.Drawing.Point(86, 1034);
+            this.log_3_1.Name = "log_3_1";
+            this.log_3_1.Size = new System.Drawing.Size(55, 16);
+            this.log_3_1.TabIndex = 25;
+            this.log_3_1.Text = "label8";
+            // 
+            // log_2_1
+            // 
+            this.log_2_1.AutoSize = true;
+            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_2_1.ForeColor = System.Drawing.Color.Red;
+            this.log_2_1.Location = new System.Drawing.Point(86, 998);
+            this.log_2_1.Name = "log_2_1";
+            this.log_2_1.Size = new System.Drawing.Size(55, 16);
+            this.log_2_1.TabIndex = 24;
+            this.log_2_1.Text = "label7";
+            // 
+            // log_1_1
+            // 
+            this.log_1_1.AutoSize = true;
+            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_1_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1_1.Location = new System.Drawing.Point(86, 962);
+            this.log_1_1.Name = "log_1_1";
+            this.log_1_1.Size = new System.Drawing.Size(55, 16);
+            this.log_1_1.TabIndex = 23;
+            this.log_1_1.Text = "label6";
+            // 
             // log_5
             // 
             this.log_5.AutoSize = true;
@@ -103,7 +160,7 @@
             this.log_5.ForeColor = System.Drawing.Color.Red;
             this.log_5.Location = new System.Drawing.Point(86, 1088);
             this.log_5.Name = "log_5";
-            this.log_5.Size = new System.Drawing.Size(56, 16);
+            this.log_5.Size = new System.Drawing.Size(55, 16);
             this.log_5.TabIndex = 21;
             this.log_5.Text = "label6";
             // 
@@ -114,7 +171,7 @@
             this.log_4.ForeColor = System.Drawing.Color.Red;
             this.log_4.Location = new System.Drawing.Point(86, 1052);
             this.log_4.Name = "log_4";
-            this.log_4.Size = new System.Drawing.Size(56, 16);
+            this.log_4.Size = new System.Drawing.Size(55, 16);
             this.log_4.TabIndex = 20;
             this.log_4.Text = "label9";
             // 
@@ -125,7 +182,7 @@
             this.log_3.ForeColor = System.Drawing.Color.Red;
             this.log_3.Location = new System.Drawing.Point(86, 1016);
             this.log_3.Name = "log_3";
-            this.log_3.Size = new System.Drawing.Size(56, 16);
+            this.log_3.Size = new System.Drawing.Size(55, 16);
             this.log_3.TabIndex = 19;
             this.log_3.Text = "label8";
             // 
@@ -136,7 +193,7 @@
             this.log_2.ForeColor = System.Drawing.Color.Red;
             this.log_2.Location = new System.Drawing.Point(86, 980);
             this.log_2.Name = "log_2";
-            this.log_2.Size = new System.Drawing.Size(56, 16);
+            this.log_2.Size = new System.Drawing.Size(55, 16);
             this.log_2.TabIndex = 18;
             this.log_2.Text = "label7";
             // 
@@ -147,7 +204,7 @@
             this.log_1.ForeColor = System.Drawing.Color.Red;
             this.log_1.Location = new System.Drawing.Point(86, 944);
             this.log_1.Name = "log_1";
-            this.log_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1.Size = new System.Drawing.Size(55, 16);
             this.log_1.TabIndex = 17;
             this.log_1.Text = "label6";
             // 
@@ -280,60 +337,14 @@
             this.Gview_gzA.Size = new System.Drawing.Size(918, 137);
             this.Gview_gzA.TabIndex = 0;
             // 
-            // log_5_1
-            // 
-            this.log_5_1.AutoSize = true;
-            this.log_5_1.Font = new System.Drawing.Font("宋体", 12F);
-            this.log_5_1.ForeColor = System.Drawing.Color.Red;
-            this.log_5_1.Location = new System.Drawing.Point(86, 1106);
-            this.log_5_1.Name = "log_5_1";
-            this.log_5_1.Size = new System.Drawing.Size(56, 16);
-            this.log_5_1.TabIndex = 27;
-            this.log_5_1.Text = "label6";
-            // 
-            // log_4_1
-            // 
-            this.log_4_1.AutoSize = true;
-            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F);
-            this.log_4_1.ForeColor = System.Drawing.Color.Red;
-            this.log_4_1.Location = new System.Drawing.Point(86, 1070);
-            this.log_4_1.Name = "log_4_1";
-            this.log_4_1.Size = new System.Drawing.Size(56, 16);
-            this.log_4_1.TabIndex = 26;
-            this.log_4_1.Text = "label9";
-            // 
-            // log_3_1
-            // 
-            this.log_3_1.AutoSize = true;
-            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F);
-            this.log_3_1.ForeColor = System.Drawing.Color.Red;
-            this.log_3_1.Location = new System.Drawing.Point(86, 1034);
-            this.log_3_1.Name = "log_3_1";
-            this.log_3_1.Size = new System.Drawing.Size(56, 16);
-            this.log_3_1.TabIndex = 25;
-            this.log_3_1.Text = "label8";
-            // 
-            // log_2_1
+            // button_preview
             // 
-            this.log_2_1.AutoSize = true;
-            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F);
-            this.log_2_1.ForeColor = System.Drawing.Color.Red;
-            this.log_2_1.Location = new System.Drawing.Point(86, 998);
-            this.log_2_1.Name = "log_2_1";
-            this.log_2_1.Size = new System.Drawing.Size(56, 16);
-            this.log_2_1.TabIndex = 24;
-            this.log_2_1.Text = "label7";
-            // 
-            // log_1_1
-            // 
-            this.log_1_1.AutoSize = true;
-            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F);
-            this.log_1_1.ForeColor = System.Drawing.Color.Red;
-            this.log_1_1.Location = new System.Drawing.Point(86, 962);
-            this.log_1_1.Name = "log_1_1";
-            this.log_1_1.Size = new System.Drawing.Size(56, 16);
-            this.log_1_1.TabIndex = 23;
-            this.log_1_1.Text = "label6";
+            this.button_preview.Location = new System.Drawing.Point(1012, 16);
+            this.button_preview.Name = "button_preview";
+            this.button_preview.Size = new System.Drawing.Size(90, 32);
+            this.button_preview.TabIndex = 28;
+            this.button_preview.Text = "报表预览";
+            this.button_preview.UseVisualStyleBackColor = true;
             // 
             // NationalStandardMethodTwo
             // 
@@ -383,5 +394,6 @@
         private System.Windows.Forms.Label log_3_1;
         private System.Windows.Forms.Label log_2_1;
         private System.Windows.Forms.Label log_1_1;
+        private System.Windows.Forms.Button button_preview;
     }
 }

OTSIncAReportApp/1-UI/GBCalculate/NationalStandardMethodTwo.resx

@@ -121,7 +121,7 @@
   <data name="pictureBox1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAKoAAAAfCAYAAAB3cVZEAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAABhBJREFUeF7tmI1NZDEMhGmBGmiBHiiBGmiBDuiADqiACmiABuiAHvb0oTU3O2s7
+        wQAADsEBuJFr7QAABhBJREFUeF7tmI1NZDEMhGmBGmiBHiiBGmiBDuiADqiACmiABuiAHvb0oTU3O2s7
         eYvQ3ZMykgW8OI5/xk7urg4LCzvAIurCr+Lt7e3w+Ph4uLu7O1xdXZ3I7e3t4eHh4UtnhEXUhV8B5Lu5
         uTkjZyUQ+f39/bj7HEOifnx8pB1xfX399e35+fnw+fl51D4Ha53DdBX2OUeB05n+SJ6eno4W/gIf8BN/
         8Vv1+Zad77i/vz/ZxySoQJFCj/MuBXY4hxzp2eQTf15eXo6ap/AYZ4Q8KDRnrkeOu5qTT90zK/hd1aEk