From bf04d07c8e1c46c4110d87a7753aaa3d212b45ff Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 10 Oct 2016 10:06:12 +0000
Subject: [PATCH] EgtCAM5 : - in simulazione si nascondono gli assi con Token =
 "**".

---
 .../SimulationExpanderViewModel.vb            | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index 67c029c..1808a0f 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -541,27 +541,35 @@ Namespace EgtCAM5
 
       Private Sub ShowCncData()
          ' Assi
-         ShowAxisNameVal(0, L1Name, L1Value)
-         ShowAxisNameVal(1, L2Name, L2Value)
-         ShowAxisNameVal(2, L3Name, L3Value)
-         ShowAxisNameVal(3, R1Name, R1Value)
-         ShowAxisNameVal(4, R2Name, R2Value)
+         Dim nInd As Integer = 0
+         ShowAxisNameVal(nInd, L1Name, L1Value)
+         ShowAxisNameVal(nInd, L2Name, L2Value)
+         ShowAxisNameVal(nInd, L3Name, L3Value)
+         ShowAxisNameVal(nInd, R1Name, R1Value)
+         ShowAxisNameVal(nInd, R2Name, R2Value)
          ' Tipo di movimento e feed
          ShowMoveTypeFeed()
          ' Nome utensile e speed
          ShowToolNameSpeed()
       End Sub
 
-      Private Function ShowAxisNameVal(ByVal nInd As Integer, ByRef sName As String, ByRef sVal As String) As Boolean
+      Private Function ShowAxisNameVal(ByRef nInd As Integer, ByRef sName As String, ByRef sVal As String) As Boolean
          Dim sInfo As String = String.Empty
          Dim dVal As Double = 0
          If EgtSimGetAxisInfoPos(nInd, sInfo, dVal) Then
-            sName = sInfo
-            sVal = If(nInd < 3, LenToString(dVal, -3), DoubleToString(dVal, -3))
-            Return True
+            If sInfo <> "**" Then
+               sName = sInfo
+               sVal = If(nInd < 3, LenToString(dVal, -3), DoubleToString(dVal, -3))
+               nInd += 1
+               Return True
+            Else
+               nInd += 1
+               Return ShowAxisNameVal(nInd, sName, sVal)
+            End If
          Else
             sName = String.Empty
             sVal = String.Empty
+            nInd += 1
             Return False
          End If
       End Function