diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/Entity/DeliverPressureEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/Entity/DeliverPressureEntity.cs index c9a9810..3cbe629 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/Entity/DeliverPressureEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/Entity/DeliverPressureEntity.cs @@ -9,8 +9,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity { public class MCButtonEntity { - public MCButton UpLoad { get; set; } - public MCButton DownLoad { get; set; } + public MCButton Download { get; set; } public MCButton Refresh { get; set; } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs index 1a073e4..6bab0c0 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs @@ -1,4 +1,5 @@ -using Mesnac.Action.Base; +using DataBlockHelper.DBHelpers; +using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity; using Mesnac.Controls.Default; using System; @@ -12,6 +13,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting { public class InitAction : ChemicalWeighingAction, IAction { + DB112Helper DB122 = new DB112Helper(); MCTextboxEntity BoxE = new MCTextboxEntity(); List Controls; @@ -28,7 +30,36 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting private void SetValueFromPlc() { - + BoxE.ASetValue1.MCValue = DB122.PressureA.SetValue1; + BoxE.ASetValue2.MCValue = DB122.PressureA.SetValue2; + BoxE.ASetValue3.MCValue = DB122.PressureA.SetValue3; + BoxE.ASetValue4.MCValue = DB122.PressureA.SetValue4; + BoxE.ASetValue5.MCValue = DB122.PressureA.SetValue5; + BoxE.ASetValue6.MCValue = DB122.PressureA.SetValue6; + BoxE.ASetValue7.MCValue = DB122.PressureA.SetValue7; + BoxE.ASetValue8.MCValue = DB122.PressureA.SetValue8; + BoxE.BSetValue1.MCValue = DB122.PressureB.SetValue1; + BoxE.BSetValue2.MCValue = DB122.PressureB.SetValue2; + BoxE.BSetValue3.MCValue = DB122.PressureB.SetValue3; + BoxE.BSetValue4.MCValue = DB122.PressureB.SetValue4; + BoxE.BSetValue5.MCValue = DB122.PressureB.SetValue5; + BoxE.BSetValue6.MCValue = DB122.PressureB.SetValue6; + BoxE.BSetValue7.MCValue = DB122.PressureB.SetValue7; + BoxE.BSetValue8.MCValue = DB122.PressureB.SetValue8; + BoxE.CSetValue1.MCValue = DB122.PressureC.SetValue1; + BoxE.CSetValue2.MCValue = DB122.PressureC.SetValue2; + BoxE.CSetValue3.MCValue = DB122.PressureC.SetValue3; + BoxE.CSetValue4.MCValue = DB122.PressureC.SetValue4; + BoxE.CSetValue5.MCValue = DB122.PressureC.SetValue5; + BoxE.CSetValue6.MCValue = DB122.PressureC.SetValue6; + BoxE.CSetValue7.MCValue = DB122.PressureC.SetValue7; + BoxE.CSetValue8.MCValue = DB122.PressureC.SetValue8; + BoxE.ATimeSetValue1.MCValue = DB122.LineTimeA.SetValue1; + BoxE.ATimeSetValue2.MCValue = DB122.LineTimeA.SetValue2; + BoxE.BTimeSetValue1.MCValue = DB122.LineTimeB.SetValue1; + BoxE.BTimeSetValue2.MCValue = DB122.LineTimeB.SetValue2; + BoxE.CTimeSetValue1.MCValue = DB122.LineTimeC.SetValue1; + BoxE.CTimeSetValue2.MCValue = DB122.LineTimeC.SetValue2; } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs new file mode 100644 index 0000000..2fbcfd2 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs @@ -0,0 +1,150 @@ +using DataBlockHelper.DBHelpers; +using Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity; +using System; +using System.Collections.Generic; +using System.Drawing.Text; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting +{ + public class PlcDownload + { + public static void PressureSettingDownload(MCTextboxEntity BoxE) + { + Conveyor conveyorA = new Conveyor(); + Conveyor conveyorB = new Conveyor(); + Conveyor conveyorC = new Conveyor(); + ConveyorTimer conveyorTimerA = new ConveyorTimer(); + ConveyorTimer conveyorTimerB = new ConveyorTimer(); + ConveyorTimer conveyorTimerC = new ConveyorTimer(); + + string Alarm = "组数值超出取值范围！（大于0小于50）"; + + if (!SetValueWithJudge(conveyorA, + Convert.ToSingle(BoxE.ASetValue1.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue2.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue3.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue4.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue5.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue6.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue7.MCValue.ToString()), + Convert.ToSingle(BoxE.ASetValue8.MCValue.ToString()))) + { + MessageBox.Show("A" + Alarm); + return; + } + + if (!SetValueWithJudge(conveyorB, + Convert.ToSingle(BoxE.BSetValue1.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue2.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue3.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue4.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue5.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue6.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue7.MCValue.ToString()), + Convert.ToSingle(BoxE.BSetValue8.MCValue.ToString()))) + { + MessageBox.Show("B" + Alarm); + return; + } + + if (!SetValueWithJudge(conveyorC, + Convert.ToSingle(BoxE.CSetValue1.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue2.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue3.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue4.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue5.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue6.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue7.MCValue.ToString()), + Convert.ToSingle(BoxE.CSetValue8.MCValue.ToString()))) + { + MessageBox.Show("C" + Alarm); + return; + } + + if (!SetValueWithJudge(conveyorTimerA, + Convert.ToInt16(BoxE.ATimeSetValue1.MCValue.ToString()), + Convert.ToInt16(BoxE.ATimeSetValue2.MCValue.ToString()))) + { + MessageBox.Show("时间设定A" + Alarm); + return; + } + + if (!SetValueWithJudge(conveyorTimerA, + Convert.ToInt16(BoxE.BTimeSetValue1.MCValue.ToString()), + Convert.ToInt16(BoxE.BTimeSetValue2.MCValue.ToString()))) + { + MessageBox.Show("时间设定B" + Alarm); + return; + } + + if (!SetValueWithJudge(conveyorTimerA, + Convert.ToInt16(BoxE.CTimeSetValue1.MCValue.ToString()), + Convert.ToInt16(BoxE.CTimeSetValue2.MCValue.ToString()))) + { + MessageBox.Show("时间设定C" + Alarm); + return; + } + + DB112WriterHelper.AddConveyorA(conveyorA); + DB112WriterHelper.AddConveyorB(conveyorB); + DB112WriterHelper.AddConveyorC(conveyorC); + DB112WriterHelper.AddConveyorTimerA(conveyorTimerA); + DB112WriterHelper.AddConveyorTimerB(conveyorTimerB); + DB112WriterHelper.AddConveyorTimerC(conveyorTimerC); + + MessageBox.Show("数据下达成功！"); + + } + + private static bool SetValueWithJudge(Conveyor conveyor, float v1, float v2, float v3, float v4, float v5, float v6, float v7, float v8) + { + if (JudgeValue(v1) && JudgeValue(v2) && JudgeValue(v3) && JudgeValue(v4) && JudgeValue(v5) && JudgeValue(v6) && JudgeValue(v7) && JudgeValue(v8)) + { + conveyor.SetValue1 = v1; + conveyor.SetValue2 = v1; + conveyor.SetValue3 = v1; + conveyor.SetValue4 = v1; + conveyor.SetValue5 = v1; + conveyor.SetValue6 = v1; + conveyor.SetValue7 = v1; + conveyor.SetValue8 = v1; + return true; + } + else + { + return false; + } + } + + private static bool SetValueWithJudge(ConveyorTimer conveyor, short v1, short v2) + { + if (JudgeValue(v1) && JudgeValue(v2)) + { + conveyor.SetValue1 = v1; + conveyor.SetValue2 = v2; + return true; + } + else + { + return false; + } + } + + private static bool JudgeValue(float value) + { + if (value < 0 || value > 50) + { + return false; + } + else + { + return true; + } + } + + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PressureSettingButtonAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PressureSettingButtonAction.cs index febf864..79373c2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PressureSettingButtonAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PressureSettingButtonAction.cs @@ -1,4 +1,6 @@ -using ICSharpCode.Core; +using DataBlockHelper.DBHelpers; +using DevExpress.Utils.Taskbar; +using ICSharpCode.Core; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity; using Mesnac.Controls.Default; @@ -26,7 +28,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting SetAllControus(); - + ButtonAction(runtime); } public void SetAllControus() @@ -35,21 +37,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting ControlsHelper.ControlImport(BoxE, Controls); } - public void ButtonSelect(RuntimeParameter runtime) + public void ButtonAction(RuntimeParameter runtime) { - if (ButtonE.DownLoad == runtime.Sender) - { - - } - - if (ButtonE.UpLoad == runtime.Sender) - { - - } + - if (ButtonE.Refresh == runtime.Sender) + if (ButtonE.Download == runtime.Sender) { + if(MessageBox.Show("确定要下传数据到PLC？", "下传数据确认", MessageBoxButtons.YesNo) == DialogResult.No) + { + return; + } + PlcDownload.PressureSettingDownload(BoxE); } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 271a893..b013889 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -304,6 +304,7 @@ + diff --git a/DataBlockHelper/DBHelpers/DB112Helper.cs b/DataBlockHelper/DBHelpers/DB112Helper.cs index ee44a15..7c97070 100644 --- a/DataBlockHelper/DBHelpers/DB112Helper.cs +++ b/DataBlockHelper/DBHelpers/DB112Helper.cs @@ -8,24 +8,23 @@ using System.Threading.Tasks; namespace DataBlockHelper.DBHelpers { - public class DB112Helper: DBHelper + public class DB112Helper : DBHelper { - public DB112Helper() { + public DB112Helper() + { OperateResult db112 = PlcConnect.Instance.Read("DB112.0.0", 151); bytes = db112.Content; } - + public Conveyor PressureA => new Conveyor(2, bytes); public Conveyor PressureB => new Conveyor(34, bytes); - public Conveyor PressureC => new Conveyor(66, bytes); - - public ConveyorTimer LineTimeA=>new ConveyorTimer(98, bytes); + public ConveyorTimer LineTimeA => new ConveyorTimer(98, bytes); public ConveyorTimer LineTimeB => new ConveyorTimer(102, bytes); @@ -41,7 +40,7 @@ namespace DataBlockHelper.DBHelpers public Conveyor(ushort startSet, byte[] bytes) { byte[] content = bytes.Skip(startSet).Take(32).ToArray(); - var trans= PlcConnect.Instance.ByteTransform; + var trans = PlcConnect.Instance.ByteTransform; SetValue1 = trans.TransSingle(content, 0); SetValue2 = trans.TransSingle(content, 4); SetValue3 = trans.TransSingle(content, 8); diff --git a/DataBlockHelper/DBHelpers/DB112WriterHelper.cs b/DataBlockHelper/DBHelpers/DB112WriterHelper.cs index 8b162e9..0215981 100644 --- a/DataBlockHelper/DBHelpers/DB112WriterHelper.cs +++ b/DataBlockHelper/DBHelpers/DB112WriterHelper.cs @@ -9,7 +9,7 @@ namespace DataBlockHelper.DBHelpers public class DB112WriterHelper { private static readonly string DbName = "DB112"; - // var siemensS7Net = PlcConnect.Instance; + // var siemensS7Net = PlcConnect.Instance; @@ -33,7 +33,7 @@ namespace DataBlockHelper.DBHelpers { int start = 66; - AddConveyor(start , conveyor); + AddConveyor(start, conveyor); } @@ -59,7 +59,7 @@ namespace DataBlockHelper.DBHelpers private static void AddConveyor(int start, Conveyor conveyor) { - + var siemensS7Net = PlcConnect.Instance; siemensS7Net.Write($"{DbName}.{start}.0", conveyor.SetValue1); siemensS7Net.Write($"{DbName}.{start + 4}.0", conveyor.SetValue2); @@ -78,7 +78,7 @@ namespace DataBlockHelper.DBHelpers var siemensS7Net = PlcConnect.Instance; siemensS7Net.Write($"{DbName}.{start}.0", conveyor.SetValue1); siemensS7Net.Write($"{DbName}.{start + 2}.0", conveyor.SetValue2); - + } diff --git a/Main/MCEdit/Data/EventConfig/榄菊输送/榄菊输送参数设置.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊输送参数设置.xml similarity index 100% rename from Main/MCEdit/Data/EventConfig/榄菊输送/榄菊输送参数设置.xml rename to Main/MCEdit/Data/EventConfig/小料称量/榄菊输送参数设置.xml diff --git a/Main/MCEdit/Data/MCProject/nodeForm/DeliverPressureSetting.xml b/Main/MCEdit/Data/MCProject/nodeForm/DeliverPressureSetting.xml index 9e24c38..0107c15 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/DeliverPressureSetting.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/DeliverPressureSetting.xml @@ -25,8 +25,7 @@ 11 - - + Red DarkGray @@ -69,8 +68,7 @@ 9 - - + Red DarkGray @@ -113,8 +111,7 @@ 7 - - + Red DarkGray @@ -157,8 +154,7 @@ 5 - - + Red DarkGray @@ -201,8 +197,7 @@ 3 - - + Red DarkGray @@ -245,8 +240,7 @@ 1 - - + Red DarkGray @@ -298,8 +292,7 @@ 15 - - + Red DarkGray @@ -342,8 +335,7 @@ 13 - - + Red DarkGray @@ -386,8 +378,7 @@ 11 - - + Red DarkGray @@ -430,8 +421,7 @@ 9 - - + Red DarkGray @@ -474,8 +464,7 @@ 7 - - + Red DarkGray @@ -518,8 +507,7 @@ 5 - - + Red DarkGray @@ -562,8 +550,7 @@ 3 - - + Red DarkGray @@ -606,8 +593,7 @@ 1 - - + Red DarkGray @@ -659,8 +645,7 @@ 15 - - + Red DarkGray @@ -703,8 +688,7 @@ 13 - - + Red DarkGray @@ -747,8 +731,7 @@ 11 - - + Red DarkGray @@ -791,8 +774,7 @@ 9 - - + Red DarkGray @@ -835,8 +817,7 @@ 7 - - + Red DarkGray @@ -879,8 +860,7 @@ 5 - - + Red DarkGray @@ -923,8 +903,7 @@ 3 - - + Red DarkGray @@ -967,8 +946,7 @@ 1 - - + Red DarkGray @@ -997,7 +975,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEYwQTk5OUJFRTI5NTQ4N0RBRUEyRkNGM0UwMTA4NEZEBgYAAAAP5Yid5aeL5YyW5Y+C5pWwBgcAAAAP5Yid5aeL5YyW5Y+C5pWwCw== @@ -1015,14 +993,14 @@ DarkGray 刷新 宋体, 12pt - 624, 251 + 732, 251 Refresh - 198, 57 + 90, 57 4 - + - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDZBQTAwQ0RBM0IzRTQ5OEE5QzY5OERDQUQ0NUY4QjRCBgYAAAAY5Y+C5pWw6K6+572u5oyJ6ZKu5LqL5Lu2BgcAAAAY5Y+C5pWw6K6+572u5oyJ6ZKu5LqL5Lu2Cw== @@ -1038,36 +1016,11 @@ Red DarkGray - 下载 + 下传 宋体, 12pt - 468, 314 - DownLoad - 150, 51 - 3 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - - False - - - - None - True - True - False - - - Red - DarkGray - 上传 - 宋体, 12pt - 12, 314 - UpLoad - 150, 51 + 624, 251 + Download + 102, 57 2 @@ -1095,8 +1048,7 @@ 15 - - + Red DarkGray @@ -1139,8 +1091,7 @@ 13 - - + Red DarkGray @@ -1183,8 +1134,7 @@ 11 - - + Red DarkGray @@ -1227,8 +1177,7 @@ 9 - - + Red DarkGray @@ -1271,8 +1220,7 @@ 7 - - + Red DarkGray @@ -1315,8 +1263,7 @@ 5 - - + Red DarkGray @@ -1359,8 +1306,7 @@ 3 - - + Red DarkGray @@ -1403,8 +1349,7 @@ 1 - - + Red DarkGray @@ -1432,7 +1377,7 @@ 0 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEYwQTk5OUJFRTI5NTQ4N0RBRUEyRkNGM0UwMTA4NEZEBgYAAAAP5Yid5aeL5YyW5Y+C5pWwBgcAAAAP5Yid5aeL5YyW5Y+C5pWwCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -1447,7 +1392,7 @@ False False Control - 863, 417 + 850, 358 WindowsDefaultLocation 输送压送罐参数设置 Normal diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index 4e85738..0a2711d 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -403,7 +403,7 @@ PreserveNewest - + PreserveNewest @@ -655,6 +655,7 @@ +