Correzione gestione uscita pagina DrawPage

Constants/ConstIni.vb

@@ -287,6 +287,8 @@ Module ConstIni
    Public Const S_VEINMATCHING As String = "VeinMatching"
    Public Const K_VEINMA_ENABLE As String = "Enable"
    Public Const K_VEINMA_PLACE As String = "WinPlace"
+   Public Const K_VEINMA_WIDTH As String = "Width"
+   Public Const K_VEINMA_HEIGHT As String = "Height"
 
    Public Const S_FASTGRID As String = "FastGrid"
    Public Const K_FG_ENABLE As String = "FGEnable"

DrawImport/DrawPageUC.xaml.vb

@@ -1190,7 +1190,7 @@ Public Class DrawPageUC
       If Keyboard.Modifiers And ModifierKeys.Shift Then
          bExitPage = Not bExitPage
       End If
-      If bExitPage And m_MainWindow.FrameCutBtn.IsChecked Then
+      If bExitPage Then
          ' Aggiorno ambiente principale
          EgtZoom(ZM.ALL)
          ' Elimino nome del componente precedente
@@ -1217,6 +1217,7 @@ Public Class DrawPageUC
          Else
             LoadSecondaryPage()
          End If
+
       End If
    End Sub
 

Machine/ToolsDbPageUC.xaml.vb

@@ -700,7 +700,7 @@ Public Class ToolsDbPageUC
             If nTType <> MCH_TY.MILL_STD Then
                ' se utensile diverso da MILL
                ToolCathegory.Items.Add(New CustomItem(ToolName, nType))
-            ElseIf nTType <> MCH_TY.MILL_STD And ToolName.Trim.ToLower = "probe" And nDebug > 4 Then
+            ElseIf nTType = MCH_TY.MILL_STD And (ToolName.Trim.ToLower <> "probe" Or nDebug > 4) Then
                ' Se utensile MILL con nome "probe" aggiungo solo se livello debug maggiore di 4
                ToolCathegory.Items.Add(New CustomItem(ToolName, nType))
             End If

MainWindow.xaml.vb

@@ -343,8 +343,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2603, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2603, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
 

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.2.1")>
-<Assembly: AssemblyFileVersion("2.6.2.1")>
+<Assembly: AssemblyVersion("2.6.3.1")>
+<Assembly: AssemblyFileVersion("2.6.3.1")>

VeinMatching/VeinMatchingWindow.xaml.vb

@@ -1174,6 +1174,8 @@ Friend Module VeinMatching
       ' Esporto il file come immagine
       EgtSetCurrentContext(m_nVeinCtx)
       Dim bOk As Boolean = (EgtGetFileType(sFilePath) = FT.IMG)
+      m_nImgWidth = GetPrivateProfileDouble(S_VEINMATCHING, K_VEINMA_WIDTH, m_nImgWidth, m_MainWindow.GetIniFile)
+      m_nImgHeight = GetPrivateProfileDouble(S_VEINMATCHING, K_VEINMA_WIDTH, m_nImgHeight, m_MainWindow.GetIniFile)
       bOk = bOk AndAlso EgtGetImage(EgtGetShowMode(), New Color3d(255, 255, 255), New Color3d(255, 255, 255),
                                     m_nImgWidth, m_nImgHeight, sFilePath)
       ' Ripristino il contesto originale