临时提交

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

@@ -27,13 +27,13 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.AccessInformation
         {
             InitializeComponent();
             Img_Access.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content\Img\Access.png");
-            //var accessFirstStringArray = new List<string>() { "夹板1", "夹板2", "夹板3" };
-            //var accessScendStringArray = new List<string>() { "供轮1", "供轮2", "供轮3" };
+            var accessFirstStringArray = new List<string>() { "夹板1", "夹板2", "夹板3" };
+            var accessScendStringArray = new List<string>() { "供轮1", "供轮2", "供轮3" };
             var firstReg = new string[] { };
             var secondReg = new string[] { };
             for (int i = 0; i < 3; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctButtonControl() { FontSize = 20 ,Width=180,Height=50,Title= accessFirstStringArray[i] };
                 basicInformation.DataContext = Omron.GetListenReg($"CIO304.{1 + i}");
                 var colunm = i % 3;
                 Grid.SetColumn(basicInformation, colunm);
@@ -41,7 +41,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.AccessInformation
             }
             for (int i = 0; i < 3; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctButtonControl() { FontSize = 20, Width = 180, Height = 50,Title= accessScendStringArray[i] };
                 basicInformation.DataContext = Omron.GetListenReg($"CIO305.{1 + i}");
                 var colunm = i % 3;
                 Grid.SetColumn(basicInformation, colunm);

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

@@ -42,9 +42,9 @@
                     <ColumnDefinition/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <local:UctSingleButtonControl x:Name="ButtonOne" Width="120" Height="50"/>
-                <local:UctSingleButtonControl Grid.Column="1" x:Name="ButtonTwo" Width="120" Height="50"/>
-                <local:UctSingleButtonControl Grid.Column="2" x:Name="ButtonThree" Width="120" Height="50"/>
+                <local:UctButtonControl x:Name="ButtonOne" Width="120" Height="50"/>
+                <local:UctButtonControl Grid.Column="1" x:Name="ButtonTwo" Width="120" Height="50"/>
+                <local:UctButtonControl Grid.Column="2" x:Name="ButtonThree" Width="120" Height="50"/>
             </Grid>
         </Grid>
     </qilin:DashboardCard>

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

@@ -14,7 +14,7 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="30" FontWeight="Black" Text="{Binding Title[0],ElementName=this}"/>
+            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="25" Text="{Binding Title[0],ElementName=this}"/>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />

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

@@ -7,26 +7,24 @@
              mc:Ignorable="d" 
              x:Name="Title"
              d:DesignHeight="450" d:DesignWidth="800">
-    <qilin:DashboardCard Margin="2">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0" >
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Bottom"  Orientation="Horizontal" Margin="0,0,30,0">
-                    <TextBlock Text="{Binding Comment.Annotation}"/>
-                </StackPanel>
-            </Grid>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Top" Grid.ColumnSpan="2" >
-                    <scadaui:RegEditView TitleVisibility="Collapsed" Width="100"  ShowTitle="False" />
-                </StackPanel>
-            </Grid>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0" >
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Bottom"  Orientation="Horizontal" Margin="0,0,30,0">
+                <TextBlock Text="{Binding Comment.Annotation}"/>
+            </StackPanel>
         </Grid>
-    </qilin:DashboardCard>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Top" Grid.ColumnSpan="2" >
+                <scadaui:RegEditView TitleVisibility="Collapsed" Width="100"  ShowTitle="False" />
+            </StackPanel>
+        </Grid>
+    </Grid>
 </UserControl>

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

@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              x:Name="this"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
+    <Grid Margin="2">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
             <wpfcontrol:IconButton  x:Name="IconButton"
                                   Width="{Binding Width,ElementName=this}"

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

@@ -5,13 +5,15 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct" xmlns:wpfcontrol="clr-namespace:SCADA.CommonCtrl.WpfControl;assembly=SCADA.CommonCtrl" xmlns:qilin="clr-namespace:SCADA_DAQ.Plugin.Qilin"
              mc:Ignorable="d" 
+             x:Name="this"
              d:DesignHeight="450" d:DesignWidth="800">
 
-    <Grid>
+    <Grid Margin="2">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
             <wpfcontrol:IconButton  x:Name="IconButton"
-                                   Height="50"
+                                   Height="{Binding Height,ElementName=this}"
                                    FontSize="20"
+                                   Width="{Binding Width,ElementName=this}"
                                    Click="IconButton_Click"
                                   Foreground="Black"
                 >

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

@@ -28,6 +28,31 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
             //var OO = new RegInfo().Comment.Annotation;
         }
 
+
+        public int Width
+        {
+            get { return (int)GetValue(WidthProperty); }
+            set { SetValue(WidthProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for Width.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty WidthProperty =
+            DependencyProperty.Register("Width", typeof(int), typeof(UctRegButtonTitleUnit), new PropertyMetadata(null));
+
+
+
+        public int Height
+        {
+            get { return (int)GetValue(HeightProperty); }
+            set { SetValue(HeightProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for Height.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty HeightProperty =
+            DependencyProperty.Register("Height", typeof(int), typeof(UctRegButtonTitleUnit), new PropertyMetadata(null));
+
+
+
         private void IconButton_Click(object sender, RoutedEventArgs e)
         {
             if (sender is IconButton btn)

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

@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              x:Name="this"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
+    <Grid Margin="2">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
             <wpfcontrol:IconButton  x:Name="IconButton"
                                   Width ="{Binding Width,ElementName=this}"

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

@@ -20,7 +20,10 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
-
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
@@ -28,13 +31,6 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-               
             </Grid.ColumnDefinitions>
         </Grid>
     </Grid>

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

@@ -30,9 +30,9 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
             {
                 var basicInformation = new UctLowerReadingControl() { FontSize = 15 };
                 basicInformation.DataContext = Omron.GetListenReg($"D{1402+i*2}");
-                var row = i / 10;
+                var row = i / 5;
                 Grid.SetRow(basicInformation, row);
-                var colunm = i % 10;
+                var colunm = i % 5;
                 Grid.SetColumn(basicInformation, colunm);
                 FirstSpringTrimming.Children.Add(basicInformation);
             }

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

@@ -10,10 +10,11 @@
     <Grid>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="9*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition/>
+                <RowDefinition Height="0.5*"/>
             </Grid.RowDefinitions>
-            <uct:UctMidCard Title="选道主页"  Grid.Row="0"/>
+            <uct:UctMidCard Title="选道主页"  Grid.Row="0" FontSize="20"/>
             <Viewbox Stretch="Fill" Grid.Row="1">
                 <uct:UctChooseTheWay />
             </Viewbox>

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

@@ -9,17 +9,11 @@
       Title="UctFrmSpringTrimmingMain">
 
     <Grid>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="20*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="9*"/>
-            </Grid.RowDefinitions>
-            <uct:UctMidCard Title="弹簧微调主页"  Grid.Row="0" Grid.ColumnSpan="2" FontSize="25" /> 
-            <uct:UctSpringTrimming Grid.Column="1" Grid.Row="1" Margin="50,50,50,50"/>
-        </Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="9*"/>
+        </Grid.RowDefinitions>
+        <uct:UctMidCard Title="弹簧微调主页"  Grid.Row="0" FontSize="25" />
+        <uct:UctSpringTrimming Grid.Column="1" Grid.Row="1" />
     </Grid>
 </wpfcontrol:BaseUctFrm>