Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/ConfigMethod/MethodMain.Designer.cs

@@ -35,7 +35,7 @@
             this.closebth = new System.Windows.Forms.Button();
             this.mixbth = new System.Windows.Forms.Button();
             this.panelmain = new System.Windows.Forms.Panel();
-            this.tabmain = new GcDevicePc.ConfigMethod.TabContorlEx();
+            this.tabmain = new GcDevicePc.ConfigMethod.TabContorlEx(this.components);
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.tabPage3 = new System.Windows.Forms.TabPage();
@@ -44,7 +44,7 @@
             this.tabPage6 = new System.Windows.Forms.TabPage();
             this.tabPage7 = new System.Windows.Forms.TabPage();
             this.tabPage8 = new System.Windows.Forms.TabPage();
-            this.methodimages = new System.Windows.Forms.ImageList();
+            this.methodimages = new System.Windows.Forms.ImageList(this.components);
             this.panelright = new System.Windows.Forms.Panel();
             this.savebth = new System.Windows.Forms.Button();
             this.saveasbth = new System.Windows.Forms.Button();
@@ -65,7 +65,7 @@
             this.paneltitle.Location = new System.Drawing.Point(0, 0);
             this.paneltitle.Margin = new System.Windows.Forms.Padding(0);
             this.paneltitle.Name = "paneltitle";
-            this.paneltitle.Size = new System.Drawing.Size(985, 25);
+            this.paneltitle.Size = new System.Drawing.Size(739, 20);
             this.paneltitle.TabIndex = 0;
             this.paneltitle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.paneltitle_MouseDown);
             this.paneltitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.paneltitle_MouseMove);
@@ -76,10 +76,9 @@
             this.maxbth.BackColor = System.Drawing.Color.Silver;
             this.maxbth.Enabled = false;
             this.maxbth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.maxbth.Location = new System.Drawing.Point(900, 0);
-            this.maxbth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.maxbth.Location = new System.Drawing.Point(675, 0);
             this.maxbth.Name = "maxbth";
-            this.maxbth.Size = new System.Drawing.Size(33, 25);
+            this.maxbth.Size = new System.Drawing.Size(25, 20);
             this.maxbth.TabIndex = 2;
             this.maxbth.Text = "口";
             this.maxbth.UseVisualStyleBackColor = false;
@@ -88,10 +87,9 @@
             // 
             this.closebth.BackColor = System.Drawing.Color.Red;
             this.closebth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.closebth.Location = new System.Drawing.Point(940, 0);
-            this.closebth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.closebth.Location = new System.Drawing.Point(705, 0);
             this.closebth.Name = "closebth";
-            this.closebth.Size = new System.Drawing.Size(33, 25);
+            this.closebth.Size = new System.Drawing.Size(25, 20);
             this.closebth.TabIndex = 1;
             this.closebth.Text = "X";
             this.closebth.UseVisualStyleBackColor = false;
@@ -101,10 +99,9 @@
             // 
             this.mixbth.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.mixbth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.mixbth.Location = new System.Drawing.Point(860, 0);
-            this.mixbth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.mixbth.Location = new System.Drawing.Point(645, 0);
             this.mixbth.Name = "mixbth";
-            this.mixbth.Size = new System.Drawing.Size(33, 25);
+            this.mixbth.Size = new System.Drawing.Size(25, 20);
             this.mixbth.TabIndex = 0;
             this.mixbth.Text = "—";
             this.mixbth.UseVisualStyleBackColor = false;
@@ -114,10 +111,10 @@
             // 
             this.panelmain.BackColor = System.Drawing.SystemColors.Control;
             this.panelmain.Controls.Add(this.tabmain);
-            this.panelmain.Location = new System.Drawing.Point(0, 25);
+            this.panelmain.Location = new System.Drawing.Point(0, 20);
             this.panelmain.Margin = new System.Windows.Forms.Padding(0);
             this.panelmain.Name = "panelmain";
-            this.panelmain.Size = new System.Drawing.Size(800, 500);
+            this.panelmain.Size = new System.Drawing.Size(600, 400);
             this.panelmain.TabIndex = 1;
             // 
             // tabmain
@@ -134,10 +131,9 @@
             this.tabmain.ImageList = this.methodimages;
             this.tabmain.ItemSize = new System.Drawing.Size(55, 60);
             this.tabmain.Location = new System.Drawing.Point(0, 0);
-            this.tabmain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabmain.Name = "tabmain";
             this.tabmain.SelectedIndex = 0;
