Merge branch 'master' of http://private.flyautomation.net:82/panruising/thick_public

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/ScanGraph.xaml.cs

@@ -23,6 +23,7 @@ namespace ThickTcpUiInWindow.UIModule
     /// </summary>
     public partial class ScanGraph : Page
     {
+        TDGage gage;
         ScanGraphItemParam graphparam;
         public ScanGraph()
         {
@@ -45,7 +46,7 @@ namespace ThickTcpUiInWindow.UIModule
             }
 
             //获取设备
-            TDGage gage = Application.Current.Properties["Gage"] as TDGage;
+            gage = Application.Current.Properties["ThickGage"] as TDGage;
 
 
             GraphScan graph = graphscan;

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/TrendGraph.xaml.cs

@@ -24,6 +24,7 @@ namespace ThickTcpUiInWindow.UIModule
     /// </summary>
     public partial class TrendGraph : Page
     {
+        TDGage gage;
         TrendGraphItemParam graphparam;
         public TrendGraph()
         {
@@ -44,7 +45,7 @@ namespace ThickTcpUiInWindow.UIModule
             }
 
             //获取设备
-            TDGage gage = Application.Current.Properties["Gage"] as TDGage;
+            gage = Application.Current.Properties["ThickGage"] as TDGage;
 
             GraphRange graph = graphrange;
             graph.DataContext = graphparam;