临时提交

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

@@ -207,8 +207,8 @@
     <Compile Include="UctFrmBedNetSizeMain.xaml.cs">
       <DependentUpon>UctFrmBedNetSizeMain.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UctFrmCapacityMain.xaml.cs">
-      <DependentUpon>UctFrmCapacityMain.xaml</DependentUpon>
+    <Compile Include="UctFrmBedCapacityMain.xaml.cs">
+      <DependentUpon>UctFrmBedCapacityMain.xaml</DependentUpon>
     </Compile>
     <Compile Include="UctFrmChannelParametersMain.xaml.cs">
       <DependentUpon>UctFrmChannelParametersMain.xaml</DependentUpon>
@@ -642,7 +642,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UctFrmCapacityMain.xaml">
+    <Page Include="UctFrmBedCapacityMain.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

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

@@ -28,7 +28,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.ApplicatorsInformation
             InitializeComponent();
           for (int i = 0; i < 4; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 ,Width=120,Height=50};
                 basicInformation.DataContext = Omron.GetListenReg($"H3.{3+i}");
                 var row = i % 4;
                 Grid.SetRow(basicInformation, row);
@@ -36,7 +36,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.ApplicatorsInformation
             }
             for (int i = 0; i < 4; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20, Width = 120, Height = 50 };
                 basicInformation.DataContext = Omron.GetListenReg($"CIO301.{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/BedNetworkInformation/UctBedNetCapacity.xaml.cs

@@ -35,10 +35,11 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.BedNetworkInformation
                 Grid.SetRow(basicInformation, row);
                 RunningSpeedOnePart.Children.Add(basicInformation);
             }
