From 0543d4ac8a4d5d92294de69dc43856dd8c3722ea Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 18 Feb 2016 10:49:15 +0000 Subject: [PATCH] OmagCUT 1.6n7 : - correzioni per macchine con TC, con foretti e senza frese. --- ChooseMachining.xaml.vb | 12 ++++--- My Project/AssemblyInfo.vb | 4 +-- SetUpPage.xaml.vb | 64 +++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/ChooseMachining.xaml.vb b/ChooseMachining.xaml.vb index bcc5e3d..1aa0cab 100644 --- a/ChooseMachining.xaml.vb +++ b/ChooseMachining.xaml.vb @@ -61,7 +61,8 @@ Public Class ChooseMachining If m_MillingList.Count = 0 Then m_CurrentMachine.sCurrMilling = String.Empty End If - ElseIf m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Then + ElseIf m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or + m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Then CreateMachiningList(MCH_MY.DRILLING, m_DrillingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo If m_DrillingList.Count = 0 Then @@ -95,16 +96,17 @@ Public Class ChooseMachining If Not m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAW Then If m_CurrentMachine.bDrilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 12))) + m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 11))) If m_CurrentMachine.bMilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 11))) - If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Then + m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 12))) + If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or + m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Then m_AuxMachTypeList.Add(New StringIdCmBx(3, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 13))) End If End If Else If m_CurrentMachine.bMilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 11))) + m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 12))) End If End If ' Aggiungo nessuna come ultimo elemento della lista diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index a777ccc..f006900 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/SetUpPage.xaml.vb b/SetUpPage.xaml.vb index abe0dca..14d5f80 100644 --- a/SetUpPage.xaml.vb +++ b/SetUpPage.xaml.vb @@ -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