Commit 24021e1a authored by 潘栩锋's avatar 潘栩锋 🚴

Merge remote-tracking branch 'gitlab/feature-graphReverse-20190808'

parents ec98dc2a d3b51cfb
......@@ -289,6 +289,7 @@
<sys:String x:Key="strTipErrorComponentAdd">Out of range,or Overlap with other!</sys:String>
<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="strScan">Scan</sys:String>
......
......@@ -293,6 +293,7 @@
<sys:String x:Key="strTipErrorComponentAdd">超出范围,或与其它控件有重叠!</sys:String>
<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="strScan">扫描</sys:String>
<sys:String x:Key="strHistory">历史</sys:String>
......
......@@ -78,6 +78,10 @@
</StackPanel>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGraphReverse}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsGraphReverse}" HorizontalAlignment="Left"/>
</StackPanel>
</StackPanel>
</GroupBox>
<StackPanel Orientation="Horizontal" Margin="3" HorizontalAlignment="Right">
......
......@@ -54,6 +54,11 @@ namespace ThickTcpUiInWindow.UIModule
/// </summary>
public bool IsDynAreaVisible { get; set; } = true;
/// <summary>
/// 曲线反向显示
/// </summary>
public bool IsGraphReverse { get; set; } = false;
/// <summary>
/// 隐藏 logo
/// </summary>
......@@ -132,7 +137,7 @@ namespace ThickTcpUiInWindow.UIModule
"Items",
"ControllerStates",
"DynAreaItems",
"DynAreaWidth","IsDynAreaVisible",
"DynAreaWidth","IsDynAreaVisible","IsGraphReverse",
"Left","Top","Width","Height","WindowState",
"IsLogoHidden"
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment