修改bluke2.2标注

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -70,16 +70,9 @@ namespace OTSController {
 			}
 			else
 			{
-				// load Bruker client dll name failed, use default Bruker client dll name Bruker.API.Esprit2.1.dll 
+				// load Bruker client dll name failed, use default Bruker client dll name Bruker.API.Esprit2.2.dll 
 				LogTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::Init: failed to call GetLoadDllName method, use default Bruker client dll name Bruker.API.Esprit2.1.dll"));
-				strBruckerDllName = _T("Bruker.API.Esprit2.1.dll");
-			}
-			
-			if (m_pBrukerDllHandle == nullptr)
-			{
-				AfxMessageBox(_T("当前Bluker能谱不能正常工作，若需调整为OffLine模式，请在SysMgeApp中修改！"));
-				LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::Init: failed to load Bruker Client Dll , Dll Name: %s"), strBruckerDllName);
-				exit(0);
+				strBruckerDllName = _T("Bruker.API.Esprit2.2.dll");
 			}
 			// is dll opened?
 			if (!m_pBrukerDllHandle)
@@ -95,8 +88,10 @@ namespace OTSController {
 		if (!m_bInit)
 		{
 			// failed to load bruker client dll
+			AfxMessageBox(_T("当前Bluker能谱不能正常工作，若需调整为OffLine模式，请在SysMgeApp中修改！"));
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::Init: failed to load Bruker Client Dll , Dll Name: %s"), strBruckerDllName);
-			return bRet;
+			exit(0);
+			//return bRet;
 		}
 
 		// return false if failed to call QueryServers or OpenClient methods

OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -59,10 +59,9 @@
             this.tabLanguage.Controls.Add(this.pictureBox3);
             this.tabLanguage.Controls.Add(this.rdb_en);
             this.tabLanguage.Controls.Add(this.rdb_ch);
-            this.tabLanguage.Location = new System.Drawing.Point(4, 22);
-            this.tabLanguage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabLanguage.Location = new System.Drawing.Point(4, 28);
             this.tabLanguage.Name = "tabLanguage";
-            this.tabLanguage.Size = new System.Drawing.Size(549, 204);
+            this.tabLanguage.Size = new System.Drawing.Size(1227, 432);
             this.tabLanguage.TabIndex = 2;
             this.tabLanguage.Text = "语言";
             this.tabLanguage.UseVisualStyleBackColor = true;
@@ -70,10 +69,9 @@
             // pictureBox3
             // 
             this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-            this.pictureBox3.Location = new System.Drawing.Point(38, 22);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pictureBox3.Location = new System.Drawing.Point(57, 33);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(67, 66);
+            this.pictureBox3.Size = new System.Drawing.Size(100, 99);
             this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pictureBox3.TabIndex = 8;
             this.pictureBox3.TabStop = false;
@@ -81,10 +79,10 @@
             // rdb_en
             // 
             this.rdb_en.AutoSize = true;
-            this.rdb_en.Location = new System.Drawing.Point(147, 58);
-            this.rdb_en.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rdb_en.Checked = true;
+            this.rdb_en.Location = new System.Drawing.Point(220, 87);
             this.rdb_en.Name = "rdb_en";
-            this.rdb_en.Size = new System.Drawing.Size(71, 16);
+            this.rdb_en.Size = new System.Drawing.Size(105, 22);
             this.rdb_en.TabIndex = 0;
             this.rdb_en.TabStop = true;
             this.rdb_en.Text = "英文[EN]";
@@ -94,12 +92,10 @@
             // rdb_ch
             // 
             this.rdb_ch.AutoSize = true;
-            this.rdb_ch.Location = new System.Drawing.Point(147, 25);
-            this.rdb_ch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rdb_ch.Location = new System.Drawing.Point(220, 38);
             this.rdb_ch.Name = "rdb_ch";
-            this.rdb_ch.Size = new System.Drawing.Size(71, 16);
+            this.rdb_ch.Size = new System.Drawing.Size(105, 22);
             this.rdb_ch.TabIndex = 0;
-            this.rdb_ch.TabStop = true;
             this.rdb_ch.Text = "中文[ZH]";
             this.rdb_ch.UseVisualStyleBackColor = true;
             this.rdb_ch.Click += new System.EventHandler(this.rdb_ch_Click);
@@ -118,11 +114,10 @@
             this.tabHardwareSet.Controls.Add(this.pictureBox2);
             this.tabHardwareSet.Controls.Add(this.button2);
             this.tabHardwareSet.Controls.Add(this.button1);
-            this.tabHardwareSet.Location = new System.Drawing.Point(4, 22);
-            this.tabHardwareSet.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabHardwareSet.Location = new System.Drawing.Point(4, 28);
             this.tabHardwareSet.Name = "tabHardwareSet";
-            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.tabHardwareSet.Size = new System.Drawing.Size(549, 204);
+            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabHardwareSet.Size = new System.Drawing.Size(818, 288);
             this.tabHardwareSet.TabIndex = 1;
             this.tabHardwareSet.Text = "硬件";
             this.tabHardwareSet.UseVisualStyleBackColor = true;
@@ -130,10 +125,9 @@
             // rbEsprit21
             // 
             this.rbEsprit21.AutoSize = true;
-            this.rbEsprit21.Location = new System.Drawing.Point(198, 142);
-            this.rbEsprit21.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rbEsprit21.Location = new System.Drawing.Point(297, 213);
             this.rbEsprit21.Name = "rbEsprit21";
-            this.rbEsprit21.Size = new System.Drawing.Size(167, 16);
+            this.rbEsprit21.Size = new System.Drawing.Size(249, 22);
             this.rbEsprit21.TabIndex = 15;
             this.rbEsprit21.Text = "Bruker.API.Esprit2.1.dll";
             this.rbEsprit21.UseVisualStyleBackColor = true;
@@ -143,13 +137,12 @@
             // 
             this.rbEsprit19.AutoSize = true;
             this.rbEsprit19.Checked = true;
-            this.rbEsprit19.Location = new System.Drawing.Point(198, 120);
-            this.rbEsprit19.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rbEsprit19.Location = new System.Drawing.Point(297, 180);
             this.rbEsprit19.Name = "rbEsprit19";
-            this.rbEsprit19.Size = new System.Drawing.Size(167, 16);
+            this.rbEsprit19.Size = new System.Drawing.Size(249, 22);
             this.rbEsprit19.TabIndex = 15;
             this.rbEsprit19.TabStop = true;
-            this.rbEsprit19.Text = "Bruker.API.Esprit1.9.dll";
+            this.rbEsprit19.Text = "Bruker.API.Esprit2.2.dll";
             this.rbEsprit19.UseVisualStyleBackColor = true;
             this.rbEsprit19.CheckedChanged += new System.EventHandler(this.rbEsprit19_CheckedChanged);
             // 
@@ -163,10 +156,9 @@
             "ESEM",
             "ZEISS",
             "Oxford"});
