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