From f0f6c4484e571ea56033e67b281a6119dbb43568 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 13 Oct 2025 09:50:30 +0200 Subject: [PATCH] OmagCUT 2.7j1 : - correzione per Feed letta da Fanuc quando in inches. --- Constants/ConstIni.vb | 1 - Constants/ConstMachIni.vb | 2 +- MainWindow.xaml.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- NcComm/M_Fanuc_hi.vb | 4 ++-- Options/OptionsPageUC.xaml.vb | 2 +- RawPhoto/Camera.vb | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 91af21b..7f6dfcc 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -240,7 +240,6 @@ Module ConstIni Public Const K_REFTAB As String = "RefTab" Public Const K_CURRENTREFTAB As String = "CurrRefTab" - Public Const S_RAWMOVE As String = "RawMove" Public Const K_RAWSTEP As String = "Step" Public Const K_EXTRASTEP As String = "ExtraStep" diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb index 2469f40..47ca51c 100644 --- a/Constants/ConstMachIni.vb +++ b/Constants/ConstMachIni.vb @@ -204,7 +204,7 @@ Public Const K_PHOTO_HQ_OFFSETY As String = "HQOffsetY" Public Const K_CAMERA_DIRECT_CMD As String = "CameraDirectCmd" Public Const K_CAMERA_STATE_VAR As String = "CameraStateVar" - Public Const K_ENABELE_GOHOME_FOR_PHOTO As String = "EnableGoHomeForPhoto" + Public Const K_ENABLE_GOHOME_FOR_PHOTO As String = "EnableGoHomeForPhoto" Public Const K_PENDIG_TIME_FOR_PHOTO As String = "PendigTimeForPhoto" Public Const S_TOOLS As String = "Tools" diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 2c17fe9..b8f07f4 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -362,8 +362,8 @@ Class MainWindow ' Verifico abilitazione nesting automatico m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2709, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2709, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2710, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2710, 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 67a8deb..f7cd46e 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/NcComm/M_Fanuc_hi.vb b/NcComm/M_Fanuc_hi.vb index 1a39632..2786464 100644 --- a/NcComm/M_Fanuc_hi.vb +++ b/NcComm/M_Fanuc_hi.vb @@ -669,8 +669,8 @@ Namespace Fanuc ' Read Cnc interface unit (for Feed units) Dim bCncHmiInches As Boolean = False - if NC_read_var_bit( "F2.2", bCncHmiInches) Then - If bCncHmiInches Then d_DInterpo_Prog_Feed *= ONEINCH + if NC_read_var_bit( "F2.0", bCncHmiInches) Then + If bCncHmiInches Then d_DInterpo_Prog_Feed *= ONEINCH / 10 End If ' Read bit variables as bytes diff --git a/Options/OptionsPageUC.xaml.vb b/Options/OptionsPageUC.xaml.vb index 686aad9..0f42a57 100644 --- a/Options/OptionsPageUC.xaml.vb +++ b/Options/OptionsPageUC.xaml.vb @@ -49,7 +49,7 @@ Public Class OptionsPageUC ' Carico la lista con il tipo di avvio StartLauncherCmBx.ItemsSource = StartLauncherList - ' 0-New, 1-Last, 2-Open, 3-Window + ' 0-Ultimo progetto, 1-Nuovo progetto, 2-Apri cartella, 3-Mostra finestra StartLauncherCmBx.SelectedIndex = GetPrivateProfileInt(S_GENERAL, K_AUTOLOADLASTPROJ, 0, m_MainWindow.GetIniFile()) ' Rendo invisibile il GroupBox dei Temi la versione corrente diff --git a/RawPhoto/Camera.vb b/RawPhoto/Camera.vb index e65b03c..6641720 100644 --- a/RawPhoto/Camera.vb +++ b/RawPhoto/Camera.vb @@ -355,7 +355,7 @@ Public Class Camera End Sub Private Function GoHomeForPhoto() As Boolean - Dim bGoHome As Boolean = GetPrivateProfileInt(S_PHOTO, K_ENABELE_GOHOME_FOR_PHOTO, 0, m_MainWindow.GetMachIniFile()) <> 0 + Dim bGoHome As Boolean = GetPrivateProfileInt(S_PHOTO, K_ENABLE_GOHOME_FOR_PHOTO, 0, m_MainWindow.GetMachIniFile()) <> 0 ' Se non configurato esco senza generare errore If Not bGoHome Then Return True ' Costruisco il bottone per potere eseguire il comando MDI