improve OxfordExtender/ExtenderWrapperIpc.cs,the oxfordWrapper will exit when the main app exit.

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="OffLine" ImageInputSources="BSE" />
-  <Member RegName="EDSName" Value="OffLine" DelayQuantify="false" />
+  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="BSE" />
+  <Member RegName="EDSName" Value="Oxford" DelayQuantify="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

Bin/x64/OTSOx50_30.wse

@@ -939,16 +939,6 @@ item: Install File
   Destination=%MAINDIR%\RegistrationAuthorization.exe
   Flags=0000000010000011
 end
-item: Install File
-  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\OxfordExtenderWrapper.exe.config
-  Destination=%MAINDIR%\OxfordExtenderWrapper.exe.config
-  Flags=0000000010000010
-end
-item: Install File
-  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\OxfordExtenderWrapper.exe
-  Destination=%MAINDIR%\OxfordExtenderWrapper.exe
-  Flags=0000000010000011
-end
 item: Install File
   Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\OTSSysMgrApp.pdb
   Destination=%MAINDIR%\OTSSysMgrApp.pdb
@@ -1064,26 +1054,11 @@ item: Install File
   Destination=%MAINDIR%\OTSCommon.dll
   Flags=0001000010000011
 end
-item: Install File
-  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\OINA.Extender.dll
-  Destination=%MAINDIR%\OINA.Extender.dll
-  Flags=0001000010000011
-end
 item: Install File
   Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\debug.log
   Destination=%MAINDIR%\debug.log
   Flags=0000000010000010
 end
-item: Install File
-  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Bruker.API.Logging64.dll
-  Destination=%MAINDIR%\Bruker.API.Logging64.dll
-  Flags=0001000010000011
-end
-item: Install File
-  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Bruker.API.Esprit64.dll
-  Destination=%MAINDIR%\Bruker.API.Esprit64.dll
-  Flags=0001000010000011
-end
 item: Install File
   Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\System\System.Xml.XPath.XDocument.dll
   Destination=%MAINDIR%\System\System.Xml.XPath.XDocument.dll

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -66,7 +66,7 @@ namespace OTSController {
 				// load Bruker client dll name succeed
 			LogTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::Init: bruker client dll name: %s"), strBruckerDllName);
 	
-			m_bInit = BrukerDll::LoadEspritAPI((/*_T("OTSCPPDll\\") +*/ strBruckerDllName).GetBuffer());
+			m_bInit = BrukerDll::LoadEspritAPI((_T("OTSCPPDll\\") + strBruckerDllName).GetBuffer());
 			// load Bruker client dll OK?
 			if (!m_bInit)
 			{

OTSCommon/OTSCommon.csproj

@@ -140,21 +140,27 @@
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto">
       <HintPath>..\OpenDll\WordApiDll\BouncyCastle.Crypto.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\OpenDll\WordApiDll\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="NPOI">
       <HintPath>..\OpenDll\NPOI\NPOI.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="NPOI.OOXML">
       <HintPath>..\OpenDll\NPOI\NPOI.OOXML.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="NPOI.OpenXml4Net">
       <HintPath>..\OpenDll\NPOI\NPOI.OpenXml4Net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="NPOI.OpenXmlFormats">
       <HintPath>..\OpenDll\NPOI\NPOI.OpenXmlFormats.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/ExtenderWrapperIpc.cs

@@ -55,12 +55,13 @@ namespace OTSMeasureApp.ServiceCenter.OxfordExtender
         internal static void KillExtenderWrapperProcess()
         {
             Process[] processes = Process.GetProcessesByName("OxfordExtenderWrapper");
-           
+
             //if (processes.Length!=0)
             //{
             //    processes[0].Kill();
-               
+
             //}
+            extenderRemoteObj.CloseExtender();
         }
     }
 }

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordEDSController.cs

@@ -139,9 +139,7 @@ namespace OTSMeasureApp.ServiceCenter
 
         public bool Connect()
         {
-            
-         
-            
+            iExtender = ExtenderWrapperIpc.GetExtenderWrapper();
 
             return true;
         }

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordScanController.cs

@@ -53,7 +53,7 @@ namespace OTSMeasureApp.ServiceCenter
 
         public bool Init()
         {
-         
+            iExtender = ExtenderWrapperIpc.GetExtenderWrapper();
             return true;
         }
 

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -445,6 +445,7 @@
     <Reference Include="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <Reference Include="System.Data.SQLite">
       <HintPath>..\OpenDll\SQLiteDll\System.Data.SQLite.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -932,7 +933,6 @@
     <EmbeddedResource Include="1-UI\OTSTemplateDesigner\OTSReport_TemplateDesignerRM.resx">
       <DependentUpon>OTSReport_TemplateDesignerRM.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="ReportTemplate\GBReport.resx">
       <DependentUpon>GBReport.cs</DependentUpon>
     </EmbeddedResource>

OTSIncAReportApp/Properties/licenses.licx

@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

