Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1024,7 +1024,7 @@
 	  <Control name="message4" text="X-axis travel cannot be empty" />
 	  <Control name="message5" text="Y-axis travel cannot be empty" />
 	  <Control name="message6" text="Y-Axis Travel Start Can't Be Empty" />
-	  <Control name="message7" text="Termination time cannot be empty" />
+	  <Control name="message7" text="StopMode cannot be empty" />
 	  <Control name="message8" text="The number of terminated frames cannot be null" />
 	  <Control name="message9" text="The number of terminated inclusions should not be empty" />
 	  <Control name="message10" text="Graphics cannot be empty" />

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1023,7 +1023,7 @@
 	  <Control name="message4" text="x轴行程起不能为空" />
 	  <Control name="message5" text="y轴行程不能为空" />
 	  <Control name="message6" text="y轴行程起不能为空" />
-	  <Control name="message7" text="终止时间不能为空" />
+	  <Control name="message7" text="测量终止方式不能为空" />
 	  <Control name="message8" text="终止帧图数不能为空" />
 	  <Control name="message9" text="终止夹杂物数不能为空" />
 	  <Control name="message10" text="取图方式不能为空" />

OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -162,8 +162,8 @@ namespace OTSDataType
         public enum OTS_MEASURE_STOP_MODE
         {
             CoverMode = 0,
-            FieldMode = 1,
-            ParticleMode = 2,
+            ParticleMode = 1,
+            FieldMode = 2,
             TimeMode = 3,
             AreaMode=4
         }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.Designer.cs

@@ -37,34 +37,34 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
             this.cB_TimeMode = new System.Windows.Forms.CheckBox();
             this.cB_CoverMode = new System.Windows.Forms.CheckBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.bt_ok = new System.Windows.Forms.Button();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
             this.cB_AreaMode = new System.Windows.Forms.CheckBox();
             this.tB_AreaMode = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
+            this.bt_ok = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.SuspendLayout();
             // 
             // cB_FieldMode
             // 
             this.cB_FieldMode.AutoSize = true;
-            this.cB_FieldMode.Location = new System.Drawing.Point(50, 84);
+            this.cB_FieldMode.Location = new System.Drawing.Point(50, 128);
             this.cB_FieldMode.Name = "cB_FieldMode";
             this.cB_FieldMode.Size = new System.Drawing.Size(120, 19);
             this.cB_FieldMode.TabIndex = 0;
-            this.cB_FieldMode.Text = "2.终止帧图数";
+            this.cB_FieldMode.Text = "3.终止帧图数";
             this.cB_FieldMode.UseVisualStyleBackColor = true;
             // 
             // tB_FieldMode
             // 
-            this.tB_FieldMode.Location = new System.Drawing.Point(247, 78);
+            this.tB_FieldMode.Location = new System.Drawing.Point(247, 122);
             this.tB_FieldMode.Name = "tB_FieldMode";
             this.tB_FieldMode.Size = new System.Drawing.Size(164, 25);
             this.tB_FieldMode.TabIndex = 1;
             // 
             // tB_ParticleMode
             // 
-            this.tB_ParticleMode.Location = new System.Drawing.Point(247, 123);
+            this.tB_ParticleMode.Location = new System.Drawing.Point(247, 78);
             this.tB_ParticleMode.Name = "tB_ParticleMode";
             this.tB_ParticleMode.Size = new System.Drawing.Size(164, 25);
             this.tB_ParticleMode.TabIndex = 3;
@@ -72,11 +72,11 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
             // cB_ParticleMode
             // 
             this.cB_ParticleMode.AutoSize = true;
-            this.cB_ParticleMode.Location = new System.Drawing.Point(50, 129);
+            this.cB_ParticleMode.Location = new System.Drawing.Point(50, 84);
             this.cB_ParticleMode.Name = "cB_ParticleMode";
             this.cB_ParticleMode.Size = new System.Drawing.Size(135, 19);
             this.cB_ParticleMode.TabIndex = 2;
-            this.cB_ParticleMode.Text = "3.终止夹杂物数";
+            this.cB_ParticleMode.Text = "2.终止夹杂物数";
             this.cB_ParticleMode.UseVisualStyleBackColor = true;
             // 
             // tB_TimeMode
