add wago simulator data view

CyberX8_RT/App.config

@@ -69,7 +69,7 @@
 			<endpoint address="net.tcp://localhost:9002/PMService" behaviorConfiguration="EndpointBehavior" binding="netTcpBinding" bindingConfiguration="Aitex_netTcpBinding" contract="ClusterInterface.IPmService" name="Client_IPECVDService" />
 			<endpoint address="net.tcp://localhost:9004/PMService" behaviorConfiguration="EndpointBehavior" binding="netTcpBinding" bindingConfiguration="Aitex_netTcpBinding" contract="ClusterInterface.IPmService" name="Client_IIBEService" />
 			<endpoint address="net.tcp://localhost:9006/PMService" behaviorConfiguration="EndpointBehavior" binding="netTcpBinding" bindingConfiguration="Aitex_netTcpBinding" contract="ClusterInterface.IPmService" name="Client_IICPService" />
-			<endpoint address="net.tcp://192.168.10.20:5771/EPDService" behaviorConfiguration="EndpointBehavior" binding="netTcpBinding" bindingConfiguration="Aitex_netTcpBinding" contract="EPInterface.IEPDService" name="Client_IEPDService"/>
+			<endpoint address="net.tcp://192.168.10.20:5771/EPDService" behaviorConfiguration="EndpointBehavior" binding="netTcpBinding" bindingConfiguration="Aitex_netTcpBinding" contract="EPInterface.IEPDService" name="Client_IEPDService" />
 			<endpoint address="net.tcp://192.168.10.20:5773/EPDCallbackService" behaviorConfiguration="EndpointBehavior" binding="netTcpBinding" bindingConfiguration="Aitex_netTcpBinding" contract="EPInterface.IEPDCallbackService" name="Client_IEPDCallbackService" />
 		</client>
 		<behaviors>
@@ -94,4 +94,24 @@
 			</endpointBehaviors>
 		</behaviors>
 	</system.serviceModel>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

CyberX8_RT/Config/Devices/WagoControllerCfg-Simulator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WagoControllerConfig>
-	<WagoDeviceConfig Module="Wago0" IpAddress="10.0.0.12" Port="502" SendTimeout="2000" RecvTimeout="2000" Channel="1">
+	<WagoDeviceConfig Module="Wago0" IpAddress="127.0.0.1" Port="501" SendTimeout="2000" RecvTimeout="2000" Channel="1">
 		<Dig_In>
 			<DIGroup Name="N5">
 				<DI Name="r_Cassette_1_150" Address="0" Invert="false"/>

CyberX8_Simulator/CyberX8_Simulator.csproj

@@ -44,6 +44,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\Newtonsoft.Json.dll</HintPath>
     </Reference>
+	    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.135\lib\net462\Microsoft.Xaml.Behaviors.dll</HintPath>
+    </Reference>
     <Reference Include="OpenSEMI.Ctrlib">
       <HintPath>..\ThirdParty\OpenSEMI.Ctrlib.dll</HintPath>
     </Reference>
@@ -181,6 +184,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+	<None Include="packages.config" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

CyberX8_Simulator/Devices/WagoSocketSimulator.cs

@@ -28,13 +28,14 @@ namespace CyberX8_Simulator.Devices
 
         private IByteTransform byteTransform = new BigEndianByteTransformBase();
 
-        private byte[] DOBytes = new byte[100];
+        //存储模拟器数据的数组
+        public byte[] DOBytes = new byte[100];
 
-        private short[] AOShorts = new short[50];
+        public short[] AOShorts = new short[50];
 
-        private byte[] DIBytes = new byte[100];
+        public byte[] DIBytes = new byte[100];
 
-        private short[] AIShorts = new short[50];
+        public short[] AIShorts = new short[50];
 
         /// <summary>
         /// 写DO锁

CyberX8_Simulator/Views/WagoView.xaml

@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:CyberX8_Simulator.Views"
              xmlns:commons="clr-namespace:MECF.Framework.Simulator.Core.Commons;assembly=MECF.Framework.Simulator.Core"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              mc:Ignorable="d" 
              d:DesignHeight="900"  d:DesignWidth="1200">
     <Grid>
@@ -20,30 +21,66 @@
             <StackPanel Orientation="Horizontal" Width="1200">
                 <Button Content="Clear Log" Width="100" Height="35"   Command="{Binding ClearLogCommand}"></Button>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" Width="500" Height="50" Canvas.Left="120">
+            <StackPanel Orientation="Horizontal" Width="600" Height="50" Canvas.Left="120">
                 <Label Content="DO:" VerticalAlignment="Center"></Label>
