Просмотр исходного кода

处理空格及报告单击样品列,属性恢复概况bug

cxs 1 год назад
Родитель
Сommit
2780664ee8

+ 1 - 1
OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -999,7 +999,7 @@ namespace OTSMeasureApp
             {
                 if (IDC_COMBO_STDSelect.Text != "NoSTDDB")
                 {
-                    Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", Application.StartupPath + "\\Config\\SysData\\" + IDC_COMBO_STDSelect.Text+".db");
+                    Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", "\""+ Application.StartupPath + "\\Config\\SysData\\" + IDC_COMBO_STDSelect.Text+".db"+ "\"");
                     p.WaitForExit();
                 }
                 else

+ 1 - 1
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -1158,7 +1158,7 @@ namespace OTSMeasureApp
             {
                 try
                 {
-                    System.Diagnostics.Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", openFileDialog.FileName);
+                    System.Diagnostics.Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", "\""+openFileDialog.FileName+ "\"");
                     p.WaitForExit();
                 }
                 catch (Exception ex)

+ 2 - 6
OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -557,8 +557,8 @@ namespace OTSIncAReportApp
                         {
                             if (m_fileName != m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.ShowSourceName)
                             {
-                                //如果已经不是原先的数据源,则需要重新加载,设定为空,后面重新加载
-                                m_ReportApp.im_Control_DrawDistrbutionImageAndBSE = null;
+                                m_ReportApp.im_Control_DrawDistrbutionImageAndBSE = null;                                //如果已经不是原先的数据源,则需要重新加载,设定为空,后面重新加载
+
                             }
                         }
 
@@ -579,10 +579,6 @@ namespace OTSIncAReportApp
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.SetSelectParticle(m_ReportApp.GetSelectedParticles());
 
-                            
-
-                          
-
                         }
                         else if (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE == null)
                         {

+ 9 - 7
OTSIncAReportApp/1-UI/frmMeasureRstMgr.cs

@@ -152,7 +152,7 @@ namespace OTSIncAReportApp
                     treeView1.SelectedNode = e.Node;    //当前被选中
 
                     treeView1.Refresh();
-
+                     
                 }
             }
         }
@@ -256,11 +256,13 @@ namespace OTSIncAReportApp
                 checkednode = "";
             }
 
-
-            //插入多数据源选项
-            m_ReportApp.MoreSource = checkednode;
-            m_ConditionChoose.SetDefaultConditionValue();
-            m_ConditionChoose.DisCurrentPicProperty();//刷新
+            if (treeView1.Nodes.Count>1&&e.Button == MouseButtons.Left)//判断按下鼠标右键
+            {
+                //插入多数据源选项
+                m_ReportApp.MoreSource = checkednode;
+                m_ConditionChoose.SetDefaultConditionValue();
+                m_ConditionChoose.DisCurrentPicProperty();//刷新
+            }
 
 
             if (e.Button == MouseButtons.Right)//判断按下鼠标右键
@@ -670,7 +672,7 @@ namespace OTSIncAReportApp
 
             CIncAFileMgr pDBFileMgr = new CIncAFileMgr(dbfile);
             var mergedpartdb = pDBFileMgr.GetMergedParticleDB();
-
+            mergedpartdb.RemoveAllRows();
 
             foreach (COTSParticleClr part in mergedParts)
             {

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

@@ -1242,7 +1242,7 @@ namespace OTSIncAReportApp
         {
             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.CurResultFile.FilePath+ "\"");
                 p.WaitForExit();
             }
             catch (Exception ex)