1

BPASmartClient.ScreenLib/AppMain.cs

@@ -17,7 +17,7 @@ namespace BPASmartClient.ScreenLib
             //启动Redis数据读取
             Main.GetInstance.Start();
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-            FSystemHelper.GetInstance.CreateDesktopShortcut();
+            //FSystemHelper.GetInstance.CreateDesktopShortcut();
            // FSystemHelper.GetInstance.AutoStart(true);
             WindowLargeScreen windowLarge = new WindowLargeScreen();
             #region 设置显示页面与标题

BeDesignerSCADA/Controls/CanvasPanelNew.xaml

@@ -232,7 +232,7 @@
                     <icon:Material Kind="FileCode"/>
                 </ToggleButton>
 
-                <Slider DockPanel.Dock="Right" x:Name="slikl" Width="100" Maximum="16" Minimum="1"  Margin="4 0 0 0" 
+                <Slider DockPanel.Dock="Right" x:Name="slikl" Width="100" Maximum="50" Minimum="4"  Margin="4 0 0 0" 
                               HorizontalContentAlignment="Center" Value="{Binding ElementName=cav,Path=GridPxiel}" />
                 <TextBlock DockPanel.Dock="Right" Text="对齐:" VerticalAlignment="Center" Margin="16 0 0 0"/>
 
@@ -254,31 +254,6 @@
                     <ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
                         <Grid>
                             <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="5,5" StrokeThickness="0.4" 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>
                             <ctl:RunCanvas x:Name="runCanvas"  Visibility="{Binding DataContext.RunCanvasVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
                         </Grid>

BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs

@@ -404,14 +404,6 @@ namespace BeDesignerSCADA.Controls
             {
                 cav.Load(ofd.FileName);
             }
-
-            DoubleAnimation da = new DoubleAnimation(-200, 0, new Duration(TimeSpan.FromMilliseconds(250)));
-            da.EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut };
-            CanvasTranslate.BeginAnimation(TranslateTransform.XProperty, da);
-
-            DoubleAnimation daop = new DoubleAnimation(0, 1, new Duration(TimeSpan.FromMilliseconds(250)));
-            daop.EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut };
-            cav.BeginAnimation(OpacityProperty, daop);
         }
         /// <summary>
         /// 保存