-                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding DONameItems}" SelectedItem="{Binding DOSelectedItem}" />
+                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding DONameItems}" SelectedItem="{Binding DOSelectedItem}" >
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding DOSelectionChangedCommand}"/>
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </ComboBox>
                 <ComboBox  Width="100" Height="30" Margin="5,0,0,0" VerticalContentAlignment="Center" ItemsSource="{Binding DigitalInputSelected}" SelectedItem="{Binding DOInputValue}" HorizontalContentAlignment="Center"></ComboBox>
                 <Button Content="DOInput" Height="30" Width="100" Margin="5,10,0,0" Command="{Binding SetDOCommand}"/>
+                <Border Margin="5,0,0,0" Background="Black" Height="30" Width="80">
+                    <TextBlock Text="{Binding DOCurrentValue}" Foreground="Lime"   FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
             </StackPanel>
             
-            <StackPanel Orientation="Horizontal" Width="500" Height="50" Canvas.Left="640">
+            <StackPanel Orientation="Horizontal" Width="600" Height="50" Canvas.Left="740">
                 <Label Content="DI:" VerticalAlignment="Center"></Label>
-                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding DINameItems}" SelectedItem="{Binding DISelectedItem}" />
+                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding DINameItems}" SelectedItem="{Binding DISelectedItem}" >
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding DISelectionChangedCommand}"/>
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </ComboBox>
                 <ComboBox  Width="100" Height="30" Margin="5,0,0,0" VerticalContentAlignment="Center" ItemsSource="{Binding DigitalInputSelected}" SelectedItem="{Binding DIInputValue}" HorizontalContentAlignment="Center"></ComboBox>
                 <Button Content="DIInput" Height="30" Width="100" Margin="5,10,0,0" Command="{Binding SetDICommand}"/>
+                <Border Margin="5,0,0,0" Background="Black" Height="30" Width="80">
+                    <TextBlock Text="{Binding DICurrentValue}" Foreground="Lime"   FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" Width="500" Height="50" Canvas.Top="50" Canvas.Left="120">
+            <StackPanel Orientation="Horizontal" Width="600" Height="50" Canvas.Top="50" Canvas.Left="120">
                 <Label Content="AO:" VerticalAlignment="Center"></Label>
-                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding AONameItems}" SelectedItem="{Binding AOSelectedItem}" />
+                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding AONameItems}" SelectedItem="{Binding AOSelectedItem}" >
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding AOSelectionChangedCommand}"/>
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </ComboBox>
                 <TextBox Text="{Binding AOInputValue,Mode=OneWayToSource}" Width="100" Height="30" Margin="5,0,0,0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></TextBox>
                 <Button Content="AOInput" Height="30" Width="100" Margin="5,10,0,0" Command="{Binding SetAOCommand}"/>
+                <Border Margin="5,0,0,0" Background="Black" Height="30" Width="80">
+                    <TextBlock Text="{Binding AOCurrentValue}" Foreground="Lime"   FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" Width="500" Height="50" Canvas.Top="50" Canvas.Left="640">
+            <StackPanel Orientation="Horizontal" Width="600" Height="50" Canvas.Top="50" Canvas.Left="740">
                 <Label Content="AI:" VerticalAlignment="Center"></Label>
-                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding AINameItems}" SelectedItem="{Binding AISelectedItem}" />
+                <ComboBox  Width="250" Height="30" VerticalContentAlignment="Center" ItemsSource="{Binding AINameItems}" SelectedItem="{Binding AISelectedItem}" >
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding AISelectionChangedCommand}"/>
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </ComboBox>
                 <TextBox Text="{Binding AIInputValue,Mode=OneWayToSource}" Width="100" Height="30" Margin="5,0,0,0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></TextBox>
                 <Button Content="AIInput" Height="30" Width="100" Margin="5,10,0,0" Command="{Binding SetAICommand}"/>
+                <Border Margin="5,0,0,0" Background="Black" Height="30" Width="80">
+                    <TextBlock Text="{Binding AICurrentValue}" Foreground="Lime"   FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
             </StackPanel>
 
         </Canvas>

CyberX8_Simulator/Views/WagoView.xaml.cs

@@ -74,6 +74,20 @@ namespace CyberX8_Simulator.Views
             }
         }
 
+        private int _DOCurrentValue;
+        [IgnorePropertyChange]
+        public int DOCurrentValue
+        {
+            get
+            {
+                return _DOCurrentValue;
+            }
+            set
+            {
+                _DOCurrentValue = value;
+            }
+        }
+
         private string _DISelectedItem;
         [IgnorePropertyChange]
         public string DISelectedItem
