修改测量结束条件得顺序

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

@@ -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;