From 78a80944bf624221ad6f507bbf32d7efe7a74d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= Date: Fri, 22 Dec 2023 14:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControlAction.cs | 83 ++++----- .../Util/ControlsImprot.cs | 21 +-- .../Data/MCProject/nodeForm/MainDetail.xml | 162 +++++++++--------- 3 files changed, 128 insertions(+), 138 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index c66db9e..b073395 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -338,63 +338,66 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple8, mixSingle[7]); + + + //湿混机 加完料 DB2114Helper dB2114 = new DB2114Helper(); var dry = dB2114.Dry; - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM1, dry.M1); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM2, dry.M2); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM3, dry.M3); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM4, dry.M4); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM5, dry.M5); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM6, dry.M6); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM7, dry.M7); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededDryM8, dry.M8); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM1, dry.M1); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM2, dry.M2); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM3, dry.M3); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM4, dry.M4); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM5, dry.M5); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM6, dry.M6); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM7, dry.M7); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededDryM8, dry.M8); dry = dB2114.Gel; - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM1, dry.M1); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM2, dry.M2); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM3, dry.M3); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM4, dry.M4); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM5, dry.M5); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM6, dry.M6); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM7, dry.M7); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededGelM8, dry.M8); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM1, dry.M1); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM2, dry.M2); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM3, dry.M3); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM4, dry.M4); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM5, dry.M5); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM6, dry.M6); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM7, dry.M7); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededGelM8, dry.M8); var ch = dB2114.CW; //FeededCWG1 - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG1, ch.G1); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG2, ch.G2); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG3, ch.G3); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG4, ch.G4); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG5, ch.G5); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG6, ch.G6); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG7, ch.G7); - ControlsHelper.SetHslLanternFeed(HslLanternSimpleE.FeededCWG8, ch.G8); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG1, ch.G1); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG2, ch.G2); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG3, ch.G3); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG4, ch.G4); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG5, ch.G5); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG6, ch.G6); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG7, ch.G7); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededCWG8, ch.G8); //SetHslLanternFeedHw ch = dB2114.HW; - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG1, ch.G1); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG2, ch.G2); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG3, ch.G3); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG4, ch.G4); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG5, ch.G5); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG6, ch.G6); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG7, ch.G7); - ControlsHelper.SetHslLanternFeedHw(HslLanternSimpleE.FeededHWG8, ch.G8); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG1, ch.G1); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG2, ch.G2); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG3, ch.G3); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG4, ch.G4); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG5, ch.G5); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG6, ch.G6); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG7, ch.G7); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededHWG8, ch.G8); ch = dB2114.PD; - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG1, ch.G1); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG2, ch.G2); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG3, ch.G3); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG4, ch.G4); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG5, ch.G5); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG6, ch.G6); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG7, ch.G7); - ControlsHelper.SetHslLanternFeedPd(HslLanternSimpleE.FeededPDG8, ch.G8); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG1, ch.G1); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG2, ch.G2); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG3, ch.G3); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG4, ch.G4); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG5, ch.G5); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG6, ch.G6); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG7, ch.G7); + ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG8, ch.G8); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs index 6f141ff..9e16813 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs @@ -289,6 +289,7 @@ namespace Mesnac.Action.ChemicalWeighing.Util } + public static void SetHslLanternFeed(HslLanternSimple lanternSimple, bool su) { @@ -302,30 +303,16 @@ namespace Mesnac.Action.ChemicalWeighing.Util } } - public static void SetHslLanternFeedHw(HslLanternSimple lanternSimple, bool su) + public static void SetHsl(HslLanternSimple lanternSimple, bool su) { if (su == true) { - lanternSimple.LanternBackground = Color.Yellow; - } - else - { - lanternSimple.LanternBackground = Color.Transparent; - } - } - - - public static void SetHslLanternFeedPd(HslLanternSimple lanternSimple, bool su) - { - - if (su == true) - { - lanternSimple.LanternBackground = Color.Blue; + lanternSimple.LanternBackground = Color.DarkGray; } else { - lanternSimple.LanternBackground = Color.Transparent; + lanternSimple.LanternBackground = Color.DimGray; } } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index f576eeb..2a5e290 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -2,204 +2,204 @@ - 1874, 470 + 1863, 473 FeededPDG8 - 10, 10 + 7, 7 - 1660, 469 + 1673, 473 FeededPDG7 - 10, 10 + 7, 7 - 1566, 469 + 1551, 476 FeededPDG6 - 10, 10 + 7, 7 - 1347, 470 + 1361, 475 FeededPDG5 - 10, 10 + 7, 7 - 1318, 471 + 1310, 476 FeededPDG4 - 10, 10 + 7, 7 - 1106, 470 + 1119, 476 FeededPDG3 - 10, 10 + 7, 7 - 1008, 469 + 1000, 477 FeededPDG2 - 10, 10 + 7, 7 - 796, 468 + 809, 475 FeededPDG1 - 10, 10 + 7, 7 - 1820, 469 + 1831, 471 FeededHWG8 - 10, 10 + 7, 7 - 1713, 470 + 1707, 472 FeededHWG7 - 10, 10 + 7, 7 - 1531, 469 + 1526, 472 FeededHWG6 - 10, 10 + 7, 7 - 1399, 470 + 1393, 472 FeededHWG5 - 10, 10 + 7, 7 - 1268, 470 + 1277, 474 FeededHWG4 - 10, 10 + 7, 7 - 1158, 471 + 1151, 475 FeededHWG3 - 10, 10 + 7, 7 - 983, 469 + 976, 473 FeededHWG2 - 10, 10 + 7, 7 - 848, 469 + 843, 474 FeededHWG1 - 10, 10 + 7, 7 - 1847, 469 + 1841, 469 FeededCWG8 - 10, 10 + 7, 7 - 1690, 469 + 1696, 470 FeededCWG7 - 10, 10 + 7, 7 - 1509, 469 + 1517, 473 FeededCWG6 - 10, 10 + 7, 7 - 1372, 470 + 1383, 471 FeededCWG5 - 10, 10 + 7, 7 - 1293, 469 + 1285, 472 FeededCWG4 - 10, 10 + 7, 7 - 1134, 470 + 1142, 473 FeededCWG3 - 10, 10 + 7, 7 - 958, 470 + 967, 474 FeededCWG2 - 10, 10 + 7, 7 - 824, 469 + 832, 472 FeededCWG1 - 10, 10 + 7, 7 - 1838, 552 + 1830, 558 FeededGelM8 - 10, 10 + 7, 7 - 1694, 553 + 1706, 557 FeededGelM7 - 10, 10 + 7, 7 - 1526, 553 + 1517, 559 FeededGelM6 - 10, 10 + 7, 7 - 1384, 553 + 1395, 559 FeededGelM5 - 10, 10 + 7, 7 - 1281, 554 + 1274, 559 FeededGelM4 - 10, 10 + 7, 7 - 1140, 554 + 1151, 559 FeededGelM3 - 10, 10 + 7, 7 - 976, 554 + 969, 560 FeededGelM2 - 10, 10 + 7, 7 - 832, 555 + 841, 559 FeededGelM1 - 10, 10 + 7, 7 - 1803, 552 + 1794, 556 FeededDryM8 - 10, 10 + 7, 7 - 1724, 552 + 1735, 557 FeededDryM7 - 10, 10 + 7, 7 - 1488, 552 + 1481, 557 FeededDryM6 - 10, 10 + 7, 7 - 1412, 551 + 1421, 558 FeededDryM5 - 10, 10 + 7, 7 - 1248, 554 + 1240, 560 FeededDryM4 - 10, 10 + 7, 7 - 1168, 553 + 1181, 559 FeededDryM3 - 10, 10 + 7, 7 - 941, 554 + 934, 559 FeededDryM2 - 10, 10 + 7, 7 - 864, 555 + 874, 559 FeededDryM1 - 10, 10 + 7, 7 @@ -2056,7 +2056,7 @@ True MiddleCenter MintCream - 1243, 549 + 1243, 550 SpecialLabelBlue427 3, 17