-            this.CmbSEMController.Location = new System.Drawing.Point(183, 22);
-            this.CmbSEMController.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.CmbSEMController.Location = new System.Drawing.Point(274, 33);
             this.CmbSEMController.Name = "CmbSEMController";
-            this.CmbSEMController.Size = new System.Drawing.Size(237, 20);
+            this.CmbSEMController.Size = new System.Drawing.Size(354, 26);
             this.CmbSEMController.TabIndex = 13;
             // 
             // CmbEDSController
@@ -177,18 +169,16 @@
             "Bruker",
             "OffLine",
             "Oxford"});
-            this.CmbEDSController.Location = new System.Drawing.Point(183, 74);
-            this.CmbEDSController.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.CmbEDSController.Location = new System.Drawing.Point(274, 111);
             this.CmbEDSController.Name = "CmbEDSController";
-            this.CmbEDSController.Size = new System.Drawing.Size(237, 20);
+            this.CmbEDSController.Size = new System.Drawing.Size(354, 26);
             this.CmbEDSController.TabIndex = 14;
             // 
             // btnEDSTest
             // 
-            this.btnEDSTest.Location = new System.Drawing.Point(429, 70);
-            this.btnEDSTest.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btnEDSTest.Location = new System.Drawing.Point(644, 105);
             this.btnEDSTest.Name = "btnEDSTest";
