From 91f86f8682f05b26fc1e5246ffa4ddd78f938a01 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 22 Jan 2024 15:05:12 +0100 Subject: [PATCH 1/3] Aggiornamento versione --- MainWindow/MainWindowM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 56febe5..1b6c8c6 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -223,8 +223,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2511, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2511, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2512, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2512, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index ec54836..b110fb4 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,6 +69,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 3d1d62398aba1f26917dc5bfe052a57391b9d91e Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 22 Jan 2024 15:38:54 +0100 Subject: [PATCH 2/3] Aggiornamento versione 2.6a1 --- MainWindow/MainWindowM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 1b6c8c6..8cd907b 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -223,8 +223,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2512, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2512, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2601, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2601, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index b110fb4..6fa4394 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,6 +69,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From ce3ff4e3d65711fa19ff66a54ce0b694d52012fe Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 23 Jan 2024 12:14:10 +0100 Subject: [PATCH 3/3] OmagOFFICE : - correzione inizializzazione lavorazioni compatibili con materiale e spessore. --- CurrMachWindow/CurrMachWindowVM.vb | 16 ++++++++-------- OmagOFFICE.vbproj | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CurrMachWindow/CurrMachWindowVM.vb b/CurrMachWindow/CurrMachWindowVM.vb index a0084ef..66a8849 100644 --- a/CurrMachWindow/CurrMachWindowVM.vb +++ b/CurrMachWindow/CurrMachWindowVM.vb @@ -456,28 +456,28 @@ Public Class CurrMachWindowVM ' --- DRILL --- CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrDrillingList.Count = 0 Then + If m_CurrDrillingList.Count <= 1 Then CurrentMachine.sCurrDrilling = String.Empty End If ' --- MILL --- CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrMillingList.Count = 0 Then + If m_CurrMillingList.Count <= 1 Then CurrentMachine.sCurrMilling = String.Empty End If ' --- SCASSO --- CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrPocketingList.Count = 0 Then + If m_CurrPocketingList.Count <= 1 Then CurrentMachine.sCurrPocketing = String.Empty End If ' --- WATERJET --- CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrWaterjettingList.Count = 0 Then + If m_CurrWaterjettingList.Count <= 1 Then CurrentMachine.sCurrWaterJetting = String.Empty End If m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities) @@ -487,28 +487,28 @@ Public Class CurrMachWindowVM ' --- DRILL --- CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrDrillingList.Count = 0 Then + If m_CurrDrillingList.Count <= 1 Then CurrentMachine.sCurrDrilling = String.Empty End If ' --- MILL --- CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrMillingList.Count = 0 Then + If m_CurrMillingList.Count <= 1 Then CurrentMachine.sCurrMilling = String.Empty End If ' --- SCASSO --- CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrPocketingList.Count = 0 Then + If m_CurrPocketingList.Count <= 1 Then CurrentMachine.sCurrPocketing = String.Empty End If ' --- WATERJET --- CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList) ' Se la lista è vuota cancello la lavorazione corrente di questo tipo - If m_CurrWaterjettingList.Count = 0 Then + If m_CurrWaterjettingList.Count <= 1 Then CurrentMachine.sCurrWaterJetting = String.Empty End If m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities) diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj index 37c0c2c..84e832e 100644 --- a/OmagOFFICE.vbproj +++ b/OmagOFFICE.vbproj @@ -128,8 +128,8 @@ My Project\app.manifest - - packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll + + ..\..\EgtProg\OmagOFFICE\DotNetZip.dll False