临时提交

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/Uct/SprayGlueSwitch/SprayGlueSwitch.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct.SprayGlueSwitch"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid x:Name="SprayGlueSwitchOne">
+    <Grid x:Name="SprayGlueSwitchOne" >
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition/>

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/Uct/SprayGlueSwitch/SprayGlueSwitch.xaml.cs

@@ -32,7 +32,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.SprayGlueSwitch
         {
             for (int i = 0; i < 90; i++)
             {
-                var basicInformation = new UctRegButtonThreeState() { FontSize = 50,Width=200};
+                var basicInformation = new UctRegButtonThreeState() { Width=180};
                 basicInformation.DataContext = Omron.GetListenReg($"D{reg+i}");
                 var row = i / 15;
                 Grid.SetRow(basicInformation, row);

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/Uct/UctRegButtonThreeState.xaml

@@ -6,13 +6,13 @@
              xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct" xmlns:wpfcontrol="clr-namespace:SCADA.CommonCtrl.WpfControl;assembly=SCADA.CommonCtrl" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
+    <Grid Margin="2">
         <Image x:Name="Img_Button" Stretch="Fill"/>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="30"> 
             <wpfcontrol:IconButton  x:Name="IconButton"
                                   Height="80"
-                                  FontSize="60"
-                                  Width="180"
+                                  FontSize="45"
+                                  Width="100"
                                   Click="IconButton_Click"
                                   Foreground="Black" Cursor="Hand"
                                   Padding="20"
@@ -24,8 +24,8 @@
                 <wpfcontrol:IconButton.Resources>
                     <Style TargetType="{x:Type wpfcontrol:IconButton}">
                         <Setter Property="Title" Value="{Binding Comment.Annotation}"/>
-                        <Setter Property="Background" Value="Red"/>
                         <Setter Property="ButtonStyle" Value="Primary" />
+                       
                         <Setter Property="Cursor" Value="Hand"/>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding Value}" Value="1">

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmSprayGlueSwitchOneMain.xaml

@@ -15,7 +15,7 @@
               </Grid.RowDefinitions>
             <uct:UctMidCard Title="喷胶开关1"  Grid.Row="0" FontSize="40"/>
         <Viewbox Stretch="Fill" Grid.Row="1">
-            <sprayglueswitch:SprayGlueSwitch x:Name="SprayGlueSwitchOne" />
+            <sprayglueswitch:SprayGlueSwitch x:Name="SprayGlueSwitchOne"/>
         </Viewbox>
     </Grid>