-            this.btnEDSTest.Size = new System.Drawing.Size(77, 24);
+            this.btnEDSTest.Size = new System.Drawing.Size(116, 36);
             this.btnEDSTest.TabIndex = 12;
             this.btnEDSTest.Text = "EDS测试";
             this.btnEDSTest.UseVisualStyleBackColor = true;
@@ -196,10 +186,9 @@
             // 
             // btnSEMTest
             // 
-            this.btnSEMTest.Location = new System.Drawing.Point(429, 20);
-            this.btnSEMTest.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btnSEMTest.Location = new System.Drawing.Point(644, 30);
             this.btnSEMTest.Name = "btnSEMTest";
-            this.btnSEMTest.Size = new System.Drawing.Size(77, 24);
+            this.btnSEMTest.Size = new System.Drawing.Size(116, 36);
             this.btnSEMTest.TabIndex = 10;
             this.btnSEMTest.Text = "SEM测试";
             this.btnSEMTest.UseVisualStyleBackColor = true;
@@ -208,60 +197,54 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(116, 122);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Location = new System.Drawing.Point(174, 183);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(65, 12);
+            this.label1.Size = new System.Drawing.Size(98, 18);
             this.label1.TabIndex = 8;
             this.label1.Text = "Bruker版本";
             // 
             // lblHEDSController
             // 
             this.lblHEDSController.AutoSize = true;
-            this.lblHEDSController.Location = new System.Drawing.Point(122, 74);
-            this.lblHEDSController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblHEDSController.Location = new System.Drawing.Point(183, 111);
             this.lblHEDSController.Name = "lblHEDSController";
-            this.lblHEDSController.Size = new System.Drawing.Size(59, 12);
+            this.lblHEDSController.Size = new System.Drawing.Size(89, 18);
             this.lblHEDSController.TabIndex = 8;
             this.lblHEDSController.Text = "EDS控制器";
             // 
             // lblHSEMController
             // 
             this.lblHSEMController.AutoSize = true;
-            this.lblHSEMController.Location = new System.Drawing.Point(122, 26);
-            this.lblHSEMController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblHSEMController.Location = new System.Drawing.Point(183, 39);
             this.lblHSEMController.Name = "lblHSEMController";
-            this.lblHSEMController.Size = new System.Drawing.Size(59, 12);
+            this.lblHSEMController.Size = new System.Drawing.Size(89, 18);
             this.lblHSEMController.TabIndex = 9;
             this.lblHSEMController.Text = "SEM控制器";
             // 
             // pictureBox2
             // 
             this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-            this.pictureBox2.Location = new System.Drawing.Point(38, 22);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pictureBox2.Location = new System.Drawing.Point(57, 33);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(67, 66);
+            this.pictureBox2.Size = new System.Drawing.Size(100, 99);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pictureBox2.TabIndex = 7;
             this.pictureBox2.TabStop = false;
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(482, 366);
-            this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button2.Location = new System.Drawing.Point(723, 549);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(67, 22);
+            this.button2.Size = new System.Drawing.Size(100, 33);
             this.button2.TabIndex = 2;
             this.button2.Text = "button1";
             this.button2.UseVisualStyleBackColor = true;
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(410, 366);
-            this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button1.Location = new System.Drawing.Point(615, 549);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(67, 22);
+            this.button1.Size = new System.Drawing.Size(100, 33);
             this.button1.TabIndex = 2;
             this.button1.Text = "button1";
             this.button1.UseVisualStyleBackColor = true;
@@ -272,24 +255,22 @@
             this.tabControl1.Controls.Add(this.tabLanguage);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(557, 230);
+            this.tabControl1.Size = new System.Drawing.Size(826, 320);
             this.tabControl1.TabIndex = 0;
             // 
             // OTSSystemManagerForms
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(557, 230);
+            this.ClientSize = new System.Drawing.Size(826, 320);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(573, 269);
-            this.MinimumSize = new System.Drawing.Size(573, 269);
+            this.MaximumSize = new System.Drawing.Size(848, 376);
+            this.MinimumSize = new System.Drawing.Size(848, 376);
             this.Name = "OTSSystemManagerForms";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OTSSystemManagerForms_FormClosing);