From e5e80e9a55ff8ea618bd0bc5149e626c3ac3ac7d Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Wed, 2 Apr 2025 16:09:35 +0200 Subject: [PATCH] Correzione/miglioramento gestione offset spostamento --- CadCuts/MoveRawPartPage.xaml.vb | 10 +++++++++- Constants/ConstIni.vb | 1 + MainWindow.xaml.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CadCuts/MoveRawPartPage.xaml.vb b/CadCuts/MoveRawPartPage.xaml.vb index 6dafd48..e558c2c 100644 --- a/CadCuts/MoveRawPartPage.xaml.vb +++ b/CadCuts/MoveRawPartPage.xaml.vb @@ -133,9 +133,17 @@ Public Class MoveRawPartPage EgtDraw() ' Carico i parametri di movimento m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile()) + ' Carico il valore ci + Dim ExtraStep As Double = GetPrivateProfileDouble(S_RAWMOVE, K_EXTRASTEP, 1, m_MainWindow.GetIniFile()) ' Ricavo la lunghezza del baffo di taglio m_dStep = SplitAuto.MaxCuttingMustache(m_dStep) - StepMoveTxBx.Text = LenToString(m_dStep, 1) & "+1" + If ExtraStep < EPS_SMALL Then + StepMoveTxBx.Text = LenToString(m_dStep, 1) + Else + StepMoveTxBx.Text = LenToString(m_dStep, 1) & "+" & LenToString(ExtraStep, 1) + ' Aggiorno il valore sommando l'extra + m_dStep = m_dStep + ExtraStep + End If m_dRotation = GetPrivateProfileDouble(S_RAWMOVE, K_RAWROTATION, 30, m_MainWindow.GetIniFile()) RotationAngleTxBx.Text = DoubleToString(m_dRotation, 3) ' Se movimento manuale perpendicolare diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 82816b7..4ec7e43 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -243,6 +243,7 @@ Module ConstIni Public Const S_RAWMOVE As String = "RawMove" Public Const K_RAWSTEP As String = "Step" + Public Const K_EXTRASTEP As String = "ExtraStep" Public Const K_RAWROTATION As String = "Rotation" Public Const K_PERPENDICULAR As String = "Perpendicular" diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 01a277d..15e8ccb 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -345,8 +345,8 @@ Class MainWindow ' Verifico abilitazione nesting automatico m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2703, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2703, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2704, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2704, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE) ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 79fec5c..6398450 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +