From 2e5845b9c008837a732bffcc6effd834ffabe3ff Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 20 Nov 2019 12:28:25 +0100
Subject: [PATCH] Ok letture stream iniziali MTC...

---
 CVCncLib/testSam.dll       | Bin 967680 -> 967680 bytes
 IOB-WIN/DATA/CONF/TEST.ini |   7 ++-
 IOB-WIN/IOB-WIN.csproj     |   4 +-
 IOB-WIN/IobMTC.cs          | 117 ++++++++++++++++++++++++++++++++++++-
 IOB-WIN/packages.config    |   2 +-
 5 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll
index c19828755e6b8dbf8b1b87cc32e429a38f86bedb..18e6426d3399e3169e1f2b55ffa57638151dde02 100644
GIT binary patch
delta 150
zcmZqZux{wEp3uSkit%b=cWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V
z9>awKS6)0lE2bghxL=~@(uRt&zuM0%<N;#d?PnJ9{ow-{HU0DkK1r2^8RDr2<%PUD
zUdwBGK4-bb$iTqhY!wq)oLW>IQ=FJvnwpb3oqr>r9Aoix-Hm+bCmOJA|Fe;gMF;@0
CWj%EO

delta 152
zcmZqZux{wEp3uP@bohK@cWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V
z9>awKnSbPrW(w6gPXA||$*-xixc$sR9w6r3er6%xA3l&#(@$^UlhnS+%xbx$D9~lU
zLT+)<cb%7v3=9m;RxzQ)sYS&x#fiD4sX3{7#U-hUx#iP2HuA|$SKr8Ye*2$|d@Mo$
DY4$wU

diff --git a/IOB-WIN/DATA/CONF/TEST.ini b/IOB-WIN/DATA/CONF/TEST.ini
index 8118d449..45683fd5 100644
--- a/IOB-WIN/DATA/CONF/TEST.ini
+++ b/IOB-WIN/DATA/CONF/TEST.ini
@@ -9,12 +9,13 @@ VENDOR=CMS
 MODEL=WaterJet
 
 [CNC]
-IP=127.0.0.1
+;IP=127.0.0.1
+IP=192.168.139.100
 PORT=5000
 
 [SERVER]                 	 
-MPIP=http://10.74.82.218
-;MPIP=http://10.0.0.233
+;MPIP=http://10.74.82.218 	 
+MPIP=http://172.28.30.50
 MPURL=/MP/IO
 CMDBASE=/IOB/input/
 CMDFLOG=/IOB/flog/
diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index edc85223..781c4630 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -553,10 +553,10 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.7\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.7\build\Microsoft.NetFramework.Analyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.7\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.7\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
     <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.7000\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.7000\build\Selenium.WebDriver.ChromeDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
   <Import Project="..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.7000\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.7000\build\Selenium.WebDriver.ChromeDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
\ No newline at end of file
diff --git a/IOB-WIN/IobMTC.cs b/IOB-WIN/IobMTC.cs
index e7266f36..00c474f7 100644
--- a/IOB-WIN/IobMTC.cs
+++ b/IOB-WIN/IobMTC.cs
@@ -104,6 +104,59 @@ namespace IOB_WIN
 #endif
       return answ;
     }