OxfordExtenderWrapper/ExtenderIpcUI1.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace OxfordExtenderWrapper
 {
@@ -32,6 +33,8 @@ namespace OxfordExtenderWrapper
         {
 
             iExtender.CloseExtender();
+           var form1= (Form1)Application.OpenForms["Form1"];
+            form1.appExit();
 
         }
 

OxfordExtenderWrapper/Form1.Designer.cs

@@ -29,10 +29,10 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -108,6 +108,7 @@
             this.button22 = new System.Windows.Forms.Button();
             this.button23 = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.button17 = new System.Windows.Forms.Button();
             this.button27 = new System.Windows.Forms.Button();
             this.拍图 = new System.Windows.Forms.GroupBox();
             this.cboSource = new System.Windows.Forms.ComboBox();
@@ -178,7 +179,6 @@
             this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.隐藏ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.button17 = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.拍图.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pBImage)).BeginInit();
@@ -1006,13 +1006,25 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "电镜和样品台控制";
             // 
+            // button17
+            // 
+            this.button17.Font = new System.Drawing.Font("Microsoft YaHei", 12F);
+            this.button17.Location = new System.Drawing.Point(4, 225);
+            this.button17.Margin = new System.Windows.Forms.Padding(2);
+            this.button17.Name = "button17";
+            this.button17.Size = new System.Drawing.Size(30, 126);
+            this.button17.TabIndex = 79;
+            this.button17.Text = "释放控制权";
+            this.button17.UseVisualStyleBackColor = true;
+            this.button17.Click += new System.EventHandler(this.button27_Click);
+            // 
             // button27
             // 
             this.button27.Font = new System.Drawing.Font("Microsoft YaHei", 12F);
             this.button27.Location = new System.Drawing.Point(4, 58);
             this.button27.Margin = new System.Windows.Forms.Padding(2);
             this.button27.Name = "button27";
-            this.button27.Size = new System.Drawing.Size(39, 125);
+            this.button27.Size = new System.Drawing.Size(30, 125);
             this.button27.TabIndex = 79;
             this.button27.Text = "连接能谱";
             this.button27.UseVisualStyleBackColor = true;
@@ -1698,25 +1710,25 @@
             // 
             // chart1
             // 
-            chartArea3.Name = "ChartArea1";
-            this.chart1.ChartAreas.Add(chartArea3);
-            legend3.Alignment = System.Drawing.StringAlignment.Center;
-            legend3.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
-            legend3.Name = "Legend1";
-            this.chart1.Legends.Add(legend3);
+            chartArea1.Name = "ChartArea1";
+            this.chart1.ChartAreas.Add(chartArea1);
+            legend1.Alignment = System.Drawing.StringAlignment.Center;
+            legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
+            legend1.Name = "Legend1";
+            this.chart1.Legends.Add(legend1);
             this.chart1.Location = new System.Drawing.Point(554, 31);
             this.chart1.Margin = new System.Windows.Forms.Padding(2);
             this.chart1.Name = "chart1";
-            series5.ChartArea = "ChartArea1";
-            series5.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
-            series5.Legend = "Legend1";
-            series5.Name = "Series1";
-            series6.ChartArea = "ChartArea1";
-            series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
-            series6.Legend = "Legend1";
-            series6.Name = "Series2";
-            this.chart1.Series.Add(series5);
-            this.chart1.Series.Add(series6);
+            series1.ChartArea = "ChartArea1";
+            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
+            series1.Legend = "Legend1";
+            series1.Name = "Series1";
+            series2.ChartArea = "ChartArea1";
+            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
+            series2.Legend = "Legend1";
+            series2.Name = "Series2";
+            this.chart1.Series.Add(series1);
+            this.chart1.Series.Add(series2);
             this.chart1.Size = new System.Drawing.Size(593, 352);
             this.chart1.TabIndex = 3;
             this.chart1.Text = "chart1";
@@ -1781,18 +1793,6 @@
             this.退出ToolStripMenuItem.Text = "退出";
             this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
             // 
-            // button17
-            // 
-            this.button17.Font = new System.Drawing.Font("Microsoft YaHei", 12F);
-            this.button17.Location = new System.Drawing.Point(4, 225);
-            this.button17.Margin = new System.Windows.Forms.Padding(2);
-            this.button17.Name = "button17";
-            this.button17.Size = new System.Drawing.Size(39, 126);
-            this.button17.TabIndex = 79;
-            this.button17.Text = "释放控制权";
-            this.button17.UseVisualStyleBackColor = true;
-            this.button17.Click += new System.EventHandler(this.button27_Click);
-            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

OxfordExtenderWrapper/Form1.cs

@@ -16,7 +16,6 @@ using System.Runtime.Remoting.Channels;
 using System.Drawing.Imaging;
 using System.Runtime.Remoting;
 using System.Threading;
