From 346e9c78f206a18233729508eb8c5626918aefee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= Date: Tue, 30 Jan 2024 10:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A6=84=E8=8F=8A=E5=8F=82=E6=95=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FreeDb/FreeSqlUnit.cs | 2 - .../LjMetage/FrmMetage.Designer.cs | 79 +++++++++---------- .../MCProject/nodeForm/FormOliveEQSetting.xml | 50 ------------ 3 files changed, 39 insertions(+), 92 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/FreeSqlUnit.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/FreeSqlUnit.cs index bfb064b..8626554 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/FreeSqlUnit.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/FreeSqlUnit.cs @@ -14,8 +14,6 @@ namespace Mesnac.Action.ChemicalWeighing.FreeDb { - - public static IFreeSql Instance => freeSql.Value; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs index dde4c35..dc71ac5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs @@ -49,30 +49,30 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // HighSpeed // - this.HighSpeed.Location = new System.Drawing.Point(194, 48); - this.HighSpeed.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.HighSpeed.Location = new System.Drawing.Point(129, 32); + this.HighSpeed.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.HighSpeed.MaxLength = 100; this.HighSpeed.Name = "HighSpeed"; - this.HighSpeed.Size = new System.Drawing.Size(220, 28); + this.HighSpeed.Size = new System.Drawing.Size(148, 21); this.HighSpeed.TabIndex = 58; // // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(268, 308); - this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.btnCancel.Location = new System.Drawing.Point(179, 205); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(147, 68); + this.btnCancel.Size = new System.Drawing.Size(98, 45); this.btnCancel.TabIndex = 56; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(57, 308); - this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.btnOK.Location = new System.Drawing.Point(38, 205); + this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(147, 68); + this.btnOK.Size = new System.Drawing.Size(98, 45); this.btnOK.TabIndex = 55; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -81,94 +81,94 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(54, 52); - this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label3.Location = new System.Drawing.Point(36, 35); + this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(125, 18); + this.label3.Size = new System.Drawing.Size(83, 12); this.label3.TabIndex = 54; this.label3.Text = "高速称量速度:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(54, 99); - this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label1.Location = new System.Drawing.Point(36, 66); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(125, 18); + this.label1.Size = new System.Drawing.Size(83, 12); this.label1.TabIndex = 54; this.label1.Text = "慢速称量速度:"; // // LowSpeed // - this.LowSpeed.Location = new System.Drawing.Point(194, 94); - this.LowSpeed.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.LowSpeed.Location = new System.Drawing.Point(129, 63); + this.LowSpeed.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.LowSpeed.MaxLength = 100; this.LowSpeed.Name = "LowSpeed"; - this.LowSpeed.Size = new System.Drawing.Size(220, 28); + this.LowSpeed.Size = new System.Drawing.Size(148, 21); this.LowSpeed.TabIndex = 58; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(108, 146); - this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label2.Location = new System.Drawing.Point(72, 97); + this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(71, 18); + this.label2.Size = new System.Drawing.Size(47, 12); this.label2.TabIndex = 54; this.label2.Text = "慢称值:"; // // WeightSlow // - this.WeightSlow.Location = new System.Drawing.Point(194, 141); - this.WeightSlow.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.WeightSlow.Location = new System.Drawing.Point(129, 94); + this.WeightSlow.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.WeightSlow.MaxLength = 100; this.WeightSlow.Name = "WeightSlow"; - this.WeightSlow.Size = new System.Drawing.Size(220, 28); + this.WeightSlow.Size = new System.Drawing.Size(148, 21); this.WeightSlow.TabIndex = 58; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(108, 192); - this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label4.Location = new System.Drawing.Point(72, 128); + this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(71, 18); + this.label4.Size = new System.Drawing.Size(47, 12); this.label4.TabIndex = 54; this.label4.Text = "提前量:"; // // Precut // - this.Precut.Location = new System.Drawing.Point(194, 188); - this.Precut.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.Precut.Location = new System.Drawing.Point(129, 125); + this.Precut.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Precut.MaxLength = 100; this.Precut.Name = "Precut"; - this.Precut.Size = new System.Drawing.Size(220, 28); + this.Precut.Size = new System.Drawing.Size(148, 21); this.Precut.TabIndex = 58; // // dong // this.dong.AutoSize = true; - this.dong.Location = new System.Drawing.Point(108, 238); - this.dong.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.dong.Location = new System.Drawing.Point(72, 159); + this.dong.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.dong.Name = "dong"; - this.dong.Size = new System.Drawing.Size(71, 18); + this.dong.Size = new System.Drawing.Size(47, 12); this.dong.TabIndex = 54; this.dong.Text = "点动值:"; // // JogTime // - this.JogTime.Location = new System.Drawing.Point(194, 234); - this.JogTime.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.JogTime.Location = new System.Drawing.Point(129, 156); + this.JogTime.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.JogTime.MaxLength = 100; this.JogTime.Name = "JogTime"; - this.JogTime.Size = new System.Drawing.Size(220, 28); + this.JogTime.Size = new System.Drawing.Size(148, 21); this.JogTime.TabIndex = 58; // // FrmMetage // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(478, 420); + this.ClientSize = new System.Drawing.Size(319, 280); this.Controls.Add(this.JogTime); this.Controls.Add(this.Precut); this.Controls.Add(this.WeightSlow); @@ -181,9 +181,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage this.Controls.Add(this.label1); this.Controls.Add(this.btnOK); this.Controls.Add(this.label3); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FrmMetage"; - this.Text = "FrmMetage"; + this.Text = "速度设置"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml index 5236752..0735d18 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml @@ -498,56 +498,6 @@ 25 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhFRTJFRTlEQTE3RTQwOENCM0M5RDIxQ0FDNzA2MkU2BgYAAAAS5pWw5o2u5YWo6YOo5LiL6L6+BgcAAAAS5pWw5o2u5YWo6YOo5LiL6L6+Cw== - - - - False - - - - None - True - True - False - - - Red - DarkGray - 一键下发 - 宋体, 12pt, style=Bold - 509, 7 - AllDownload - 110, 52 - 13 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEI5NDcyMzM1QTlGQjQ2MEZBNkRFMDM3NzJDQ0UzNjE2BgYAAAAS5pWw5o2u5YWo6YOo5LiK5LygBgcAAAAS5pWw5o2u5YWo6YOo5LiK5LygCw== - - - - False - - - - None - True - True - False - - - Red - DarkGray - 一键上传 - 宋体, 12pt, style=Bold - 384, 7 - AllUpload - 110, 52 - 12 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCRjBEM0RDRTU2M0I0RTY4OUI4MTVFMzNEMDlGOUFFBgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw==