From eb2c04097aefa9f392a3f5c53a0e06076c8a603e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 13 Sep 2019 15:20:28 +0200
Subject: [PATCH] FIX FINALE!

---
 MTC_Adapter/SCMA/AdapterGeneric.cs       | 4 ++--
 MTC_Adapter/SCMA/DATA/CONF/DataModel.xml | 2 +-
 MTC_Adapter/SCMA/MainForm.cs             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MTC_Adapter/SCMA/AdapterGeneric.cs b/MTC_Adapter/SCMA/AdapterGeneric.cs
index 2651f6c..21b2c2c 100644
--- a/MTC_Adapter/SCMA/AdapterGeneric.cs
+++ b/MTC_Adapter/SCMA/AdapterGeneric.cs
@@ -1745,7 +1745,7 @@ namespace SCMA
         }
         else if (item.dataType == "RTV")
         {
-          elRTVCount.Add(item.varName + "-RTV", idxRTV);
+          elRTVCount.Add(item.varName, idxRTV);
           currGateway.addItemNodeByType(item.varName, itemType.Event);
           istRTVCount[idxRTV] = new sampleVect();
           idxRTV++;
@@ -4566,7 +4566,7 @@ namespace SCMA
             istRTCounters[numero - 1].addValue(DateTime.Now, Convert.ToInt32(tabDatiMtz[idxTab]));
           }
         }
-        else if (origName.EndsWith("-RTV"))
+        else if (elRTVCount.ContainsKey(origName))
         {
           // recupero da dictionary!
           try
diff --git a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
index 928d83e..8af98ca 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
@@ -183,7 +183,7 @@
 			<Component Name="03">
 				<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_ACT" />
 				<Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="019" CmsDataOpt="NUM" />
-				<Variable SymbolicName="TestData-RTV" BrowseName="TestData-RTV" DataType="ua:UInt32" ValueRank="Scalar" Units="Count"  CmsDataType="CounterList" CmsDataIndex="017" CmsDataOpt="NUM" />
+				<Variable SymbolicName="TestData" BrowseName="TestData" DataType="ua:UInt32" ValueRank="Scalar" Units="Count"  CmsDataType="CounterList" CmsDataIndex="017" CmsDataOpt="RTV" />
 			</Component>
 		</Component>
 		<Component Name="ProductionProcesses">
diff --git a/MTC_Adapter/SCMA/MainForm.cs b/MTC_Adapter/SCMA/MainForm.cs
index d906a49..e18d388 100644
--- a/MTC_Adapter/SCMA/MainForm.cs
+++ b/MTC_Adapter/SCMA/MainForm.cs
@@ -1688,7 +1688,7 @@ namespace SCMA
         List<DataModel.Variable> selCounter = currDataModel.Variables.FindAll(x => x.CmsDataType.Equals("CounterList"));
         foreach (var item in selCounter)
         {
-          // compilo il file di conf...
+          // compilo il file di conf... se è RTV aggiungo la parte RTV..
           fileOut.WriteLine($"{item.CmsDataIndex}|{item.BrowseName.Replace("Machine:", "")}|{item.CmsDataOpt}");
           numCounter++;
         }