OmagCUT 1.6n7 :

- correzioni per macchine con TC, con foretti e senza frese.
2016-02-18 10:49:15 +00:00
parent 6818489f83
commit 0543d4ac8a
3 changed files with 45 additions and 35 deletions
@@ -94,20 +94,24 @@ Public Class SetUpPage
      ' Posiziono utensili già posizionati sul portautensili
      For Each ToolPosition In m_MainWindow.m_CurrentMachine.ToolChanger
         If ToolPosition.sTool <> String.Empty Then
-            For Each Item In m_DrillbitsList.Items
-               If Item.Name = ToolPosition.sTool Then
-                  m_SetUpToolsList.Items.Add(Item)
-                  m_DrillbitsList.Items.Remove(Item)
-                  Exit For
-               End If
-            Next
-            For Each Item In m_MillsList.Items
-               If Item.Name = ToolPosition.sTool Then
-                  m_SetUpToolsList.Items.Add(Item)
-                  m_MillsList.Items.Remove(Item)
-                  Exit For
-               End If
-            Next
+            If Not IsNothing(m_DrillbitsList) Then
+               For Each Item In m_DrillbitsList.Items
+                  If Item.Name = ToolPosition.sTool Then
+                     m_SetUpToolsList.Items.Add(Item)
+                     m_DrillbitsList.Items.Remove(Item)
+                     Exit For
+                  End If
+               Next
+            End If
+            If Not IsNothing(m_MillsList) Then
+               For Each Item In m_MillsList.Items
+                  If Item.Name = ToolPosition.sTool Then
+                     m_SetUpToolsList.Items.Add(Item)
+                     m_MillsList.Items.Remove(Item)
+                     Exit For
+                  End If
+               Next
+            End If
            GetTlChPosFromIndex(ToolPosition.sPosition).Tool.IsChecked = True
            GetTxBxFromIndex(ToolPosition.sPosition).Text = ToolPosition.sTool
         End If
@@ -116,20 +120,24 @@ Public Class SetUpPage
      ' Posiziono utensili già posizionati sul portautensili manuale
      For Each ToolPosition In m_MainWindow.m_CurrentMachine.ManualToolChanger
         If ToolPosition.sTool <> String.Empty Then
-            For Each Item In m_DrillbitsList.Items
-               If Item.Name = ToolPosition.sTool Then
-                  m_SetUpToolsList.Items.Add(Item)
-                  m_DrillbitsList.Items.Remove(Item)
-                  Exit For
-               End If
-            Next
-            For Each Item In m_MillsList.Items
-               If Item.Name = ToolPosition.sTool Then
-                  m_SetUpToolsList.Items.Add(Item)
-                  m_MillsList.Items.Remove(Item)
-                  Exit For
-               End If
-            Next
+            If Not IsNothing(m_DrillbitsList) Then
+               For Each Item In m_DrillbitsList.Items
+                  If Item.Name = ToolPosition.sTool Then
+                     m_SetUpToolsList.Items.Add(Item)
+                     m_DrillbitsList.Items.Remove(Item)
+                     Exit For
+                  End If
+               Next
+            End If
+            If Not IsNothing(m_MillsList) Then
+               For Each Item In m_MillsList.Items
+                  If Item.Name = ToolPosition.sTool Then
+                     m_SetUpToolsList.Items.Add(Item)
+                     m_MillsList.Items.Remove(Item)
+                     Exit For
+                  End If
+               Next
+            End If
            GetManTlChPosFromIndex(ToolPosition.sPosition).Tool.IsChecked = True
            GetManTxBxFromIndex(ToolPosition.sPosition).Text = ToolPosition.sTool
         End If