+    /// <summary>
+    /// Effettua log di un devices (ed eventualmente dei sub-devices...
+    /// </summary>
+    /// <param name="elencoDevices"></param>
+    protected void logDevicesList(List<MTConnectDevices.Device> elencoDevices)
+    {
+      // loggo devices principali...
+      foreach (var item in elencoDevices)
+      {
+        lgInfo($"Device data | ID: {item.Id} | Name: {item.Name} | UUID: {item.Uuid} | # items: {item.DataItems.Count}");
+        // se ho subItems descrivo pure loro...
+        if (item.DataItems.Count > 0)
+        {
+          logDataItemList(item.DataItems);
+        }
+        if (item.Components.Components.Count > 0)
+        {
+          logComponentsList(item.Components.Components);
+        }
+      }
+    }
+    protected void logComponentsList(List<MTConnectDevices.Component> elencoComponenti)
+    {
+      foreach (var item in elencoComponenti)
+      {
+        lgInfo($"Component data | ID: {item.Id} | Name: {item.Name} | Type: {item.Type} | # items: {item.DataItems.Count}");
+        // se ho sottocomponenti richiamo...
+        if (item.SubComponents != null)
+        {
+          if (item.SubComponents.Components.Count > 0)
+          {
+            logComponentsList(item.SubComponents.Components);
+          }
+        }
+        if (item.DataItems.Count > 0)
+        {
+          logDataItemList(item.DataItems);
+        }
+      }
+    }
+    /// <summary>
+    /// Log elenco DataItems
+    /// </summary>
+    /// <param name="elencoItems"></param>
+    protected void logDataItemList(List<MTConnectDevices.DataItem> elencoItems)
+    {
+      // loggo devices principali...
+      foreach (var item in elencoItems)
+      {
+        lgInfo($"Device data | ID: {item.Id} | Name: {item.Name} | Category: {item.Category} | # Type: {item.Type}");
+      }
+    }
+
     /// <summary>
     /// Vera connessione ad MTC
     /// </summary>
@@ -121,6 +174,14 @@ namespace IOB_WIN
       try
       {
         var probe = new Probe($"http://{cIobConf.cncIpAddr}:{port}").Execute();
+        // se valido loggo!
+        if (probe != null)
+        {
+          lgInfo($"Effettuata correttamente PROBE per device MTC all'URL {probe.Url} | vers: {probe.Version} | send: {probe.Header.Sender}");
+          lgInfo($"---------------- Elenco Devices ----------------");
+          // loggo devices principali...
+          logDevicesList(probe.Devices);
+        }
       }
       catch
       { }
@@ -145,7 +206,10 @@ namespace IOB_WIN
       foreach (var device in document.Devices)
       {
         var dataItems = device.GetDataItems();
-        foreach (var dataItem in dataItems) Console.WriteLine(dataItem.Id + " : " + dataItem.Name);
+        foreach (var dataItem in dataItems)
+        {
+          lgInfo($"Category: {dataItem.Category} | Type: {dataItem.Type} | Id: {dataItem.Id} | Name: {dataItem.Name}");
+        }
       }
     }
 
@@ -153,7 +217,56 @@ namespace IOB_WIN
     {
       foreach (var deviceStream in document.DeviceStreams)
       {
-        foreach (var dataItem in deviceStream.DataItems) Console.WriteLine(dataItem.DataItemId + " = " + dataItem.CDATA);
+
+#if false
+        // check su dataItems (conditions + events + samples)
+        try
+        {
+          foreach (var dataItem in deviceStream.DataItems)
+          {
+            lgInfo(dataItem.DataItemId + " = " + dataItem.CDATA);
+          }
+        }
+        catch
+        { }
+
+#endif
+
+        // check su Conditions
+        try
+        {
+          // check su dataItems (conditions + events + samples)
+          foreach (var dataItem in deviceStream.Conditions)
+          {
+            lgInfo("CONDITION: " + dataItem.DataItemId + " = " + dataItem.CDATA);
+          }
+        }
+        catch
+        { }
+        // check su events
+        try
+        {
+          // check su dataItems (conditions + events + samples)
+          foreach (var dataItem in deviceStream.Events)
+          {
+            lgInfo("EVENT: " + dataItem.DataItemId + " = " + dataItem.CDATA);
+          }
+        }
+        catch
+        { }
+
+        // cehck su samples
+        try
+        {
+          // check su dataItems (conditions + events + samples)
+          foreach (var dataItem in deviceStream.Samples)
+          {
+            lgInfo("SAMPLE: " + dataItem.DataItemId + " = " + dataItem.CDATA);
+          }
+        }
+        catch
+        { }
+
       }
     }
 
diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config
index 07e3a5cc..928a4a8e 100644
--- a/IOB-WIN/packages.config
+++ b/IOB-WIN/packages.config
@@ -20,5 +20,5 @@
   <package id="S7netplus" version="0.1.9" targetFramework="net40-client" />
   <package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net40-client" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net40-client" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="78.0.3904.7000" targetFramework="net40-client" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="78.0.3904.10500" targetFramework="net40-client" />
 </packages>
\ No newline at end of file