From ecbbb482d943d1654d07479e75a0f5fa8ad0b563 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 2 Mar 2016 16:31:06 +0000 Subject: [PATCH] OmagCUT 1.6n10 : - correzioni in scelta utensile ausiliario. --- AlarmsPageUC.xaml.vb | 6 +++--- ChooseMachining.xaml.vb | 10 +++++----- My Project/AssemblyInfo.vb | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AlarmsPageUC.xaml.vb b/AlarmsPageUC.xaml.vb index d9343a7..e5dc0c5 100644 --- a/AlarmsPageUC.xaml.vb +++ b/AlarmsPageUC.xaml.vb @@ -94,13 +94,13 @@ Public Class AlarmsPageUC ' Non compio alcuna azione Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL If m_CurrentMachine.bDrilling Then - m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_ALARMSPAGEUC + 22))) + m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_ALARMSPAGEUC + 21))) If m_CurrentMachine.bMilling Then - m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_ALARMSPAGEUC + 21))) + m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_ALARMSPAGEUC + 22))) End If Else If m_CurrentMachine.bMilling Then - m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_ALARMSPAGEUC + 21))) + m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_ALARMSPAGEUC + 22))) End If End If ' Aggiungo elemento nessuno in fondo alla lista diff --git a/ChooseMachining.xaml.vb b/ChooseMachining.xaml.vb index 1aa0cab..a74732a 100644 --- a/ChooseMachining.xaml.vb +++ b/ChooseMachining.xaml.vb @@ -96,21 +96,21 @@ Public Class ChooseMachining If Not m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAW Then If m_CurrentMachine.bDrilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 11))) + m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 6))) If m_CurrentMachine.bMilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 12))) + m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 7))) 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))) + m_AuxMachTypeList.Add(New StringIdCmBx(3, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 8))) End If End If Else If m_CurrentMachine.bMilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 12))) + m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 7))) End If End If ' Aggiungo nessuna come ultimo elemento della lista - m_AuxMachTypeList.Add(New StringIdCmBx(0, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 10))) + m_AuxMachTypeList.Add(New StringIdCmBx(0, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 5))) If m_CurrentMachine.sCurrDrilling <> String.Empty Then If m_CurrentMachine.sCurrMilling <> String.Empty Then diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index ec02553..0a18c9e 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +