Browse Source

报告程序修正,导出时没有标准库发生弹窗的问题,还有导出报告时没有打开过分布图发生报错为空的问题

zhangjiaxin 1 year ago
parent
commit
1921a7f8d2

+ 1 - 1
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -219,7 +219,7 @@ namespace OTSIncAReportGrids
                     else
                     {
                         userLibraryData = null;
-                        MessageBox.Show("未读取到用户标准库!");
+                        //MessageBox.Show("未读取到用户标准库!");
                     }
                 }
                 //初始化底层操作类

+ 1 - 1
OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1656,7 +1656,7 @@ namespace OTSIncAReportApp
 
             //导出完成,打开报表
             OpenOTSINcAreportTemplateAPP();
-            m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
+            //m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
 
             this.Close();
         }

+ 19 - 4
OTSIncAReportApp/1-UI/frmTables.cs

@@ -13,7 +13,9 @@ namespace OTSIncAReportApp
     public partial class frmTables : DockContent
     {
         #region 变量定义
-        private frmReportApp m_ReportApp = null;
+        //private frmReportApp m_ReportApp = null;
+        private frmReportApp m_ReportApp { get; set; }
+
         Hashtable table;
         #endregion
 
@@ -43,11 +45,24 @@ namespace OTSIncAReportApp
             //根据标签索引 显示默认的数据图表
             if (m_ReportApp.m_TablesWindow.Controls != null)
             {
-                if (m_ReportApp.m_TablesWindow.Controls.Count == 0|| m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles()|| m_ReportApp.GetSelectedParticles().Count!=0)
+                if (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE != null)
                 {
-                    m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataTable;
-                    m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
+                    if (m_ReportApp.m_TablesWindow.Controls.Count == 0 || m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles() || m_ReportApp.GetSelectedParticles().Count != 0)
+                    {
+                        m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataTable;
+                        m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
+                    }
                 }
+
+                else
+                {
+                    if (m_ReportApp.m_TablesWindow.Controls.Count == 0 || m_ReportApp.GetSelectedParticles().Count != 0)
+                    {
+                        m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataTable;
+                        m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
+                    }
+                }
+
             }
 
             m_ReportApp.m_RstWindow.SelectWorkSampleNode();

+ 1 - 0
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -879,6 +879,7 @@
     <EmbeddedResource Include="1-UI\OTSTemplateDesigner\OTSReport_TemplateDesignerRM.resx">
       <DependentUpon>OTSReport_TemplateDesignerRM.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="ReportTemplate\GBReport.resx">
       <DependentUpon>GBReport.cs</DependentUpon>
     </EmbeddedResource>