From 62953c981e7a13b0385919c208ae7751ce0591b3 Mon Sep 17 00:00:00 2001 From: NicolaP Date: Mon, 17 Oct 2022 14:36:08 +0200 Subject: [PATCH 1/2] Correzione creazione nuovo grezzo in macchina --- OptionPanel/RawPartTab/RawPartTabVM.vb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OptionPanel/RawPartTab/RawPartTabVM.vb b/OptionPanel/RawPartTab/RawPartTabVM.vb index d719215..3dff47a 100644 --- a/OptionPanel/RawPartTab/RawPartTabVM.vb +++ b/OptionPanel/RawPartTab/RawPartTabVM.vb @@ -1145,14 +1145,14 @@ Public Class RawPartTabVM dRawWidth = m_dTableWidth - 2 * dRawKerf End If If dRawOffsX < dRawKerf Then dRawOffsX = dRawKerf - If dRawOffsX + dRawLen + dRawKerf > m_dTableLength Then - dRawOffsX = Math.Max(dRawKerf, m_dTableLength - dRawLen - dRawKerf) - dRawLen = Math.Min(dRawLen, m_dTableLength - dRawOffsX - dRawKerf) + If dRawOffsX + dRawLen + 2 * dRawKerf > m_dTableLength Then + dRawOffsX = Math.Max(dRawKerf, m_dTableLength - dRawLen - 2 * dRawKerf) + dRawLen = Math.Min(dRawLen, m_dTableLength - dRawOffsX - 2 * dRawKerf) End If If dRawOffsY < dRawKerf Then dRawOffsY = dRawKerf - If dRawOffsY + dRawWidth + dRawKerf > m_dTableWidth Then - dRawOffsY = Math.Max(dRawKerf, m_dTableWidth - dRawWidth - dRawKerf) - dRawWidth = Math.Min(dRawWidth, m_dTableWidth - dRawOffsY - dRawKerf) + If dRawOffsY + dRawWidth + 2 * dRawKerf > m_dTableWidth Then + dRawOffsY = Math.Max(dRawKerf, m_dTableWidth - dRawWidth - 2 * dRawKerf) + dRawWidth = Math.Min(dRawWidth, m_dTableWidth - dRawOffsY - 2 * dRawKerf) End If ' Assegno i dati SetLength(dRawLen) From 4c62410c201019544da160e0a43496239a5ae357 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 24 Oct 2022 08:48:12 +0200 Subject: [PATCH 2/2] OmagOFFICE 2.4j1 : - ricompilazione con cambio 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 9f0064b..1062406 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, 2406, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2410, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2410, 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 9aecb08..bb19eec 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,6 +69,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +