Browse Source

添加详细工作信息展示

master
sc 1 year ago
parent
commit
fac463078b
  1. 54
      Properties/Resources.Designer.cs
  2. 26
      Properties/Resources.en-US.resx
  3. 18
      Properties/Resources.resx
  4. 32
      Properties/Resources.zh-CN.resx
  5. 228
      Properties/Resources.zh-TW.resx
  6. 6
      View/TechnologicalProcessView.xaml
  7. 1
      View/TechnologicalProcessView.xaml.cs
  8. 50
      ViewModel/MainWindowViewModel.cs

54
Properties/Resources.Designer.cs

@ -186,6 +186,15 @@ namespace DyeingComputer.Properties {
} }
} }
/// <summary>
/// 查找类似 Compute 的本地化字符串。
/// </summary>
public static string Compute {
get {
return ResourceManager.GetString("Compute", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Confirm 的本地化字符串。 /// 查找类似 Confirm 的本地化字符串。
/// </summary> /// </summary>
@ -402,6 +411,15 @@ namespace DyeingComputer.Properties {
} }
} }
/// <summary>
/// 查找类似 High-water level 的本地化字符串。
/// </summary>
public static string High_waterlevel {
get {
return ResourceManager.GetString("High-waterlevel", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 History 的本地化字符串。 /// 查找类似 History 的本地化字符串。
/// </summary> /// </summary>
@ -474,6 +492,15 @@ namespace DyeingComputer.Properties {
} }
} }
/// <summary>
/// 查找类似 Low-water level 的本地化字符串。
/// </summary>
public static string Low_waterlevel {
get {
return ResourceManager.GetString("Low-waterlevel", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Malfunction 的本地化字符串。 /// 查找类似 Malfunction 的本地化字符串。
/// </summary> /// </summary>
@ -483,6 +510,15 @@ namespace DyeingComputer.Properties {
} }
} }
/// <summary>
/// 查找类似 MasterCylinder 的本地化字符串。
/// </summary>
public static string MasterCylinder {
get {
return ResourceManager.GetString("MasterCylinder", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Measure 的本地化字符串。 /// 查找类似 Measure 的本地化字符串。
/// </summary> /// </summary>
@ -501,6 +537,15 @@ namespace DyeingComputer.Properties {
} }
} }
/// <summary>
/// 查找类似 Mid-waterlevel 的本地化字符串。
/// </summary>
public static string Mid_waterlevel {
get {
return ResourceManager.GetString("Mid-waterlevel", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Min 的本地化字符串。 /// 查找类似 Min 的本地化字符串。
/// </summary> /// </summary>
@ -708,6 +753,15 @@ namespace DyeingComputer.Properties {
} }
} }
/// <summary>
/// 查找类似 ProportionalValves 的本地化字符串。
/// </summary>
public static string ProportionalValves {
get {
return ResourceManager.GetString("ProportionalValves", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Pump 的本地化字符串。 /// 查找类似 Pump 的本地化字符串。
/// </summary> /// </summary>

26
Properties/Resources.en-US.resx

@ -423,16 +423,12 @@
<data name="Min" xml:space="preserve"> <data name="Min" xml:space="preserve">
<value>Min</value> <value>Min</value>
</data> </data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="Expected" xml:space="preserve">
<data name="Expected" type="System.Resources.ResXNullRef, System.Windows.Forms"> <value>Expected</value>
<value />
</data> </data>
<data name="Heat insulating" xml:space="preserve"> <data name="Heat insulating" xml:space="preserve">
<value>Heat insulating</value> <value>Heat insulating</value>
</data> </data>
<data name="Expected" xml:space="preserve">
<value>Expected</value>
</data>
<data name="Malfunction" xml:space="preserve"> <data name="Malfunction" xml:space="preserve">
<value>Malfunction</value> <value>Malfunction</value>
</data> </data>
@ -445,4 +441,22 @@
<data name="StopProcess" xml:space="preserve"> <data name="StopProcess" xml:space="preserve">
<value>End the current process</value> <value>End the current process</value>
</data> </data>
<data name="Compute" xml:space="preserve">
<value>Compute</value>
</data>
<data name="MasterCylinder" xml:space="preserve">
<value>Master Cylinder</value>
</data>
<data name="ProportionalValves" xml:space="preserve">
<value>Proportional Valves</value>
</data>
<data name="Mid-waterlevel" xml:space="preserve">
<value>Mid-water level</value>
</data>
<data name="High-waterlevel" xml:space="preserve">
<value>High-water level</value>
</data>
<data name="Low-waterlevel" xml:space="preserve">
<value>Low-water level</value>
</data>
</root> </root>

18
Properties/Resources.resx

@ -441,4 +441,22 @@
<data name="StopProcess" xml:space="preserve"> <data name="StopProcess" xml:space="preserve">
<value>StopProcess</value> <value>StopProcess</value>
</data> </data>
<data name="Compute" xml:space="preserve">
<value>Compute</value>
</data>
<data name="MasterCylinder" xml:space="preserve">
<value>MasterCylinder</value>
</data>
<data name="ProportionalValves" xml:space="preserve">
<value>ProportionalValves</value>
</data>
<data name="Mid-waterlevel" xml:space="preserve">
<value>Mid-waterlevel</value>
</data>
<data name="High-waterlevel" xml:space="preserve">
<value>High-water level</value>
</data>
<data name="Low-waterlevel" xml:space="preserve">
<value>Low-water level</value>
</data>
</root> </root>

32
Properties/Resources.zh-CN.resx

@ -423,26 +423,40 @@
<data name="Min" xml:space="preserve"> <data name="Min" xml:space="preserve">
<value>分钟</value> <value>分钟</value>
</data> </data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="Expected" xml:space="preserve">
<data name="Expected" type="System.Resources.ResXNullRef, System.Windows.Forms"> <value>预计</value>
<value />
</data> </data>
<data name="Heat insulating" xml:space="preserve"> <data name="Heat insulating" xml:space="preserve">
<value>保温</value> <value>保温</value>
</data> </data>
<data name="Sensor" xml:space="preserve">
<value>传感器</value>
</data>
<data name="Expected" xml:space="preserve">
<value>预计</value>
</data>
<data name="Malfunction" xml:space="preserve"> <data name="Malfunction" xml:space="preserve">
<value>故障</value> <value>故障</value>
</data> </data>
<data name="Sensor" xml:space="preserve">
<value>传感器</value>
</data>
<data name="FailureRecovery" xml:space="preserve"> <data name="FailureRecovery" xml:space="preserve">
<value>异常恢复</value> <value>异常恢复</value>
</data> </data>
<data name="StopProcess" xml:space="preserve"> <data name="StopProcess" xml:space="preserve">
<value>结束当前工艺</value> <value>结束当前工艺</value>
</data> </data>
<data name="Compute" xml:space="preserve">
<value>计算</value>
</data>
<data name="MasterCylinder" xml:space="preserve">
<value>主缸</value>
</data>
<data name="ProportionalValves" xml:space="preserve">
<value>比例控制</value>
</data>
<data name="Mid-waterlevel" xml:space="preserve">
<value>中水位</value>
</data>
<data name="High-waterlevel" xml:space="preserve">
<value>高水位</value>
</data>
<data name="Low-waterlevel" xml:space="preserve">
<value>低水位</value>
</data>
</root> </root>

228
Properties/Resources.zh-TW.resx

@ -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="Previous" xml:space="preserve"> <data name="CurveDiagram" xml:space="preserve">
<value>返回</value> <value>製程曲線</value>
</data>
<data name="SysSet" xml:space="preserve">
<value>系統</value>
</data>
<data name="TechnologicalProcess" xml:space="preserve">
<value>製程流程</value>
</data>
<data name="ParameterSet" xml:space="preserve">
<value>參數</value>
</data>
<data name="Programgroup" xml:space="preserve">
<value>程序組</value>
</data>
<data name="Next" xml:space="preserve">
<value>更多</value>
</data>
<data name="InOut" xml:space="preserve">
<value>輸入輸出</value>
</data> </data>
<data name="HistoryRecords" xml:space="preserve"> <data name="Delete" xml:space="preserve">
<value>歷史</value> <value>刪除</value>
</data> </data>
<data name="EquipmentSimulation" xml:space="preserve"> <data name="EndTime" xml:space="preserve">
<value>設備模擬</value> <value>結束時間</value>
</data> </data>
<data name="EngineerSet" xml:space="preserve"> <data name="EngineerSet" xml:space="preserve">
<value>工程師</value> <value>工程師</value>
</data> </data>
<data name="CurveDiagram" xml:space="preserve"> <data name="EquipmentSimulation" xml:space="preserve">
<value>製程曲線</value> <value>設備模擬</value>
</data>
<data name="WorkOrder" xml:space="preserve">
<value>工作清單</value>
</data>
<data name="SysDatLoss" xml:space="preserve">
<value>系統資料遺失</value>
</data> </data>
<data name="WorkOrderNumder" xml:space="preserve"> <data name="HistoryRecords" xml:space="preserve">
<value>工單號碼</value> <value>歷史</value>
</data> </data>
<data name="Temperature" xml:space="preserve"> <data name="InOut" xml:space="preserve">
<value>溫度</value> <value>輸入輸出</value>
</data> </data>
<data name="lock" xml:space="preserve"> <data name="lock" xml:space="preserve">
<value>鎖定</value> <value>鎖定</value>
@ -168,27 +144,51 @@
<data name="New" xml:space="preserve"> <data name="New" xml:space="preserve">
<value>新建</value> <value>新建</value>
</data> </data>
<data name="Delete" xml:space="preserve"> <data name="Next" xml:space="preserve">
<value>刪除</value> <value>更多</value>
</data> </data>
<data name="Redye" xml:space="preserve"> <data name="ParameterSet" xml:space="preserve">
<value>重染</value> <value>參數</value>
</data> </data>
<data name="EndTime" xml:space="preserve"> <data name="Previous" xml:space="preserve">
<value>結束時間</value> <value>返回</value>
</data> </data>
<data name="ProcessName" xml:space="preserve"> <data name="ProcessName" xml:space="preserve">
<value>工藝名</value> <value>工藝名</value>
</data> </data>
<data name="Programgroup" xml:space="preserve">
<value>程序組</value>
</data>
<data name="Redye" xml:space="preserve">
<value>重染</value>
</data>
<data name="Remark" xml:space="preserve"> <data name="Remark" xml:space="preserve">
<value>備註</value> <value>備註</value>
</data> </data>
<data name="StartTime" xml:space="preserve"> <data name="StartTime" xml:space="preserve">
<value>開始時間</value> <value>開始時間</value>
</data> </data>
<data name="SysDatLoss" xml:space="preserve">
<value>系統資料遺失</value>
</data>
<data name="SysSet" xml:space="preserve">
<value>系統</value>
</data>
<data name="TechnologicalProcess" xml:space="preserve">
<value>製程流程</value>
</data>
<data name="Temperature" xml:space="preserve">
<value>溫度</value>
</data>
<data name="Time" xml:space="preserve"> <data name="Time" xml:space="preserve">
<value>時間</value> <value>時間</value>
</data> </data>
<data name="WorkOrder" xml:space="preserve">
<value>工作清單</value>
</data>
<data name="WorkOrderNumder" xml:space="preserve">
<value>工單號碼</value>
</data>
<data name="Ready" xml:space="preserve"> <data name="Ready" xml:space="preserve">
<value>準備</value> <value>準備</value>
</data> </data>
@ -204,20 +204,20 @@
<data name="Finish" xml:space="preserve"> <data name="Finish" xml:space="preserve">
<value>完成</value> <value>完成</value>
</data> </data>
<data name="LineUp" xml:space="preserve">
<value>轉入</value>
</data>
<data name="Measure" xml:space="preserve"> <data name="Measure" xml:space="preserve">
<value>計量</value> <value>計量</value>
</data> </data>
<data name="State" xml:space="preserve"> <data name="LineUp" xml:space="preserve">
<value>狀態</value> <value>轉入</value>
</data>
<data name="Notimplementation" xml:space="preserve">
<value>未執行</value>
</data> </data>
<data name="Confirm" xml:space="preserve"> <data name="Confirm" xml:space="preserve">
<value>確認</value> <value>確認</value>
</data> </data>
<data name="Step" xml:space="preserve"> <data name="State" xml:space="preserve">
<value>步驟</value> <value>狀態</value>
</data> </data>
<data name="edit" xml:space="preserve"> <data name="edit" xml:space="preserve">
<value>編輯</value> <value>編輯</value>
@ -225,47 +225,56 @@
<data name="Rename" xml:space="preserve"> <data name="Rename" xml:space="preserve">
<value>重新命名</value> <value>重新命名</value>
</data> </data>
<data name="ID" xml:space="preserve"> <data name="Step" xml:space="preserve">
<value>ID</value> <value>步驟</value>
</data>
<data name="Directives" xml:space="preserve">
<value>指令</value>
</data> </data>
<data name="Code" xml:space="preserve"> <data name="Code" xml:space="preserve">
<value>代碼</value> <value>代碼</value>
</data> </data>
<data name="Recover" xml:space="preserve"> <data name="Directives" xml:space="preserve">
<value>恢復</value> <value>指令</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>插入</value> <value>插入</value>
</data> </data>
<data name="Recover" xml:space="preserve">
<value>恢復</value>
</data>
<data name="Save" xml:space="preserve"> <data name="Save" xml:space="preserve">
<value>儲存</value> <value>儲存</value>
</data> </data>
<data name="Quit" xml:space="preserve"> <data name="Quit" xml:space="preserve">
<value>退出</value> <value>退出</value>
</data> </data>
<data name="TemperatureControl" xml:space="preserve">
<value>溫度控制</value>
</data>
<data name="AddWater" xml:space="preserve"> <data name="AddWater" xml:space="preserve">
<value>入水</value> <value>入水</value>
</data> </data>
<data name="Cooling" xml:space="preserve">
<value>冷卻</value>
</data>
<data name="Drainage" xml:space="preserve">
<value>排水</value>
</data>
<data name="Flowmeter" xml:space="preserve"> <data name="Flowmeter" xml:space="preserve">
<value>流量</value> <value>流量</value>
</data> </data>
<data name="WaterLevel" xml:space="preserve"> <data name="TemperatureControl" xml:space="preserve">
<value>水位</value> <value>溫度控制</value>
</data> </data>
<data name="Washing" xml:space="preserve"> <data name="Washing" xml:space="preserve">
<value>洗滌</value> <value>洗滌</value>
</data> </data>
<data name="Cooling" xml:space="preserve"> <data name="WaterLevel" xml:space="preserve">
<value>冷卻</value> <value>水位</value>
</data> </data>
<data name="Drainage" xml:space="preserve"> <data name="ClothIntake" xml:space="preserve">
<value>排水</value> <value>準備入布</value>
</data>
<data name="OutTheCloth" xml:space="preserve">
<value>準備出布</value>
</data> </data>
<data name="PumpDrainage" xml:space="preserve"> <data name="PumpDrainage" xml:space="preserve">
<value>泵排水</value> <value>泵排水</value>
@ -273,12 +282,6 @@
<data name="RunningTime" xml:space="preserve"> <data name="RunningTime" xml:space="preserve">
<value>運轉</value> <value>運轉</value>
</data> </data>
<data name="ClothIntake" xml:space="preserve">
<value>準備入布</value>
</data>
<data name="OutTheCloth" xml:space="preserve">
<value>準備出布</value>
</data>
<data name="AddTheMedicine" xml:space="preserve"> <data name="AddTheMedicine" xml:space="preserve">
<value>加藥</value> <value>加藥</value>
</data> </data>
@ -300,6 +303,9 @@
<data name="PHControl" xml:space="preserve"> <data name="PHControl" xml:space="preserve">
<value>PH控制</value> <value>PH控制</value>
</data> </data>
<data name="PHDetection" xml:space="preserve">
<value>PH檢測</value>
</data>
<data name="PHTemperatureControl" xml:space="preserve"> <data name="PHTemperatureControl" xml:space="preserve">
<value>PH溫度控制</value> <value>PH溫度控制</value>
</data> </data>
@ -324,84 +330,78 @@
<data name="Sampling" xml:space="preserve"> <data name="Sampling" xml:space="preserve">
<value>取樣</value> <value>取樣</value>
</data> </data>
<data name="PHDetection" xml:space="preserve"> <data name="Function" xml:space="preserve">
<value>PH檢測</value> <value>機能</value>
</data> </data>
<data name="Invalidfeatures" xml:space="preserve"> <data name="Invalidfeatures" xml:space="preserve">
<value>無效的圖徵</value> <value>無效的圖徵</value>
</data> </data>
<data name="Function" xml:space="preserve">
<value>機能</value>
</data>
<data name="NO" xml:space="preserve"> <data name="NO" xml:space="preserve">
<value>否</value> <value>否</value>
</data> </data>
<data name="YES" xml:space="preserve"> <data name="YES" xml:space="preserve">
<value>是</value> <value>是</value>
</data> </data>
<data name="Rate" xml:space="preserve"> <data name="Advance" xml:space="preserve">
<value>速率</value> <value>提前</value>
</data> </data>
<data name="Target" xml:space="preserve"> <data name="Beginning" xml:space="preserve">
<value>目標</value> <value>開始</value>
</data>
<data name="Container" xml:space="preserve">
<value>容器</value>
</data>
<data name="Curve" xml:space="preserve">
<value>曲線</value>
</data> </data>
<data name="Headwaters" xml:space="preserve"> <data name="Headwaters" xml:space="preserve">
<value>來源</value> <value>來源</value>
</data> </data>
<data name="Medicine" xml:space="preserve">
<value>藥</value>
</data>
<data name="Mixing" xml:space="preserve">
<value>攪拌</value>
</data>
<data name="Number" xml:space="preserve"> <data name="Number" xml:space="preserve">
<value>次數</value> <value>次數</value>
</data> </data>
<data name="Pressure" xml:space="preserve"> <data name="Pressure" xml:space="preserve">
<value>壓力</value> <value>壓力</value>
</data> </data>
<data name="Container" xml:space="preserve"> <data name="Rate" xml:space="preserve">
<value>容器</value> <value>速率</value>
</data>
<data name="Medicine" xml:space="preserve">
<value>藥</value>
</data> </data>
<data name="Tank" xml:space="preserve"> <data name="Tank" xml:space="preserve">
<value>缸</value> <value>缸</value>
</data> </data>
<data name="Target" xml:space="preserve">
<value>目標</value>
</data>
<data name="Type" xml:space="preserve"> <data name="Type" xml:space="preserve">
<value>類別</value> <value>類別</value>
</data> </data>
<data name="Beginning" xml:space="preserve">
<value>開始</value>
</data>
<data name="Advance" xml:space="preserve">
<value>提前</value>
</data>
<data name="Curve" xml:space="preserve">
<value>曲線</value>
</data>
<data name="Mixing" xml:space="preserve">
<value>攪拌</value>
</data>
<data name="Blower" xml:space="preserve"> <data name="Blower" xml:space="preserve">
<value>風機</value> <value>風機</value>
</data> </data>
<data name="Pump" xml:space="preserve">
<value>泵</value>
</data>
<data name="Nozzle" xml:space="preserve"> <data name="Nozzle" xml:space="preserve">
<value>噴頭</value> <value>噴頭</value>
</data> </data>
<data name="Wiggle" xml:space="preserve">
<value>擺佈</value>
</data>
<data name="Overflow" xml:space="preserve"> <data name="Overflow" xml:space="preserve">
<value>溢流</value> <value>溢流</value>
</data> </data>
<data name="process_not" xml:space="preserve"> <data name="Pump" xml:space="preserve">
<value>流程不存在</value> <value>泵</value>
</data> </data>
<data name="Notimplementation" xml:space="preserve"> <data name="Wiggle" xml:space="preserve">
<value>未執行</value> <value>擺佈</value>
</data> </data>
<data name="Implementation" xml:space="preserve"> <data name="Implementation" xml:space="preserve">
<value>執行</value> <value>執行</value>
</data> </data>
<data name="process_not" xml:space="preserve">
<value>流程不存在</value>
</data>
<data name="Connectionlost" xml:space="preserve"> <data name="Connectionlost" xml:space="preserve">
<value>網路斷開</value> <value>網路斷開</value>
</data> </data>
@ -423,12 +423,12 @@
<data name="Min" xml:space="preserve"> <data name="Min" xml:space="preserve">
<value>分鐘</value> <value>分鐘</value>
</data> </data>
<data name="Heat insulating" xml:space="preserve">
<value>保溫</value>
</data>
<data name="Expected" xml:space="preserve"> <data name="Expected" xml:space="preserve">
<value>預計</value> <value>預計</value>
</data> </data>
<data name="Heat insulating" xml:space="preserve">
<value>保溫</value>
</data>
<data name="Malfunction" xml:space="preserve"> <data name="Malfunction" xml:space="preserve">
<value>故障</value> <value>故障</value>
</data> </data>
@ -439,6 +439,12 @@
<value>異常恢復</value> <value>異常恢復</value>
</data> </data>
<data name="StopProcess" xml:space="preserve"> <data name="StopProcess" xml:space="preserve">
<value>結束當前製程!</value> <value>結束當前製程</value>
</data>
<data name="Compute" xml:space="preserve">
<value>計算</value>
</data>
<data name="MasterCylinder" xml:space="preserve">
<value>主缸</value>
</data> </data>
</root> </root>

6
View/TechnologicalProcessView.xaml

@ -5,13 +5,15 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
xmlns:lang="clr-namespace:DyeingComputer.Properties" xmlns:lang="clr-namespace:DyeingComputer.Properties"
xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
mc:Ignorable="d" Loaded="UserControl_Loaded" mc:Ignorable="d" Loaded="UserControl_Loaded"
KeyDown="UserControl_KeyDown" KeyDown="UserControl_KeyDown"
d:DesignHeight="630" d:DesignWidth="1280"> d:DesignHeight="630" d:DesignWidth="1280">
<Grid Focusable="True"> <Grid Focusable="True">
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged" <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
Margin="630,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="630,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="Black" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="{x:Null}"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column" SelectedIndex="{Binding Sys_workSTEPID}" CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column" SelectedIndex="{Binding Sys_workSTEPID}"
@ -65,7 +67,7 @@
<DataGridTextColumn Binding="{Binding DYELOT}" Width="0" MinWidth="0" MaxWidth="0"/> <DataGridTextColumn Binding="{Binding DYELOT}" Width="0" MinWidth="0" MaxWidth="0"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,40,0,0" TextWrapping="Wrap" Width="600" FontSize="20" Background="White"/> <TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,40,0,0" TextWrapping="Wrap" Width="600" FontSize="25" Background="White" Text="{Binding Sys_log}"/>
<TextBlock x:Name="name" HorizontalAlignment="Left" Margin="600,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="NAME" Height="30" Block.TextAlignment="Center"> <TextBlock x:Name="name" HorizontalAlignment="Left" Margin="600,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="NAME" Height="30" Block.TextAlignment="Center">
<TextBlock.LayoutTransform> <TextBlock.LayoutTransform>
<!--文字同样旋转90度--> <!--文字同样旋转90度-->

1
View/TechnologicalProcessView.xaml.cs

@ -1,6 +1,7 @@
using DyeingComputer.UserClass; using DyeingComputer.UserClass;
using DyeingComputer.ViewModel; using DyeingComputer.ViewModel;
using DyeingComputer.Windows; using DyeingComputer.Windows;
using ScottPlot;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;

50
ViewModel/MainWindowViewModel.cs

@ -75,6 +75,9 @@ namespace DyeingComputer.ViewModel
private static int MT06;//主缸排水延时 private static int MT06;//主缸排水延时
private static double MT16;//流量计数系数 private static double MT16;//流量计数系数
private static double MT33;//主缸温度偏差 private static double MT33;//主缸温度偏差
private int MT38;//高水位
private int MT39;//中水位
private int MT40;//低水位
private static int MT90;//呼叫操作员 private static int MT90;//呼叫操作员
void SYS_SET() void SYS_SET()
{ {
@ -94,6 +97,9 @@ namespace DyeingComputer.ViewModel
MT06 = Convert.ToInt16(Selet_sys("MT06"));//动力排水延时 MT06 = Convert.ToInt16(Selet_sys("MT06"));//动力排水延时
MT16 = Convert.ToDouble(Selet_sys("MT16"));//流量计数系数 MT16 = Convert.ToDouble(Selet_sys("MT16"));//流量计数系数
MT33 = Convert.ToDouble(Selet_sys("MT33"));//温度偏差参数 MT33 = Convert.ToDouble(Selet_sys("MT33"));//温度偏差参数
MT38 = Convert.ToInt16(Selet_sys("MT38"));//
MT39 = Convert.ToInt16(Selet_sys("MT39"));//
MT40 = Convert.ToInt16(Selet_sys("MT40"));//
MT90 = Convert.ToInt16(Selet_sys("MT90"));//呼叫操作员 MT90 = Convert.ToInt16(Selet_sys("MT90"));//呼叫操作员
} }
@ -143,6 +149,12 @@ namespace DyeingComputer.ViewModel
get { return sys_workSTEPID; } get { return sys_workSTEPID; }
set { sys_workSTEPID = value; OnPropertyChanged("Sys_workSTEPID"); } set { sys_workSTEPID = value; OnPropertyChanged("Sys_workSTEPID"); }
} }
public string sys_log; //
public string Sys_log //通知UI控件参数改变
{
get { return sys_log; }
set { sys_log = value; OnPropertyChanged("Sys_log"); }
}
public static int ViewID = 0;//页面id public static int ViewID = 0;//页面id
public static object Name_err = ""; public static object Name_err = "";
@ -185,6 +197,7 @@ namespace DyeingComputer.ViewModel
STEP_RUN(); STEP_RUN();
IO_view(); IO_view();
LOG_view();
if (!string.IsNullOrEmpty(Name_err.ToString())) Status_Str = Name_err.ToString(); if (!string.IsNullOrEmpty(Name_err.ToString())) Status_Str = Name_err.ToString();
} }
@ -223,6 +236,8 @@ namespace DyeingComputer.ViewModel
private static int STEP_TIME = 0; //步骤计时S private static int STEP_TIME = 0; //步骤计时S
private static int THL_mode = 0; //温控模式 0保温 1加热 2降 private static int THL_mode = 0; //温控模式 0保温 1加热 2降
private static double TEMP_co = 0; //计算温度 private static double TEMP_co = 0; //计算温度
private static double TEMP_tar = 16.5; //目标温度
private bool Pump_M = false;//主泵状态
private bool Alert_yellow = false; //警报黄灯 private bool Alert_yellow = false; //警报黄灯
private bool Alert_red = false; //警报红灯 private bool Alert_red = false; //警报红灯
private bool Alert_bell = false; //警报铃声 private bool Alert_bell = false; //警报铃声
@ -235,6 +250,7 @@ namespace DyeingComputer.ViewModel
STEP_P1 = Convert.ToDouble(P1); STEP_P1 = Convert.ToDouble(P1);
STEP_P2 = Convert.ToDouble(P2); STEP_P2 = Convert.ToDouble(P2);
STEP_P3 = Convert.ToDouble(P3); STEP_P3 = Convert.ToDouble(P3);
TEMP_tar = STEP_P1;
double t_t = Convert.ToDouble(Selet_dtm("1010")); double t_t = Convert.ToDouble(Selet_dtm("1010"));
if (STEP_P1 > t_t) { THL_mode = 1; } if (STEP_P1 > t_t) { THL_mode = 1; }
@ -836,7 +852,6 @@ namespace DyeingComputer.ViewModel
static ModbusFactory factory = new ModbusFactory(); static ModbusFactory factory = new ModbusFactory();
// Create Modbus Master // Create Modbus Master
static IModbusMaster master = factory.CreateRtuMaster(port); static IModbusMaster master = factory.CreateRtuMaster(port);
void UPort() void UPort()
{ {
try try
@ -871,7 +886,6 @@ namespace DyeingComputer.ViewModel
ushort[] RW = new ushort[100]; ushort[] RW = new ushort[100];
ushort RW_L = 100; ushort RW_L = 100;
readonly byte slaveId = 1; readonly byte slaveId = 1;
private async void Modbus_link() private async void Modbus_link()
{ {
await Task.Run(() => await Task.Run(() =>
@ -895,6 +909,35 @@ namespace DyeingComputer.ViewModel
}); });
} }
void LOG_view()//细节页面
{
Sys_log = Resources.Target + Resources.Temperature + ":"+ string.Format(" {0:###.#}", TEMP_tar) + "°C";//显示目标温度
Sys_log = Sys_log + "\n" + Resources.Compute + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1005"))) + "°C";//显示计算温度
Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1010"))) + "°C";//显示实际温度
Sys_log = Sys_log + "\n" + Resources.ProportionalValves + ":" + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1004"))) + "%";//显示比例
int IO1015 = Convert.ToInt16( Selet_dtm("1015"));
if (IO1015<MT39)
{
Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + IO1015 + "L =>["+Resources.Low_waterlevel+"]";//显示水位
}
else if ((IO1015 > MT39) && (IO1015 < MT38))
{
Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + IO1015 + "L =>[" + Resources.Mid_waterlevel + "]";//显示水位
}
else if (IO1015 > MT38)
{
Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + IO1015 + "L =>[" + Resources.High_waterlevel + "]";//显示水位
}
if (Pump_M) //主泵状态
{
Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStart+"]";//主泵状态
}
else
{
Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStops+"]";//主泵状态
}
}
public static DataTable dt_d = new DataTable("DIO"); public static DataTable dt_d = new DataTable("DIO");
public static DataTable dt_a = new DataTable("AIO"); public static DataTable dt_a = new DataTable("AIO");
public static DataTable dt_m = new DataTable("M"); public static DataTable dt_m = new DataTable("M");
@ -916,7 +959,6 @@ namespace DyeingComputer.ViewModel
DataColumn[] dt_mcols = new DataColumn[] { dt_m.Columns["ID"] }; DataColumn[] dt_mcols = new DataColumn[] { dt_m.Columns["ID"] };
dt_m.PrimaryKey = dt_mcols; dt_m.PrimaryKey = dt_mcols;
} }
private async void IO_data()//刷新 private async void IO_data()//刷新
{ {
updata_dtm("1001", LINK_RUN); updata_dtm("1001", LINK_RUN);
@ -934,7 +976,7 @@ namespace DyeingComputer.ViewModel
for (ushort i = 0; i < DW_L; i++) { DW[i] = Convert.ToUInt16(Selet_dta((i + 5001).ToString())); } for (ushort i = 0; i < DW_L; i++) { DW[i] = Convert.ToUInt16(Selet_dta((i + 5001).ToString())); }
}); });
} }
private async void IO_view() private async void IO_view()//IO显示
{ {
await Task.Run(() => await Task.Run(() =>
{ {

Loading…
Cancel
Save