修改界面多窗口

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" DelayQuantify="true" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -60,10 +60,10 @@ namespace OTSMeasureApp
                 m_MeasureApp = m_MeasureApps;
                
                 m_OTSSamplespaceWindow = m_MeasureApps.m_SamplepaceWindow;
-                m_OTSMeasureResultWindow = m_MeasureApp.m_MeasureResultWindow;
+                m_OTSMeasureResultWindow = m_MeasureApp.m_SubMidWindow.m_MeasureResultWindow;
                 m_SPropertyWindows = m_MeasureApp.m_SPropertyWindows;
             
-            m_OTSMeasureStatusWindow = m_MeasureApp.m_MessureStatuWindow;
+            m_OTSMeasureStatusWindow = m_MeasureApp.m_SubMidWindow.m_MessureStatuWindow;
 
             Control.CheckForIllegalCrossThreadCalls = false;
 
@@ -108,7 +108,7 @@ namespace OTSMeasureApp
                     if (m_OTSMeasureResultWindow == null)
                     {
                         //实例窗体
-                        m_OTSMeasureResultWindow = m_MeasureApp.m_MeasureResultWindow;
+                        m_OTSMeasureResultWindow = m_MeasureApp.m_SubMidWindow.m_MeasureResultWindow;
                     }
                     //设置工作样品
                     m_MeasureApp.m_ProjParam.SetWorkSample(m_OTSSamplespaceWindow.GetWorkingVisualSample().GetSampleName());
@@ -161,22 +161,22 @@ namespace OTSMeasureApp
         {
             //设置图像数据与状态
             OTSMeasureStatusWindow.bfResult = true;
-            m_MeasureApps.m_MessureStatuWindow.originalBseData = ImageData;
+            m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.originalBseData = ImageData;
             //获取灰度图数据
             double[] dGrayLevelData = new double[255];
             dGrayLevelData = GetStaticGaryData(ImageData, dGrayLevelData);
-            m_MeasureApps.m_MessureStatuWindow.dGrayLevelData = dGrayLevelData;
-            if (m_MeasureApps.m_MessureStatuWindow.panelXray.Visible)
+            m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.dGrayLevelData = dGrayLevelData;
+            if (m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.panelXray.Visible)
             {
-                m_MeasureApps.m_MessureStatuWindow.panelXray.Visible = false;
+                m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.panelXray.Visible = false;
             }
             //删除点标记
-            m_MeasureApps.m_MessureStatuWindow.DelElementPointGDIObjects();
+            m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.DelElementPointGDIObjects();
             //显示BSE图
-            m_MeasureApps.m_MessureStatuWindow.picBox.Show();
+            m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.picBox.Show();
   
             //显示BSE图
-            m_MeasureApps.m_MessureStatuWindow.ShowImage(width, height, ImageData);
+            m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.ShowImage(width, height, ImageData);
         }
         public double[] GetStaticGaryData(byte[] Imagedata, double[] GrayLevelData)
         {
@@ -268,9 +268,6 @@ namespace OTSMeasureApp
         }
 
 
-
-
-
             #region 测量方法
             //运行测量状态方法
         //public void UpdateMeasureState_samplespace_propertyGrid(ST_MSTMsg SMsrData)
@@ -412,9 +409,9 @@ namespace OTSMeasureApp
             //图片高度
             int height = SMsrData.STMSampleRetData.BSEData.iBSEDataHeight;
             //显示状态中的BSE图像控件