@@ -127,15 +127,23 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "测量结束方式";
             // 
-            // bt_ok
+            // label2
             // 
-            this.bt_ok.Location = new System.Drawing.Point(375, 271);
-            this.bt_ok.Name = "bt_ok";
-            this.bt_ok.Size = new System.Drawing.Size(112, 33);
-            this.bt_ok.TabIndex = 7;
-            this.bt_ok.Text = "确 定";
-            this.bt_ok.UseVisualStyleBackColor = true;
-            this.bt_ok.Click += new System.EventHandler(this.bt_ok_Click);
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(419, 222);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(67, 15);
+            this.label2.TabIndex = 11;
+            this.label2.Text = "平方毫米";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(419, 176);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(22, 15);
+            this.label1.TabIndex = 10;
+            this.label1.Text = "秒";
             // 
             // cB_AreaMode
             // 
@@ -154,23 +162,15 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
             this.tB_AreaMode.Size = new System.Drawing.Size(164, 25);
             this.tB_AreaMode.TabIndex = 9;
             // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(419, 176);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(22, 15);
-            this.label1.TabIndex = 10;
-            this.label1.Text = "秒";
-            // 
-            // label2
+            // bt_ok
             // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(419, 222);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(67, 15);
-            this.label2.TabIndex = 11;
-            this.label2.Text = "平方毫米";
+            this.bt_ok.Location = new System.Drawing.Point(375, 271);
+            this.bt_ok.Name = "bt_ok";
+            this.bt_ok.Size = new System.Drawing.Size(112, 33);
+            this.bt_ok.TabIndex = 7;
+            this.bt_ok.Text = "确 定";
+            this.bt_ok.UseVisualStyleBackColor = true;
+            this.bt_ok.Click += new System.EventHandler(this.bt_ok_Click);
             // 
             // MeasureStopMode
             // 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.cs

