From d19bd0b84228b593ef3a45f1d49776510bccd693 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Tue, 11 Aug 2026 20:12:50 +0200
Subject: [PATCH] =?UTF-8?q?EgtCAM5=203.1h1=20:=20-=20per=20utenti=20intern?=
 =?UTF-8?q?i=20aggiunta=20possibilit=C3=A0=20di=20configurare=20da=20Optio?=
 =?UTF-8?q?ns=20il=20formato=20di=20salvataggio=20del=20DB=20geometrico.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow/MainWindowVM.vb                    |  4 +-
 My Project/AssemblyInfo.vb                    |  4 +-
 .../ManageLayerExpanderVM.vb                  |  3 +-
 OptionsWindow/OptionModule.vb                 |  5 ++
 OptionsWindow/OptionWindowV.xaml              | 21 +++++++-
 OptionsWindow/OptionWindowVM.vb               | 51 ++++++++++++++++++-
 Project/ProjectVM.vb                          |  8 ++-
 7 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 87e3053..f9151b4 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -378,8 +378,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3107, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 3107, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3108, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 3108, 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
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 5ee975a..ebb101a 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.1.7.4")>
-<Assembly: AssemblyFileVersion("3.1.7.4")>
+<Assembly: AssemblyVersion("3.1.8.1")>
+<Assembly: AssemblyFileVersion("3.1.8.1")>
 
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
index 7dd752d..cf8c210 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
@@ -535,8 +535,7 @@ Public Class ManageLayerExpanderVM
    Public Sub Save(ByVal param As Object)
       Dim sDir As String = String.Empty
       GetPrivateProfileString(S_GENERAL, K_LASTNGEOBJDIR, "", sDir)
-      Dim nType As NGE = DirectCast(GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT), NGE)
-      Map.refProjectVM.SaveObject(New SaveObjectParam(m_RightClickedTreeItemId, sDir, nType))
+      Map.refProjectVM.SaveObject(New SaveObjectParam(m_RightClickedTreeItemId, sDir, OptionModule.m_nGeomDBSaveType))
    End Sub
 
 #End Region ' SaveCommand
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index dcf4e42..258388d 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -16,6 +16,8 @@ Friend Module OptionModule
    Friend m_ShowSurfQuality As SceneSurfQualityOpt
    ' Tipo di visualizzazione delle Zmap
    Friend m_nShowZmapType As Integer
+   ' Formato di salvataggio del progetto
+   Friend m_nGeomDBSaveType As NGE
 
    ' Colore di default in disegno
    Friend m_DefMaterialColor As Color3d
@@ -122,6 +124,9 @@ Friend Module OptionModule
       m_ShowSurfQuality = DirectCast( Math.Min( Math.Max( nSSQ, -2), 2), SceneSurfQualityOpt)
       ' Inizializzo tipo di visualizzazione Zmap
       m_nShowZmapType = GetPrivateProfileInt(S_SCENE, K_SHOWZMAP, 9)
+      ' Inizializzo formato di salvataggio del progetto
+      Dim nGST As Integer = GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT)
+      m_nGeomDBSaveType = DirectCast( Math.Min( Math.Max( nGST, 0), 3), NGE)
       ' Inizio colore di default in disegno
       Dim DefColor As New Color3d(0, 0, 0)
       GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml
index 3475d6a..54ba8d8 100644
--- a/OptionsWindow/OptionWindowV.xaml
+++ b/OptionsWindow/OptionWindowV.xaml
@@ -15,6 +15,7 @@
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:GeomTypeConverter x:Key="GeomTypeConverter"/>
       <local:SceneSurfQualityOptConverter x:Key="SceneSurfQualityOptConverter"/>
+      <local:GeomDBSaveTypeConverter x:Key="GeomDBSaveTypeConverter"/>
       <local:VMillTypeConverter x:Key="VMillTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
@@ -85,7 +86,7 @@
                          SelectedItem="{Binding SelectedTextFont}" Height="25"
                          Margin="10,5,0,0"/>
             </UniformGrid>
-            <GroupBox Header="ShowZmap"
+            <GroupBox Header="Show Zmap"
                       Visibility="{Binding ShowZmapVisibility}"
                       Margin="0,0,0,5">
                <Grid>
@@ -109,7 +110,23 @@
                             Grid.Row="0" Grid.Column="3" Margin="5,5,10,5" VerticalAlignment="Center"/>
                </Grid>
             </GroupBox>