-            if (!m_MeasureApp.m_MessureStatuWindow.picBox.Visible)
+            if (!m_MeasureApp.m_SubMidWindow.m_MessureStatuWindow.picBox.Visible)
             {
-                m_MeasureApp.m_MessureStatuWindow.picBox.Visible = true;
+                m_MeasureApp.m_SubMidWindow.m_MessureStatuWindow.picBox.Visible = true;
             }
             //调用测量状态TAB中窗体 显示BSE图片
             OTSMeasureStatusWindowFun(width, height, ImageData, m_MeasureApp);

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -234,7 +234,7 @@ namespace OTSMeasureApp
                     if (MessageBox.Show("The result data of this sample will be deleted, continue?", "DeleteData", MessageBoxButtons.OKCancel) == DialogResult.OK)
                     {
                         m_MeasureAppForm.DeleteCurrentSampleData();
-                        m_MeasureAppForm.m_MeasureResultWindow.SetInit();
+                        m_MeasureAppForm.m_SubMidWindow.m_MeasureResultWindow.SetInit();
                         PrepareMeasureField(GetWorkingVisualSample(), MSR_RUN_TYPE.RUNMEASURE);
                     }
                     break;
@@ -813,7 +813,7 @@ namespace OTSMeasureApp
             if (m_visualSamples.Count == 0)
             {
                 //将测量状态初始化
-                m_MeasureAppForm.m_MessureStatuWindow.SetMeasureStatusInit();
+                m_MeasureAppForm.m_SubMidWindow.m_MessureStatuWindow.SetMeasureStatusInit();
             }
 
 
@@ -822,12 +822,12 @@ namespace OTSMeasureApp
 
         public void HideMessureStatuWindowBSEImage(OTSIncAMeasureAppForm m_MeasureApps)
         {
-            m_MeasureApps.m_MessureStatuWindow.picBox.Hide();
+            m_MeasureApps.m_SubMidWindow.m_MessureStatuWindow.picBox.Hide();
         }
         #region 将测量状态进度窗口信息初始化
         public void InitMeasureStateInfo()
         {
-            m_MeasureAppForm.m_MeasureResultWindow.SetInit();
+            m_MeasureAppForm.m_SubMidWindow.m_MeasureResultWindow.SetInit();
         }
         #endregion
 

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSSolutionWindow.cs

@@ -164,7 +164,7 @@ namespace OTSMeasureApp
                     m_TreeViewBase.GetTreeWorkSampleNode(m_WorkSampleName);
 
                     //删除时重新初始化结果窗体结果
-                    m_MeasureAppForm.m_MeasureResultWindow.SetInit();
+                    m_MeasureAppForm.m_SubMidWindow.m_MeasureResultWindow.SetInit();
                    
                 }
             }
@@ -333,7 +333,7 @@ namespace OTSMeasureApp
 
             }
             //通过样品名称获取
-            m_MeasureAppForm.m_MeasureResultWindow.GetResultFileInfoBySampleName(m_WorkSampleNode.Text);
+            m_MeasureAppForm.m_SubMidWindow.m_MeasureResultWindow.GetResultFileInfoBySampleName(m_WorkSampleNode.Text);
         }
 
         //Treeview增加测量样品节点
@@ -712,7 +712,7 @@ namespace OTSMeasureApp
                                 {
                                     treeView1.SelectedNode = treeView1.Nodes[0].Nodes[currentNodeIndex];
                                     //通过样品名称获取
-                                    m_MeasureAppForm.m_MeasureResultWindow.GetResultFileInfoBySampleName(treeView1.Nodes[0].Nodes[currentNodeIndex - 1].Text);
+                                    m_MeasureAppForm.m_SubMidWindow.m_MeasureResultWindow.GetResultFileInfoBySampleName(treeView1.Nodes[0].Nodes[currentNodeIndex - 1].Text);
                                     break;
                                 }
                             }
@@ -731,7 +731,7 @@ namespace OTSMeasureApp
                                 {
                                     treeView1.SelectedNode = treeView1.Nodes[0].Nodes[currentNodeIndex];
                                     //通过样品名称获取
-                                    m_MeasureAppForm.m_MeasureResultWindow.GetResultFileInfoBySampleName(treeView1.Nodes[0].Nodes[currentNodeIndex + 1].Text);
+                                    m_MeasureAppForm.m_SubMidWindow.m_MeasureResultWindow.GetResultFileInfoBySampleName(treeView1.Nodes[0].Nodes[currentNodeIndex + 1].Text);
                                     break;
                                 }
                             }

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -338,6 +338,12 @@
     <Compile Include="0-OTSModel\OTSDataType\SEMStageData.cs" />
     <Compile Include="0-OTSModel\OTSDataType\XmlResourceData.cs" />
     <Compile Include="0-OTSModel\OTSDataType\XMLSerialization.cs" />