@@ -87,7 +87,7 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
         }
         private void bt_ok_Click(object sender, EventArgs e)
         {
-            if(!cB_FieldMode.Checked&&!cB_ParticleMode.Checked&&!cB_TimeMode.Checked&&!cB_CoverMode.Checked)
+            if(!cB_FieldMode.Checked&&!cB_ParticleMode.Checked&&!cB_TimeMode.Checked&&!cB_CoverMode.Checked&&!cB_AreaMode.Checked)
             {
                 MessageBox.Show("You must choose at least one item!");
                 return;
@@ -103,14 +103,14 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
             {
                 m_StopMode += (int)OTS_MEASURE_STOP_MODE.CoverMode+1 + " + ";
             }
-            if (cB_FieldMode.Checked)
-            {
-                m_StopMode += (int)OTS_MEASURE_STOP_MODE.FieldMode+1 + " + ";
-            }
             if (cB_ParticleMode.Checked)
             {
                 m_StopMode += (int)OTS_MEASURE_STOP_MODE.ParticleMode+1 + " + ";
             }
+            if (cB_FieldMode.Checked)
+            {
+                m_StopMode += (int)OTS_MEASURE_STOP_MODE.FieldMode + 1 + " + ";
+            }
             if (cB_TimeMode.Checked)
             {
                 m_StopMode += (int)OTS_MEASURE_STOP_MODE.TimeMode+1 + " + ";
@@ -135,16 +135,16 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
                     return false;
                 }
             }
-            if(cB_ParticleMode.Checked)
-            { 
-                if (!int.TryParse(tB_ParticleMode.Text, out m_ParticleMode))
+            if(cB_TimeMode.Checked)
+            {
+                if (!int.TryParse(tB_TimeMode.Text, out m_TimeMode))
                 {
                     return false;
                 }
             }
-            if(cB_TimeMode.Checked)
+            if (cB_ParticleMode.Checked)
             {
-                if (!int.TryParse(tB_TimeMode.Text, out m_TimeMode))
+                if (!int.TryParse(tB_ParticleMode.Text, out m_ParticleMode))
                 {
                     return false;
                 }
@@ -170,16 +170,17 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
             {
                 switch ((OTS_MEASURE_STOP_MODE)(int.Parse(st[k])-1))
                 {
-                    case OTS_MEASURE_STOP_MODE.FieldMode: 
-                         { 
-                              cB_FieldMode.Checked=true; 
-                              break; 
-                         }
+                    
                     case OTS_MEASURE_STOP_MODE.ParticleMode:
                         {
                             cB_ParticleMode.Checked = true;
                             break;
                         }
+                    case OTS_MEASURE_STOP_MODE.FieldMode:
+                        {
+                            cB_FieldMode.Checked = true;
+                            break;
+                        }
                     case OTS_MEASURE_STOP_MODE.TimeMode:
                         {
                             cB_TimeMode.Checked = true;

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -306,11 +306,17 @@ namespace OTSMeasureApp
 
                     if (result == DialogResult.OK)
                     {
+                        string str = PropGrid[0, 0].Value.ToString();
+
                         PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.StopMode;
                         PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.FieldMode;
                         PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.TimeMode;
                         PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.ParticleMode;
                         PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.AreaMode;
+
+                        PropGrid[0, 0].Value = str;
+                        PropGrid.Refresh();
+                        PropGrid.Invalidate();
                     }
                 }
             }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -452,12 +452,14 @@ namespace OTSMeasureApp
 
             //测量终止方式
             tB_StopMode.Text = m_cotsimgscanprm.GetStopMode().ToString();
-            ////终止时间
-            //IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
-            ////终止帧图数
-            //IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
-            ////终止夹杂物数
-            //IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
+            //终止时间
+            IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
+            //终止帧图数
+            IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
+            //终止夹杂物数
+            IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
+            //终止面积
+            IDC_EDIT_STOP_INCA_AREA.Text = m_cotsimgscanprm.GetStopParamArea().ToString();
             //取图方式
             foreach (ComboBoxItem cbi in IDC_COMBO_FETCHIMGMODE.Items)
             {
@@ -1143,7 +1145,7 @@ namespace OTSMeasureApp
                 IDC_EDIT_YEND.SelectAll();
                 return false;
             }
-            if ("" == IDC_EDIT_STOP_TIME.Text)
+            if ("" == tB_StopMode.Text)
             {
                 string message = table["message7"].ToString();
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -1151,22 +1153,6 @@ namespace OTSMeasureApp
                 IDC_EDIT_STOP_TIME.SelectAll();
                 return false;
             }
-            if ("" == IDC_EDIT_STOP_FIELD_NUM.Text)
-            {
-                string message = table["message8"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                IDC_EDIT_STOP_FIELD_NUM.Focus();
-                IDC_EDIT_STOP_FIELD_NUM.SelectAll();
-                return false;
-            }
-            if ("" == IDC_EDIT_STOP_INCA_NUM.Text)
-            {
-                string message = table["message9"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                IDC_EDIT_STOP_INCA_NUM.Focus();
-                IDC_EDIT_STOP_INCA_NUM.SelectAll();
-                return false;
-            }
             if ("" == IDC_COMBO_FETCHIMGMODE.Text)
             {
                 string message = table["message10"].ToString();
@@ -1338,33 +1324,6 @@ namespace OTSMeasureApp
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 return false;
             }
-            //终止时间
-            if (false == rg.Match(IDC_EDIT_STOP_TIME.Text.Trim()).Success)
-            {
-                IDC_EDIT_STOP_TIME.Focus();
-                IDC_EDIT_STOP_TIME.SelectAll();
-                string message = table["message28"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                return false;
-            }
-            //终止帧图数
-            if (false == rg.Match(IDC_EDIT_STOP_FIELD_NUM.Text.Trim()).Success)
-            {
-                IDC_EDIT_STOP_FIELD_NUM.Focus();
-                IDC_EDIT_STOP_FIELD_NUM.SelectAll();
-                string message = table["message29"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                return false;
-            }
-            //终止夹杂物数
-            if (false == rg.Match(IDC_EDIT_STOP_INCA_NUM.Text.Trim()).Success)
-            {
-                IDC_EDIT_STOP_INCA_NUM.Focus();
-                IDC_EDIT_STOP_INCA_NUM.SelectAll();
-                string message = table["message30"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                return false;
-            }
             //颗粒面积范围 最小
             if (false == rgPositiveDecimals.Match(IDC_EDIT_PARTAREAMIN.Text.Trim()).Success)
             {

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1129,7 +1129,7 @@ namespace OTSIncAReportApp
                 arg4 = "Cleanness";//打卡清洁度报告
             }
 
-            string arg5 = "";
+            string arg5 = "null";
             process.Arguments = string.Format("{0} {1} {2} {3} {4}", arg1, arg2, arg3, arg4, arg5);  //多个参数用空格隔开
             process.WindowStyle = ProcessWindowStyle.Normal;
             Process.Start(process);

OTSIncAReportApp/1-UI/frmReportApp.Designer.cs

@@ -31,21 +31,21 @@
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.RibbonPanel ribbonPanel1;
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmReportApp));
-            OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new OTS.WinFormsUI.Docking.DockPanelSkin();
-            OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient1 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new OTS.WinFormsUI.Docking.DockPaneStripSkin();
-            OTS.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new OTS.WinFormsUI.Docking.DockPaneStripGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient2 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient3 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient4 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient5 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient6 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient7 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new OTS.WinFormsUI.Docking.DockPanelSkin();
+            OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient8 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new OTS.WinFormsUI.Docking.DockPaneStripSkin();
+            OTS.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new OTS.WinFormsUI.Docking.DockPaneStripGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient9 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient10 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient11 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient12 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient13 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient14 = new OTS.WinFormsUI.Docking.TabGradient();
             this.rbSave = new System.Windows.Forms.RibbonButton();
             this.rbSaveAs = new System.Windows.Forms.RibbonButton();
             this.rbOut = new System.Windows.Forms.RibbonButton();
@@ -55,6 +55,7 @@
             this.ribbon1 = new System.Windows.Forms.Ribbon();
             this.dpbOpen = new System.Windows.Forms.RibbonOrbMenuItem();
             this.dpbExport = new System.Windows.Forms.RibbonOrbMenuItem();
+            this.ribbonOrbMenuItem_Extremum = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonOrbOptionButton1 = new System.Windows.Forms.RibbonOrbOptionButton();
             this.ribbonOrbRecentItem1 = new System.Windows.Forms.RibbonOrbRecentItem();
             this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
@@ -183,7 +184,7 @@
             // 
             this.ribbon1.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ribbon1.Location = new System.Drawing.Point(0, 0);
-            this.ribbon1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ribbon1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.ribbon1.Minimized = false;
             this.ribbon1.Name = "ribbon1";
             // 
@@ -193,10 +194,11 @@
             this.ribbon1.OrbDropDown.Location = new System.Drawing.Point(0, 0);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbOpen);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbExport);
+            this.ribbon1.OrbDropDown.MenuItems.Add(this.ribbonOrbMenuItem_Extremum);
             this.ribbon1.OrbDropDown.Name = "";
             this.ribbon1.OrbDropDown.OptionItems.Add(this.ribbonOrbOptionButton1);
             this.ribbon1.OrbDropDown.RecentItems.Add(this.ribbonOrbRecentItem1);
-            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 160);
+            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 204);
             this.ribbon1.OrbDropDown.TabIndex = 0;
             this.ribbon1.OrbImage = global::OTSIncAReportApp.Properties.Resources.logo_40;
             // 
@@ -209,7 +211,7 @@
             this.ribbon1.QuickAcessToolbar.ToolTip = null;
             this.ribbon1.QuickAcessToolbar.ToolTipImage = null;
             this.ribbon1.QuickAcessToolbar.ToolTipTitle = null;
-            this.ribbon1.Size = new System.Drawing.Size(1276, 130);
+            this.ribbon1.Size = new System.Drawing.Size(1701, 130);
             this.ribbon1.TabIndex = 0;
             this.ribbon1.Tabs.Add(this.ribbonTab1);
             this.ribbon1.Tabs.Add(this.rbMenu);
@@ -246,6 +248,21 @@
             this.dpbExport.ToolTipTitle = null;
             this.dpbExport.Click += new System.EventHandler(this.ribbonOrbMenuItem4_Click);
             // 
+            // ribbonOrbMenuItem_Extremum
+            // 
+            this.ribbonOrbMenuItem_Extremum.AltKey = null;
+            this.ribbonOrbMenuItem_Extremum.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.ribbonOrbMenuItem_Extremum.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.ribbonOrbMenuItem_Extremum.Image = global::OTSIncAReportApp.Properties.Resources.编辑;
+            this.ribbonOrbMenuItem_Extremum.SmallImage = global::OTSIncAReportApp.Properties.Resources.编辑;
+            this.ribbonOrbMenuItem_Extremum.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.ribbonOrbMenuItem_Extremum.Tag = null;
+            this.ribbonOrbMenuItem_Extremum.Text = "极值分析法";
+            this.ribbonOrbMenuItem_Extremum.ToolTip = null;
+            this.ribbonOrbMenuItem_Extremum.ToolTipImage = null;
+            this.ribbonOrbMenuItem_Extremum.ToolTipTitle = null;
+            this.ribbonOrbMenuItem_Extremum.Click += new System.EventHandler(this.ribbonOrbMenuItem_Extremum_Click);
+            // 
             // ribbonOrbOptionButton1
             // 
             this.ribbonOrbOptionButton1.AltKey = null;
@@ -518,11 +535,11 @@
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RSGrayVal,
             this.mouseMatter});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 666);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 835);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(9, 0, 2, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(12, 0, 3, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1276, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(1701, 30);
             this.statusStrip1.TabIndex = 4;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -530,14 +547,14 @@
             // 
             this.RSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.RSGrayVal.Name = "RSGrayVal";
-            this.RSGrayVal.Size = new System.Drawing.Size(48, 21);
+            this.RSGrayVal.Size = new System.Drawing.Size(58, 24);
             this.RSGrayVal.Text = "灰度值";
             // 
             // mouseMatter
             // 
             this.mouseMatter.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.mouseMatter.Name = "mouseMatter";
-            this.mouseMatter.Size = new System.Drawing.Size(84, 21);
+            this.mouseMatter.Size = new System.Drawing.Size(103, 24);
             this.mouseMatter.Text = "鼠标点的物质";
             // 
             // DockWindowPanel
@@ -546,53 +563,53 @@
             this.DockWindowPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DockWindowPanel.DockBackColor = System.Drawing.SystemColors.Control;
             this.DockWindowPanel.Location = new System.Drawing.Point(0, 130);
-            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.DockWindowPanel.Name = "DockWindowPanel";
-            this.DockWindowPanel.Size = new System.Drawing.Size(1276, 536);
-            dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
-            dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
-            autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
-            tabGradient1.EndColor = System.Drawing.SystemColors.Control;
-            tabGradient1.StartColor = System.Drawing.SystemColors.Control;
-            tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-            autoHideStripSkin1.TabGradient = tabGradient1;
-            dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1;
-            tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight;
-            tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight;
-            tabGradient2.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripGradient1.ActiveTabGradient = tabGradient2;
-            dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control;
-            dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control;
-            dockPaneStripGradient1.DockStripGradient = dockPanelGradient2;
-            tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
-            tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
-            tabGradient3.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripGradient1.InactiveTabGradient = tabGradient3;
-            dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1;
-            tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption;
-            tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
-            tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
-            dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4;
-            tabGradient5.EndColor = System.Drawing.SystemColors.Control;
-            tabGradient5.StartColor = System.Drawing.SystemColors.Control;
-            tabGradient5.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5;
-            dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
-            dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
-            dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3;
-            tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            tabGradient6.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6;
-            tabGradient7.EndColor = System.Drawing.Color.Transparent;
-            tabGradient7.StartColor = System.Drawing.Color.Transparent;
-            tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-            dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7;
-            dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1;
-            dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1;
-            this.DockWindowPanel.Skin = dockPanelSkin1;
+            this.DockWindowPanel.Size = new System.Drawing.Size(1701, 705);
+            dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight;
+            dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight;
+            autoHideStripSkin2.DockStripGradient = dockPanelGradient4;
+            tabGradient8.EndColor = System.Drawing.SystemColors.Control;
+            tabGradient8.StartColor = System.Drawing.SystemColors.Control;
+            tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+            autoHideStripSkin2.TabGradient = tabGradient8;
+            dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2;
+            tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight;
+            tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight;
+            tabGradient9.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripGradient2.ActiveTabGradient = tabGradient9;
+            dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control;
+            dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control;
+            dockPaneStripGradient2.DockStripGradient = dockPanelGradient5;
+            tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight;
+            tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight;
+            tabGradient10.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripGradient2.InactiveTabGradient = tabGradient10;
+            dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2;
+            tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption;
+            tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+            tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+            tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+            dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11;
+            tabGradient12.EndColor = System.Drawing.SystemColors.Control;
+            tabGradient12.StartColor = System.Drawing.SystemColors.Control;
+            tabGradient12.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12;
+            dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight;
+            dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight;
+            dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6;
+            tabGradient13.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+            tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            tabGradient13.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13;
+            tabGradient14.EndColor = System.Drawing.Color.Transparent;
+            tabGradient14.StartColor = System.Drawing.Color.Transparent;
+            tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+            dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14;
+            dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2;
+            dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2;
+            this.DockWindowPanel.Skin = dockPanelSkin2;
             this.DockWindowPanel.TabIndex = 5;
             // 
             // ribbonOrbMenuItem5
@@ -639,15 +656,15 @@
             // 
             // frmReportApp
             // 
-            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(1276, 692);
+            this.ClientSize = new System.Drawing.Size(1701, 865);
             this.Controls.Add(this.DockWindowPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.ribbon1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Name = "frmReportApp";
             this.Text = "OTSReportApp";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -708,6 +725,7 @@
         private System.Windows.Forms.RibbonPanel ribbonPanelOthers;
         public System.Windows.Forms.RibbonButton ribbonButton3;
         public System.Windows.Forms.RibbonButton rbHelp;
+        private System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem_Extremum;
     }
 }
 

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -1071,7 +1071,7 @@ namespace OTSIncAReportApp
             }
             catch (Exception ex)
             {
-                log.Error("OTSPartA_STDEditor:" + ex.ToString());
+                log.Error("OTSExtremum:" + ex.ToString());
             }
         }
 