-using static OxfordExtenderWrapper.ExtenderIpcUI;
 
 namespace OxfordExtenderWrapper
 {
@@ -370,11 +369,11 @@ namespace OxfordExtenderWrapper
                 p.DwellTime = Convert.ToInt32(txtBSEDwell.Text);
                 if (cboSource.Text == "BSE")
                 {
-                    p.sourceType = ImageInputSourceType.Bse;
+                    p.sourceType = ExtenderIpcUI.ImageInputSourceType.Bse;
                 }
                 else
                 {
-                    p.sourceType = ImageInputSourceType.SE;
+                    p.sourceType = ExtenderIpcUI.ImageInputSourceType.SE;
                 }
 
                 p.ImageData = new byte[0];
@@ -794,6 +793,13 @@ namespace OxfordExtenderWrapper
                 Application.Exit();            //关闭应用程序窗体
             }
         }
+        public void appExit()
+        {
+            notifyIcon_wrapper.Visible = false;   //设置图标不可见
+            this.Close();                  //关闭窗体
+            this.Dispose();                //释放资源
+            Application.Exit();
+        }
 
         private void notifyIcon_wrapper_MouseClick(object sender, MouseEventArgs e)
         {

OxfordExtenderWrapper/Form1.resx

@@ -123,12 +123,6 @@
   <metadata name="含量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="元素.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="含量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="notifyIcon_wrapper.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

OxfordExtenderWrapper/OTSMeasureOutputNlog.Designer.cs

@@ -43,11 +43,11 @@
             // 
             this.richTextBox_Nlog.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBox_Nlog.Font = new System.Drawing.Font("SimSun", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.richTextBox_Nlog.Location = new System.Drawing.Point(4, 62);
+            this.richTextBox_Nlog.Location = new System.Drawing.Point(4, 63);
             this.richTextBox_Nlog.Margin = new System.Windows.Forms.Padding(4);
             this.richTextBox_Nlog.Name = "richTextBox_Nlog";
             this.richTextBox_Nlog.ReadOnly = true;
-            this.richTextBox_Nlog.Size = new System.Drawing.Size(504, 909);
+            this.richTextBox_Nlog.Size = new System.Drawing.Size(506, 615);
             this.richTextBox_Nlog.TabIndex = 0;
             this.richTextBox_Nlog.Text = "";
             // 
@@ -61,13 +61,13 @@
             this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox1.Size = new System.Drawing.Size(504, 45);
+            this.groupBox1.Size = new System.Drawing.Size(506, 45);
             this.groupBox1.TabIndex = 7;
             this.groupBox1.TabStop = false;
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(0, 12);
+            this.button1.Location = new System.Drawing.Point(0, 9);
             this.button1.Margin = new System.Windows.Forms.Padding(4);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(100, 29);
@@ -79,19 +79,19 @@
             // button_Clear
             // 
             this.button_Clear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.button_Clear.Location = new System.Drawing.Point(412, 12);
+            this.button_Clear.Location = new System.Drawing.Point(314, 8);
             this.button_Clear.Margin = new System.Windows.Forms.Padding(4);
             this.button_Clear.Name = "button_Clear";
             this.button_Clear.Size = new System.Drawing.Size(84, 29);
             this.button_Clear.TabIndex = 4;
-            this.button_Clear.Text = "close";
+            this.button_Clear.Text = "clear";
             this.button_Clear.UseVisualStyleBackColor = true;
             this.button_Clear.Click += new System.EventHandler(this.button_Clear_Click);
             // 
             // button_stop
             // 
             this.button_stop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.button_stop.Location = new System.Drawing.Point(292, 12);
+            this.button_stop.Location = new System.Drawing.Point(222, 9);
             this.button_stop.Margin = new System.Windows.Forms.Padding(4);
             this.button_stop.Name = "button_stop";
             this.button_stop.Size = new System.Drawing.Size(84, 29);
@@ -104,7 +104,7 @@
             // 
             this.combox_NlogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.combox_NlogType.FormattingEnabled = true;
-            this.combox_NlogType.Location = new System.Drawing.Point(133, 15);
+            this.combox_NlogType.Location = new System.Drawing.Point(108, 13);
             this.combox_NlogType.Margin = new System.Windows.Forms.Padding(4);
             this.combox_NlogType.Name = "combox_NlogType";
             this.combox_NlogType.Size = new System.Drawing.Size(104, 20);
@@ -115,15 +115,15 @@
             // 
             this.tableLayoutPanel1.ColumnCount = 1;
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.richTextBox_Nlog, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 2;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.948718F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.05128F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(509, 975);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.651027F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 91.34898F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(419, 682);
             this.tableLayoutPanel1.TabIndex = 8;
             // 
             // OTSMeasureOutputNlog
@@ -132,7 +132,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScroll = true;
             this.AutoSize = true;
-            this.ClientSize = new System.Drawing.Size(509, 975);
+            this.ClientSize = new System.Drawing.Size(419, 682);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Margin = new System.Windows.Forms.Padding(4);

OxfordExtenderWrapper/OxfordExtenderWrapper.csproj

@@ -42,6 +42,7 @@
     <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\OxfordApi61Dll\OINA.Extender.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />