From 05d1602c2eccebc14913b4becf286cee5c1ed0ca Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Tue, 2 Apr 2024 15:40:44 +0200
Subject: [PATCH] EgtCAM5 2.6d1 : - in Opzioni Macchina aggiunto parametro
 Tolleranza Lineare di Approssimazione.

---
 MachOptionsWindow/MachOptionV.xaml | 10 ++++++++--
 MachOptionsWindow/MachOptionVM.vb  | 24 ++++++++++++++++++++++++
 MainWindow/MainWindowVM.vb         |  4 ++--
 My Project/AssemblyInfo.vb         |  4 ++--
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/MachOptionsWindow/MachOptionV.xaml b/MachOptionsWindow/MachOptionV.xaml
index 3ae73f4..07039ed 100644
--- a/MachOptionsWindow/MachOptionV.xaml
+++ b/MachOptionsWindow/MachOptionV.xaml
@@ -15,7 +15,7 @@
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid Margin="10">
-      <Grid.ColumnDefinitions>
+      <Grid.ColumnDefinitions>          
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
@@ -27,6 +27,7 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
       <UniformGrid Grid.Row="0" Columns="2" Margin="0,0,0,5">
@@ -56,7 +57,12 @@
          </ComboBox>
       </UniformGrid>
 
-      <UniformGrid Grid.Row="4" Columns="2">
+      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
+         <TextBlock Text="{Binding ApproxLinTolMsg}" VerticalAlignment="Center"/>
+         <TextBox Text="{Binding ApproxLinTol}" Height="25" Margin="10,0,0,0"/>
+      </UniformGrid>
+
+      <UniformGrid Grid.Row="5" Columns="2">
          <TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
             SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>
diff --git a/MachOptionsWindow/MachOptionVM.vb b/MachOptionsWindow/MachOptionVM.vb
index 91b0248..67afd8a 100644
--- a/MachOptionsWindow/MachOptionVM.vb
+++ b/MachOptionsWindow/MachOptionVM.vb
@@ -48,6 +48,21 @@ Public Class MachOptionVM
       End Set
    End Property
 
+   Private m_sApproxLinTol As String
+   Public Property ApproxLinTol As String
+      Get
+         Return m_sApproxLinTol
+      End Get
+      Set(value As String)
+         Dim dApproxLinTol As Double = 0
+         If StringToLen(value, dApproxLinTol) Then
+            EgtMdbSetGeneralParam(MCH_GP.APPROXLINTOL, dApproxLinTol)
+            EgtMdbSave()
+            m_sApproxLinTol = value
+         End If
+      End Set
+   End Property
+
    Private m_SplitArcsList As New List(Of MCH_SA)({MCH_SA.NEVER, MCH_SA.GEN_PLANE, MCH_SA.NO_XY_PLANE, MCH_SA.ALWAYS})
    Public ReadOnly Property SplitArcsList As List(Of MCH_SA)
       Get
@@ -106,6 +121,11 @@ Public Class MachOptionVM
          Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
       End Get
    End Property
+   Public ReadOnly Property ApproxLinTolMsg As String
+      Get
+         Return EgtMsg(6410)         ' Tolleranza di approssimazione
+      End Get
+   End Property
 
    Public ReadOnly Property SplitArcsMsg As String
       Get
@@ -141,6 +161,10 @@ Public Class MachOptionVM
       Dim nVal As Integer = 0
       EgtMdbGetGeneralParam(MCH_GP.SPLITARCS, nVal)
       m_SelectedSplitArcs = DirectCast(nVal, MCH_SA)
+      ' Leggo tolleranza lineare di approssimazione
+      dVal = 0
+      EgtMdbGetGeneralParam(MCH_GP.APPROXLINTOL, dVal)
+      m_sApproxLinTol = LenToString(dVal, 4)
       ' Riempio lista attrezzaggi salvati
       m_ArchivedSetUpList.Add(String.Empty)
       If Directory.Exists(IniFile.m_sCurrMachSetUpDirPath) Then
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index ef24a39..dbcd5fc 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -388,8 +388,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2603, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2603, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2604, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2604, 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 93a93da..05856f4 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("2.6.3.2")>
-<Assembly: AssemblyFileVersion("2.6.3.2")>
+<Assembly: AssemblyVersion("2.6.4.1")>
+<Assembly: AssemblyFileVersion("2.6.4.1")>