Browse Source

溯源和纯洁度 多样品 限制

cxs 1 year ago
parent
commit
d9c2e60000
2 changed files with 14 additions and 8 deletions
  1. 0 7
      OTSIncAReportApp/1-UI/GBCalculate/Purity.cs
  2. 14 1
      OTSIncAReportApp/1-UI/frmReportApp.cs

+ 0 - 7
OTSIncAReportApp/1-UI/GBCalculate/Purity.cs

@@ -72,13 +72,6 @@ namespace OTSIncAReportApp._1_UI.GBCalculate
             tB_result.Text = "";this.Refresh();
             Cursor = Cursors.WaitCursor;
             rBx_process.Text = "";
-            //Clipboard.SetDataObject(Properties.Resources.PurityFormula, false);//将图像放入剪切板
-            //if (rBx_process.CanPaste(DataFormats.GetFormat(DataFormats.Bitmap)))//判断剪切板内是否是图像
-            //{
-            //    rBx_process.Paste();//粘贴剪切板的内容到控件中
-            //    Clipboard.SetDataObject(String.Empty, false);//清空剪切板
-            //}
-            //rBx_process.AppendText("\n\n");
 
             int index = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)

+ 14 - 1
OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -1240,9 +1240,16 @@ namespace OTSIncAReportApp
 
         private void ribbonOrbMenuItem_InclusionsTraceability_Click(object sender, EventArgs e)
         {
+            string sou = m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
+            if(sou.Contains("+"))
+            {
+                MessageBox.Show("This function does not support multiple samples!");
+                return;
+            }
+            int index = m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             try
             {
-                System.Diagnostics.Process p = System.Diagnostics.Process.Start(".\\OTSInclusionsTraceability.exe", "\""+ m_rstDataMgr.CurResultFile.FilePath+ "\"");
+                System.Diagnostics.Process p = System.Diagnostics.Process.Start(".\\OTSInclusionsTraceability.exe", "\""+ m_rstDataMgr.ResultFilesList[index].FilePath+ "\"");
                 p.WaitForExit();
             }
             catch (Exception ex)
@@ -1263,6 +1270,12 @@ namespace OTSIncAReportApp
 
         private void ribbonOrbMenuItem_purity_Click(object sender, EventArgs e)
         {
+            string sou = m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
+            if (sou.Contains("+"))
+            {
+                MessageBox.Show("This function does not support multiple samples!");
+                return;
+            }
             try
             {
                 _1_UI.GBCalculate.Purity purity = new _1_UI.GBCalculate.Purity(this);