EgtCAM5 :

- correzioni a simulazione
- correzioni a TcPos in DB utensili.

ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb

@@ -468,7 +468,7 @@ Namespace EgtCAM5
                ' Per evitare di ciclare rapidissimamente e consumare inutilmente CPU
                System.Threading.Thread.Sleep(1)
             End If
-            '' Costringo ad aggiornare UI
+            ' Costringo ad aggiornare UI
             UpdateUI()
          End While
       End Sub
@@ -477,29 +477,24 @@ Namespace EgtCAM5
          ' Assi
          Dim nEgtIndex As Integer = 0
          Dim nAxisIndex As Integer = 0
-         Dim sInfo As String = String.Empty
+         Dim sName As String = String.Empty
+         Dim sToken As String = String.Empty
          Dim bLinear As Boolean = True
          Dim dVal As Double = 0
-         While EgtSimGetAxisInfoPos(nEgtIndex, sInfo, bLinear, dVal)
-            If sInfo <> "**" Then
+         While EgtSimGetAxisInfoPos(nEgtIndex, sName, sToken, bLinear, dVal)
+            If sToken <> "**" Then
                IsValidAxisIndex(nAxisIndex)
-               m_MachineAxisList(nAxisIndex).Name = sInfo
+               m_MachineAxisList(nAxisIndex).Name = sName
+               m_MachineAxisList(nAxisIndex).Token = sToken
+               m_MachineAxisList(nAxisIndex).Linear = bLinear
                m_MachineAxisList(nAxisIndex).Value = If(bLinear, LenToString(dVal, -3), DoubleToString(dVal, -3))
                nAxisIndex += 1
             End If
             nEgtIndex += 1
          End While
-         For ClearIndex = m_MachineAxisList.Count - 1 To nEgtIndex - 1
+         For ClearIndex = m_MachineAxisList.Count - 1 To nAxisIndex Step -1
             m_MachineAxisList.RemoveAt(ClearIndex)
          Next
-         'ShowAxisNameVal(nInd, A1Name, A1Value)
-         'ShowAxisNameVal(nInd, A2Name, A2Value)
-         'ShowAxisNameVal(nInd, A3Name, A3Value)
-         'ShowAxisNameVal(nInd, A4Name, A4Value)
-         'ShowAxisNameVal(nInd, A5Name, A5Value)
-         'ShowAxisNameVal(nInd, A6Name, A6Value)
-         'ShowAxisNameVal(nInd, A7Name, A7Value)
-         'ShowAxisNameVal(nInd, A8Name, A8Value)
          ' Tipo di movimento e feed
          ShowMoveTypeFeed()
          ' Nome utensile e speed
@@ -507,33 +502,11 @@ Namespace EgtCAM5
       End Sub
 
       Private Sub IsValidAxisIndex(nIndex As Integer)
-         For Index = m_MachineAxisList.Count - 1 To nIndex
+         For Index = m_MachineAxisList.Count To nIndex
             m_MachineAxisList.Add(New MachineAxis)
          Next
       End Sub
 
-      Private Function ShowAxisNameVal(ByRef nInd As Integer, ByRef sName As String, ByRef sVal As String) As Boolean
-         Dim sInfo As String = String.Empty
-         Dim bLinear As Boolean = True
-         Dim dVal As Double = 0
-         If EgtSimGetAxisInfoPos(nInd, sInfo, bLinear, dVal) Then
-            If sInfo <> "**" Then
-               sName = sInfo
-               sVal = If(bLinear, 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
-
       Private Function ShowMoveTypeFeed() As Boolean
          Dim nG As Integer = 0
          Dim dFeed As Double = 0