l临时提交

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

@@ -475,6 +475,9 @@
     <Compile Include="Uct\UctRegButtonTitleUnit.xaml.cs">
       <DependentUpon>UctRegButtonTitleUnit.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Uct\UctRegEditViewUnitControl.xaml.cs">
+      <DependentUpon>UctRegEditViewUnitControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Uct\UctRegTitleValueUnitControl.xaml.cs">
       <DependentUpon>UctRegTitleValueUnitControl.xaml</DependentUpon>
     </Compile>
@@ -998,6 +1001,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Uct\UctRegEditViewUnitControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Uct\UctRegTitleValueUnitControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1164,6 +1171,8 @@
     <Resource Include="Content\Img\Specification.png" />
     <Resource Include="Content\Img\SpringHeight.png" />
     <Resource Include="Content\Img\Configuration.png" />
+    <Resource Include="Content\Img\RightBound.png" />
+    <Resource Include="Content\Img\Origin.png" />
     <Content Include="HCCoreDevCfg.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

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

@@ -9,8 +9,8 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition />
-            <RowDefinition Height="Auto"/>
+            <RowDefinition  Height="4*"/>
+            <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="auto"/>
@@ -102,7 +102,7 @@
                 </Grid.RowDefinitions>
             </Grid>
         </Grid>
-        <Grid Grid.Row="2" x:Name="SeventhApplicatorParameters" Grid.ColumnSpan="2">
+        <Grid Grid.Row="2" x:Name="SeventhApplicatorParameters" Grid.ColumnSpan="2" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>

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

@@ -27,17 +27,18 @@
                     </Grid.ColumnDefinitions>
                     <Image Name="Img_Background" />
                     <Image x:Name="Img_Background_Right" Grid.Column="2"/>
-                    <uct:UctLowerReadingControl x:Name="GlueGunTravelDistance"  Grid.Column="1" FontSize="20" />
+                    <uct:UctNoTitleRegEditViewUnitControl x:Name="GlueGunTravelDistance"  Grid.Column="1" FontSize="10"  />
+                    <TextBlock Text="胶枪行程距离" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="10"/>
                 </Grid>
             </qilin:DashboardCard>
             <Grid Grid.Row="1" Grid.RowSpan="2">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="0.5*"/>
                         <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="0.5*"/>
                         <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="0.5*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="1*"/>

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