+            var BedCapacityName = new List<string> {"清零", "清零", "清零"};
             for (int i = 0; i < 3; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
-                basicInformation.DataContext = Omron.GetListenReg($"CIO304.{ 7+ i}");
+                var basicInformation = new UctButtonControl() { FontSize = 20, Width = 150, Height = 50,Title= BedCapacityName[i] };
+                basicInformation.DataContext = Omron.GetListenReg($"CIO304.{7 + i}");
                 var row = i % 3;
                 Grid.SetRow(basicInformation, row);
                 RunningSpeedTwoPart.Children.Add(basicInformation);

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

@@ -27,8 +27,8 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.FeedingInformation
         {
             InitializeComponent();
 
-            //var firstButtonWeldingKnivesString = new string[] { "焊架切刀", "切刀工作", "焊架刀模", "下面刀", "双面刀", "上面刀" };
-            //var secondButtonWeldingKnivesString = new string[] { "焊架刀模闭合", "焊架切刀往上", "焊架切割点检", "焊架切刀往下" };
+            var firstButtonWeldingKnivesString = new string[] { "焊架切刀", "切刀工作", "焊架刀模", "下面刀", "双面刀", "上面刀" };
+            var secondButtonWeldingKnivesString = new string[] { "焊架刀模闭合", "焊架切刀往上", "焊架切割点检", "焊架切刀往下" };
             var oneWeldingKnivesString = new string[] { "焊架延迟时间", "s" };
             var twoWeldingKnivesString = new string[] { "焊架保持时间", "s" };
             var threeWeldingKnivesString = new string[] { "焊架打开延迟", "s" };
@@ -36,7 +36,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.FeedingInformation
             var weldingKnivesList = new List<string[]>() { oneWeldingKnivesString, twoWeldingKnivesString, threeWeldingKnivesString };
             for (int i = 0; i < 6; i++)
             {
-                var basicInformation = new UctSingleButtonControl() { FontSize = 20 ,Width=150,Height=50};
+                var basicInformation = new UctButtonControl() { FontSize = 20 ,Width=150,Height=50,Title= firstButtonWeldingKnivesString[i]};
                 basicInformation.DataContext = Omron.GetListenReg(firstReg[i]);
                 var row = i / 3;
                 Grid.SetRow(basicInformation, row);
@@ -56,7 +56,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.FeedingInformation
             var ScendReg = new string[] {"CIO303.4", "CIO303.5", "CIO303.7", "CIO303.6" };
             for (int i = 0; i < 4; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctButtonControl() { FontSize = 20,Width = 220, Height = 50, Title = secondButtonWeldingKnivesString[i] };
                 basicInformation.DataContext = Omron.GetListenReg(ScendReg[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/TraverseInformation/UctFirstTraversePart.xaml.cs

@@ -27,12 +27,12 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.TraverseInformation
         {
             InitializeComponent();
             Img_Traverse.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Content\Img\Traverse.png");
-            //var traverseFirstStringArray = new List<string>() { "通道1", "通道2", "通道3" };
-            //var traverseScendStringArray = new List<string>() { "随机选", "指定条", "两头定" };
+            var traverseFirstStringArray = new List<string>() { "通道1", "通道2", "通道3" };
+            var traverseScendStringArray = new List<string>() { "随机选", "指定条", "两头定" };
 
             for (int i = 0; i < 3; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctButtonControl() { FontSize = 20 ,Width=120,Height=50,Title= traverseFirstStringArray[i]};
                 basicInformation.DataContext = Omron.GetListenReg($"H3.{8+i}");
                 var colunm = i % 3;
                 Grid.SetColumn(basicInformation, colunm);
@@ -40,7 +40,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct.TraverseInformation
             }
             for (int i = 0; i < 3; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 20 };
+                var basicInformation = new UctButtonControl() { FontSize = 20, Width = 120, Height = 50,Title= traverseScendStringArray[i]};
                 basicInformation.DataContext = Omron.GetListenReg($"H3.{11 + 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/UctButtonControl.xaml

@@ -16,9 +16,9 @@
                                   Width="{Binding Width,ElementName=this}"
                                   Height="{Binding Height,ElementName=this}"
                                   Foreground="Black"
-                                  PreviewMouseLeftButtonDown="IconButton_PreviewMouseLeftButtonDown"
-                                  PreviewMouseLeftButtonUp="IconButton_PreviewMouseLeftButtonUp" Cursor="Hand"
+                                  Cursor="Hand"
                                   FontSize="20"
+                                  Click="IconButton_Click"
                 >
                 <wpfcontrol:IconButton.Resources>
                     <Style TargetType="{x:Type wpfcontrol:IconButton}">
@@ -28,8 +28,9 @@
 
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding Value}" Value="1">
-                                <Setter Property="ButtonKind" Value="StopButton"/>
+                                <Setter Property="ButtonKind" Value="StartButton"/>
                                 <Setter Property="Background" Value="Green"/>
+                                <Setter Property="ButtonStyle" Value="Primary"/>
                                 <Setter Property="Title" Value="{Binding Title,ElementName=this}"/>
                             </DataTrigger>
 

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

@@ -66,24 +66,13 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
 
 
 
-        private void IconButton_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void IconButton_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is IconButton btn)
+            if(sender is IconButton bth)
             {
-                if (btn.DataContext is RegInfo reg)
+                if(bth.DataContext is RegInfo reg)
                 {
-                    Task.Run(() => reg.SetBit());
-                }
-            }
-        }
-
-        private void IconButton_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is IconButton btn)
-            {
-                if (btn.DataContext is RegInfo reg)
-                {
-                    Task.Run(() => reg.ResetBit());
+                    Task.Run(() => reg.Reverse());
                 }
             }
         }

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

@@ -28,9 +28,10 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
             InitializeComponent();
             var firstReg = new string[] {"H4.8","H4.7","H4.6","H4.9","H4.10","H4.11"};
             var scendReg = new string[] { "D1027", "D1026", "D1025", "D1031", "D1030", "D1029","D1032" };
+            var channelName = new List<string> {"通道3弹簧有空格","通道2弹簧有空格","通道1弹簧有空格", "仅计数模式停切","计数空格模式停切", "计长空格模式停切" };
             for (int i = 0; i < 6; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() {FontSize=20,Width=300};
+                var basicInformation = new UctButtonControl() {FontSize=20,Width=200,Height=50,Title= channelName[i]};
                 basicInformation.DataContext = Omron.GetListenReg(firstReg[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/UctChooseTheWay.xaml.cs

@@ -28,7 +28,7 @@ namespace SCADA_DAQ.Plugin.Qilin.Uct
             InitializeComponent();
             for (int i = 0; i < 50; i++)
             {
-                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 15, Width = 150 };
+                var basicInformation = new UctRegButtonTitleUnit() { FontSize = 15, Width = 150,Height=50 };
                 basicInformation.DataContext = Omron.GetListenReg($"D{501 + i}");
                 var row = i / 10;
                 Grid.SetRow(basicInformation, row);

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

@@ -6,7 +6,6 @@
              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:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <qilin:DashboardCard Margin="10">
         <Grid>
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
                 <wpfcontrol:IconButton  x:Name="IconButton"
@@ -34,5 +33,4 @@
                 </wpfcontrol:IconButton>
             </StackPanel>
         </Grid>
-    </qilin:DashboardCard>
-</UserControl>
+ </UserControl>

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

@@ -7,15 +7,15 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <qilin:DashboardCard Margin="5">
-        
-    
-    <Grid>
-        <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>
+
+
+        <Grid>
+            <Image x:Name="Img_Button"  Stretch="Fill"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <TextBlock Text="{Binding Comment.Annotation}" />
+                <TextBlock Text="{Binding Value}" Margin="5,0,0,0"/>
+                <TextBlock Text="{Binding Comment.Unit}" Margin="5,0,0,0"/>
+            </StackPanel>
+        </Grid>
     </qilin:DashboardCard>
 </UserControl>

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmCapacityMain.xaml → skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmBedCapacityMain.xaml

@@ -1,4 +1,4 @@
-<wpfcontrol:BaseUctFrm  xmlns:wpfcontrol="clr-namespace:SCADA.CommonCtrl.WpfControl;assembly=SCADA.CommonCtrl" x:Class="SCADA_DAQ.Plugin.Qilin.UctFrmCapacityMain"
+<wpfcontrol:BaseUctFrm  xmlns:wpfcontrol="clr-namespace:SCADA.CommonCtrl.WpfControl;assembly=SCADA.CommonCtrl" x:Class="SCADA_DAQ.Plugin.Qilin.UctFrmBedCapacityMain"
       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" 

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmCapacityMain.xaml.cs → skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.Plugin.Qilin/UctFrmBedCapacityMain.xaml.cs

@@ -20,9 +20,9 @@ namespace SCADA_DAQ.Plugin.Qilin
     /// UctFrmCapacityMain.xaml 的交互逻辑
     /// </summary>
     [UctMenu("床网产能", Icon = "看板")]
-    public partial class UctFrmCapacityMain : BaseUctFrm
+    public partial class UctFrmBedCapacityMain : BaseUctFrm
     {
-        public UctFrmCapacityMain()
+        public UctFrmBedCapacityMain()
         {
             InitializeComponent();
             ToolBar.Visibility = Visibility.Collapsed;