-            <Grid Margin="5,100,5,5">
+            <UniformGrid Columns="2"
+                         Margin="0,0,0,5">
+               <TextBlock Text="GeomDB SaveType" VerticalAlignment="Center"
+                          Visibility="{Binding GeomDBSaveTypeVisibility}"
+                          Grid.Row="1" Margin="0,5,0,5"/>
+               <ComboBox ItemsSource="{Binding GeomDBSaveTypeOptList, Mode=OneWay}"
+                         Visibility="{Binding GeomDBSaveTypeVisibility}"
+                         SelectedItem="{Binding SelectedGeomDBSaveType}"
+                         Grid.Column="1" Grid.Row="1" Height="25" Margin="10,5,0,0">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource GeomDBSaveTypeConverter}}"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
+            </UniformGrid>
+            <Grid Margin="5,75,5,5">
                <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
             </Grid>
          </StackPanel>
diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb
index 6152db3..a25dd24 100644
--- a/OptionsWindow/OptionWindowVM.vb
+++ b/OptionsWindow/OptionWindowVM.vb
@@ -58,6 +58,13 @@ Public Class OptionWindowVM
       End Get
    End Property
 
+   Private m_GeomDBSaveType As ObservableCollection(Of NGE) = New ObservableCollection(Of NGE)({NGE.TEXT, NGE.BIN, NGE.CMPTEXT, NGE.CMPBIN})
+   Public ReadOnly Property GeomDBSaveTypeOptList As ObservableCollection(Of NGE)
+      Get
+         Return m_GeomDBSaveType
+      End Get
+   End Property
+
    Private m_ScaleDXFList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(MSG_OPTIONPAGE + 46)})
    Public ReadOnly Property ScaleDXFList As List(Of String)
       Get
@@ -117,6 +124,17 @@ Public Class OptionWindowVM
       End Set
    End Property
 
+   Public Property SelectedGeomDBSaveType As NGE
+      Get
+         Return OptionModule.m_nGeomDBSaveType
+      End Get
+      Set(value As NGE)
+         If WritePrivateProfileString(S_GEOMDB, K_SAVETYPE, CInt(value).ToString()) Then
+            OptionModule.m_nGeomDBSaveType = value
+         End If
+      End Set
+   End Property
+
    Public Property SelectedMillingGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomMilling
@@ -177,7 +195,7 @@ Public Class OptionWindowVM
          End If
       End Set
    End Property
-    Public Property SelectedGenGeomType As SceneSelModeOpt
+   Public Property SelectedGenGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomGenMachining
       End Get
@@ -187,7 +205,7 @@ Public Class OptionWindowVM
          End If
       End Set
    End Property
-    Public Property SelectedSurfRoughGeomType As SceneSelModeOpt
+   Public Property SelectedSurfRoughGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomSurfRoughing
       End Get
@@ -1315,6 +1333,12 @@ Public Class OptionWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property GeomDBSaveTypeVisibility As Visibility
+      Get
+         Return If( (IniFile.m_nUserLevel > 5), Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
 #End Region
 
 
@@ -2260,6 +2284,29 @@ Public Class SceneSurfQualityOptConverter
    End Function
 End Class
 
+Public Class GeomDBSaveTypeConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
+      Select Case CInt(value)
+         Case NGE.TEXT
+            Return "Text"
+         Case NGE.BIN
+            Return "Binary"
+         Case NGE.CMPTEXT
+            Return "Compressed Text"
+         Case NGE.CMPBIN
+            Return "Compressed Binary"
+         Case Else
+            Return ""
+      End Select
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
+End Class
+
 Public Class VMillTypeConverter
    Implements IValueConverter
 
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index 72a73e2..99aac05 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -793,27 +793,25 @@ Public Class ProjectVM
    End Sub
 
    Friend Sub SaveProject()
-      Dim nType As NGE = DirectCast(GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT), NGE)
       If Not String.IsNullOrWhiteSpace(m_Controller.GetCurrFile()) Then
-         m_Controller.SaveProject(nType)
+         m_Controller.SaveProject(OptionModule.m_nGeomDBSaveType)
       Else
          Dim sFile As String = String.Empty
          GetPrivateProfileString(S_GENERAL, K_LASTNGEDIR, "", sFile)
          sFile.TrimEnd("\"c)
          sFile += "\New" & IniFile.m_nInstance.ToString() & ".nge"
-         m_Controller.SaveAsProject(sFile, nType)
+         m_Controller.SaveAsProject(sFile, OptionModule.m_nGeomDBSaveType)
       End If
    End Sub
 
    Friend Sub SaveAsProject()
-      Dim nType As NGE = DirectCast(GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT), NGE)
       Dim sFile As String = m_Controller.GetCurrFile()
       If String.IsNullOrWhiteSpace(sFile) Then
          GetPrivateProfileString(S_GENERAL, K_LASTNGEDIR, "", sFile)
          sFile.TrimEnd("\"c)
          sFile += "\New" & IniFile.m_nInstance.ToString() & ".nge"
       End If
-      m_Controller.SaveAsProject(sFile, nType)
+      m_Controller.SaveAsProject(sFile, OptionModule.m_nGeomDBSaveType)
    End Sub
 
    Friend Sub InsertProject()