diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs index 4610d8a..de6d5d7 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs @@ -13,6 +13,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public class HslLanternAlarmEntity { public HslLanternAlarm HslLanternAlarm1 { get; set; } + + + public HslLanternAlarm HslLanternAlarm2 { get; set; } public HslLanternAlarm HslLanternAlarm3 { get; set; } public HslLanternAlarm HslLanternAlarm4 { get; set; } @@ -22,6 +25,12 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public HslLanternAlarm HslLanternAlarm8 { get; set; } } + + public class HslAgvCarEntity + { + public HslAgvCar HslAgvCar1 { get; set; } + } + public class HslLanternSimpleEntity { public HslLanternSimple HslLanternSimple1 { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index a19e804..a74203f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -88,6 +88,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl //控件实体类 HslLanternAlarmEntity HslAlarmE = new HslLanternAlarmEntity(); + + HslAgvCarEntity hslAgvCarEntity = new HslAgvCarEntity(); + HslLanternSimpleEntity HslLanternSimpleE = new HslLanternSimpleEntity(); MCLabelEntity LabelE = new MCLabelEntity(); SwitchLightEntity LightE = new SwitchLightEntity(); @@ -177,6 +180,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl private void SetAllControls() { ControlsHelper.ControlImport(HslAlarmE, Controls); + ControlsHelper.ControlImport(hslAgvCarEntity, Controls); + ControlsHelper.ControlImport(HslLanternSimpleE, Controls); ControlsHelper.ControlImport(LabelE, Controls); ControlsHelper.ControlImport(LightE, Controls); @@ -334,7 +339,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl //目前只有主线程可以 //小车到位信号 - ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm1, reachSingle[0]); + ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm1, hslAgvCarEntity.HslAgvCar1, reachSingle[0]); ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm2, reachSingle[1]); ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm3, reachSingle[2]); ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm4, reachSingle[3]); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs index 3a983ac..4366c2a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs @@ -56,104 +56,104 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl MessageBox.Show("此功能停止使用"); return; - if (GelChooseA == 0) - { - MessageBox.Show("请先选择糊化锅！"); - return; - } - if (!DB2105.Force_CA.forceOn) - { - MessageBox.Show("冷水称A强制控制按钮未打开！"); - return; - } - if (MessageBox.Show("确认向冷水称A补充？", "强制模式启动确认", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - return; - } - DB2105WriteHelper.AddCaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text)); - DB2105WriteHelper.AddCaAddForceBin(GelChooseA); - DB2105WriteHelper.AddCaAddStartIn(true); - ManualLogControl("冷水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text), GelChooseA); - MessageBox.Show("冷水称A强制补充"); + //if (GelChooseA == 0) + //{ + // MessageBox.Show("请先选择糊化锅！"); + // return; + //} + //if (!DB2105.Force_CA.forceOn) + //{ + // MessageBox.Show("冷水称A强制控制按钮未打开！"); + // return; + //} + //if (MessageBox.Show("确认向冷水称A补充？", "强制模式启动确认", + // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + //{ + // return; + //} + //DB2105WriteHelper.AddCaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text)); + //DB2105WriteHelper.AddCaAddForceBin(GelChooseA); + //DB2105WriteHelper.AddCaAddStartIn(true); + //ManualLogControl("冷水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text), GelChooseA); + //MessageBox.Show("冷水称A强制补充"); } if (ButtonE.StartMetage2 == runtime.Sender) { MessageBox.Show("此功能停止使用"); return; - if (GelChooseA == 0) - { - MessageBox.Show("请先选择糊化锅！"); - return; - } - if (!DB2105.Force_HA.forceOn) - { - MessageBox.Show("热水称A强制控制按钮未打开！"); - return; - } - if (MessageBox.Show("确认向热水称A补充？", "强制模式启动确认", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - return; - } - DB2105WriteHelper.AddHaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text)); - DB2105WriteHelper.AddHaAddForceBin(GelChooseA); - DB2105WriteHelper.AddHaAddStartIn(true); - ManualLogControl("热水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text), GelChooseA); - MessageBox.Show("热水称A强制补充"); + //if (GelChooseA == 0) + //{ + // MessageBox.Show("请先选择糊化锅！"); + // return; + //} + //if (!DB2105.Force_HA.forceOn) + //{ + // MessageBox.Show("热水称A强制控制按钮未打开！"); + // return; + //} + //if (MessageBox.Show("确认向热水称A补充？", "强制模式启动确认", + // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + //{ + // return; + //} + //DB2105WriteHelper.AddHaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text)); + //DB2105WriteHelper.AddHaAddForceBin(GelChooseA); + //DB2105WriteHelper.AddHaAddStartIn(true); + //ManualLogControl("热水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text), GelChooseA); + //MessageBox.Show("热水称A强制补充"); } if (ButtonE.StartMetage3 == runtime.Sender) { MessageBox.Show("此功能停止使用"); return; - if (GelChooseB == 0) - { - MessageBox.Show("请先选择糊化锅！"); - return; - } - if (!DB2105.Force_CB.forceOn) - { - MessageBox.Show("冷水称B强制控制按钮未打开！"); - return; - } - if (MessageBox.Show("确认向冷水称B补充？", "强制模式启动确认", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - return; - } - DB2105WriteHelper.AddCbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text)); - DB2105WriteHelper.AddCbAddForceBin(GelChooseB); - DB2105WriteHelper.AddCbAddStartIn(true); - ManualLogControl("冷水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text), GelChooseB + 4); - MessageBox.Show("冷水称B强制补充"); + //if (GelChooseB == 0) + //{ + // MessageBox.Show("请先选择糊化锅！"); + // return; + //} + //if (!DB2105.Force_CB.forceOn) + //{ + // MessageBox.Show("冷水称B强制控制按钮未打开！"); + // return; + //} + //if (MessageBox.Show("确认向冷水称B补充？", "强制模式启动确认", + // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + //{ + // return; + //} + //DB2105WriteHelper.AddCbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text)); + //DB2105WriteHelper.AddCbAddForceBin(GelChooseB); + //DB2105WriteHelper.AddCbAddStartIn(true); + //ManualLogControl("冷水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text), GelChooseB + 4); + //MessageBox.Show("冷水称B强制补充"); } if (ButtonE.StartMetage4 == runtime.Sender) { MessageBox.Show("此功能停止使用"); return; - if (GelChooseB == 0) - { - MessageBox.Show("请先选择糊化锅！"); - return; - } - if (!DB2105.Force_HB.forceOn) - { - MessageBox.Show("热水称B强制控制按钮未打开！"); - return; - } - if (MessageBox.Show("确认向热水称B补充？", "强制模式启动确认", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - return; - } - DB2105WriteHelper.AddHbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text)); - DB2105WriteHelper.AddHbAddForceBin(GelChooseB); - DB2105WriteHelper.AddHbAddStartIn(true); - ManualLogControl("热水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text), GelChooseB + 4); - MessageBox.Show("热水称B强制补充"); + //if (GelChooseB == 0) + //{ + // MessageBox.Show("请先选择糊化锅！"); + // return; + //} + //if (!DB2105.Force_HB.forceOn) + //{ + // MessageBox.Show("热水称B强制控制按钮未打开！"); + // return; + //} + //if (MessageBox.Show("确认向热水称B补充？", "强制模式启动确认", + // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + //{ + // return; + //} + //DB2105WriteHelper.AddHbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text)); + //DB2105WriteHelper.AddHbAddForceBin(GelChooseB); + //DB2105WriteHelper.AddHbAddStartIn(true); + //ManualLogControl("热水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text), GelChooseB + 4); + //MessageBox.Show("热水称B强制补充"); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs index 3cc4733..8d88cef 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs @@ -298,6 +298,33 @@ namespace Mesnac.Action.ChemicalWeighing.Util } } + public static void SetHslLanternAlarm(HslLanternAlarm lanternAlarm, HslAgvCar car,RGVEntity rGV) + { + lanternAlarm.IsAlarm = false; + car.BackColor = Color.Transparent; + if (rGV.Error) + { + lanternAlarm.NormalColor = Color.Red; + car.AgvColor = Color.Red; + } + else + { + if (rGV.RequestFeed) + { + lanternAlarm.NormalColor = Color.Green; + car.AgvColor = Color.Green; + } + else + { + lanternAlarm.NormalColor = Color.DarkGray; + car.AgvColor = Color.DarkGray; + } + } + + + } + + /// /// 绿色胡工小灯 /// diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/HslAgvCar.cs b/Controls/Mesnac.Controls.ChemicalWeighing/HslAgvCar.cs new file mode 100644 index 0000000..5113a3f --- /dev/null +++ b/Controls/Mesnac.Controls.ChemicalWeighing/HslAgvCar.cs @@ -0,0 +1,233 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing.Drawing2D; +using System.Drawing.Text; +using System.Drawing; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Controls.ChemicalWeighing +{ + /// + /// Agv小车控件 + /// + // Token: 0x02000004 RID: 4 + [Description("Agv 小车控件")] + public class HslAgvCar : UserControl + { + /// + /// 实例化一个默认的对象 + /// + // Token: 0x0600000C RID: 12 RVA: 0x00010BB4 File Offset: 0x0000EDB4 + public HslAgvCar() + { + this.InitializeComponent(); + base.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); + base.SetStyle(ControlStyles.ResizeRedraw, true); + base.SetStyle(ControlStyles.OptimizedDoubleBuffer, true); + base.SetStyle(ControlStyles.AllPaintingInWmPaint, true); + } + + /// + /// 获取或设置当前AGV小车的颜色信息 + /// + // Token: 0x17000001 RID: 1 + // (get) Token: 0x0600000D RID: 13 RVA: 0x00010C50 File Offset: 0x0000EE50 + // (set) Token: 0x0600000E RID: 14 RVA: 0x00010C6D File Offset: 0x0000EE6D + [Browsable(true)] + [Description("获取或设置当前AGV小车的颜色信息")] + [Category("HslControls")] + [DefaultValue(typeof(Color), "Tomato")] + public virtual Color AgvColor + { + get + { + return this.carBrush.Color; + } + set + { + this.carBrush.Color = value; + base.Invalidate(); + } + } + + /// + /// 获取或设置当前的轮胎的颜色 + /// + // Token: 0x17000002 RID: 2 + // (get) Token: 0x0600000F RID: 15 RVA: 0x00010C84 File Offset: 0x0000EE84 + // (set) Token: 0x06000010 RID: 16 RVA: 0x00010C91 File Offset: 0x0000EE91 + [Browsable(true)] + [Description("获取或设置当前的轮胎的颜色")] + [Category("HslControls")] + [DefaultValue(typeof(Color), "52, 52, 52")] + public virtual Color TireColor + { + get + { + return this.darkBlack.Color; + } + set + { + this.darkBlack.Color = value; + base.Invalidate(); + } + } + + /// + /// 重绘控件的 + /// + /// 重绘事件 + // Token: 0x06000011 RID: 17 RVA: 0x00010CA8 File Offset: 0x0000EEA8 + protected override void OnPaint(PaintEventArgs e) + { + bool flag = true; + if (flag) + { + Graphics graphics = e.Graphics; + graphics.SmoothingMode = SmoothingMode.HighQuality; + graphics.TextRenderingHint = TextRenderingHint.ClearTypeGridFit; + this.PaintHslControls(graphics, base.Width, base.Height); + base.OnPaint(e); + } + } + + /// + // Token: 0x06000012 RID: 18 RVA: 0x00010CF8 File Offset: 0x0000EEF8 + public void PaintHslControls(Graphics g, int width, int height) + { + this.PaintMain(g, width, height); + } + + // Token: 0x06000013 RID: 19 RVA: 0x00010D20 File Offset: 0x0000EF20 + private void PaintMain(Graphics g, int width, int height) + { + int num = (int)((float)height * 0.08f); + bool flag = width < 50 && height < 50; + if (flag) + { + num = (int)((float)height * 0.12f); + } + int num2 = (int)((float)width * 0.04f); + int num3 = (int)((float)width * 0.1f); + GraphicsPath graphicsPath = new GraphicsPath(); + graphicsPath.AddArc(new Rectangle(width - num3 - num3 + 1, num, num3 + num3 - 2, num3 + num3 - 2), -90f, 90f); + graphicsPath.AddLine(new Point(width - 1, num + num3), new Point(width - 1, height - num - num3)); + graphicsPath.AddArc(new Rectangle(width - num3 - num3 + 1, height - num - num3 - num3, num3 + num3 - 2, num3 + num3), 0f, 90f); + Rectangle rect = new Rectangle(num2, num, width - num2 - num3, height - num - num); + using (LinearGradientBrush linearGradientBrush = new LinearGradientBrush(new PointF(0f, (float)(height - num)), new PointF(0f, (float)num), this.carBrush.Color, HslHelper.GetColorOffset(this.carBrush.Color, height - num))) + { + linearGradientBrush.InterpolationColors = new ColorBlend + { + Positions = new float[] + { + 0f, + 0.1f, + 0.9f, + 1f + }, + Colors = new Color[] + { + HslHelper.GetColorLight(this.carBrush.Color), + this.carBrush.Color, + this.carBrush.Color, + HslHelper.GetColorLight(this.carBrush.Color) + } + }; + g.FillPath(linearGradientBrush, graphicsPath); + g.DrawPath(this.borderPen, graphicsPath); + g.FillRectangle(linearGradientBrush, rect); + g.DrawRectangle(this.borderPen, rect); + using (Pen pen = new Pen(HslHelper.GetColorLight(this.carBrush.Color, -15))) + { + g.DrawLine(pen, new Point(width - num3, num + 1), new Point(width - num3, height - num - 2)); + } + } + int num4 = (int)((float)width * 0.12f); + int num5 = (int)((float)width * 0.28f); + Rectangle rect2 = new Rectangle(rect.X + rect.Width / 2 - num5 - num4 / 2, 0, num4, num * 2); + g.FillRectangle(this.darkBlack, rect2); + rect2.X = rect.X + rect.Width / 2 + num5 - num4 / 2; + g.FillRectangle(this.darkBlack, rect2); + rect2.X = rect.X + rect.Width / 2 - num5 - num4 / 2; + rect2.Y = height - rect2.Height; + g.FillRectangle(this.darkBlack, rect2); + rect2.X = rect.X + rect.Width / 2 + num5 - num4 / 2; + g.FillRectangle(this.darkBlack, rect2); + Point point = new Point(rect.X + rect.Width / 2, height / 2); + g.TranslateTransform((float)point.X, (float)point.Y); + int num6 = (int)((float)height * 0.36f); + g.FillEllipse(Brushes.LightGray, new Rectangle(-num6, -num6, num6 + num6, num6 + num6)); + g.DrawEllipse(Pens.Gray, new Rectangle(-num6, -num6, num6 + num6, num6 + num6)); + num6 = (int)((float)height * 0.33f); + for (int i = 0; i < 6; i++) + { + g.FillPie(this.darkBlack, new Rectangle(-num6, -num6, num6 + num6, num6 + num6), (float)(-115 + 60 * i), 50f); + } + num6 = (int)((float)height * 0.24f); + g.FillEllipse(Brushes.LightGray, new Rectangle(-num6, -num6, num6 + num6, num6 + num6)); + num6 = (int)((float)height * 0.04f); + for (int j = 0; j < 4; j++) + { + g.FillEllipse(this.darkBlack, new Rectangle((int)((float)height * 0.16f) - num6, -num6, num6 * 2, num6 * 2)); + g.RotateTransform(90f); + } + num6 = (int)((float)height * 0.06f); + g.FillEllipse(this.carBrush, new Rectangle(-num6, -num6, num6 + num6, num6 + num6)); + g.TranslateTransform((float)(-(float)point.X), (float)(-(float)point.Y)); + } + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + // Token: 0x06000014 RID: 20 RVA: 0x00011208 File Offset: 0x0000F408 + protected override void Dispose(bool disposing) + { + bool flag = disposing && this.components != null; + if (flag) + { + this.components.Dispose(); + } + base.Dispose(disposing); + } + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + // Token: 0x06000015 RID: 21 RVA: 0x00011240 File Offset: 0x0000F440 + private void InitializeComponent() + { + base.SuspendLayout(); + base.AutoScaleMode = AutoScaleMode.None; + this.BackColor = Color.Transparent; + this.Font = new Font("微软雅黑", 9f, FontStyle.Regular, GraphicsUnit.Point, 134); + base.Name = "HslAgvCar"; + base.Size = new Size(58, 65); + base.ResumeLayout(false); + } + + // Token: 0x0400000B RID: 11 + private Color borderColor = Color.Gray; + + // Token: 0x0400000C RID: 12 + private Pen borderPen = new Pen(Color.Gray, 1f); + + // Token: 0x0400000D RID: 13 + private SolidBrush carBrush = new SolidBrush(Color.Tomato); + + // Token: 0x0400000E RID: 14 + private SolidBrush darkBlack = new SolidBrush(Color.FromArgb(52, 52, 52)); + + /// + /// 必需的设计器变量。 + /// + // Token: 0x0400000F RID: 15 + private IContainer components = null; + } +} diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index c580f5d..0a0c91a 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -123,6 +123,9 @@ GanHunJi.cs + + UserControl + UserControl diff --git a/Main/MCEdit/Data/ComponentProperty.xml b/Main/MCEdit/Data/ComponentProperty.xml index 5c4b4c4..6c92d0a 100644 --- a/Main/MCEdit/Data/ComponentProperty.xml +++ b/Main/MCEdit/Data/ComponentProperty.xml @@ -1636,6 +1636,22 @@ + + + + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml index dac0389..29443d7 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml @@ -3797,7 +3797,7 @@ 48 False - 湿混机手动控制 + 湿混机手动控制(千克) 宋体, 9pt 6, 266 GroupBox48 @@ -3849,7 +3849,7 @@ 53, 12 False - 5-时间设定 + 5-时间设定(分钟) 宋体, 9pt 6, 204 GroupBox46 @@ -3910,7 +3910,7 @@ 53, 12 False - 3-混合 + 3-混合(分钟) 宋体, 9pt 6, 115 GroupBox44 @@ -3962,7 +3962,7 @@ 53, 12 False - 2-下干料 + 2-下干料(千克) 宋体, 9pt 6, 52 GroupBox43 @@ -4115,11 +4115,11 @@ None True True - 重量： + 重量(千克)： 宋体, 9pt - 224, 60 + 216, 60 MCLabel56 - 41, 12 + 77, 12 @@ -4139,9 +4139,9 @@ True True - 271, 53 + 293, 53 MaterialWeight2 - 80, 26 + 58, 26 34 @@ -4188,7 +4188,7 @@ True 77, 55 ChooseMaterial2 - 137, 24 + 133, 24 33 @@ -4236,7 +4236,7 @@ 29, 12 False - 7-时间设定 + 7-时间设定(分钟) 宋体, 9pt 6, 363 GroupBox41 @@ -4340,7 +4340,7 @@ 65, 12 False - 8-排料等待时间设定 + 8-排料等待时间设定(分钟) 宋体, 9pt 6, 424 GroupBox30 @@ -4392,7 +4392,7 @@ 29, 12 False - 5-时间设定 + 5-时间设定(分钟) 宋体, 9pt 6, 275 GroupBox39 @@ -4539,7 +4539,7 @@ 35, 12 False - 3-搅拌 + 3-搅拌(分钟) 宋体, 9pt 6, 186 GroupBox37 @@ -4603,11 +4603,11 @@ None True True - 重量： + 重量(千克)： 宋体, 9pt - 224, 30 + 216, 30 MCLabel60 - 41, 12 + 77, 12 @@ -4627,9 +4627,9 @@ True True - 271, 23 + 293, 23 MaterialWeight1 - 80, 26 + 58, 26 25 @@ -4676,7 +4676,7 @@ True 77, 25 ChooseMaterial1 - 137, 24 + 133, 24 23 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 310c028..339d9e2 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,6 +1,11 @@ + + 891, 717 + HslAgvCar1 + 37, 31 + diff --git a/Main/MCEdit/Data/SharpDevelopControlLibrary.xml b/Main/MCEdit/Data/SharpDevelopControlLibrary.xml index d71b294..9062de6 100644 --- a/Main/MCEdit/Data/SharpDevelopControlLibrary.xml +++ b/Main/MCEdit/Data/SharpDevelopControlLibrary.xml @@ -115,6 +115,8 @@ + +