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

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Culture/StringResource.en-US.xaml

@@ -290,7 +290,7 @@
     <sys:String x:Key="strTipNoTabItem">No TabItem!</sys:String>
     <sys:String x:Key="strVisible">Visible</sys:String>
     <sys:String x:Key="strGraphReverse">GraphReverse</sys:String>
-
+    <sys:String x:Key="strYAxisTitleHidden">YAxis Title Hidden</sys:String>
 
     <sys:String x:Key="strScan">Scan</sys:String>
     <sys:String x:Key="strHistory">History</sys:String>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/Culture/StringResource.zh-CN.xaml

@@ -294,7 +294,9 @@
     <sys:String x:Key="strTipNoTabItem">没有页面!</sys:String>
     <sys:String x:Key="strVisible">显示</sys:String>
     <sys:String x:Key="strGraphReverse">图像反向</sys:String>
-
+    <sys:String x:Key="strYAxisTitleHidden">隐藏Y轴标题</sys:String>
+    
+    
     <sys:String x:Key="strScan">扫描</sys:String>
     <sys:String x:Key="strHistory">历史</sys:String>
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj

@@ -131,14 +131,14 @@
     <Compile Include="Page_Loading.xaml.cs">
       <DependentUpon>Page_Loading.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Page_MainEdit.xaml.cs">
-      <DependentUpon>Page_MainEdit.xaml</DependentUpon>
+    <Compile Include="MainEdit\PgMainEdit.xaml.cs">
+      <DependentUpon>PgMainEdit.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Page_MainEditDynArea.xaml.cs">
-      <DependentUpon>Page_MainEditDynArea.xaml</DependentUpon>
+    <Compile Include="MainEdit\PgMainEditDynArea.xaml.cs">
+      <DependentUpon>PgMainEditDynArea.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Page_MainEditGraph.xaml.cs">
-      <DependentUpon>Page_MainEditGraph.xaml</DependentUpon>
+    <Compile Include="MainEdit\PgMainEditGraph.xaml.cs">
+      <DependentUpon>PgMainEditGraph.xaml</DependentUpon>
     </Compile>
     <Compile Include="Page_ProfilePlastic.xaml.cs">
       <DependentUpon>Page_ProfilePlastic.xaml</DependentUpon>
@@ -192,17 +192,17 @@
     <Compile Include="Window_FlyADAccess.xaml.cs">
       <DependentUpon>Window_FlyADAccess.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Window_MainEditDynAreaComponent.xaml.cs">
-      <DependentUpon>Window_MainEditDynAreaComponent.xaml</DependentUpon>
+    <Compile Include="MainEdit\WdDynAreaConfig.xaml.cs">
+      <DependentUpon>WdDynAreaConfig.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Window_MainEditGraphComponent.xaml.cs">
-      <DependentUpon>Window_MainEditGraphComponent.xaml</DependentUpon>
+    <Compile Include="MainEdit\WdGraphConfig.xaml.cs">
+      <DependentUpon>WdGraphConfig.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Window_MainEditGraphTabItem.xaml.cs">
-      <DependentUpon>Window_MainEditGraphTabItem.xaml</DependentUpon>
+    <Compile Include="MainEdit\WdGraphTabItemConfig.xaml.cs">
+      <DependentUpon>WdGraphTabItemConfig.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainEdit\Window_MainSet.xaml.cs">
-      <DependentUpon>Window_MainSet.xaml</DependentUpon>
+    <Compile Include="MainEdit\WdMainConfig.xaml.cs">
+      <DependentUpon>WdMainConfig.xaml</DependentUpon>
     </Compile>
     <Compile Include="Window_Password.xaml.cs">
       <DependentUpon>Window_Password.xaml</DependentUpon>
