|
|
@@ -171,7 +171,6 @@ namespace OTSIncAReportApp
|
|
|
|
|
|
//初始化Ribbon类,操作Ribbon按钮的可用或者不可用
|
|
|
m_RibbonFun = new OTSRibbonFun(this);
|
|
|
-
|
|
|
//和DataMgr进行数据交互类
|
|
|
m_rstDataMgr = new ResultDataMgr(this);
|
|
|
//配置文件管理窗体
|
|
|
@@ -180,8 +179,6 @@ namespace OTSIncAReportApp
|
|
|
m_conditionChoose = new frmReportConditionChoose(this);
|
|
|
//树窗口
|
|
|
m_RstWindow = new frmMeasureRstMgr(this);
|
|
|
-
|
|
|
-
|
|
|
//分布图,排列图窗体
|
|
|
m_SImageWindow = new frmSampleImage(this);
|
|
|
//chart图表窗体
|
|
|
@@ -189,10 +186,6 @@ namespace OTSIncAReportApp
|
|
|
//grid表格窗体
|
|
|
m_TablesWindow = new frmTables(this);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
SetTag();
|
|
|
|
|
|
#region 国际化语言
|
|
|
@@ -223,7 +216,6 @@ namespace OTSIncAReportApp
|
|
|
ribbonOrbMenuItem_Extremum.Tag = "ribbonOrbMenuItem_Extremum";
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 窗体构造函数,可接收多个测量结果文件
|
|
|
/// </summary>
|
|
|
@@ -234,35 +226,34 @@ namespace OTSIncAReportApp
|
|
|
|
|
|
InitializeComponent();
|
|
|
log = NLog.LogManager.GetCurrentClassLogger();
|
|
|
-
|
|
|
|
|
|
|
|
|
- //树窗口
|
|
|
- m_RstWindow = new frmMeasureRstMgr(this);
|
|
|
+
|
|
|
+ //初始化Ribbon类,操作Ribbon按钮的可用或者不可用
|
|
|
+ m_RibbonFun = new OTSRibbonFun(this);
|
|
|
+ //和DataMgr进行数据交互类
|
|
|
+ m_rstDataMgr = new ResultDataMgr(this);//必须放在new frmReportSysConfig(this)前
|
|
|
+ //配置文件管理窗体
|
|
|
+ m_ReportSysConfigForm = new frmReportSysConfig(this);
|
|
|
//属性窗口
|
|
|
m_conditionChoose = new frmReportConditionChoose(this);
|
|
|
-
|
|
|
- //初始化图形组件中返回的颗粒列表对象
|
|
|
- SelectedParticles = new List<DataOperation.Model.Particle>();
|
|
|
-
|
|
|
-
|
|
|
+ //树窗口
|
|
|
+ m_RstWindow = new frmMeasureRstMgr(this);
|
|
|
//分布图,排列图窗体
|
|
|
m_SImageWindow = new frmSampleImage(this);
|
|
|
//chart图表窗体
|
|
|
m_ChartsWindow = new frmCharts(this);
|
|
|
//grid表格窗体
|
|
|
m_TablesWindow = new frmTables(this);
|
|
|
+ //初始化图形组件中返回的颗粒列表对象
|
|
|
+ SelectedParticles = new List<DataOperation.Model.Particle>();
|
|
|
|
|
|
- //初始化Ribbon类,操作Ribbon按钮的可用或者不可用
|
|
|
- m_RibbonFun = new OTSRibbonFun(this);
|
|
|
-
|
|
|
- //和DataMgr进行数据交互类
|
|
|
- m_rstDataMgr = new ResultDataMgr(this);//必须放在new frmReportSysConfig(this)前
|
|
|
- //配置文件管理窗体
|
|
|
- m_ReportSysConfigForm = new frmReportSysConfig(this);
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
SetTag();
|
|
|
-
|
|
|
#region 国际化语言
|
|
|
Language lan = new Language(this);
|
|
|
table = lan.GetNameTable(this.Name);
|