-            this.tabmain.Size = new System.Drawing.Size(800, 500);
+            this.tabmain.Size = new System.Drawing.Size(600, 400);
             this.tabmain.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.tabmain.TabIndex = 0;
             // 
@@ -145,10 +141,9 @@
             // 
             this.tabPage1.ImageIndex = 0;
             this.tabPage1.Location = new System.Drawing.Point(4, 64);
-            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage1.Size = new System.Drawing.Size(792, 432);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Size = new System.Drawing.Size(592, 332);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -157,10 +152,9 @@
             // 
             this.tabPage2.ImageIndex = 1;
             this.tabPage2.Location = new System.Drawing.Point(4, 64);
-            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage2.Size = new System.Drawing.Size(792, 432);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Size = new System.Drawing.Size(592, 332);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -169,9 +163,8 @@
             // 
             this.tabPage3.ImageIndex = 2;
             this.tabPage3.Location = new System.Drawing.Point(4, 64);
-            this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(792, 432);
+            this.tabPage3.Size = new System.Drawing.Size(592, 332);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "tabPage3";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -180,9 +173,8 @@
             // 
             this.tabPage4.ImageIndex = 3;
             this.tabPage4.Location = new System.Drawing.Point(4, 64);
-            this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(792, 432);
+            this.tabPage4.Size = new System.Drawing.Size(592, 332);
             this.tabPage4.TabIndex = 3;
             this.tabPage4.Text = "tabPage4";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -191,9 +183,8 @@
             // 
             this.tabPage5.ImageIndex = 4;
             this.tabPage5.Location = new System.Drawing.Point(4, 64);
-            this.tabPage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Size = new System.Drawing.Size(792, 432);
+            this.tabPage5.Size = new System.Drawing.Size(592, 332);
             this.tabPage5.TabIndex = 4;
             this.tabPage5.Text = "tabPage5";
             this.tabPage5.UseVisualStyleBackColor = true;
@@ -202,9 +193,8 @@
             // 
             this.tabPage6.ImageIndex = 5;
             this.tabPage6.Location = new System.Drawing.Point(4, 64);
-            this.tabPage6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage6.Name = "tabPage6";
-            this.tabPage6.Size = new System.Drawing.Size(792, 432);
+            this.tabPage6.Size = new System.Drawing.Size(592, 332);
             this.tabPage6.TabIndex = 5;
             this.tabPage6.Text = "tabPage6";
             this.tabPage6.UseVisualStyleBackColor = true;
@@ -213,9 +203,8 @@
             // 
             this.tabPage7.ImageIndex = 6;
             this.tabPage7.Location = new System.Drawing.Point(4, 64);
-            this.tabPage7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage7.Name = "tabPage7";
-            this.tabPage7.Size = new System.Drawing.Size(792, 432);
+            this.tabPage7.Size = new System.Drawing.Size(592, 332);
             this.tabPage7.TabIndex = 6;
             this.tabPage7.Text = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
@@ -224,9 +213,8 @@
             // 
             this.tabPage8.ImageIndex = 7;
             this.tabPage8.Location = new System.Drawing.Point(4, 64);
-            this.tabPage8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage8.Name = "tabPage8";
-            this.tabPage8.Size = new System.Drawing.Size(792, 432);
+            this.tabPage8.Size = new System.Drawing.Size(592, 332);
             this.tabPage8.TabIndex = 7;
             this.tabPage8.Text = "tabPage8";
             this.tabPage8.UseVisualStyleBackColor = true;
@@ -266,20 +254,19 @@
             this.panelright.Controls.Add(this.savebth);
             this.panelright.Controls.Add(this.saveasbth);
             this.panelright.Controls.Add(this.resetbth);
-            this.panelright.Location = new System.Drawing.Point(800, 25);
+            this.panelright.Location = new System.Drawing.Point(600, 20);
             this.panelright.Margin = new System.Windows.Forms.Padding(0);
             this.panelright.Name = "panelright";
-            this.panelright.Size = new System.Drawing.Size(185, 500);
+            this.panelright.Size = new System.Drawing.Size(139, 400);
             this.panelright.TabIndex = 2;
             this.panelright.Paint += new System.Windows.Forms.PaintEventHandler(this.panelright_Paint);
             // 
             // savebth
             // 
             this.savebth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.savebth.Location = new System.Drawing.Point(48, 435);
-            this.savebth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.savebth.Location = new System.Drawing.Point(36, 348);
             this.savebth.Name = "savebth";