@@ -264,15 +264,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Page_MainEdit.xaml">
+    <Page Include="MainEdit\PgMainEdit.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Page_MainEditDynArea.xaml">
+    <Page Include="MainEdit\PgMainEditDynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Page_MainEditGraph.xaml">
+    <Page Include="MainEdit\PgMainEditGraph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -344,19 +344,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Window_MainEditDynAreaComponent.xaml">
+    <Page Include="MainEdit\WdDynAreaConfig.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Window_MainEditGraphComponent.xaml">
+    <Page Include="MainEdit\WdGraphConfig.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Window_MainEditGraphTabItem.xaml">
+    <Page Include="MainEdit\WdGraphTabItemConfig.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainEdit\Window_MainSet.xaml">
+    <Page Include="MainEdit\WdMainConfig.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEdit.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/PgMainEdit.xaml

-<Page x:Class="ThickTcpUiInWindow.MainEdit.Page_MainEdit"
+<Page x:Class="ThickTcpUiInWindow.MainEdit.PgMainEdit"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEdit.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/PgMainEdit.xaml.cs

@@ -18,11 +18,11 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Page_MainEdit.xaml 的交互逻辑
     /// </summary>
-    public partial class Page_MainEdit : Page
+    public partial class PgMainEdit : Page
     {
         FLYLayoutManager mManager;
 
-        public Page_MainEdit()
+        public PgMainEdit()
         {
             InitializeComponent();
         }
@@ -32,21 +32,21 @@ namespace ThickTcpUiInWindow.MainEdit
         }
         private void button_dynarea_Click(object sender, RoutedEventArgs e)
         {
-            Page_MainEditDynArea p = new Page_MainEditDynArea();
+            PgMainEditDynArea p = new PgMainEditDynArea();
             p.Init(mManager);
             NavigationService.Navigate(p);
         }
 
         private void button_graph_Click(object sender, RoutedEventArgs e)
         {
-            Page_MainEditGraph p = new Page_MainEditGraph();
+            PgMainEditGraph p = new PgMainEditGraph();
             p.Init(mManager);
             NavigationService.Navigate(p);
         }
 
         private void button_setting_Click(object sender, RoutedEventArgs e)
         {
-            Window_MainSet w = new Window_MainSet();
+            WdMainConfig w = new WdMainConfig();
 
             w.Init(mManager);
             w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEditDynArea.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/PgMainEditDynArea.xaml

-<Page x:Class="ThickTcpUiInWindow.MainEdit.Page_MainEditDynArea"
+<Page x:Class="ThickTcpUiInWindow.MainEdit.PgMainEditDynArea"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEditDynArea.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/PgMainEditDynArea.xaml.cs

@@ -18,14 +18,14 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Page_MainEditDynArea.xaml 的交互逻辑
     /// </summary>
-    public partial class Page_MainEditDynArea : Page
+    public partial class PgMainEditDynArea : Page
     {
         UIModule.FLYLayout mLayout;
         FLYLayoutManager mManager;
 
         ObservableCollection<GraphComponentType> ToolboxItems;
         ObservableCollection<DynAreaComponent> Items;
-        public Page_MainEditDynArea()
+        public PgMainEditDynArea()
         {
             InitializeComponent();
         }
@@ -194,7 +194,7 @@ namespace ThickTcpUiInWindow.MainEdit
                 //异常
                 return;
             }
-            Window_MainEditDynAreaComponent w = new Window_MainEditDynAreaComponent();
+            WdDynAreaConfig w = new WdDynAreaConfig();
             w.Init(Items, idx);
             w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
             w.ShowDialog();

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEditGraph.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/PgMainEditGraph.xaml

-<Page x:Class="ThickTcpUiInWindow.MainEdit.Page_MainEditGraph"
+<Page x:Class="ThickTcpUiInWindow.MainEdit.PgMainEditGraph"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEditGraph.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/PgMainEditGraph.xaml.cs

@@ -20,7 +20,7 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Page_MainEditGraph.xaml 的交互逻辑
     /// </summary>
-    public partial class Page_MainEditGraph : Page
+    public partial class PgMainEditGraph : Page
     {
         FLYLayoutManager mManager;
         UIModule.FLYLayout mLayout;
@@ -28,7 +28,7 @@ namespace ThickTcpUiInWindow.MainEdit
 
         ObservableCollection<GraphTabItem> Items;
         ObservableCollection<GraphComponentType> ToolboxItems;
-        public Page_MainEditGraph()
+        public PgMainEditGraph()
         {
             InitializeComponent();
 
@@ -389,7 +389,7 @@ namespace ThickTcpUiInWindow.MainEdit
                 return;
             }
             
-            Window_MainEditGraphTabItem w = new Window_MainEditGraphTabItem();
+            WdGraphTabItemConfig w = new WdGraphTabItemConfig();
             w.Init(Items, idx);
             w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
             w.ShowDialog();
@@ -439,7 +439,7 @@ namespace ThickTcpUiInWindow.MainEdit
                 Rect = new System.Drawing.Rectangle(p.X, p.Y, 1, 1)
             };
 
-            Window_MainEditGraphComponent w = new Window_MainEditGraphComponent();
+            WdGraphConfig w = new WdGraphConfig();
             w.Init(c);
             w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
             if (w.ShowDialog() == true)
@@ -488,7 +488,7 @@ namespace ThickTcpUiInWindow.MainEdit
             Button button = sender as Button;
             GraphComponent c = button.Tag as GraphComponent;
 
-            Window_MainEditGraphComponent w = new Window_MainEditGraphComponent();
+            WdGraphConfig w = new WdGraphConfig();
             w.Init(c);
             w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
             if (w.ShowDialog() == true)

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainEditDynAreaComponent.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdDynAreaConfig.xaml

-<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.Window_MainEditDynAreaComponent"
+<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.WdDynAreaConfig"
                             xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainEditDynAreaComponent.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdDynAreaConfig.xaml.cs

@@ -17,11 +17,11 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Window_MainEditDynAreaComponent.xaml 的交互逻辑
     /// </summary>
-    public partial class Window_MainEditDynAreaComponent : FLY.ControlLibrary.WindowBigClose
+    public partial class WdDynAreaConfig : FLY.ControlLibrary.WindowBigClose
     {
         ObservableCollection<DynAreaComponent> Items;
         int Idx;
-        public Window_MainEditDynAreaComponent()
+        public WdDynAreaConfig()
         {
             InitializeComponent();
         }

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainEditGraphComponent.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdGraphConfig.xaml

-<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.Window_MainEditGraphComponent"
+<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.WdGraphConfig"
                             xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainEditGraphComponent.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdGraphConfig.xaml.cs

@@ -17,10 +17,10 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Window_MainEditGraphComponent.xaml 的交互逻辑
     /// </summary>
-    public partial class Window_MainEditGraphComponent : FLY.ControlLibrary.WindowBigClose
+    public partial class WdGraphConfig : FLY.ControlLibrary.WindowBigClose
     {
         public GraphComponentEditResult Result;
-        public Window_MainEditGraphComponent()
+        public WdGraphConfig()
         {
             InitializeComponent();
         }

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainEditGraphTabItem.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdGraphTabItemConfig.xaml

-<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.Window_MainEditGraphTabItem"
+<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.WdGraphTabItemConfig"
                             xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainEditGraphTabItem.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdGraphTabItemConfig.xaml.cs

@@ -18,12 +18,12 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Window_MainEditGraphTabItem.xaml 的交互逻辑
     /// </summary>
-    public partial class Window_MainEditGraphTabItem : FLY.ControlLibrary.WindowBigClose
+    public partial class WdGraphTabItemConfig : FLY.ControlLibrary.WindowBigClose
     {
         ObservableCollection<GraphTabItem> Items;
         int Idx;
         GraphTabItem_RC ItemRC;
-        public Window_MainEditGraphTabItem()
+        public WdGraphTabItemConfig()
         {
             InitializeComponent();
         }

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainSet.xaml → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdMainConfig.xaml

-<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.Window_MainSet"
+<flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.MainEdit.WdMainConfig"
         xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -79,9 +79,16 @@
                         </Button>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGraphReverse}" />
-                        <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsGraphReverse}" HorizontalAlignment="Left"/>
+                        <StackPanel Margin="2">
+                            <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGraphReverse}" />
+                            <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsGraphReverse}" HorizontalAlignment="Left"/>
+                        </StackPanel>
+                        <StackPanel Margin="2">
+                            <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strYAxisTitleHidden}" />
+                            <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsYAxisTitleHidden}" HorizontalAlignment="Left"/>
+                        </StackPanel>
                     </StackPanel>
