增加SV和MV的模型数据

CapMachine.Wpf/Views/HistoryDataView.xaml

@@ -658,7 +658,7 @@
                                             <GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle1}">
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -686,23 +686,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -753,7 +753,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -781,23 +781,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -912,7 +912,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -940,23 +940,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1071,7 +1071,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1099,23 +1099,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1230,7 +1230,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1258,23 +1258,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1389,7 +1389,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1417,23 +1417,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1548,7 +1548,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1576,23 +1576,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1707,7 +1707,7 @@
 
                                                 <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
 
-                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
+                                                <GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
 
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
 
@@ -1735,23 +1735,23 @@
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
                                                     Header="左游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding RightCursorEngValueStr}"
+                                                    DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
                                                     Header="右游标" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MinEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MinEngPvValueStr}"
                                                     Header="最小值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding MaxEngValueStr}"
+                                                    DisplayMemberBinding="{Binding MaxEngPvValueStr}"
                                                     Header="最大值" />
                                                 <GridViewColumn
                                                     Width="60"
-                                                    DisplayMemberBinding="{Binding AveEngValueStr}"
+                                                    DisplayMemberBinding="{Binding AveEngPvValueStr}"
                                                     Header="平均值" />
                                                 <!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->