Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
8fe1625936
8 files changed
+242
-140
No files matched your search
@@ -170,6 +170,7 @@ namespace DyeingComputer
|
|||||||
if (messageBoxResult == MessageBoxResult.OK)
|
if (messageBoxResult == MessageBoxResult.OK)
|
||||||
{
|
{
|
||||||
MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为
|
MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为
|
||||||
|
MainWindowViewModel.DIDETime = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+36
@@ -330,6 +330,15 @@ namespace DyeingComputer.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Expected 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string Expected {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Expected", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Finish 的本地化字符串。
|
/// 查找类似 Finish 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -366,6 +375,24 @@ namespace DyeingComputer.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Heat insulating 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string Heat_insulating {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Heat insulating", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Heats 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string Heats {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Heats", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 History 的本地化字符串。
|
/// 查找类似 History 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -456,6 +483,15 @@ namespace DyeingComputer.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Min 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string Min {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Min", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Mixing 的本地化字符串。
|
/// 查找类似 Mixing 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
+112
-99
@@ -117,50 +117,26 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<data name="WorkOrder" xml:space="preserve">
|
|
||||||
<value>Work Order</value>
|
|
||||||
</data>
|
|
||||||
<data name="TechnologicalProcess" xml:space="preserve">
|
|
||||||
<value>Process</value>
|
|
||||||
</data>
|
|
||||||
<data name="CurveDiagram" xml:space="preserve">
|
<data name="CurveDiagram" xml:space="preserve">
|
||||||
<value>Curve</value>
|
<value>Curve</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Delete" xml:space="preserve">
|
||||||
|
<value>Delete</value>
|
||||||
|
</data>
|
||||||
|
<data name="EndTime" xml:space="preserve">
|
||||||
|
<value>End Time</value>
|
||||||
|
</data>
|
||||||
<data name="EngineerSet" xml:space="preserve">
|
<data name="EngineerSet" xml:space="preserve">
|
||||||
<value>Engineer</value>
|
<value>Engineer</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="EquipmentSimulation" xml:space="preserve">
|
<data name="EquipmentSimulation" xml:space="preserve">
|
||||||
<value>Simulation</value>
|
<value>Simulation</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="InOut" xml:space="preserve">
|
|
||||||
<value>I/O</value>
|
|
||||||
</data>
|
|
||||||
<data name="Next" xml:space="preserve">
|
|
||||||
<value>Next</value>
|
|
||||||
</data>
|
|
||||||
<data name="Previous" xml:space="preserve">
|
|
||||||
<value>back</value>
|
|
||||||
</data>
|
|
||||||
<data name="SysSet" xml:space="preserve">
|
|
||||||
<value>System</value>
|
|
||||||
</data>
|
|
||||||
<data name="HistoryRecords" xml:space="preserve">
|
<data name="HistoryRecords" xml:space="preserve">
|
||||||
<value>History</value>
|
<value>History</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ParameterSet" xml:space="preserve">
|
<data name="InOut" xml:space="preserve">
|
||||||
<value>Parameter</value>
|
<value>I/O</value>
|
||||||
</data>
|
|
||||||
<data name="Programgroup" xml:space="preserve">
|
|
||||||
<value>Program Group</value>
|
|
||||||
</data>
|
|
||||||
<data name="SysDatLoss" xml:space="preserve">
|
|
||||||
<value>System Data Lost</value>
|
|
||||||
</data>
|
|
||||||
<data name="WorkOrderNumder" xml:space="preserve">
|
|
||||||
<value>Work Order Numder</value>
|
|
||||||
</data>
|
|
||||||
<data name="Temperature" xml:space="preserve">
|
|
||||||
<value>Temperature</value>
|
|
||||||
</data>
|
</data>
|
||||||
<data name="lock" xml:space="preserve">
|
<data name="lock" xml:space="preserve">
|
||||||
<value>Lock/Unlock</value>
|
<value>Lock/Unlock</value>
|
||||||
@@ -168,27 +144,51 @@
|
|||||||
<data name="New" xml:space="preserve">
|
<data name="New" xml:space="preserve">
|
||||||
<value>New</value>
|
<value>New</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Delete" xml:space="preserve">
|
<data name="Next" xml:space="preserve">
|
||||||
<value>Delete</value>
|
<value>Next</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Redye" xml:space="preserve">
|
<data name="ParameterSet" xml:space="preserve">
|
||||||
<value>Redye</value>
|
<value>Parameter</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="EndTime" xml:space="preserve">
|
<data name="Previous" xml:space="preserve">
|
||||||
<value>End Time</value>
|
<value>back</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ProcessName" xml:space="preserve">
|
<data name="ProcessName" xml:space="preserve">
|
||||||
<value>Process name</value>
|
<value>Process name</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Programgroup" xml:space="preserve">
|
||||||
|
<value>Program Group</value>
|
||||||
|
</data>
|
||||||
|
<data name="Redye" xml:space="preserve">
|
||||||
|
<value>Redye</value>
|
||||||
|
</data>
|
||||||
<data name="Remark" xml:space="preserve">
|
<data name="Remark" xml:space="preserve">
|
||||||
<value>Remarks</value>
|
<value>Remarks</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="StartTime" xml:space="preserve">
|
<data name="StartTime" xml:space="preserve">
|
||||||
<value>Start Time</value>
|
<value>Start Time</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="SysDatLoss" xml:space="preserve">
|
||||||
|
<value>System Data Lost</value>
|
||||||
|
</data>
|
||||||
|
<data name="SysSet" xml:space="preserve">
|
||||||
|
<value>System</value>
|
||||||
|
</data>
|
||||||
|
<data name="TechnologicalProcess" xml:space="preserve">
|
||||||
|
<value>Process</value>
|
||||||
|
</data>
|
||||||
|
<data name="Temperature" xml:space="preserve">
|
||||||
|
<value>Temperature</value>
|
||||||
|
</data>
|
||||||
<data name="Time" xml:space="preserve">
|
<data name="Time" xml:space="preserve">
|
||||||
<value>Time</value>
|
<value>Time</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="WorkOrder" xml:space="preserve">
|
||||||
|
<value>Work Order</value>
|
||||||
|
</data>
|
||||||
|
<data name="WorkOrderNumder" xml:space="preserve">
|
||||||
|
<value>Work Order Numder</value>
|
||||||
|
</data>
|
||||||
<data name="Ready" xml:space="preserve">
|
<data name="Ready" xml:space="preserve">
|
||||||
<value>Ready</value>
|
<value>Ready</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -210,14 +210,14 @@
|
|||||||
<data name="LineUp" xml:space="preserve">
|
<data name="LineUp" xml:space="preserve">
|
||||||
<value>Line Up</value>
|
<value>Line Up</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="State" xml:space="preserve">
|
<data name="Notimplementation" xml:space="preserve">
|
||||||
<value>State</value>
|
<value>Not Implementation</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Confirm" xml:space="preserve">
|
<data name="Confirm" xml:space="preserve">
|
||||||
<value>Confirm</value>
|
<value>Confirm</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Step" xml:space="preserve">
|
<data name="State" xml:space="preserve">
|
||||||
<value>Step</value>
|
<value>State</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="edit" xml:space="preserve">
|
<data name="edit" xml:space="preserve">
|
||||||
<value>Edit</value>
|
<value>Edit</value>
|
||||||
@@ -225,60 +225,63 @@
|
|||||||
<data name="Rename" xml:space="preserve">
|
<data name="Rename" xml:space="preserve">
|
||||||
<value>Rename</value>
|
<value>Rename</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ID" xml:space="preserve">
|
<data name="Step" xml:space="preserve">
|
||||||
<value>ID</value>
|
<value>Step</value>
|
||||||
</data>
|
|
||||||
<data name="Directives" xml:space="preserve">
|
|
||||||
<value>Directives</value>
|
|
||||||
</data>
|
</data>
|
||||||
<data name="Code" xml:space="preserve">
|
<data name="Code" xml:space="preserve">
|
||||||
<value>Code</value>
|
<value>Code</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Recover" xml:space="preserve">
|
<data name="Directives" xml:space="preserve">
|
||||||
<value>Recover</value>
|
<value>Directives</value>
|
||||||
|
</data>
|
||||||
|
<data name="ID" xml:space="preserve">
|
||||||
|
<value>ID</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Insert" xml:space="preserve">
|
<data name="Insert" xml:space="preserve">
|
||||||
<value>Insert</value>
|
<value>Insert</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Recover" xml:space="preserve">
|
||||||
|
<value>Recover</value>
|
||||||
|
</data>
|
||||||
<data name="Save" xml:space="preserve">
|
<data name="Save" xml:space="preserve">
|
||||||
<value>Save</value>
|
<value>Save</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Quit" xml:space="preserve">
|
<data name="Quit" xml:space="preserve">
|
||||||
<value>Quit</value>
|
<value>Quit</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TemperatureControl" xml:space="preserve">
|
|
||||||
<value>Temperature Control</value>
|
|
||||||
</data>
|
|
||||||
<data name="AddWater" xml:space="preserve">
|
<data name="AddWater" xml:space="preserve">
|
||||||
<value>Add water</value>
|
<value>Add water</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Flowmeter" xml:space="preserve">
|
|
||||||
<value>Flowmeter</value>
|
|
||||||
</data>
|
|
||||||
<data name="WaterLevel" xml:space="preserve">
|
|
||||||
<value>Water Level</value>
|
|
||||||
</data>
|
|
||||||
<data name="Washing" xml:space="preserve">
|
|
||||||
<value>Washing</value>
|
|
||||||
</data>
|
|
||||||
<data name="Cooling" xml:space="preserve">
|
<data name="Cooling" xml:space="preserve">
|
||||||
<value>Cooling</value>
|
<value>Cooling</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Drainage" xml:space="preserve">
|
<data name="Drainage" xml:space="preserve">
|
||||||
<value>Drainage</value>
|
<value>Drainage</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="PumpDrainage" xml:space="preserve">
|
<data name="Flowmeter" xml:space="preserve">
|
||||||
<value>Pump Drainage</value>
|
<value>Flowmeter</value>
|
||||||
|
</data>
|
||||||
|
<data name="TemperatureControl" xml:space="preserve">
|
||||||
|
<value>Temperature Control</value>
|
||||||
|
</data>
|
||||||
|
<data name="Washing" xml:space="preserve">
|
||||||
|
<value>Washing</value>
|
||||||
|
</data>
|
||||||
|
<data name="WaterLevel" xml:space="preserve">
|
||||||
|
<value>Water Level</value>
|
||||||
|
</data>
|
||||||
|
<data name="ClothIntake" xml:space="preserve">
|
||||||
|
<value>Put in the cloth</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="OutTheCloth" xml:space="preserve">
|
<data name="OutTheCloth" xml:space="preserve">
|
||||||
<value>Out The Cloth</value>
|
<value>Out The Cloth</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="PumpDrainage" xml:space="preserve">
|
||||||
|
<value>Pump Drainage</value>
|
||||||
|
</data>
|
||||||
<data name="RunningTime" xml:space="preserve">
|
<data name="RunningTime" xml:space="preserve">
|
||||||
<value>Running Time</value>
|
<value>Running Time</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ClothIntake" xml:space="preserve">
|
|
||||||
<value>Put in the cloth</value>
|
|
||||||
</data>
|
|
||||||
<data name="AddTheMedicine" xml:space="preserve">
|
<data name="AddTheMedicine" xml:space="preserve">
|
||||||
<value>Add The Medicine</value>
|
<value>Add The Medicine</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -327,80 +330,77 @@
|
|||||||
<data name="Sampling" xml:space="preserve">
|
<data name="Sampling" xml:space="preserve">
|
||||||
<value>Sampling</value>
|
<value>Sampling</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Invalidfeatures" xml:space="preserve">
|
|
||||||
<value>Invalid features</value>
|
|
||||||
</data>
|
|
||||||
<data name="Function" xml:space="preserve">
|
<data name="Function" xml:space="preserve">
|
||||||
<value>Function</value>
|
<value>Function</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Invalidfeatures" xml:space="preserve">
|
||||||
|
<value>Invalid features</value>
|
||||||
|
</data>
|
||||||
<data name="NO" xml:space="preserve">
|
<data name="NO" xml:space="preserve">
|
||||||
<value>NO</value>
|
<value>NO</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="YES" xml:space="preserve">
|
<data name="YES" xml:space="preserve">
|
||||||
<value>YES</value>
|
<value>YES</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Rate" xml:space="preserve">
|
<data name="Advance" xml:space="preserve">
|
||||||
<value>Rate</value>
|
<value>Advance</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Target" xml:space="preserve">
|
<data name="Beginning" xml:space="preserve">
|
||||||
<value>Target</value>
|
<value>Beginning</value>
|
||||||
|
</data>
|
||||||
|
<data name="Container" xml:space="preserve">
|
||||||
|
<value>Container</value>
|
||||||
|
</data>
|
||||||
|
<data name="Curve" xml:space="preserve">
|
||||||
|
<value>Curve</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Headwaters" xml:space="preserve">
|
<data name="Headwaters" xml:space="preserve">
|
||||||
<value>Headwaters</value>
|
<value>Headwaters</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Medicine" xml:space="preserve">
|
||||||
|
<value>Medicine</value>
|
||||||
|
</data>
|
||||||
|
<data name="Mixing" xml:space="preserve">
|
||||||
|
<value>Mixing</value>
|
||||||
|
</data>
|
||||||
<data name="Number" xml:space="preserve">
|
<data name="Number" xml:space="preserve">
|
||||||
<value>Number</value>
|
<value>Number</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Pressure" xml:space="preserve">
|
<data name="Pressure" xml:space="preserve">
|
||||||
<value>Pressure</value>
|
<value>Pressure</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Container" xml:space="preserve">
|
<data name="Rate" xml:space="preserve">
|
||||||
<value>Container</value>
|
<value>Rate</value>
|
||||||
</data>
|
|
||||||
<data name="Medicine" xml:space="preserve">
|
|
||||||
<value>Medicine</value>
|
|
||||||
</data>
|
</data>
|
||||||
<data name="Tank" xml:space="preserve">
|
<data name="Tank" xml:space="preserve">
|
||||||
<value>Tank</value>
|
<value>Tank</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Beginning" xml:space="preserve">
|
<data name="Target" xml:space="preserve">
|
||||||
<value>Beginning</value>
|
<value>Target</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Type" xml:space="preserve">
|
<data name="Type" xml:space="preserve">
|
||||||
<value>Type</value>
|
<value>Type</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Advance" xml:space="preserve">
|
|
||||||
<value>Advance</value>
|
|
||||||
</data>
|
|
||||||
<data name="Curve" xml:space="preserve">
|
|
||||||
<value>Curve</value>
|
|
||||||
</data>
|
|
||||||
<data name="Mixing" xml:space="preserve">
|
|
||||||
<value>Mixing</value>
|
|
||||||
</data>
|
|
||||||
<data name="Blower" xml:space="preserve">
|
<data name="Blower" xml:space="preserve">
|
||||||
<value>Blower</value>
|
<value>Blower</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Pump" xml:space="preserve">
|
|
||||||
<value>Pump</value>
|
|
||||||
</data>
|
|
||||||
<data name="Nozzle" xml:space="preserve">
|
<data name="Nozzle" xml:space="preserve">
|
||||||
<value>Nozzle</value>
|
<value>Nozzle</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Wiggle" xml:space="preserve">
|
|
||||||
<value>Wiggle</value>
|
|
||||||
</data>
|
|
||||||
<data name="Overflow" xml:space="preserve">
|
<data name="Overflow" xml:space="preserve">
|
||||||
<value>Overflow</value>
|
<value>Overflow</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="process_not" xml:space="preserve">
|
<data name="Pump" xml:space="preserve">
|
||||||
<value>The process does not exist</value>
|
<value>Pump</value>
|
||||||
|
</data>
|
||||||
|
<data name="Wiggle" xml:space="preserve">
|
||||||
|
<value>Wiggle</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Implementation" xml:space="preserve">
|
<data name="Implementation" xml:space="preserve">
|
||||||
<value>Implementation</value>
|
<value>Implementation</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Notimplementation" xml:space="preserve">
|
<data name="process_not" xml:space="preserve">
|
||||||
<value>Not Implementation</value>
|
<value>The process does not exist</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Connectionlost" xml:space="preserve">
|
<data name="Connectionlost" xml:space="preserve">
|
||||||
<value>Connection lost</value>
|
<value>Connection lost</value>
|
||||||
@@ -417,4 +417,17 @@
|
|||||||
<data name="Paused" xml:space="preserve">
|
<data name="Paused" xml:space="preserve">
|
||||||
<value>Paused</value>
|
<value>Paused</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Heats" xml:space="preserve">
|
||||||
|
<value>Heats</value>
|
||||||
|
</data>
|
||||||
|
<data name="Min" xml:space="preserve">
|
||||||
|
<value>Min</value>
|
||||||
|
</data>
|
||||||
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
|
<data name="Expected" type="System.Resources.ResXNullRef, System.Windows.Forms">
|
||||||
|
<value />
|
||||||
|
</data>
|
||||||
|
<data name="Heat insulating" xml:space="preserve">
|
||||||
|
<value>Heat insulating</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -417,4 +417,16 @@
|
|||||||
<data name="Paused" xml:space="preserve">
|
<data name="Paused" xml:space="preserve">
|
||||||
<value>Paused</value>
|
<value>Paused</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Heats" xml:space="preserve">
|
||||||
|
<value>Heats</value>
|
||||||
|
</data>
|
||||||
|
<data name="Min" xml:space="preserve">
|
||||||
|
<value>Min</value>
|
||||||
|
</data>
|
||||||
|
<data name="Expected" xml:space="preserve">
|
||||||
|
<value>Expected</value>
|
||||||
|
</data>
|
||||||
|
<data name="Heat insulating" xml:space="preserve">
|
||||||
|
<value>Heat insulating</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -417,4 +417,17 @@
|
|||||||
<data name="Paused" xml:space="preserve">
|
<data name="Paused" xml:space="preserve">
|
||||||
<value>暂停</value>
|
<value>暂停</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Heats" xml:space="preserve">
|
||||||
|
<value>加热</value>
|
||||||
|
</data>
|
||||||
|
<data name="Min" xml:space="preserve">
|
||||||
|
<value>分钟</value>
|
||||||
|
</data>
|
||||||
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
|
<data name="Expected" type="System.Resources.ResXNullRef, System.Windows.Forms">
|
||||||
|
<value />
|
||||||
|
</data>
|
||||||
|
<data name="Heat insulating" xml:space="preserve">
|
||||||
|
<value>保温</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -417,4 +417,13 @@
|
|||||||
<data name="Paused" xml:space="preserve">
|
<data name="Paused" xml:space="preserve">
|
||||||
<value>已暫停</value>
|
<value>已暫停</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Heats" xml:space="preserve">
|
||||||
|
<value>加熱</value>
|
||||||
|
</data>
|
||||||
|
<data name="Min" xml:space="preserve">
|
||||||
|
<value>分鐘</value>
|
||||||
|
</data>
|
||||||
|
<data name="Heat insulating" xml:space="preserve">
|
||||||
|
<value>保溫</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -104,8 +104,9 @@ namespace DyeingComputer.View
|
|||||||
{
|
{
|
||||||
if (e.Key == Key.Y) //按键y
|
if (e.Key == Key.Y) //按键y
|
||||||
{
|
{
|
||||||
// MainWindowViewModel strart = new MainWindowViewModel();//实例
|
MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));
|
||||||
// strart.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));//传入参数开始
|
// MainWindowViewModel strart = new MainWindowViewModel();//实例
|
||||||
|
// strart.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));//传入参数开始
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -155,14 +155,12 @@ namespace DyeingComputer.ViewModel
|
|||||||
public static object Name_err;
|
public static object Name_err;
|
||||||
public static object WorkNumder;
|
public static object WorkNumder;
|
||||||
public static object Process_step;
|
public static object Process_step;
|
||||||
public Int32 DIDETime;
|
public static Int32 DIDETime; //空闲计时器
|
||||||
void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
|
void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
|
||||||
{
|
{
|
||||||
Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
|
Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
|
||||||
|
|
||||||
Work_Temp = Selet_dtm("1010") + " ℃";
|
Work_Temp = Selet_dtm("1010") + " ℃";
|
||||||
Work_Numder = WorkNumder.ToString();
|
Work_Numder = WorkNumder.ToString();
|
||||||
// Status_Str = "qweqeqwqqfwfqef";
|
|
||||||
|
|
||||||
if (LINK_OK) Modbus_link();
|
if (LINK_OK) Modbus_link();
|
||||||
|
|
||||||
@@ -175,28 +173,27 @@ namespace DyeingComputer.ViewModel
|
|||||||
{
|
{
|
||||||
if (!LINK_OK) Modbus_link();
|
if (!LINK_OK) Modbus_link();
|
||||||
if (Name_err != null) Status_Str = Name_err.ToString();
|
if (Name_err != null) Status_Str = Name_err.ToString();
|
||||||
// if(SETP_runtime) STEP_RUN();
|
|
||||||
}
|
}
|
||||||
void DisTimer_100MS(object sender, EventArgs e)//Tick_Event周期执行事件100MS
|
void DisTimer_100MS(object sender, EventArgs e)//Tick_Event周期执行事件100MS
|
||||||
{
|
{
|
||||||
// if (LINK_OK) Modbus_link();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static int WORK_RUN = 0; //运行状态0停止1暂停2运行
|
public static int WORK_RUN = 0; //运行状态0停止1暂停2运行
|
||||||
private string STEP_ID = "0";
|
private static string STEP_ID = "0";
|
||||||
private double STEP_P1 = 0;
|
private static double STEP_P1 = 0;
|
||||||
private double STEP_P2 = 0;
|
private static double STEP_P2 = 0;
|
||||||
private double STEP_P3 = 0;
|
private static double STEP_P3 = 0;
|
||||||
private double STEP_P4 = 0;
|
private static double STEP_P4 = 0;
|
||||||
private double STEP_P5 = 0;
|
private static double STEP_P5 = 0;
|
||||||
private int SETP_runtime; //步骤开始
|
private static bool SETP_runtime = false; //步骤开始
|
||||||
private bool STEP_finish = false; //步骤结束
|
private static bool STEP_finish = false; //步骤结束
|
||||||
private int STEP_TIME = 0; //步骤计时S
|
private static int STEP_TIME = 0; //步骤计时S
|
||||||
private int THL_mode = 0; //温控模式 0保温 1加热 2降
|
private static int THL_mode = 0; //温控模式 0保温 1加热 2降
|
||||||
private double TEMP_co = 0; //计算温度
|
private static double TEMP_co = 0; //计算温度
|
||||||
|
|
||||||
public void STEP_START(string ID,double P1,double P2,double P3,double P4,double P5)
|
public static void STEP_START(string ID,double P1,double P2,double P3,double P4,double P5)
|
||||||
{
|
{
|
||||||
if (ID == "001")
|
if (ID == "001")
|
||||||
{
|
{
|
||||||
@@ -213,7 +210,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
updata_dtm("1003", STEP_P2 / 600);
|
updata_dtm("1003", STEP_P2 / 600);
|
||||||
STEP_TIME = Convert.ToInt16(STEP_P3) * 60;
|
STEP_TIME = Convert.ToInt16(STEP_P3) * 60;
|
||||||
WORK_RUN = 2;
|
WORK_RUN = 2;
|
||||||
SETP_runtime = 1;
|
SETP_runtime = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,13 +218,15 @@ namespace DyeingComputer.ViewModel
|
|||||||
void STEP_RUN()
|
void STEP_RUN()
|
||||||
{
|
{
|
||||||
|
|
||||||
/* if (WORK_RUN == 2)
|
if (WORK_RUN == 2)
|
||||||
{
|
{
|
||||||
if (SETP_runtime == 1)
|
if (SETP_runtime)
|
||||||
{
|
{
|
||||||
if (STEP_ID == "001")
|
if (STEP_ID == "001")
|
||||||
{
|
{
|
||||||
|
int TIME_H;
|
||||||
|
int TIME_M;
|
||||||
|
int TIME_S;
|
||||||
double TO = 0;
|
double TO = 0;
|
||||||
double T = Selet_dtm("1010"); //实际温度
|
double T = Selet_dtm("1010"); //实际温度
|
||||||
if (THL_mode == 0) //保温
|
if (THL_mode == 0) //保温
|
||||||
@@ -237,25 +236,43 @@ namespace DyeingComputer.ViewModel
|
|||||||
TO = pid.PID_iterate(STEP_P1, T, ts);
|
TO = pid.PID_iterate(STEP_P1, T, ts);
|
||||||
if (TO < 0) TO = 0;
|
if (TO < 0) TO = 0;
|
||||||
|
|
||||||
int TIME_H = STEP_TIME / 3600;
|
TIME_H = STEP_TIME / 3600;
|
||||||
int TIME_M = (STEP_TIME - TIME_H * 3600) / 60;
|
TIME_M = (STEP_TIME - TIME_H * 3600) / 60;
|
||||||
int TIME_S = STEP_TIME - TIME_H * 3600 - TIME_M * 60;
|
TIME_S = STEP_TIME - TIME_H * 3600 - TIME_M * 60;
|
||||||
Status_Str = Resources.Temperature + Resources.Time + string.Format(" {0:D2}", TIME_H) + ":" + string.Format(" {0:D2}", TIME_M) + ":" + string.Format(" {0:D2}", TIME_S);
|
Status_Str = Resources.Heat_insulating+":" + Resources.Time + string.Format(" {0:D2}", TIME_H) + ":" + string.Format(" {0:D2}", TIME_M) + ":" + string.Format(" {0:D2}", TIME_S);
|
||||||
}
|
}
|
||||||
else if (THL_mode == 1)//升温
|
else if (THL_mode == 1)//升温
|
||||||
{
|
{
|
||||||
TEMP_co = TEMP_co + (STEP_P2 / 60);
|
TEMP_co = TEMP_co + (STEP_P2 / 600);
|
||||||
TO = pid.PID_iterate(TEMP_co, T, ts);
|
TO = pid.PID_iterate(TEMP_co, T, ts);
|
||||||
if (TO < 0) TO = 0;
|
if (TO < 0) TO = 0;
|
||||||
if (STEP_P1 < T) THL_mode = 0;
|
if (STEP_P1 < T)
|
||||||
|
{
|
||||||
|
THL_mode = 0;
|
||||||
|
TIME_M = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TIME_M = Convert.ToInt16( (STEP_P1 - T) / (STEP_P2/10));
|
||||||
|
}
|
||||||
|
Status_Str = Resources.Heats + ":" + Resources.Target + Resources.Temperature + string.Format(" {0:###.#}", STEP_P1) + "°C" + Resources.Expected+ string.Format(" {0:D2}", TIME_M) + Resources.Min;
|
||||||
}
|
}
|
||||||
else if (THL_mode == 2)//降温
|
else if (THL_mode == 2)//降温
|
||||||
{
|
{
|
||||||
TEMP_co = TEMP_co - (STEP_P2 / 60);
|
TEMP_co = TEMP_co - (STEP_P2 / 600);
|
||||||
TO = pid.PID_iterate(TEMP_co, T, ts);
|
TO = pid.PID_iterate(TEMP_co, T, ts);
|
||||||
if (TO > 0) TO = 0;
|
if (TO > 0) TO = 0;
|
||||||
TO = Math.Abs(TO);
|
TO = Math.Abs(TO);
|
||||||
if (STEP_P1 > T) THL_mode = 0;
|
if (STEP_P1 > T)
|
||||||
|
{
|
||||||
|
THL_mode = 0;
|
||||||
|
TIME_M = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TIME_M = Convert.ToInt16((T - STEP_P1) / (STEP_P2 / 10));
|
||||||
|
}
|
||||||
|
Status_Str = Resources.Cooling +":" + Resources.Target + Resources.Temperature + string.Format(" {0:###.#}", STEP_P1) +"°C" + Resources.Expected + string.Format(" {0:D2}", TIME_M )+ Resources.Min;
|
||||||
}
|
}
|
||||||
|
|
||||||
updata_dtm("1004", TO);
|
updata_dtm("1004", TO);
|
||||||
@@ -276,7 +293,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
{
|
{
|
||||||
Status_Str = Resources.Paused;
|
Status_Str = Resources.Paused;
|
||||||
}
|
}
|
||||||
else */
|
else
|
||||||
if (WORK_RUN == 0)
|
if (WORK_RUN == 0)
|
||||||
{
|
{
|
||||||
if (Name_err == null)
|
if (Name_err == null)
|
||||||
@@ -360,9 +377,9 @@ namespace DyeingComputer.ViewModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public DataTable dt_d = new DataTable("DIO");
|
public static DataTable dt_d = new DataTable("DIO");
|
||||||
public DataTable dt_a = new DataTable("AIO");
|
public static DataTable dt_a = new DataTable("AIO");
|
||||||
public DataTable dt_m = new DataTable("M");
|
public static DataTable dt_m = new DataTable("M");
|
||||||
void SQL_data()//获得io表
|
void SQL_data()//获得io表
|
||||||
{
|
{
|
||||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||||
@@ -396,7 +413,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public double Selet_dtm(string key)//M寄存器
|
public static double Selet_dtm(string key)//M寄存器
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -410,7 +427,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public bool Selet_dtd(string key)//D寄存器
|
public static bool Selet_dtd(string key)//D寄存器
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
DataRow[] arrRows = dt_d.Select("ID='" + key + "'");
|
DataRow[] arrRows = dt_d.Select("ID='" + key + "'");
|
||||||
@@ -423,7 +440,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public int Selet_dta(string key)//A寄存器
|
public static int Selet_dta(string key)//A寄存器
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
DataRow[] arrRows = dt_a.Select("ID='" + key + "'");
|
DataRow[] arrRows = dt_a.Select("ID='" + key + "'");
|
||||||
@@ -436,7 +453,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void updata_dtm(string key,double Value)//更新M寄存器
|
public static void updata_dtm(string key,double Value)//更新M寄存器
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -459,7 +476,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
public void updata_dtd(string key, bool Value)//更新D寄存器
|
public static void updata_dtd(string key, bool Value)//更新D寄存器
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -483,7 +500,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
LogGing.LogGingDATA(ex.ToString());
|
LogGing.LogGingDATA(ex.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void updata_dta(string key, int Value)//更新A寄存器
|
public static void updata_dta(string key, int Value)//更新A寄存器
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user