Egalware/EgtCAM5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '4147457b7d66c393119cab246288fa2cbbbf6457' into features/ButtonPreview

Browse Source
This commit is contained in:
Demetrio Cassarino
2026-03-05 08:42:21 +01:00
parent 3cac37cb0d 4147457b7d
commit dc7a3b78cd
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow/MainWindowVM.vb
+2 -2
View File
@@ -370,8 +370,8 @@ Public Class MainWindowVM
EgtSetLockId(sLockId)
End If
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(3279, 3102, 1, IniFile.m_nKeyLevel) And
EgtGetKeyOptions(3279, 3102, 1, IniFile.m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(3279, 3103, 1, IniFile.m_nKeyLevel) And
EgtGetKeyOptions(3279, 3103, 1, IniFile.m_nKeyOptions)
' Leggo e imposto livello utilizzatore
IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
' Imposto abilitazione lavorazioni avanzate
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,6 +70,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.2.1")>
<Assembly: AssemblyFileVersion("3.1.2.1")>
<Assembly: AssemblyVersion("3.1.3.1")>
<Assembly: AssemblyFileVersion("3.1.3.1")>
OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
+6 -4
View File
@@ -1302,10 +1302,12 @@ Public Class OperationsListExpanderVM
' Annullo creazione nuova lavorazione
If m_NewMachining Then EndNewMachining(GDB_ID.NULL)
' Disabilito visualizzazione utensile
Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE)
Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
Map.refMachiningParameterExpanderVM.ResetSliderValue()
EgtRemovePreviewMachiningTool()
If Not IsNothing(Map.refMachiningParameterExpanderVM) Then
Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE)
Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
Map.refMachiningParameterExpanderVM.ResetSliderValue()
EgtRemovePreviewMachiningTool()
End If
' Deseleziono le operazioni correnti per eliminare il mark
For Each Operation In OperationList
If Operation.IsSelected Then