@@ -26,6 +26,9 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.ApplicatorsInformation
         public UctFirstApplicatorsPart()
         {
             InitializeComponent();
+            GlueGunTravelDistance.DataContext= Omron.GetListenReg("D366");
+            Img_Background.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content\Img\Origin.png");
+            Img_Background_Right.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content\Img\RightBound.png");
             ApplicatorsPart.Title = new string[] { "胶枪手动操作", "点动速度", "实时位置", "原点", "点检", "左移", "右移" };
             var reg = new string[] {"D150","D110", "D75","CIO276.5", "CIO274.5", "CIO272.5" };
             ApplicatorsPart.RegValue(reg);

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

@@ -29,7 +29,7 @@
                     <ColumnDefinition Width="2*"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                    <maincontrol:UctTitleValueUnitControl x:Name="CoverClosingAngle" Grid.Row="0" FontSize="20" Grid.Column="1"/>
+                <maincontrol:UctRegEditViewUnitControl x:Name="CoverClosingAngle" Grid.Row="0" FontSize="10" Grid.Column="1"/>
                 </Grid>
             </Grid>
 

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

@@ -28,6 +28,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.ApplicatorsInformation
         {
 
             InitializeComponent();
+            CoverClosingAngle.DataContext = Omron.GetListenReg("D368");
             Img_Background.Source=SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content/Img/CoverPlate.png");
             ApplicatorsPart.Title = new string[] { "盖板手动操作", "点动速度", "实时位置", "原点", "点检", "闭合", "打开" };
             var regValueArray = new string[]{ "D152", "D112", "D76", "CIO276.6", "CIO272.6", "CIO274.6" };

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

@@ -9,48 +9,49 @@
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
+            <ColumnDefinition Width="1.2*"/>
             <ColumnDefinition Width="2*"/>
         </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
+        <qilin:DashboardCard Grid.Column="0">
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition  Height="5*"/>
+                    <RowDefinition  Height="2*"/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition Width="1.5*"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <Image x:Name="Img_BedNet" Grid.ColumnSpan="3"  Source="D:\PROJECT\skoda-scada-daq3.0-master\skoda-scada-daq3.0-master\scada_-daq3.0-master\SCADA_DAQ.Plugin.Qilin\Content\Img\BedNet.png"/>
-                <uct:UctLowerReadingControl Grid.Row="1" x:Name="CutterPosition" VerticalContentAlignment="Center"  Grid.Column="1"/>
-              
+                <Image x:Name="Img_BedNet" Grid.ColumnSpan="3"  Source="D:\PROJECT\skoda-scada-daq3.0-master\skoda-scada-daq3.0-master\scada_-daq3.0-master\SCADA_DAQ.Plugin.Qilin\Content\Img\BedNet.png" VerticalAlignment="Top"/>
+                <uct:UctNoTitleRegEditViewUnitControl Grid.Row="1" x:Name="CutterPosition" VerticalContentAlignment="Center"  Grid.Column="1" HorizontalAlignment="Center" Margin="10"/>
+                <TextBlock Text="切刀位置" VerticalAlignment="Top" HorizontalAlignment="Center" Grid.Row="1" Grid.Column="1" Margin="10"/>
+
             </Grid>
-        </Grid>
+        </qilin:DashboardCard>
         <qilin:DashboardCard  Grid.Column="1">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition/>
-                    <RowDefinition/>
+                    <RowDefinition Height="1.1*"/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <TextBlock Text="床网手动操作" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="30"/>
                 <Grid Grid.Row="1">
                     <Grid>
                         <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="0.5*"/>
+                            <ColumnDefinition Width="3*"/>
                             <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="2*"/>
                             <ColumnDefinition Width="3*"/>
                             <ColumnDefinition Width="2*"/>
-                            <ColumnDefinition Width="3*"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="1*"/>
                             <RowDefinition Height="2*"/>
                         </Grid.RowDefinitions>
-                        <uct:UctLowerReadingControl   x:Name="JoggingSpeed" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="1" FontSize="20"/>
-                        <uct:UctLowerReadingControl  Grid.Column="3" x:Name="RealtimeLocation"  VerticalContentAlignment="Bottom" Grid.Row="1" FontSize="20"/>
+                        <uct:UctRegEditViewUnitControl   x:Name="JoggingSpeed" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="1" FontSize="10"/>
+                        <uct:UctRegEditViewUnitControl  Grid.Column="3" x:Name="RealtimeLocation"  VerticalContentAlignment="Bottom" Grid.Row="1" FontSize="10"/>
                     </Grid>
                 </Grid>
                 <Grid Grid.Row="2">

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

@@ -20,12 +20,11 @@
                     <RowDefinition />
                     <RowDefinition />
                     <RowDefinition />
-                    <RowDefinition />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/> 
+                    <ColumnDefinition Width="0.2*"/> 
                     <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition Width="0.2*"/>
                 </Grid.ColumnDefinitions>
                 <uct:UctRightReadingControl Grid.Row="0" x:Name="CutterDelayAcceleration" Grid.Column="1" FontSize="20"/>
                 <uct:UctRightReadingControl Grid.Row="1" x:Name="CutterAccelerationTime" Grid.Column="1" FontSize="20"/>

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

@@ -24,8 +24,8 @@
                 <RowDefinition Height="4*"/>
                 <RowDefinition />
             </Grid.RowDefinitions>
-            <uct:UctTitleValueUnitControl Title="{Binding Title[1],ElementName=this}" x:Name="JoggingSpeed"/>
-            <uct:UctTextValueControl Title="{Binding Title[2],ElementName=this}"  Grid.Column="1" x:Name="Realtimelocation"/>
+                <uct:UctRegEditViewUnitControl  x:Name="JoggingSpeed" FontSize="12"/>
+            <uct:UctTextValueControl Title="{Binding Title[2],ElementName=this}"  Grid.Column="1" x:Name="Realtimelocation" FontSize="12"/>
         </Grid>
         <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>

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

@@ -24,8 +24,9 @@
                 <RowDefinition Height="4*"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <uct:UctTitleValueUnitControl Title="{Binding Title[1],ElementName=this}" x:Name="JoggingSpeed"/>
-            <uct:UctTextValueControl Title="{Binding Title[2],ElementName=this}"  Grid.Column="1" x:Name="RealtimeLocation"/>
+                <uct:UctRegEditViewUnitControl  x:Name="JoggingSpeed" FontSize="12"/>
+                <!--<TextBox Text="点动速度" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="15" Margin="5"/>-->
+                <uct:UctTextValueControl Title="{Binding Title[2],ElementName=this}"  Grid.Column="1" x:Name="RealtimeLocation" FontSize="12"/>
         </Grid>
         <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>

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

@@ -49,7 +49,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
             var thirdRegValue = new string[] { "D1018", "D1016", "D1014", "D444", "D442", "D440" };
             for (int i = 0; i < 6; i++)
             {
-                var basicInformation = new UctTitleRegEditViewUnitControl() { FontSize = 10 };
+                var basicInformation = new UctLowerReadingControl() { FontSize = 10 };
                 basicInformation.DataContext = Omron.GetListenReg(thirdRegValue[i]);
                 var row = i % 6;
                 Grid.SetRow(basicInformation, row);

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

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

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

@@ -6,10 +6,10 @@
              xmlns:local="clr-namespace:SCADA_DAQ.Plugin.Qilin.Uct" 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="5" >
+    <qilin:DashboardCard Margin="0" >
         <Grid>
             <StackPanel Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
-                <scadaui:RegEditView TitleVisibility="Collapsed" Width="68" Margin="18" TitleWidth="100"  ShowTitle="False"/>
+                <scadaui:RegEditView TitleVisibility="Collapsed" Width="70" Margin="18" TitleWidth="100"  ShowTitle="False"/>
             </StackPanel>
         </Grid>
     </qilin:DashboardCard>

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

@@ -0,0 +1,18 @@
+<UserControl x:Class="SCADA_DAQ.Plugin.Qilin.Uct.UctRegEditViewUnitControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             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:qilin="clr-namespace:SCADA_DAQ.Plugin.Qilin" xmlns:scadaui="clr-namespace:SCADA.CommonCtrl.SCADAUI;assembly=SCADA.CommonCtrl"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <qilin:DashboardCard Margin="5" >
+        <Grid>
+            <!--<TextBlock Text="{Binding Comment.Annotation}"  VerticalAlignment="Bottom"  HorizontalAlignment="Center" Margin="0,0,60,0"/>-->
+            <StackPanel Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
+                <scadaui:RegEditView TitleVisibility="Collapsed" Width="120" Margin="15,0,25,5" TitleWidth="200" />
+                <!--<TextBlock Text="{Binding Comment.Unit}" Margin="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
+            </StackPanel>
+        </Grid>
+    </qilin:DashboardCard>
+</UserControl>

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

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SCADA_DAQ.Plugin.Qilin.Uct
+{
+    /// <summary>
+    /// UctRegEditViewUnitControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class UctRegEditViewUnitControl : UserControl
+    {
+        public UctRegEditViewUnitControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -6,7 +6,7 @@
              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" xmlns:scadaui="clr-namespace:SCADA.CommonCtrl.SCADAUI;assembly=SCADA.CommonCtrl"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <qilin:DashboardCard Margin="10">
+    <qilin:DashboardCard Margin="5">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>

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

@@ -8,20 +8,20 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="6*"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="1.2*"/>
-                <ColumnDefinition Width="1.2*"/>
+                <ColumnDefinition Width="1.7*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-            <TextBlock Text="皮带处B_阀值" FontSize="20" VerticalAlignment="Bottom"/>
-            <TextBlock Text="刀模处A_阀值" FontSize="20" Grid.Column="1" VerticalAlignment="Bottom"/>
-            <local:UctSingleButtonControl Grid.Column="2" Title="固定系数压缩" Margin="10"/>
+            <TextBlock Text="皮带处B_阀值" FontSize="15" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
+            <TextBlock Text="刀模处A_阀值" FontSize="15" Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
+            <local:UctSingleButtonControl Grid.Column="2" Title="固定系数压缩"  Margin="20,5,20,5"/>
         </Grid>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
@@ -54,25 +54,27 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <local:UctTextValueControl Title="皮带中阀值" FontSize="20"/>
-                    <local:UctTextValueControl Title="刀模中阀值" Grid.Column="1" FontSize="20"/>
-                    <local:UctLowerReadingControl  Grid.Row="1" FontSize="20"/>
-                    <local:UctLowerReadingControl   Grid.Row="1" Grid.Column="1" FontSize="20"/>
+                    <local:UctLowerReadingControl  FontSize="15" x:Name="MideltThreshold"/>
+                    <local:UctLowerReadingControl  Grid.Column="1" FontSize="15" x:Name="ThresholdInTheDie" />
+                    <local:UctLowerReadingControl  Grid.Row="1" FontSize="12"  x:Name="DifferentSpringCoefficientA"/>
+                    <local:UctLowerReadingControl   Grid.Row="1" Grid.Column="1" FontSize="12" x:Name="DifferentSpringCoefficientB" />
                 </Grid>
             </Grid>
-            <Grid Grid.Column="1" x:Name="ScendThreshold">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
+            <Grid Grid.Column="1">
+                <Grid Grid.Column="1" x:Name="ScendThreshold" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                </Grid>
             </Grid>
         </Grid>
     </Grid>

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

@@ -27,10 +27,14 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
         public UctThreshold()
         {
             InitializeComponent();
+            MideltThreshold.DataContext = Omron.GetListenReg("D1022");
+            ThresholdInTheDie.DataContext = Omron.GetListenReg("D1020");
+            DifferentSpringCoefficientA.DataContext = Omron.GetListenReg("D430");
+            DifferentSpringCoefficientB.DataContext = Omron.GetListenReg("D424");
             string[] Address = new string[] { "D164", "D124", "D230", "D232", "D234", "D124", "D230", "D232", "D234" };
             for (int i = 0; i < 9; i++)
             {
-                var basicInformation = new UctLowerReadingControl() { FontSize = 20};
+                var basicInformation = new UctLowerReadingControl() { FontSize = 10};
                 basicInformation.DataContext = Omron.GetListenReg(Address[i]);
                 var row = i / 3;
                 Grid.SetRow(basicInformation, row);
@@ -41,7 +45,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
             var regValue = new string[] {"D456","D476","D454","D474","D452","D472","D390","D436","D388","D434","D386","D432"};
             for (int i = 0; i < 12; i++)
             {
-                var basicInformation=new UctLowerReadingControl(){FontSize=20 };
+                var basicInformation=new UctRegEditViewUnitControl(){FontSize= 10 };
                 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/UctFrmApplicatorsMain.xaml

@@ -7,7 +7,7 @@
                         mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="UctFrmApplicatorsMain">
-    <Viewbox Stretch="Fill">
+ 
     <Grid>
         <Grid>
             <Grid.ColumnDefinitions>
@@ -29,5 +29,5 @@
             </Grid>
         </Grid>
     </Grid>
-    </Viewbox>
+
 </wpfcontrol:BaseUctFrm>

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

@@ -11,11 +11,11 @@
     <Grid>
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="0.5*"/>
                 <ColumnDefinition Width="20*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="9*"/>
             </Grid.RowDefinitions>
             <uct:UctMidCard Title="阈值主页"  Grid.Row="0" Grid.ColumnSpan="2" FontSize="25"/>