From 30db79c7f5df4b7912877a84080cfcb84ba123dc Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Tue, 27 Sep 2022 11:13:43 +0800
Subject: [PATCH] 1

---
 BeDesignerSCADA/Common/PropertyHelper.cs      |  2 +-
 BeDesignerSCADA/Controls/MainCanvasPanel.xaml | 63 ++++++++++---------
 .../Controls/MainCanvasPanel.xaml.cs          |  6 +-
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/BeDesignerSCADA/Common/PropertyHelper.cs b/BeDesignerSCADA/Common/PropertyHelper.cs
index 8c53c96e..b82d5b8a 100644
--- a/BeDesignerSCADA/Common/PropertyHelper.cs
+++ b/BeDesignerSCADA/Common/PropertyHelper.cs
@@ -20,7 +20,7 @@ namespace BeDesignerSCADA.Common
             "IsChecked", "Value", "CurValue", 
             "StatusValue", "NumberValue", "Text",
             "Direction","RefreshData",
-            "ChangedText","Content","SendText"
+            "ChangedText","Content","SendText","LeftTogIsChecked","RightTogIsChecked"
         };
         public static List<ControlName> GetCustomerControlProperty(List<FrameworkElement> selectItems)
         {
diff --git a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
index 6ecfcbad..44ce8483 100644
--- a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
+++ b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
@@ -148,7 +148,7 @@
                     <icon:Material Kind="FileCode"/>
                 </ToggleButton>
 
-                <Slider DockPanel.Dock="Right" Width="100" Maximum="16" Minimum="1"  Margin="4 0 0 0" 
+                <Slider DockPanel.Dock="Right" x:Name="slikl" Width="100" Maximum="16" Minimum="1"  Margin="4 0 0 0" ValueChanged="Slider_ValueChanged"
                               HorizontalContentAlignment="Center" Value="{Binding ElementName=cav,Path=GridPxiel}" ></Slider>
                 <TextBlock DockPanel.Dock="Right" Text="对齐:" VerticalAlignment="Center" Margin="16 0 0 0"/>
 
@@ -164,37 +164,40 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="auto"/>
                     </Grid.ColumnDefinitions>
-                    <Compiler:CanvasPanel x:Name="cav" Visibility="{Binding CanvasPanelVisibility}" SelectedItem="{Binding CanSelectedItem,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" AllowDrop="True" RenderTransformOrigin="0.5,0.5" ClipToBounds="True" UseLayoutRounding="True" Focusable="True" SnapsToDevicePixels="True">
-                        <Compiler:CanvasPanel.Background>
-                            <VisualBrush TileMode="Tile"  Viewport="0,0,20,20" ViewportUnits="Absolute">
-                                <VisualBrush.Visual>
-                                    <Rectangle Width="20" Height="20" StrokeDashArray="4,2" StrokeThickness="0.5" Stroke="#CBCBCB">
-                                        <Rectangle.Style>
-                                            <Style TargetType="{x:Type Rectangle}">
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding UseAutoAlignment, RelativeSource={RelativeSource AncestorType={x:Type Compiler:CanvasPanel}, Mode=FindAncestor}}" Value="True">
-                                                        <Setter Property="Visibility" Value="Visible"/>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding UseAutoAlignment, RelativeSource={RelativeSource AncestorType={x:Type Compiler:CanvasPanel}, Mode=FindAncestor}}" Value="False">
-                                                        <Setter Property="Visibility" Value="Collapsed"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Rectangle.Style>
-                                    </Rectangle>
-                                </VisualBrush.Visual>
-                            </VisualBrush>
-                        </Compiler:CanvasPanel.Background>
-
-                        <Compiler:CanvasPanel.RenderTransform>
-                            <TransformGroup>
-                                <TranslateTransform x:Name="CanvasTranslate"/>
-                            </TransformGroup>
-                        </Compiler:CanvasPanel.RenderTransform>
-                    </Compiler:CanvasPanel>
 
+                    <ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
+                        <Viewbox Width="auto" Height="auto" Grid.Row="1">
+                            <Compiler:CanvasPanel x:Name="cav" Width="1920" Height="1080" Visibility="{Binding CanvasPanelVisibility}" SelectedItem="{Binding CanSelectedItem,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" AllowDrop="True" RenderTransformOrigin="0.5,0.5" ClipToBounds="True" UseLayoutRounding="True" Focusable="True" SnapsToDevicePixels="True">
+                                <Compiler:CanvasPanel.Background>
+                                    <VisualBrush TileMode="Tile"  Viewport="0,0,20,20" ViewportUnits="Absolute">
+                                        <VisualBrush.Visual>
+                                            <Rectangle Width="20" Height="20" StrokeDashArray="4,2" StrokeThickness="0.5" Stroke="#CBCBCB">
+                                                <Rectangle.Style>
+                                                    <Style TargetType="{x:Type Rectangle}">
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding UseAutoAlignment, RelativeSource={RelativeSource AncestorType={x:Type Compiler:CanvasPanel}, Mode=FindAncestor}}" Value="True">
+                                                                <Setter Property="Visibility" Value="Visible"/>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding UseAutoAlignment, RelativeSource={RelativeSource AncestorType={x:Type Compiler:CanvasPanel}, Mode=FindAncestor}}" Value="False">
+                                                                <Setter Property="Visibility" Value="Collapsed"/>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Rectangle.Style>
+                                            </Rectangle>
+                                        </VisualBrush.Visual>
+                                    </VisualBrush>
+                                </Compiler:CanvasPanel.Background>
+
+                                <Compiler:CanvasPanel.RenderTransform>
+                                    <TransformGroup>
+                                        <TranslateTransform x:Name="CanvasTranslate"/>
+                                    </TransformGroup>
+                                </Compiler:CanvasPanel.RenderTransform>
+                            </Compiler:CanvasPanel>
+                        </Viewbox>
+                    </ScrollViewer>
                     <ctl:RunCanvas x:Name="runCanvas"  Visibility="{Binding RunCanvasVisibility}" />
-
                     <avae:TextEditor x:Name="codeEditor" ShowLineNumbers="True" Padding="4" WordWrap="True" IsReadOnly="True" SyntaxHighlighting="XML" BorderThickness="1 0 0 0" BorderBrush="{StaticResource ControlBorderBrush}" Grid.Column="1" Width="480" Visibility="{Binding ElementName=showCode, Path=IsChecked, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
                 </Grid>
             </Border>
diff --git a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs
index 4fdb5130..8d6e6bc4 100644
--- a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs
+++ b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs
@@ -487,6 +487,7 @@ namespace BeDesignerSCADA.Controls
             }
         }
 
+
         #endregion
 
         #region 不需要的
@@ -588,7 +589,10 @@ namespace BeDesignerSCADA.Controls
         //}
         #endregion
 
-
+        private void Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+         
+        }
     }