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

@@ -12,13 +12,13 @@
             <ColumnDefinition/>
             <ColumnDefinition/>
             <ColumnDefinition />
-            <ColumnDefinition/>
+           
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition/>
             <RowDefinition/>
-            <RowDefinition/>
+         
         </Grid.RowDefinitions>
     </Grid>
 </UserControl>

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

@@ -29,7 +29,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.AutomaticOperationInformation
             var regValue = new string[] { "D364", "D362", "D260", "D248", "D374", "", "D262", "D252", "D240", "D242", "D246", "D266" };
             for (int i = 0; i < 12; i++)
             {
-                var basicInformation = new UctRegTitleValueUnitControl() { FontSize = 20 };
+                var basicInformation = new UctRegTitleValueUnitControl() { FontSize = 10 };
                 basicInformation.DataContext = Omron.GetListenReg(regValue[i]);
                 var row = i / 4;
                 Grid.SetRow(basicInformation, row);

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

@@ -8,20 +8,18 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid >
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
-        <Grid Grid.Column="1" x:Name="FirstAutomaticOperationPart">
+        <Grid Grid.Column="1" x:Name="FirstAutomaticOperationPart" >
             <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition/>
             <RowDefinition/>
-        </Grid.RowDefinitions>
+             <RowDefinition/>
+            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <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/AutomaticOperationInformation/UctAutomaticOperationThreePart.xaml.cs

@@ -29,7 +29,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.AutomaticOperationInformation
             var regValue = new string[] { "CIO304.5", "CIO304.6", "H1.0", "CIO260.6", "CIO260.4", "CIO260.0" };
             for (int i = 0; i < 6; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 15 };
                 basicInformation.DataContext = Omron.GetListenReg(regValue[i]);
                 var row = i / 2;
                 Grid.SetRow(basicInformation, row);

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

@@ -11,13 +11,11 @@
             <ColumnDefinition/>
             <ColumnDefinition/>
             <ColumnDefinition/>
-            <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition/>
             <RowDefinition/>
-            <RowDefinition/>
         </Grid.RowDefinitions>
     </Grid>
 </UserControl>

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

@@ -6,14 +6,14 @@
              xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct" xmlns:iconpacks="clr-namespace:MahApps.Metro.IconPacks;assembly=MahApps.Metro.IconPacks.Material" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:scadaui="clr-namespace:SCADA.CommonCtrl.SCADAUI;assembly=SCADA.CommonCtrl" xmlns:qilin="clr-namespace:SCADA_DAQ.Plugin.Qilin"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <qilin:DashboardCard Margin="0,10,120,10">
+    <qilin:DashboardCard Margin="5,5,5,5">
         <Grid>
         <!--<Grid.ColumnDefinitions>
             <ColumnDefinition/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>-->
         <!--<TextBlock Text="{Binding Comment.Annotation}" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->
-        <scadaui:RegBoolEditView Grid.Column="1" VerticalAlignment="Center" Height="50"/>
+        <scadaui:RegBoolEditView Grid.Column="1" VerticalAlignment="Center" Height="30" />
     </Grid>
     </qilin:DashboardCard>
   </UserControl>

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

@@ -3,15 +3,19 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct"
+             xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct" xmlns:qilin="clr-namespace:SCADA_DAQ.Plugin.Qilin"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
+    <qilin:DashboardCard Margin="5">
+        
+    
     <Grid>
-        <Image x:Name="Img_Button" Source="D:\PROJECT\skoda-scada-daq3.0-master\skoda-scada-daq3.0-master\scada_-daq3.0-master\SCADA_DAQ.Plugin.Qilin\Content\Img\Framing.png" Stretch="Fill"/>
+        <Image x:Name="Img_Button"  Stretch="Fill"/>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock Text="{Binding Comment.Annotation}" />
             <TextBlock Text="{Binding Value}" />
             <TextBlock Text="{Binding Comment.Unit}"/>
         </StackPanel>
     </Grid>
+    </qilin:DashboardCard>
 </UserControl>

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

@@ -23,7 +23,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
         public UctRegTitleValueUnitControl()
         {
             InitializeComponent();
-            Img_Button.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content\Img\Framing.png");
+            //Img_Button.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content\Img\Framing.png");
            
         }
     }

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

@@ -7,21 +7,22 @@
                         mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="UctFrmAutomaticOperationMain">
-    <Viewbox Stretch="Fill">
+    <!--<Viewbox Stretch="Fill">-->
         <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition Width="0.8*"/>
-        </Grid.ColumnDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="0.8*"/>
+            </Grid.ColumnDefinitions>
             <automaticoperationinformation:UctAutomaticOperationThreePart Grid.Column="1"/>
         <Grid Grid.Column="0">
             <Grid.RowDefinitions>
                 <RowDefinition/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
+                
+                   <RowDefinition/>
+                </Grid.RowDefinitions>
                 <automaticoperationinformation:UctAutomaticOperationOnePart/>
                 <automaticoperationinformation:UctAutomaticOperationTwoPart Grid.Row="1"/>
         </Grid>
     </Grid>
-    </Viewbox>
+    <!--</Viewbox>-->
 </wpfcontrol:BaseUctFrm>