OmagCUT 2.7j1 :

- correzione per Feed letta da Fanuc quando in inches.
This commit is contained in:
Dario Sassi
2025-10-13 09:50:30 +02:00
parent 3740ec6de7
commit f0f6c4484e
7 changed files with 9 additions and 10 deletions
-1
View File
@@ -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"
+1 -1
View File
@@ -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"
+2 -2
View File
@@ -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
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.9.5")>
<Assembly: AssemblyFileVersion("2.7.9.5")>
<Assembly: AssemblyVersion("2.7.10.1")>
<Assembly: AssemblyFileVersion("2.7.10.1")>
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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