@@ -100,7 +114,19 @@ namespace CyberX8_Simulator.Views
                 _DIInputValue = value;
             }
         }
-
+        private int _DICurrentValue;
+        [IgnorePropertyChange]
+        public int DICurrentValue
+        {
+            get
+            {
+                return _DICurrentValue;
+            }
+            set
+            {
+                _DICurrentValue = value;
+            }
+        }
         private string _AOSelectedItem;
         [IgnorePropertyChange]
         public string AOSelectedItem
@@ -127,7 +153,19 @@ namespace CyberX8_Simulator.Views
                 _AOInputValue = value;
             }
         }
-
+        private int _AOCurrentValue;
+        [IgnorePropertyChange]
+        public int AOCurrentValue
+        {
+            get
+            {
+                return _AOCurrentValue;
+            }
+            set
+            {
+                _AOCurrentValue = value;
+            }
+        }
         private string _AISelectedItem;
         [IgnorePropertyChange]
         public string AISelectedItem
@@ -154,6 +192,19 @@ namespace CyberX8_Simulator.Views
                 _AIInputValue = value;
             }
         }
+        private int _AICurrentValue;
+        [IgnorePropertyChange]
+        public int AICurrentValue
+        {
+            get
+            {
+                return _AICurrentValue;
+            }
+            set
+            {
+                _AICurrentValue = value;
+            }
+        }
         #endregion
 
         public ObservableCollection<string> DONameItems { get; set; }
@@ -171,14 +222,24 @@ namespace CyberX8_Simulator.Views
         public ICommand SetAICommand { get; set; }
         public ICommand SetAOCommand { get; set; }
 
+        public ICommand DOSelectionChangedCommand { get; set; }
+        public ICommand DISelectionChangedCommand { get; set; }
+        public ICommand AOSelectionChangedCommand { get; set; }
+        public ICommand AISelectionChangedCommand { get; set; }
+
         public WagoViewModel(string str) : base("WagoViewModel")
         {
+
+
+            DOSelectionChangedCommand = new DelegateCommand<object>(DOSelectionChangedAction);
+            DISelectionChangedCommand = new DelegateCommand<object>(DISelectionChangedAction);
+            AOSelectionChangedCommand = new DelegateCommand<object>(AOSelectionChangedAction);
+            AISelectionChangedCommand = new DelegateCommand<object>(AISelectionChangedAction);
             
-            
-            SetDICommand = new DelegateCommand<object>(SetDIAction);
             SetDOCommand = new DelegateCommand<object>(SetDOAction);
             SetAICommand = new DelegateCommand<object>(SetAIAction);
             SetAOCommand = new DelegateCommand<object>(SetAOAction);
+            SetAOCommand = new DelegateCommand<object>(SetAOAction);
             
             int.TryParse(str, out int port);
             _sim = new WagoSocketSimulator(port);
@@ -189,18 +250,39 @@ namespace CyberX8_Simulator.Views
         private void SetDIAction(object obj)
         {
             _sim.UpdataDIBytes(DISelectedItem, DIInputValue);
+            DISelectionChangedAction(null);
         }
         private void SetDOAction(object obj)
         {
             _sim.UpdataDOBytes(DOSelectedItem, DOInputValue);
+            DOSelectionChangedAction(null);
         }
         private void SetAIAction(object obj)
         {
             _sim.UpdataAIShorts(AISelectedItem, AIInputValue);
+            AISelectionChangedAction(null);
         }
         private void SetAOAction(object obj)
         {
             _sim.UpdataAOShorts(AOSelectedItem, AOInputValue);
+            AOSelectionChangedAction(null);
+        }
+
+        private void DOSelectionChangedAction(object obj)
+        {
+            DOCurrentValue = _sim.DOBytes[_sim.DONameIndexDic[DOSelectedItem]];
+        }
+        private void DISelectionChangedAction(object obj)
+        {
+            DICurrentValue = _sim.DIBytes[_sim.DINameIndexDic[DISelectedItem]];
+        }
+        private void AOSelectionChangedAction(object obj)
+        {
+            AOCurrentValue = _sim.AOShorts[_sim.AONameIndexDic[AOSelectedItem]];
+        }
+        private void AISelectionChangedAction(object obj)
+        {
+            AICurrentValue = _sim.AIShorts[_sim.AINameIndexDic[AISelectedItem]];
         }
 
         private void InitData(int port) //端口用于初始化不同Wago设备的字典
@@ -231,6 +313,8 @@ namespace CyberX8_Simulator.Views
                 AINameItems.Add(item);
             }
         }
+
+       
     }
 
 }

CyberX8_Simulator/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.135" targetFramework="net472" />
+</packages>