OTSIncAReportApp/1-UI/frmReportApp.resx

@@ -167,6 +167,12 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="rbOpen.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
+        JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -179,12 +185,6 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="rbOpen.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
-        JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonOrbOptionButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -161,14 +161,6 @@ namespace OTSIncAReportTemplate
             #region 选择报告模板
             if (m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk == true && m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk == true && m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk == true)
             {
-                //if (m_arg4== "inca")
-                //{
-                //rmReport1.LoadFromFile("Resources\\ReportTemplate\\Inca.rmf");
-                //}
-                //else
-                //{
-                //    rmReport1.LoadFromFile("Resources\\ReportTemplate\\Cleanness.rmf");
-                //}
                 rmReport1.LoadFromFile("Resources\\ReportTemplate\\OTS_Report.rmf");
             }
             else
@@ -209,9 +201,6 @@ namespace OTSIncAReportTemplate
             DataTable ls_dt_PicInclusionAreaClassRatio = list_dt.Where(aa => aa.TableName.Contains("Pic_InclusionareaClassRatio")).ToList()[0];
             rmReport1.AddDataSet(ls_dt_PicInclusionAreaClassRatio, "Pic_InclusionareaClassRatio");
 
-
-            //if (m_arg4 == "inca")
-            //{
                 if (m_mbszclass.M_SYXT.b_ck_syxt_xsmk)//判断三元相图是否显示
                 {
                     rmReport1.FindObject("GroupHeader1").Prop["Visible"] = true;
@@ -234,11 +223,7 @@ namespace OTSIncAReportTemplate
                         //ls_dt_picSYXT3T.Clear();
                     }
                 }
-                //else
-                //{
-                  
-                //}
-            //}
+           
 
 
             if (m_mbszclass.M_SY.b_ck_ypsm)//判断样品说明是否显示