+    <Compile Include="1-OTSMeasure\SubMidWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="1-OTSMeasure\SubMidWindow.Designer.cs">
+      <DependentUpon>SubMidWindow.cs</DependentUpon>
+    </Compile>
     <Compile Include="3-OTSDisplaySourceGridData\CPropItem.cs" />
     <Compile Include="3-OTSDisplaySourceGridData\CPropItemGrp.cs" />
     <Compile Include="3-OTSDisplaySourceGridData\MeasureStopMode.cs">
@@ -575,6 +581,9 @@
     <EmbeddedResource Include="1-OTSMeasure\Measure\ParamData\DIALOG_CHECK_PARAM_RESULT.resx">
       <DependentUpon>DIALOG_CHECK_PARAM_RESULT.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="1-OTSMeasure\SubMidWindow.resx">
+      <DependentUpon>SubMidWindow.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="3-OTSDisplaySourceGridData\MeasureStopMode.resx">
       <DependentUpon>MeasureStopMode.cs</DependentUpon>
     </EmbeddedResource>

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -23,6 +23,7 @@ using System.Runtime.Remoting.Channels.Ipc;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting;
 using OTSMeasureApp.ServiceCenter;
+using OTSMeasureApp._1_OTSMeasure;
 
 namespace OTSMeasureApp 
 {
@@ -65,13 +66,13 @@ namespace OTSMeasureApp
 
 
         //  Control m_ControlWindow = null;
-        public OTSMeasureResultWindow m_MeasureResultWindow = null;
-        public OTSMeasureStatusWindow m_MessureStatuWindow = null;
+        //public OTSMeasureResultWindow m_MeasureResultWindow = null;
+        //public OTSMeasureStatusWindow m_MessureStatuWindow = null;
         public OTSSamplespaceWindow m_SamplepaceWindow = null;
         public OTSMeasureOutputNlog m_OTSMeasureOutputNlog = null;
+        public SubMidWindow m_SubMidWindow = null;
+
 
-      
-      
         public COTSMeasureParam m_ProjParam = null;
 
         public COTSMsrPrjResultData m_ProjData;
@@ -121,14 +122,14 @@ namespace OTSMeasureApp
             // 初始化Docpanle
             m_SolutionWindows = new OTSSolutionWindow(this);
             m_SPropertyWindows = new OTSPropertyWindow(this);
+            m_SubMidWindow = new SubMidWindow();
 
-            m_MeasureResultWindow = new OTSMeasureResultWindow(this);
-            m_MeasureResultWindow.Text = m_MeasureRetWindowName;
-            m_MessureStatuWindow = new OTSMeasureStatusWindow(this);
-            m_MessureStatuWindow.Text = m_MeasureStauWindowName;
+            m_SubMidWindow.m_MeasureResultWindow = new OTSMeasureResultWindow(this);
+            m_SubMidWindow.m_MeasureResultWindow.Text = m_MeasureRetWindowName;
+            m_SubMidWindow.m_MessureStatuWindow = new OTSMeasureStatusWindow(this);
+            m_SubMidWindow.m_MessureStatuWindow.Text = m_MeasureStauWindowName;
             m_SamplepaceWindow = new OTSSamplespaceWindow(this);
             m_SamplepaceWindow.Text = m_SamplespaceWindowName;
-
      
 
             //和DataMgr进行数据交互类
@@ -233,21 +234,21 @@ namespace OTSMeasureApp
         public void ArrangWorkspaceWindow()
         {
             //Show 样品台窗口 
-           m_SamplepaceWindow.Show(dockPanel);
+           m_SamplepaceWindow.Show(dockPanel, DockState.Document);
 
-            //Show 测量状态窗口  
-           m_MessureStatuWindow.Show(dockPanel);
+           // //Show 测量状态窗口  
+           //m_MessureStatuWindow.Show(dockPanel);
 
-            //Show 测量结果窗口
-           m_MeasureResultWindow.Show(dockPanel);
-
-           m_SolutionWindows.Show(dockPanel, DockState.DockLeft);
+           // //Show 测量结果窗口
+           //m_MeasureResultWindow.Show(dockPanel);
+            m_SubMidWindow.Show(dockPanel, DockState.DockBottom);
+            m_SolutionWindows.Show(dockPanel);
             //Show 测量过程中Log显示窗口
            m_OTSMeasureOutputNlog.Show(dockPanel, DockState.DockRight);
 
            dockPanel.DockRightPortion = 365;
-
-           m_SPropertyWindows.Show(dockPanel);
+            dockPanel.DockBottomPortion = 400;
+            m_SPropertyWindows.Show(dockPanel);
 
            m_SamplepaceWindow.Activate();
 
@@ -456,9 +457,9 @@ namespace OTSMeasureApp
             //绘制样品台
             m_SamplepaceWindow.InitStageDisplay(m_ProjData.GetStage(), m_ProjData.GetSEMStageData());
             //隐藏XrayTable控件
-            m_MessureStatuWindow.HideXRayTable();
+            m_SubMidWindow.m_MessureStatuWindow.HideXRayTable();
             //新建时重新初始化结果窗体结果
-            m_MeasureResultWindow.SetInit();
+            m_SubMidWindow.m_MeasureResultWindow.SetInit();
         }
 
         // 新建样品时提示保存样品信息Messagebox 
@@ -642,9 +643,9 @@ namespace OTSMeasureApp
                 
                 m_SPropertyWindows.PropGrid.Hide();
                 m_SolutionWindows.treeView1.Nodes.Clear();
-                m_MessureStatuWindow.HideXRayTable();
+                m_SubMidWindow.m_MessureStatuWindow.HideXRayTable();
 
-                m_MeasureResultWindow.SetInit();
+                m_SubMidWindow.m_MeasureResultWindow.SetInit();
                 return ;
             }
             else 
