|
@@ -353,10 +353,10 @@ namespace OTSIncAReportApp
|
|
|
|
|
|
//激活测量结果窗体
|
|
//激活测量结果窗体
|
|
this.m_RstWindow.Activate();
|
|
this.m_RstWindow.Activate();
|
|
- //激活分布图窗体
|
|
|
|
- this.m_SImageWindow.Activate();
|
|
|
|
|
|
+ //激活表图窗体
|
|
|
|
+ this.m_TablesWindow.Activate();
|
|
//----------------end the initialization
|
|
//----------------end the initialization
|
|
-
|
|
|
|
|
|
+
|
|
if (m_str_resultfilepaths != null)
|
|
if (m_str_resultfilepaths != null)
|
|
{
|
|
{
|
|
//构造函数直接接收传入的测量结果文件,并加载
|
|
//构造函数直接接收传入的测量结果文件,并加载
|
|
@@ -873,16 +873,13 @@ namespace OTSIncAReportApp
|
|
/// </summary>
|
|
/// </summary>
|
|
public void CreateNewWorkspaceWindow()
|
|
public void CreateNewWorkspaceWindow()
|
|
{
|
|
{
|
|
-
|
|
|
|
- //Show BSE图窗口
|
|
|
|
- CreateSampleWindow();
|
|
|
|
//创建测量数据窗口
|
|
//创建测量数据窗口
|
|
CreateCTablesWindow();
|
|
CreateCTablesWindow();
|
|
|
|
+ //Show BSE图窗口
|
|
|
|
+ CreateSampleWindow();
|
|
//创建图表窗口
|
|
//创建图表窗口
|
|
CreateChartsWindow();
|
|
CreateChartsWindow();
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
m_OutputNlog.Show(DockWindowPanel, OTS.WinFormsUI.Docking.DockState.DockRight);
|
|
m_OutputNlog.Show(DockWindowPanel, OTS.WinFormsUI.Docking.DockState.DockRight);
|
|
m_OutputNlog.Visible = true;
|
|
m_OutputNlog.Visible = true;
|
|
m_RstWindow.Show(DockWindowPanel, OTS.WinFormsUI.Docking.DockState.DockLeft);
|
|
m_RstWindow.Show(DockWindowPanel, OTS.WinFormsUI.Docking.DockState.DockLeft);
|