+                    
                 </StackPanel>
             </GroupBox>
             <StackPanel Orientation="Horizontal" Margin="3" HorizontalAlignment="Right">

Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainSet.xaml.cs → Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/WdMainConfig.xaml.cs

@@ -18,12 +18,12 @@ namespace ThickTcpUiInWindow.MainEdit
     /// <summary>
     /// Window_MainSet.xaml 的交互逻辑
     /// </summary>
-    public partial class Window_MainSet : FLY.ControlLibrary.WindowBigClose
+    public partial class WdMainConfig : FLY.ControlLibrary.WindowBigClose
     {
         ObservableCollection<ControllerStateTabItemHeader> mControllerStates = new ObservableCollection<ControllerStateTabItemHeader>();
 
         FLYLayoutManager mManager;
-        public Window_MainSet()
+        public WdMainConfig()
         {
             InitializeComponent();
             

Project.FLY.Thick.Base/FLY.Thick.Base.UI/SysParam.cs

@@ -70,18 +70,31 @@ namespace ThickTcpUiInWindow
         /// </summary>
         public string WarningTipPath { get; set; }
 
-
-
         /// <summary>
         /// 使用虚拟键盘
         /// </summary>
-        public virtual bool HaveOSK { get; set; }
+        public bool HaveOSK { get; set; }
 
 
         /// <summary>
         /// 虚拟键盘支持鼠标
         /// </summary>
-        public virtual bool HaveOSK_mouse { get; set; }
+        public bool HaveOSK_mouse { get; set; }
+
+        /// <summary>
+        /// list窗口大小
+        /// </summary>
+        public int WindowSize { get; set; } = 30;
+
+        /// <summary>
+        /// USB 继电器 串口地址
+        /// </summary>
+        public string LCUS1_PortName { get; set; } = "COM1";
+
+        /// <summary>
+        /// 使能USB 继电器
+        /// </summary>
+        public bool EnableLCUS1 { get; set; }
 
         #endregion
         /// <summary>
@@ -137,7 +150,10 @@ namespace ThickTcpUiInWindow
                 "Language",
                 "WarningTipPath",
                 "HaveOSK",
-                "HaveOSK_mouse"
+                "HaveOSK_mouse",
+                "WindowSize",
+                "LCUS1_PortName",
+                "EnableLCUS1"
             };
         }
     }

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/FLYLayout.cs

@@ -43,7 +43,6 @@ namespace ThickTcpUiInWindow.UIModule
                 if (dynareawidth != value)
                 {
                     dynareawidth = value;
-                    NotifyPropertyChanged("DynAreaWidth");
                 }
             }
         }
@@ -59,6 +58,10 @@ namespace ThickTcpUiInWindow.UIModule
         /// </summary>
         public bool IsGraphReverse { get; set; } = false;
 
+        /// <summary>
+        /// 隐藏Y轴标题
+        /// </summary>
+        public bool IsYAxisTitleHidden { get; set; } = false;
         /// <summary>
         /// 隐藏 logo
         /// </summary>
@@ -139,7 +142,7 @@ namespace ThickTcpUiInWindow.UIModule
                 "DynAreaItems",
                 "DynAreaWidth","IsDynAreaVisible","IsGraphReverse",
                 "Left","Top","Width","Height","WindowState",
-                "IsLogoHidden"
+                "IsLogoHidden","IsYAxisTitleHidden"
             };
         }