From d7c1ecacc2d11234a0ddbdfb38d2bc3fdfb2af2a Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 14 Nov 2023 11:26:51 +0100
Subject: [PATCH] Correzione gestione Flattening (CamAuto)

---
 DirectCuts/FlatteningCut.xaml.vb |  6 +++---
 MainWindow.xaml.vb               |  4 ++--
 My Project/AssemblyInfo.vb       |  4 ++--
 OmagCUT.vbproj                   |  6 +++---
 Options/OptionsPageUC.xaml.vb    |  2 ++
 Utility/Utility.vb               | 22 +++++++++++-----------
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/DirectCuts/FlatteningCut.xaml.vb b/DirectCuts/FlatteningCut.xaml.vb
index bdba156..e9c6fbf 100644
--- a/DirectCuts/FlatteningCut.xaml.vb
+++ b/DirectCuts/FlatteningCut.xaml.vb
@@ -187,11 +187,11 @@ Public Class FlatteningCut
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, If( m_bRotLock, "1", "0"), m_MainWindow.GetIniFile())
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
-      ' imposto la Z di sicurezza corretta
-      EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
-      EgtMdbSave()
       ' Se non vado in simulazione
       If Not m_bSimul Then
+         ' imposto la Z di sicurezza corretta
+         EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
+         EgtMdbSave()
          ' Dichiaro sottopagina da non riattivare
          m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb
index 9129b09..0158306 100644
--- a/MainWindow.xaml.vb
+++ b/MainWindow.xaml.vb
@@ -329,8 +329,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2510, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2510, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2511, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2511, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 5207c8d..b923b53 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.10.1")>
-<Assembly: AssemblyFileVersion("2.5.10.1")>
+<Assembly: AssemblyVersion("2.5.11.1")>
+<Assembly: AssemblyFileVersion("2.5.11.1")>
diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj
index 0790d7b..34bfc12 100644
--- a/OmagCUT.vbproj
+++ b/OmagCUT.vbproj
@@ -115,6 +115,9 @@
     <Reference Include="AxInterop.FXLib">
       <HintPath>..\..\EgtProg\OmagCUT\AxInterop.FXLib.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\OmagCUT\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtPHOTOLib">
       <HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
     </Reference>
@@ -142,9 +145,6 @@
       <HintPath>..\..\EgtProg\OmagCUT\Interop.FXServer.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\..\EgtProg\OmagCUT\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
diff --git a/Options/OptionsPageUC.xaml.vb b/Options/OptionsPageUC.xaml.vb
index ec9a859..c03a172 100644
--- a/Options/OptionsPageUC.xaml.vb
+++ b/Options/OptionsPageUC.xaml.vb
@@ -1304,6 +1304,8 @@ Public Class OptionsPageUC
       End If
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
             ' aggiungo file macchine
             For Each sMachineName As String In Machines
                Dim sMachineDir As String = m_MainWindow.GetMachinesRootDir() & "\" & sMachineName
diff --git a/Utility/Utility.vb b/Utility/Utility.vb
index 702065a..d0a06c2 100644
--- a/Utility/Utility.vb
+++ b/Utility/Utility.vb
@@ -25,18 +25,18 @@ Module Utility
       StopWatch.Start()
    End Sub
 
-   Friend Function TimeSpanEnd()
-        Dim sTime As String = ""
-        If Not IsNothing(StopWatch) Then
-            StopWatch.Stop()
-            Dim ts As TimeSpan = StopWatch.Elapsed
-            sTime = String.Format("{0:00}:{1:00}:{2:00}.{3:000}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds)
-        End If
-        Return sTime
-    End Function
+   Friend Function TimeSpanEnd() As String
+      Dim sTime As String = ""
+      If Not IsNothing(StopWatch) Then
+         StopWatch.Stop()
+         Dim ts As TimeSpan = StopWatch.Elapsed
+         sTime = String.Format("{0:00}:{1:00}:{2:00}.{3:000}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds)
+      End If
+      Return sTime
+   End Function
 
-    '--------------------------------------------------------------------------------------------------
-    Friend Sub UpdateUI()
+   '--------------------------------------------------------------------------------------------------
+   Friend Sub UpdateUI()
       ' Costringo ad aggiornare UI
       Dim nDummy As Integer
       Application.Current.Dispatcher.Invoke(Windows.Threading.DispatcherPriority.Background, _