重新调整布局适应1290*1080分辨率屏幕
This commit is contained in:
parent
a3b1700b9c
commit
f262e3ed20
@ -97,7 +97,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
|
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<Viewbox Stretch="Uniform" StretchDirection="Both">
|
||||||
<Grid Width="2000">
|
<Grid Width="2000">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="1700" />
|
<ColumnDefinition Width="1700" />
|
||||||
@ -1729,7 +1729,7 @@
|
|||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="678"
|
Canvas.Left="678"
|
||||||
Canvas.Top="534"
|
Canvas.Top="534"
|
||||||
Width="260"
|
Width="250"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
||||||
@ -1746,7 +1746,7 @@
|
|||||||
|
|
||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="676"
|
Canvas.Left="676"
|
||||||
Canvas.Top="794"
|
Canvas.Top="784"
|
||||||
Width="760"
|
Width="760"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
@ -3373,7 +3373,7 @@
|
|||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="1004"
|
Canvas.Left="1004"
|
||||||
Canvas.Top="328"
|
Canvas.Top="328"
|
||||||
Width="442"
|
Width="439"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
||||||
@ -3640,14 +3640,14 @@
|
|||||||
ValveName="{Binding V58s.DisplayName}" />
|
ValveName="{Binding V58s.DisplayName}" />
|
||||||
|
|
||||||
</Canvas>
|
</Canvas>
|
||||||
<Canvas Canvas.Left="68" Canvas.Top="377">
|
<Canvas Canvas.Left="68" Canvas.Top="327">
|
||||||
<Label Canvas.Left="660" Canvas.Top="130">
|
<Label Canvas.Left="660" Canvas.Top="130">
|
||||||
PC5
|
PC5
|
||||||
</Label>
|
</Label>
|
||||||
<Label Canvas.Left="802" Canvas.Top="130">
|
<Label Canvas.Left="802" Canvas.Top="130">
|
||||||
PC6
|
PC6
|
||||||
</Label>
|
</Label>
|
||||||
<Label Canvas.Left="978" Canvas.Top="17">
|
<Label Canvas.Left="978" Canvas.Top="60">
|
||||||
PC7
|
PC7
|
||||||
</Label>
|
</Label>
|
||||||
<Label Canvas.Left="1011" Canvas.Top="130">
|
<Label Canvas.Left="1011" Canvas.Top="130">
|
||||||
@ -3671,7 +3671,7 @@
|
|||||||
HideDialog="false" />
|
HideDialog="false" />
|
||||||
<controlRT:AnalogControl
|
<controlRT:AnalogControl
|
||||||
Canvas.Left="952"
|
Canvas.Left="952"
|
||||||
Canvas.Top="30"
|
Canvas.Top="73"
|
||||||
Width="54"
|
Width="54"
|
||||||
Height="25"
|
Height="25"
|
||||||
BackColor="Blue"
|
BackColor="Blue"
|
||||||
@ -4102,7 +4102,7 @@
|
|||||||
|
|
||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="1004"
|
Canvas.Left="1004"
|
||||||
Canvas.Top="768"
|
Canvas.Top="765"
|
||||||
Width="278"
|
Width="278"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
@ -4114,7 +4114,7 @@
|
|||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="1282"
|
Canvas.Left="1282"
|
||||||
Canvas.Top="745"
|
Canvas.Top="745"
|
||||||
Width="25"
|
Width="22"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
||||||
@ -4827,7 +4827,7 @@
|
|||||||
<Canvas
|
<Canvas
|
||||||
x:Name="腔体"
|
x:Name="腔体"
|
||||||
Canvas.Left="1390"
|
Canvas.Left="1390"
|
||||||
Canvas.Top="380"
|
Canvas.Top="370"
|
||||||
UseLayoutRounding="False">
|
UseLayoutRounding="False">
|
||||||
<controlRT:Reactor
|
<controlRT:Reactor
|
||||||
Canvas.Left="33"
|
Canvas.Left="33"
|
||||||
@ -5204,7 +5204,7 @@
|
|||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="252"
|
Canvas.Left="252"
|
||||||
Canvas.Top="16"
|
Canvas.Top="16"
|
||||||
Width="221"
|
Width="211"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
||||||
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
||||||
@ -5258,7 +5258,7 @@
|
|||||||
|
|
||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="152"
|
Canvas.Left="152"
|
||||||
Canvas.Top="235"
|
Canvas.Top="225"
|
||||||
Width="100"
|
Width="100"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
CenterColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
||||||
@ -5377,7 +5377,7 @@
|
|||||||
|
|
||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="29"
|
Canvas.Left="29"
|
||||||
Canvas.Top="184"
|
Canvas.Top="179"
|
||||||
Width="18"
|
Width="18"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
@ -5392,7 +5392,7 @@
|
|||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="-2"
|
Canvas.Left="-2"
|
||||||
Canvas.Top="65"
|
Canvas.Top="65"
|
||||||
Width="115"
|
Width="125"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
|
CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
|
||||||
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
|
||||||
@ -5411,7 +5411,7 @@
|
|||||||
<industrialcontrol:PipeLine
|
<industrialcontrol:PipeLine
|
||||||
Canvas.Left="39"
|
Canvas.Left="39"
|
||||||
Canvas.Top="14"
|
Canvas.Top="14"
|
||||||
Width="170"
|
Width="165"
|
||||||
Height="{StaticResource ResourceKey=Pipe_Height}"
|
Height="{StaticResource ResourceKey=Pipe_Height}"
|
||||||
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
|
||||||
EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
EdgeColor="{StaticResource ResourceKey=EdgeColorBlack}"
|
||||||
@ -5597,7 +5597,7 @@
|
|||||||
|
|
||||||
<controlRT:AITPumpSIC
|
<controlRT:AITPumpSIC
|
||||||
Canvas.Left="-93"
|
Canvas.Left="-93"
|
||||||
Canvas.Top="205"
|
Canvas.Top="195"
|
||||||
DeviceData="{Binding PumpData}"
|
DeviceData="{Binding PumpData}"
|
||||||
EnableControl="True" />
|
EnableControl="True" />
|
||||||
|
|
||||||
@ -5618,7 +5618,7 @@
|
|||||||
<Label Canvas.Left="114" Canvas.Top="14">PT2</Label>
|
<Label Canvas.Left="114" Canvas.Top="14">PT2</Label>
|
||||||
<Label Canvas.Left="156" Canvas.Top="60">70mbar</Label>
|
<Label Canvas.Left="156" Canvas.Top="60">70mbar</Label>
|
||||||
<Label Canvas.Left="121" Canvas.Top="64">EPV2</Label>
|
<Label Canvas.Left="121" Canvas.Top="64">EPV2</Label>
|
||||||
<Label Canvas.Left="161" Canvas.Top="82">TV</Label>
|
<Label Canvas.Left="119" Canvas.Top="98">TV</Label>
|
||||||
<Label
|
<Label
|
||||||
Canvas.Left="13"
|
Canvas.Left="13"
|
||||||
Canvas.Top="103"
|
Canvas.Top="103"
|
||||||
@ -5634,7 +5634,7 @@
|
|||||||
</Label>
|
</Label>
|
||||||
<Label
|
<Label
|
||||||
Canvas.Left="13"
|
Canvas.Left="13"
|
||||||
Canvas.Top="181"
|
Canvas.Top="176"
|
||||||
Visibility="{Binding VisbleOnlyIdle}">
|
Visibility="{Binding VisbleOnlyIdle}">
|
||||||
Leak Check
|
Leak Check
|
||||||
</Label>
|
</Label>
|
||||||
@ -5644,5 +5644,5 @@
|
|||||||
|
|
||||||
</Canvas>
|
</Canvas>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
</Viewbox>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
Loading…
Reference in New Issue
Block a user