update top view

CyberX8_MainPages/Views/TopView.xaml

@@ -48,7 +48,6 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
-                <ColumnDefinition/>
 
 
             </Grid.ColumnDefinitions>
@@ -89,7 +88,7 @@
                 <Button Style="{StaticResource SysBtnStyle}"  Visibility="{Binding IsControlPermission,Converter={StaticResource boolToVisibility}}" Background="{DynamicResource TopFrame_TableBG}"  Content="Permission"  Width="120" Height="30" Command="{Binding ControlPermissionCommand}"/>
                 <Button Style="{StaticResource SysBtnStyle}"  Visibility="{Binding IsControlPermission,Converter={StaticResource boolToVisibility2}}" Background="{DynamicResource TopFrame_TableBG}"  Content="Release"  Width="120" Height="30" Command="{Binding ControlReleaseCommand}" Margin="-120,0,0,0"/>
                 <Label Content="Log" Style="{StaticResource TopLable_LeftTop}" Canvas.Left="520" Width="100" Canvas.Top="76" BorderThickness="1"   HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Height="30" FontWeight="Bold" Margin="2,0,0,0"/>
-                <ComboBox  Width="1050" Canvas.Left="620" Canvas.Top="74.2" Height="32"
+                <ComboBox  Width="960" Canvas.Left="620" Canvas.Top="74.2" Height="32"
                                        ItemsSource="{Binding EventLogList}"   
                                        SelectedIndex="{Binding EventLogListSelectedIndex}"
                                        VerticalContentAlignment="Center" FontSize="15"  >

CyberX8_Simulator/Devices/WagoSocketSimulator.cs

@@ -838,7 +838,7 @@ namespace CyberX8_Simulator.Devices
             }
             if (_rinse1DumpValve && AIShorts[AINameIndexDic["r_QDRD1_WATER_LEVEL"]] > 500) //快排
             {
-                AIShorts[AINameIndexDic["r_QDRD1_WATER_LEVEL"]] -= 350;
+                AIShorts[AINameIndexDic["r_QDRD1_WATER_LEVEL"]] -= 600;
             }
             if (AIShorts[AINameIndexDic["r_QDRD1_WATER_LEVEL"]] > 500)//慢排
             {
@@ -852,7 +852,7 @@ namespace CyberX8_Simulator.Devices
             }
             if (_rinse2DumpValve && AIShorts[AINameIndexDic["r_QDRD2_WATER_LEVEL"]] > 500)
             {
-                AIShorts[AINameIndexDic["r_QDRD2_WATER_LEVEL"]] -= 300;
+                AIShorts[AINameIndexDic["r_QDRD2_WATER_LEVEL"]] -= 600;
             }
             if (AIShorts[AINameIndexDic["r_QDRD2_WATER_LEVEL"]] > 500)//慢排
             {
@@ -866,7 +866,7 @@ namespace CyberX8_Simulator.Devices
             }
             if (_rinse3DumpValve && AIShorts[AINameIndexDic["r_QDRD3_WATER_LEVEL"]] > 500)
             {
-                AIShorts[AINameIndexDic["r_QDRD3_WATER_LEVEL"]] -= 300;
+                AIShorts[AINameIndexDic["r_QDRD3_WATER_LEVEL"]] -= 600;
             }
             if (AIShorts[AINameIndexDic["r_QDRD3_WATER_LEVEL"]] > 500)//慢排
             {
@@ -880,7 +880,7 @@ namespace CyberX8_Simulator.Devices
             }
             if (_rinse4DumpValve && AIShorts[AINameIndexDic["r_QDRD4_WATER_LEVEL"]] > 500)
             {
-                AIShorts[AINameIndexDic["r_QDRD4_WATER_LEVEL"]] -= 300;
+                AIShorts[AINameIndexDic["r_QDRD4_WATER_LEVEL"]] -= 600;
             }
             if (AIShorts[AINameIndexDic["r_QDRD4_WATER_LEVEL"]] > 500)//慢排
             {

CyberX8_Themes/UserControls/StateTitle.xaml

@@ -9,6 +9,6 @@
     
     <StackPanel Orientation="Horizontal">
         <Label  Style="{StaticResource TopLable_LeftTop}" Content="{Binding ElementName=stateTitle,Path=Title}"      HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="80" BorderBrush="Silver" BorderThickness="1" VerticalAlignment="Center" Height="30" Background="{Binding ElementName=stateTitle,Path=LabelColor}" Foreground="White"  FontWeight="Bold"/>
-        <TextBox Style="{StaticResource TextBox_Top}"      Text="{Binding ElementName=stateTitle,Path=TextBoxValue}"  Background="{Binding ElementName=stateTitle,Path=TextBoxColor}" Width="180" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderThickness="1" Height="30" BorderBrush="Black" VerticalAlignment="Center" FontSize="18"/>
+        <TextBox Style="{StaticResource TextBox_Top}"      Text="{Binding ElementName=stateTitle,Path=TextBoxValue}"  Background="{Binding ElementName=stateTitle,Path=TextBoxColor}" Width="200" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderThickness="1" Height="30" BorderBrush="Black" VerticalAlignment="Center" FontSize="18"/>
     </StackPanel>
 </UserControl>

Framework/Common/Utilities/DeviceTimer.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
+using Aitex.Core.RT.Log;
 
 namespace Aitex.Core.Util
 {

Framework/Common/Utilities/PeriodicJob.cs

@@ -122,23 +122,23 @@ namespace Aitex.Core.Util
 
         void Run()
         {
-            while (!_cancelFlag.IsCancellationRequested)
+            try
             {
-                _waitFlag.WaitOne();
+                while (!_cancelFlag.IsCancellationRequested)
+                {
 
-                _elapseTimer.Start(0);
+                    _waitFlag.WaitOne();
+
+                    _elapseTimer.Start(0);
 
-                try
-                {
                     if (!_func())
                         break;
+                    _sleepFlag.WaitOne(Math.Max(_interval - (int)_elapseTimer.GetElapseTime(), 30));
                 }
-                catch (Exception ex)
-                {
-                    LOG.WriteExeption(ex);
-                }
-
-                _sleepFlag.WaitOne(Math.Max(_interval - (int)_elapseTimer.GetElapseTime(), 30));
+            }
+            catch (Exception ex)
+            {
+                LOG.WriteExeption(ex);
             }
         }
     }