|
@@ -49,7 +49,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
|
|
|
#endregion
|
|
|
|
|
|
#region Constructors
|
|
|
-
|
|
|
+ private static Dictionary<string, string> _displayDic { get; set; } = new Dictionary<string, string>();
|
|
|
public RealtimeViewModel()
|
|
|
{
|
|
|
DisplayName = "Realtime";
|
|
@@ -62,7 +62,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
|
|
|
|
|
|
ParameterNodes.ChildNodes.AddRange(_provider.GetTreeNodeParameters());
|
|
|
ParameterNodes.TerminalNodeSelectionChanged += OnNodeSelectionChanged;
|
|
|
-
|
|
|
+ _displayDic = _provider.GetTreeNameDict();
|
|
|
IntervalSaved = true;
|
|
|
TrendInterval = 500;
|
|
|
TimeSpanSaved = true;
|
|
@@ -139,10 +139,16 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- Dictionary<string, object> data = null;
|
|
|
- if (!IsHold&&SelectedData.Count > 0)
|
|
|
+ Dictionary<string, object> data = new Dictionary<string, object>();
|
|
|
+ if (!IsHold && SelectedData.Count > 0)
|
|
|
{
|
|
|
- data = QueryDataClient.Instance.Service.PollData(SelectedData.Select(r => (r as FastLineSeries)?.DataName).ToList());
|
|
|
+ var rtData = QueryDataClient.Instance.Service.PollData(SelectedData.Select(r => FindKeyByValue(_displayDic, (r as FastLineSeries)?.DataName)).ToList());
|
|
|
+
|
|
|
+ foreach (var item in rtData)
|
|
|
+ {
|
|
|
+ var uiName = _displayDic[item.Key];
|
|
|
+ data.Add(uiName, item.Value);
|
|
|
+ }
|
|
|
AppendData(data);
|
|
|
}
|
|
|
for (var j = 0; j < ParameterNodes.ChildNodes.Count; j++)
|
|
@@ -158,7 +164,17 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
|
|
|
|
|
|
return true;
|
|
|
}
|
|
|
-
|
|
|
+ static string FindKeyByValue(Dictionary<string, string> dictionary, string value)
|
|
|
+ {
|
|
|
+ foreach (var pair in dictionary)
|
|
|
+ {
|
|
|
+ if (pair.Value == value)
|
|
|
+ {
|
|
|
+ return pair.Key;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return null; // Return null if the value is not found
|
|
|
+ }
|
|
|
public void AppendData(Dictionary<string, object> data)
|
|
|
{
|
|
|
if (data == null)
|