-            this.savebth.Size = new System.Drawing.Size(100, 29);
+            this.savebth.Size = new System.Drawing.Size(75, 23);
             this.savebth.TabIndex = 2;
             this.savebth.Text = "保存";
             this.savebth.UseVisualStyleBackColor = true;
@@ -288,10 +275,9 @@
             // saveasbth
             // 
             this.saveasbth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.saveasbth.Location = new System.Drawing.Point(48, 375);
-            this.saveasbth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.saveasbth.Location = new System.Drawing.Point(36, 300);
             this.saveasbth.Name = "saveasbth";
-            this.saveasbth.Size = new System.Drawing.Size(100, 29);
+            this.saveasbth.Size = new System.Drawing.Size(75, 23);
             this.saveasbth.TabIndex = 1;
             this.saveasbth.Text = "另存为";
             this.saveasbth.UseVisualStyleBackColor = true;
@@ -300,39 +286,37 @@
             // resetbth
             // 
             this.resetbth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.resetbth.Location = new System.Drawing.Point(48, 320);
-            this.resetbth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.resetbth.Location = new System.Drawing.Point(36, 256);
             this.resetbth.Name = "resetbth";
-            this.resetbth.Size = new System.Drawing.Size(100, 29);
+            this.resetbth.Size = new System.Drawing.Size(75, 23);
             this.resetbth.TabIndex = 0;
             this.resetbth.Text = "重置";
             this.resetbth.UseVisualStyleBackColor = true;
             // 
             // panelbottom
             // 
-            this.panelbottom.Location = new System.Drawing.Point(0, 525);
-            this.panelbottom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panelbottom.Location = new System.Drawing.Point(0, 420);
             this.panelbottom.Name = "panelbottom";
-            this.panelbottom.Size = new System.Drawing.Size(985, 162);
+            this.panelbottom.Size = new System.Drawing.Size(739, 130);
             this.panelbottom.TabIndex = 3;
             this.panelbottom.Paint += new System.Windows.Forms.PaintEventHandler(this.panelbottom_Paint);
             // 
             // MethodMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(985, 688);
+            this.ClientSize = new System.Drawing.Size(739, 550);
             this.Controls.Add(this.panelbottom);
             this.Controls.Add(this.panelright);
             this.Controls.Add(this.panelmain);
             this.Controls.Add(this.paneltitle);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "MethodMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "MethodMain";
-            this.TopMost = true;
             this.Load += new System.EventHandler(this.MethodMain_Load);
             this.paneltitle.ResumeLayout(false);
             this.panelmain.ResumeLayout(false);

GcDevicePc/MDIBase.cs

@@ -727,6 +727,10 @@ namespace GcDevicePc
                             globaldata.show_MethodName = tmpname;
                             SetMainFormMethodName(tmpname);
                             globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, tmpname.ToString());
+
+                            if(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 2)
+                                globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, tmpname.ToString());
+
                             globaldata.m_profileMethod.SetMethodFullName(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName);
                             globaldata.m_profileMethod.GetDevInjPortAllPara();
                             globaldata.m_profileMethod.GetSampleAllPara("前进样器");
@@ -1658,6 +1662,7 @@ namespace GcDevicePc
             OpenFileDialog fileDlg = new OpenFileDialog();
             fileDlg.Multiselect = false;
             fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder;
+            fileDlg.RestoreDirectory = true;
             fileDlg.Title = "请选择方法文件";
             fileDlg.Filter = "配置文件(*.ini)|*.ini";
             if (fileDlg.ShowDialog() == DialogResult.OK)
@@ -1709,6 +1714,7 @@ namespace GcDevicePc
                 OpenFileDialog fileDlg = new OpenFileDialog();
                 fileDlg.Multiselect = false;
                 fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder;
+                fileDlg.RestoreDirectory = true;
                 fileDlg.Title = "请选择方法文件";
                 fileDlg.Filter = "配置文件(*.ini)|*.ini";
                 if (fileDlg.ShowDialog() == DialogResult.OK)

GcDevicePc/auxtool.cs

@@ -170,6 +170,7 @@ namespace GcDevicePc
             OpenFileDialog fileDlg = new OpenFileDialog();
             fileDlg.Multiselect = false;
             fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.TmpFolder;
+            fileDlg.RestoreDirectory = true;
             fileDlg.Title = "请选择方法文件";
             fileDlg.Filter = "更新程序(*.*)|*.*";