@@ -660,7 +661,7 @@ namespace OTSMeasureApp
                 m_SolutionWindows.DeletCurrentSampleNode();
                 m_SolutionWindows.DisplaySample(sNewWSName);
                 //将测量状态初始化
-                m_MessureStatuWindow.SetMeasureStatusInit();
+                m_SubMidWindow.m_MessureStatuWindow.SetMeasureStatusInit();
                 //给工作样品台发送删除样品和新的工作样品名称
                 m_SamplepaceWindow.DeleteWorkSample(sDeleteWSampleName);
 
@@ -1079,8 +1080,8 @@ namespace OTSMeasureApp
             m_SPropertyWindows.Show(dockPanel);
             //显示样品台窗口 测量状态与测量结果窗口
             m_SamplepaceWindow.Show(dockPanel);
-            m_MessureStatuWindow.Show(dockPanel);
-            m_MeasureResultWindow.Show(dockPanel);
+            m_SubMidWindow.m_MessureStatuWindow.Show(dockPanel);
+            m_SubMidWindow.m_MeasureResultWindow.Show(dockPanel);
 
             //此处将在父窗体选项卡上显示
             foreach (Form child in this.MdiChildren)
@@ -1098,8 +1099,8 @@ namespace OTSMeasureApp
             m_SolutionWindows.DockPanel = null;
             m_SPropertyWindows.DockPanel = null;
             m_SamplepaceWindow.DockPanel = null;
-            m_MessureStatuWindow.DockPanel = null;
-            m_MeasureResultWindow.DockPanel = null;
+            m_SubMidWindow.m_MessureStatuWindow.DockPanel = null;
+            m_SubMidWindow.m_MeasureResultWindow.DockPanel = null;
             CloseAllDocuments();
         }
         private void CloseAllDocuments()