From be5c0bc9a1b51dbc6286aba6b511366ecab57fdd Mon Sep 17 00:00:00 2001 From: wangsr Date: Thu, 17 Aug 2023 16:34:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"change=20-=20Timer=E5=AE=8C=E5=96=84?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20=E7=AD=89=E5=BE=85=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=A4=9A=E7=B6=AB=E7=A8=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e00504ce9af6399d1f09ebf4f27c36947856cfac. --- .../ElectronicMachineryStateMonitor.Designer.cs | 9 --------- .../ElectronicMachineryStateMonitor.cs | 7 ------- .../ElectronicMachineryStateMonitor.resx | 3 --- .../ValveStateMonitor/ValveStateMonitor.cs | 2 -- .../Mesnac.Action.ChemicalWeighing.csproj | 3 +++ .../Mesnac.Action.ChemicalWeighing/Test/TestAction.cs | 2 +- 6 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.Designer.cs index a2802ba..2987417 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); this.FOR_MOTOR = new System.Windows.Forms.GroupBox(); this.Alarm = new System.Windows.Forms.Label(); this.Run = new System.Windows.Forms.Label(); @@ -127,7 +126,6 @@ this.Running_VFD = new System.Windows.Forms.Label(); this.DmChange_FOR_MOTOR_S = new System.Windows.Forms.ListBox(); this.DmChange_FOR_MOTOR_VFD = new System.Windows.Forms.ListBox(); - this.ValueTimer = new System.Windows.Forms.Timer(this.components); this.FOR_MOTOR.SuspendLayout(); this.FOR_MOTOR_S_TO_T.SuspendLayout(); this.FOR_MOTOR_VFD.SuspendLayout(); @@ -1130,12 +1128,6 @@ this.DmChange_FOR_MOTOR_VFD.TabIndex = 5; this.DmChange_FOR_MOTOR_VFD.SelectedIndexChanged += new System.EventHandler(this.DmChange_FOR_MOTOR_VFD_SelectedIndexChanged); // - // ValueTimer - // - this.ValueTimer.Enabled = true; - this.ValueTimer.Interval = 1000; - this.ValueTimer.Tick += new System.EventHandler(this.ValueTimer_Tick); - // // ElectronicMachineryStateMonitor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1259,6 +1251,5 @@ private System.Windows.Forms.Label Alarm_VFD; private System.Windows.Forms.Label VVVF_OK_VFD; private System.Windows.Forms.Label Running_VFD; - private System.Windows.Forms.Timer ValueTimer; } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.cs index cdf73ba..c2c35c2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.cs @@ -172,12 +172,5 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ElectronicMach SetSpeed_M_VFD.Text = GetDataToString(dmName, "_SetSpeedM"); ACT_Speed_VFD.Text = GetDataToString(dmName, "_ACTSpeed"); } - - private void ValueTimer_Tick(object sender, EventArgs e) - { - StateMonitor_FOR_MOTOR(DmName_FOR_MOTOR); - StateMonitor_FOR_MOTOR_S(DmName_FOR_MOTOR_S); - StateMonitor_FOR_MOTOR_VFD(DmName_FOR_MOTOR_VFD); - } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.resx index e9d931c..1af7de1 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.resx +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ElectronicMachineryStateMonitor/ElectronicMachineryStateMonitor.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveStateMonitor/ValveStateMonitor.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveStateMonitor/ValveStateMonitor.cs index 2cc3f7b..96f7d55 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveStateMonitor/ValveStateMonitor.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveStateMonitor/ValveStateMonitor.cs @@ -23,8 +23,6 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ValveStateMoni public ValveStateMonitor() { InitializeComponent(); - StateMonitor_D(DmName_D); - StateMonitor_S(DmName_S); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 7b9342d..82b0d19 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -153,6 +153,9 @@ False ..\..\..\PlugInPlatform\Mesnac.PlugIn.dll + + ..\Microsoft.Office.Interop.Excel.dll + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index b54dafa..f820286 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -42,7 +42,7 @@ namespace Mesnac.Action.ChemicalWeighing.Test // dbHelper.CommandText = sql; - ElectronicMachineryStateMonitor Form = new ElectronicMachineryStateMonitor(); + ValveStateMonitor Form = new ValveStateMonitor(); Form.Show();