|
@@ -819,26 +819,26 @@ namespace OTSIncAReportApp
|
|
|
/// <param name="WorkWindow"></param>
|
|
|
/// <param name="iType"></param>
|
|
|
/// <returns></returns>
|
|
|
- private OTS.WinFormsUI.Docking.DockContent CreateNewDocument(OTS.WinFormsUI.Docking.DockContent WorkWindow, DisplayPicutureType iType)
|
|
|
- {
|
|
|
- string text = "";
|
|
|
- if (iType == DisplayPicutureType.AnalyzeImg)
|
|
|
- {
|
|
|
- text = "分析图";
|
|
|
- }
|
|
|
- else if (iType == DisplayPicutureType.AnalyzeDataTable)
|
|
|
- {
|
|
|
- text = "分析数据表";
|
|
|
- }
|
|
|
- else if (iType == DisplayPicutureType.AnalyzeDataChart)
|
|
|
- {
|
|
|
- text = "分析数据图";
|
|
|
- }
|
|
|
-
|
|
|
- WorkWindow.Text = text;
|
|
|
- return WorkWindow;
|
|
|
-
|
|
|
- }
|
|
|
+ //private OTS.WinFormsUI.Docking.DockContent CreateNewDocument(OTS.WinFormsUI.Docking.DockContent WorkWindow, DisplayPicutureType iType)
|
|
|
+ //{
|
|
|
+ // string text = "";
|
|
|
+ // if (iType == DisplayPicutureType.AnalyzeImg)
|
|
|
+ // {
|
|
|
+ // text = "分析图";
|
|
|
+ // }
|
|
|
+ // else if (iType == DisplayPicutureType.AnalyzeDataTable)
|
|
|
+ // {
|
|
|
+ // text = "分析数据表";
|
|
|
+ // }
|
|
|
+ // else if (iType == DisplayPicutureType.AnalyzeDataChart)
|
|
|
+ // {
|
|
|
+ // text = "分析数据图";
|
|
|
+ // }
|
|
|
+
|
|
|
+ // WorkWindow.Text = text;
|
|
|
+ // return WorkWindow;
|
|
|
+
|
|
|
+ //}
|
|
|
|
|
|
/// <summary>
|
|
|
/// 创建样品BSE图窗口
|
|
@@ -849,7 +849,7 @@ namespace OTSIncAReportApp
|
|
|
{
|
|
|
m_SImageWindow = new frmSampleImage(this);
|
|
|
}
|
|
|
- m_SImageWindow = (frmSampleImage)CreateNewDocument(m_SImageWindow, DisplayPicutureType.AnalyzeImg);
|
|
|
+ //m_SImageWindow = (frmSampleImage)CreateNewDocument(m_SImageWindow, DisplayPicutureType.AnalyzeImg);
|
|
|
if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
|
|
|
{
|
|
|
m_SImageWindow.MdiParent = this;
|
|
@@ -871,7 +871,7 @@ namespace OTSIncAReportApp
|
|
|
m_CTablesWindow = new frmTables(this);
|
|
|
}
|
|
|
|
|
|
- m_CTablesWindow = (frmTables)CreateNewDocument(m_CTablesWindow, DisplayPicutureType.AnalyzeDataTable);
|
|
|
+ //m_CTablesWindow = (frmTables)CreateNewDocument(m_CTablesWindow, DisplayPicutureType.AnalyzeDataTable);
|
|
|
|
|
|
if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
|
|
|
{
|
|
@@ -895,7 +895,7 @@ namespace OTSIncAReportApp
|
|
|
m_CChartsWindow = new frmCharts(this);
|
|
|
}
|
|
|
|
|
|
- m_CChartsWindow = (frmCharts)CreateNewDocument(m_CChartsWindow, DisplayPicutureType.AnalyzeDataChart);
|
|
|
+ //m_CChartsWindow = (frmCharts)CreateNewDocument(m_CChartsWindow, DisplayPicutureType.AnalyzeDataChart);
|
|
|
|
|
|
if (DockWindowPanel.DocumentStyle == DocumentStyle.SystemMdi)
|
|
|
{
|