修改联合终止条件生效条件

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -294,31 +294,63 @@ namespace OTSMeasureApp
             if(m_SampleGrid.m_ClickRow>=0 && m_SampleGrid.m_ClickColumn>=0)
             {
                 m_SampleGrid.SetGridTitleStatus();
-                if(m_SampleGrid.m_ClickRow==9&& m_SampleGrid.m_ClickColumn==2)
+                if(m_MeasureAppForm.m_ProjData.m_nPackId == otsdataconst.OTS_SysType_ID.CleannessA)
                 {
-                    StopModeDialog = new MeasureStopMode();
-                    StopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
-                    StopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
-                    StopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
-                    StopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
-                    StopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow+4, m_SampleGrid.m_ClickColumn].Value.ToString());
-                    DialogResult result = StopModeDialog.ShowDialog();
+                    if (m_SampleGrid.m_ClickRow == 7 && m_SampleGrid.m_ClickColumn == 2)
+                    {
+                        StopModeDialog = new MeasureStopMode();
+                        StopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        StopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        StopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        StopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
+                        StopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        DialogResult result = StopModeDialog.ShowDialog();
+
+                        if (result == DialogResult.OK)
+                        {
+                            string str = PropGrid[0, 0].Value.ToString();
 
-                    if (result == DialogResult.OK)
+                            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();
+                        }
+                    }
+                }
+                else
+                {
+                    if (m_SampleGrid.m_ClickRow == 9 && m_SampleGrid.m_ClickColumn == 2)
                     {
-                        string str = PropGrid[0, 0].Value.ToString();
+                        StopModeDialog = new MeasureStopMode();
+                        StopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        StopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        StopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        StopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
+                        StopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        DialogResult result = StopModeDialog.ShowDialog();
+
+                        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[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();
+                            PropGrid[0, 0].Value = str;
+                            PropGrid.Refresh();
+                            PropGrid.Invalidate();
+                        }
                     }
                 }
+                
             }
             
         }