From 20b978c19c6a903dce0d4189d0c1b2b2c5a194d1 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 13 Dec 2016 19:56:29 +0000
Subject: [PATCH] EgtCAM5 1.6x2 : - modifiche per Gunstock.

---
 Application.xaml.vb                           |   3 +-
 Constants/ConstIni.vb                         |  13 +-
 IniFile.vb                                    |   3 +-
 MainWindow/MainWindowViewModel.vb             |   4 +-
 My Project/AssemblyInfo.vb                    |   4 +-
 .../GunStockPanel/GunStockPanelView.xaml      |   4 +-
 .../GunStockPanel/GunStockPanelViewModel.vb   |  18 +-
 ProjectPage/ProjectViewModel.vb               | 108 +++++--
 Special/Doors.vb                              |   3 +-
 Special/GunStock.vb                           | 298 +++++++++++++++---
 .../GunStockWindow/GunStockParamListItem.vb   |  23 +-
 Special/GunStockWindow/GunStockWndView.xaml   |  32 +-
 .../GunStockWindow/GunStockWndView.xaml.vb    |  16 +-
 .../GunStockWindow/GunStockWndViewModel.vb    |  90 ++++--
 14 files changed, 480 insertions(+), 139 deletions(-)

diff --git a/Application.xaml.vb b/Application.xaml.vb
index 1b709bc..d320232 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -217,7 +217,8 @@ Class Application
    Friend Const REMOVEDOORTABLE As String = "RemoveDoorTable"
 
    ' GunStock
-   Friend Const GUNSTOCKSCRIPT As String = "GunStockScript"
+   Friend Const GUNSTOCKNEW As String = "GunStockNew"
+   Friend Const GUNSTOCKMODIF As String = "GunStockModif"
 
    Shared ReadOnly _messenger As New Messenger()
 
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 35f089a..4a96747 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -93,10 +93,14 @@ Module ConstIni
    Public Const K_TABLESDIR As String = "TablesDir"
 
    Public Const S_GUNSTOCK As String = "GunStock"
-   Public Const K_MODENABLE As String = "ModEnable"
-   Public Const K_MODEXEC As String = "ModExec"
-   Public Const K_MODFUNCTION As String = "ModFun"
+   Public Const K_GUNSTOCKENABLE As String = "GsEnable"
+   Public Const K_GUNSTOCKEXEC As String = "GsExec"
+   Public Const K_READMODFUNCTION As String = "ReadModFun"
+   Public Const K_WRITEPEZFUNCTION As String = "WritePezFun"
+   Public Const K_READPEZFUNCTION As String = "ReadPezFun"
+   Public Const K_CREATEFUNCTION As String = "CreateFun"
    Public Const K_MODDIR As String = "ModDir"
+   Public Const K_PEZDIR As String = "PezDir"
 
    Public Const S_MACH As String = "Mach"
    Public Const K_MACHINESDIR As String = "MachinesDir"
@@ -121,7 +125,8 @@ Module ConstIni
    Public Const S_MRUFILES As String = "MruFiles"
    Public Const S_MRUSCRIPTS As String = "MruScripts"
    Public Const S_MRUDOORS As String = "MruDoors"
-   Public Const S_MRUGUNSTOCK As String = "MruGunStock"
+   Public Const S_MRUGUNSTOCKMOD As String = "MruGunStockMod"
+   Public Const S_MRUGUNSTOCKPEZ As String = "MruGunStockPez"
    Public Const K_FILE As String = "File"
 
 End Module
diff --git a/IniFile.vb b/IniFile.vb
index 3c84db8..e68c5dd 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -58,6 +58,7 @@ Public Module IniFile
    Friend m_bStopScript As Boolean = False
    Friend m_DDFFilePath As String = String.Empty
    Friend m_MODFilePath As String = String.Empty
+   Friend m_PEZFilePath As String = String.Empty
    ' Grid data
    Friend dSnapStepMm As Double
    Friend dSnapStepInch As Double
@@ -164,7 +165,7 @@ Public Module IniFile
    End Function
 
    Friend Function IsActiveGunStock() As Boolean
-      Return (IniFile.m_nKeyOptions And KEY_OPT.GUNSTOCK) <> 0 And (GetPrivateProfileInt(S_GUNSTOCK, K_MODENABLE, 0) <> 0)
+      Return (IniFile.m_nKeyOptions And KEY_OPT.GUNSTOCK) <> 0 And (GetPrivateProfileInt(S_GUNSTOCK, K_GUNSTOCKENABLE, 0) <> 0)
    End Function
 
 End Module
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index b61ac1c..7f1eee8 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -380,8 +380,8 @@ Namespace EgtCAM5
             m_MruDoors.Init(S_MRUDOORS, 8)
          End If
          If IniFile.IsActiveGunStock() Then
-            m_MruNewGunStock.Init(S_MRUGUNSTOCK, 8)
-            m_MruModifyGunStock.Init(S_MRUGUNSTOCK, 8)
+            m_MruNewGunStock.Init(S_MRUGUNSTOCKMOD, 8)
+            m_MruModifyGunStock.Init(S_MRUGUNSTOCKPEZ, 8)
          End If
          ' Installo funzione gestione eventi per lua
          EgtSetProcessEvents(m_ProcEventsCallback)
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 57d8262..74d4979 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.6.24.1")> 
-<Assembly: AssemblyFileVersion("1.6.24.1")> 
+<Assembly: AssemblyVersion("1.6.24.2")> 
+<Assembly: AssemblyFileVersion("1.6.24.2")> 
diff --git a/ProjectPage/GunStockPanel/GunStockPanelView.xaml b/ProjectPage/GunStockPanel/GunStockPanelView.xaml
index 806e877..225b205 100644
--- a/ProjectPage/GunStockPanel/GunStockPanelView.xaml
+++ b/ProjectPage/GunStockPanel/GunStockPanelView.xaml
@@ -11,7 +11,7 @@
          </Button.ContextMenu>
       </Button>-->
       <Button Command="{Binding NewGunStockCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="70" Content="Nuovo calcio" ContextMenuService.Placement="Bottom"
+         Width="70" Content="{Binding NewGunStockMsg}" ContextMenuService.Placement="Bottom"
          ToolTip="{Binding NewGunStockToolTip}">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruNewGunStockNames}"
@@ -20,7 +20,7 @@
          </Button.ContextMenu>
       </Button>
       <Button Command="{Binding ModifyGunStockCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="70" Content="Modifica calcio" ContextMenuService.Placement="Bottom"
+         Width="70" Content="{Binding ModifyGunStockMsg}" ContextMenuService.Placement="Bottom"
          ToolTip="{Binding ModifyGunStockToolTip}">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruModifyGunStockNames}"
diff --git a/ProjectPage/GunStockPanel/GunStockPanelViewModel.vb b/ProjectPage/GunStockPanel/GunStockPanelViewModel.vb
index df0b36c..d532014 100644
--- a/ProjectPage/GunStockPanel/GunStockPanelViewModel.vb
+++ b/ProjectPage/GunStockPanel/GunStockPanelViewModel.vb
@@ -22,12 +22,12 @@ Namespace EgtCAM5
 
       Public ReadOnly Property NewGunStockMsg As String
          Get
-            Return EgtMsg(MSG_DOORS + 4)
+            Return EgtMsg(MSG_GUNSTOCK + 1)
          End Get
       End Property
       Public ReadOnly Property ModifyGunStockMsg As String
          Get
-            Return EgtMsg(MSG_DOORS + 4)
+            Return EgtMsg(MSG_GUNSTOCK + 3)
          End Get
       End Property
 
@@ -37,12 +37,12 @@ Namespace EgtCAM5
 
       Public ReadOnly Property NewGunStockToolTip As String
          Get
-            Return EgtMsg(MSG_DOORS + 4)
+            Return EgtMsg(MSG_GUNSTOCK + 2)
          End Get
       End Property
       Public ReadOnly Property ModifyGunStockToolTip As String
          Get
-            Return EgtMsg(MSG_DOORS + 4)
+            Return EgtMsg(MSG_GUNSTOCK + 4)
          End Get
       End Property
 
@@ -74,7 +74,7 @@ Namespace EgtCAM5
       ''' Execute the Door. This method is invoked by the DoorsCommand.
       ''' </summary>
       Public Sub NewGunStock(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.GUNSTOCKSCRIPT, String.Empty)
+         Application.Msn.NotifyColleagues(Application.GUNSTOCKNEW, String.Empty)
       End Sub
 
 #End Region ' NewGunStockCommand
@@ -97,7 +97,7 @@ Namespace EgtCAM5
       ''' Execute the Door. This method is invoked by the DoorsCommand.
       ''' </summary>
       Public Sub ModifyGunStock(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.GUNSTOCKSCRIPT, String.Empty)
+         Application.Msn.NotifyColleagues(Application.GUNSTOCKMODIF, String.Empty)
       End Sub
 
 #End Region ' ModifyGunStockCommand
@@ -120,12 +120,12 @@ Namespace EgtCAM5
       ''' Execute the Open.  This method is invoked by the OpenCommand.
       ''' </summary>
       Public Shared Sub OpenMruNewGunStock(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.GUNSTOCKSCRIPT, DirectCast(param, String).Replace("__", "_"))
+         Application.Msn.NotifyColleagues(Application.GUNSTOCKNEW, DirectCast(param, String).Replace("__", "_"))
       End Sub
 
 #End Region ' OpenMruNewGunStockCommand
 
-#Region "OpenMruNewGunStockCommand"
+#Region "OpenMruModifyGunStockCommand"
 
       ''' <summary>
       ''' Returns a command that do Open.
@@ -143,7 +143,7 @@ Namespace EgtCAM5
       ''' Execute the Open.  This method is invoked by the OpenCommand.
       ''' </summary>
       Public Shared Sub OpenMruModifyGunStock(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.GUNSTOCKSCRIPT, DirectCast(param, String).Replace("__", "_"))
+         Application.Msn.NotifyColleagues(Application.GUNSTOCKMODIF, DirectCast(param, String).Replace("__", "_"))
       End Sub
 
 #End Region ' OpenMruNewGunStockCommand
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index 4db469a..f4fb46d 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -710,43 +710,81 @@ Namespace EgtCAM5
                                                               End If
                                                               If Not bOk Then Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, EgtMsg(MSG_DOORSERRORS + 2))
                                                            End Sub)
-         Application.Msn.Register(Application.GUNSTOCKSCRIPT, Sub(sFilePath As String)
-                                                                 Dim bOk As Boolean
-                                                                 If String.IsNullOrEmpty(sFilePath) Then
-                                                                    bOk = ExecGunStock(m_ProjectScene, String.Empty)
-                                                                 Else
-                                                                    bOk = ExecGunStock(m_ProjectScene, sFilePath)
+         Application.Msn.Register(Application.GUNSTOCKNEW, Sub(sFilePath As String)
+                                                              Dim bOk As Boolean
+                                                              If String.IsNullOrEmpty(sFilePath) Then
+                                                                 bOk = ExecGunStockMod(m_ProjectScene, String.Empty)
+                                                              Else
+                                                                 bOk = ExecGunStockMod(m_ProjectScene, sFilePath)
+                                                              End If
+                                                              EgtResetCurrPartLayer()
+                                                              OnUpdateUI(Nothing, True)
+                                                              Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREENOMARK, EgtGetCurrLayer())
+                                                              If EgtGetCurrMachGroup() <> GDB_ID.NULL Then
+                                                                 Application.Msn.NotifyColleagues(Application.SETMACHININGMODE)
+                                                              End If
+                                                              If bOk Then
+                                                                 IniFile.m_MruNewGunStock.Add(IniFile.m_MODFilePath)
+                                                                 IniFile.m_MruModifyGunStock.Add(IniFile.m_PEZFilePath)
+                                                                 Dim sFile As String = String.Empty
+                                                                 If EgtGetCurrFilePath(sFile) Then
+                                                                    IniFile.m_MruFiles.Add(sFile)
                                                                  End If
-                                                                 EgtResetCurrPartLayer()
-                                                                 OnUpdateUI(Nothing, True)
-                                                                 Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREENOMARK, EgtGetCurrLayer())
-                                                                 If EgtGetCurrMachGroup() <> GDB_ID.NULL Then
-                                                                    Application.Msn.NotifyColleagues(Application.SETMACHININGMODE)
+                                                              Else
+                                                                 IniFile.m_MruNewGunStock.Remove(IniFile.m_MODFilePath)
+                                                                 Try
+                                                                    Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_MODFilePath, ".txt")
+                                                                    Dim fileReader As String = My.Computer.FileSystem.ReadAllText(sErrFilePath)
+                                                                    Dim Lines() As String = fileReader.Split(ControlChars.CrLf.ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+                                                                    Dim values() As String = Lines(0).Split(CChar("=")).ToArray
+                                                                    Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1))
+                                                                    fileReader = String.Empty
+                                                                    For Index = 1 To Lines.Count - 1
+                                                                       fileReader &= (Lines(Index) + ControlChars.CrLf.ToCharArray())
+                                                                    Next
+                                                                    MessageBox.Show(fileReader, Lines(0).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error)
+                                                                 Catch ex As Exception
+                                                                    MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 7))
+                                                                 End Try
+                                                              End If
+                                                           End Sub)
+         Application.Msn.Register(Application.GUNSTOCKMODIF, Sub(sFilePath As String)
+                                                              Dim bOk As Boolean
+                                                              If String.IsNullOrEmpty(sFilePath) Then
+                                                                 bOk = ExecGunStockPez(m_ProjectScene, String.Empty)
+                                                              Else
+                                                                 bOk = ExecGunStockPez(m_ProjectScene, sFilePath)
+                                                              End If
+                                                              EgtResetCurrPartLayer()
+                                                              OnUpdateUI(Nothing, True)
+                                                              Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREENOMARK, EgtGetCurrLayer())
+                                                              If EgtGetCurrMachGroup() <> GDB_ID.NULL Then
+                                                                 Application.Msn.NotifyColleagues(Application.SETMACHININGMODE)
+                                                              End If
+                                                              If bOk Then
+                                                                 IniFile.m_MruModifyGunStock.Add(IniFile.m_PEZFilePath)
+                                                                 Dim sFile As String = String.Empty
+                                                                 If EgtGetCurrFilePath(sFile) Then
+                                                                    IniFile.m_MruFiles.Add(sFile)
                                                                  End If
-                                                                 If bOk Then
-                                                                    IniFile.m_MruNewGunStock.Add(IniFile.m_MODFilePath)
-                                                                    Dim sFile As String = String.Empty
-                                                                    If EgtGetCurrFilePath(sFile) Then
-                                                                       IniFile.m_MruFiles.Add(sFile)
-                                                                    End If
-                                                                 Else
-                                                                    IniFile.m_MruNewGunStock.Remove(IniFile.m_MODFilePath)
-                                                                    Try
-                                                                       Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_MODFilePath, ".txt")
-                                                                       Dim fileReader As String = My.Computer.FileSystem.ReadAllText(sErrFilePath)
-                                                                       Dim Lines() As String = fileReader.Split(ControlChars.CrLf.ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
-                                                                       Dim values() As String = Lines(0).Split(CChar("=")).ToArray
-                                                                       Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1))
-                                                                       fileReader = String.Empty
-                                                                       For Index = 1 To Lines.Count - 1
-                                                                          fileReader &= (Lines(Index) + ControlChars.CrLf.ToCharArray())
-                                                                       Next
-                                                                       MessageBox.Show(fileReader, Lines(0).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error)
-                                                                    Catch ex As Exception
-                                                                       MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 7))
-                                                                    End Try
-                                                                 End If
-                                                              End Sub)
+                                                              Else
+                                                                 IniFile.m_MruModifyGunStock.Remove(IniFile.m_PEZFilePath)
+                                                                 Try
+                                                                    Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_PEZFilePath, ".txt")
+                                                                    Dim fileReader As String = My.Computer.FileSystem.ReadAllText(sErrFilePath)
+                                                                    Dim Lines() As String = fileReader.Split(ControlChars.CrLf.ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+                                                                    Dim values() As String = Lines(0).Split(CChar("=")).ToArray
+                                                                    Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1))
+                                                                    fileReader = String.Empty
+                                                                    For Index = 1 To Lines.Count - 1
+                                                                       fileReader &= (Lines(Index) + ControlChars.CrLf.ToCharArray())
+                                                                    Next
+                                                                    MessageBox.Show(fileReader, Lines(0).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error)
+                                                                 Catch ex As Exception
+                                                                    MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 7))
+                                                                 End Try
+                                                              End If
+                                                           End Sub)
 
       End Sub
 
diff --git a/Special/Doors.vb b/Special/Doors.vb
index 6ddbdf3..b4ae58c 100644
--- a/Special/Doors.vb
+++ b/Special/Doors.vb
@@ -29,7 +29,7 @@ Public Module Doors
          ' Apertura dialogo di scelta file DDF
          Dim OpenFileDialog As New System.Windows.Forms.OpenFileDialog
          OpenFileDialog.Title = "Open DDF file"
-         OpenFileDialog.Filter = "Door Description Format(*.ddf)|*.ddf"
+         OpenFileDialog.Filter = "Door Description Format (*.ddf)|*.ddf"
          OpenFileDialog.FilterIndex = 1
          OpenFileDialog.InitialDirectory = sDir
          If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
@@ -37,7 +37,6 @@ Public Module Doors
          End If
          sFile = OpenFileDialog.FileName
       End If
-      System.IO.Path.GetDirectoryName(sFile)
       WritePrivateProfileString(S_DOORS, K_DDFDIR, System.IO.Path.GetDirectoryName(sFile))
 
       ' Generazione porta
diff --git a/Special/GunStock.vb b/Special/GunStock.vb
index 38478d2..6a2b309 100644
--- a/Special/GunStock.vb
+++ b/Special/GunStock.vb
@@ -1,7 +1,7 @@
 '----------------------------------------------------------------------------
 '  EgalTech 2016-2016
 '----------------------------------------------------------------------------
-' File : GunStock.vb       Data : 08.10.16        Versione : 1.6v4
+' File : GunStock.vb       Data : 13.12.16        Versione : 1.6x2
 ' Contenuto : Classe GunStock (interfaccia per script Calci di Fucile).
 '
 '
@@ -17,76 +17,286 @@ Imports EgtUILib
 
 Module GunStock
 
-   Function ExecGunStock(ByRef scene As Scene, sFilePath As String) As Boolean
-      ' Scelta file MOD
-      Dim sFile As String
-      ' Se sFilePath non vuoto apro questo file
+   Private m_sModFile As String = String.Empty
+   Private m_sPezFile As String = String.Empty
+   Private m_sDescription As String = String.Empty
+   Structure ParamData
+      Dim sName As String
+      Dim dMin As Double
+      Dim dMax As Double
+      Dim dDef As Double
+      Dim dVal As Double
+      Dim sVar As String
+   End Structure
+   Private m_vParams() As ParamData
+
+   Function ExecGunStockMod(ByRef scene As Scene, sFilePath As String) As Boolean
+      ' Scelta file MOD : se sFilePath non vuoto apro questo file
       If Not String.IsNullOrEmpty(sFilePath) Then
-         sFile = sFilePath
+         m_sModFile = sFilePath
+      ' altrimenti chiedo all'utente
       Else
          ' Direttorio corrente per file MOD
          Dim sDir As String = String.Empty
          GetPrivateProfileString(S_GUNSTOCK, K_MODDIR, "", sDir)
          ' Apertura dialogo di scelta file MOD
-         Dim OpenFileDialog As New EgtWPFLib5.EgtOpenFileDialog
+         Dim OpenFileDialog As New System.Windows.Forms.OpenFileDialog
          OpenFileDialog.Title = "Open MOD file"
-         OpenFileDialog.Extension = ".mod"
-         OpenFileDialog.Directory = sDir
-         If Not OpenFileDialog.ShowDialog Then
+         OpenFileDialog.Filter = "Model file (*.mod)|*.mod"
+         OpenFileDialog.FilterIndex = 1
+         OpenFileDialog.InitialDirectory = sDir
+         If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
             Return True
          End If
-         sFile = OpenFileDialog.FileName
+         m_sModFile = OpenFileDialog.FileName
       End If
-      System.IO.Path.GetDirectoryName(sFile)
-      WritePrivateProfileString(S_GUNSTOCK, K_MODDIR, System.IO.Path.GetDirectoryName(sFile))
+      WritePrivateProfileString(S_GUNSTOCK, K_MODDIR, System.IO.Path.GetDirectoryName(m_sModFile))
+      IniFile.m_MODFilePath = m_sModFile
 
+      ' Carico ambiente lua per Gunstock
+      If Not LoadGunStock() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 2), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in LoadGunStock")
+         Return False
+      End If
 
+      ' Lettura dei parametri dal modello
+      If Not ReadModParams() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in ReadModParams")
+         Return False
+      End If
 
-      '' Prove
-      'Dim GunStockWnd As New GunStockWndView
-      'Dim GunStockWndViewModel As New GunStockWndViewModel
-      'GunStockWnd.DataContext = GunStockWndViewModel
-      'GunStockWnd.Owner = Application.Current.MainWindow
-      '' Creo lista dei valori
-      'GunStockWndViewModel.AddParam("Nome1", 13, 7, 9)
-      'GunStockWndViewModel.AddParam("Nome2", 25, 14, 32)
-      'If Not GunStockWnd.ShowDialog() Then
-      '   Return False
-      'End If
-      '' Lettura nome
-      'Dim sFileName As String = GunStockWndViewModel.FileName
-      '' Lettura dei valori delle variabili(due diverse possibilità)
-      'Dim Value1 As Double = 0
-      'StringToDouble(GunStockWndViewModel.ParamList(0).Value, Value1)
-      'Dim Value2 As Double = 0
-      'GunStockWndViewModel.GetParam("Nome1", Value2)
+      ' Calcolo path per file PEZ
+      m_sPezFile = System.IO.Path.GetDirectoryName(System.IO.Path.GetDirectoryName(m_sModFile)) & "\PEZ\" &
+                   System.IO.Path.GetFileNameWithoutExtension(m_sModFile) & ".pez"
+      m_sDescription = String.Empty
+      If Not UpdatePezParams(True) Then
+         Return True
+      End If
+      WritePrivateProfileString(S_GUNSTOCK, K_PEZDIR, System.IO.Path.GetDirectoryName(m_sPezFile))
+      IniFile.m_PEZFilePath = m_sPezFile
 
+      ' Scrivo file PEZ
+      If Not WritePezParams() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in WritePezParams")
+         Return False
+      End If
 
+      ' Visualizzo dimensioni grezzo
+      If Not ShowRawDim() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in ShawRawDim")
+         Return False
+      End If
 
       ' Generazione calcio di fucile
-      ' Cursore attesa
       scene.Cursor = System.Windows.Forms.Cursors.WaitCursor
-      ' Creazione porta
-      Dim bOk As Boolean = CreateGunStock(sFile, False, False)
-      ' Scrivo il nome del file aperto in una variabile globale per averlo in caso di errore
-      IniFile.m_MODFilePath = sFile
+      Dim bOk As Boolean = CreateGunStock()
       ' Aggiorno la visualizzazione
       EgtZoom(ZM.ALL)
-      ' Cursore standard
       scene.Cursor = System.Windows.Forms.Cursors.Default
 
+      Return True
+   End Function
+
+   Function ExecGunStockPez(ByRef scene As Scene, sFilePath As String) As Boolean
+      ' Scelta file PEZ : se sFilePath non vuoto apro questo file
+      If Not String.IsNullOrEmpty(sFilePath) Then
+         m_sPezFile = sFilePath
+      ' altrimenti chiedo all'utente
+      Else
+         ' Direttorio corrente per file MOD
+         Dim sDir As String = String.Empty
+         GetPrivateProfileString(S_GUNSTOCK, K_PEZDIR, "", sDir)
+         ' Apertura dialogo di scelta file MOD
+         Dim OpenFileDialog As New System.Windows.Forms.OpenFileDialog
+         OpenFileDialog.Title = "Open PEZ file"
+         OpenFileDialog.Filter = "Part file (*.pez)|*.pez"
+         OpenFileDialog.FilterIndex = 1
+         OpenFileDialog.InitialDirectory = sDir
+         If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
+            Return True
+         End If
+         m_sPezFile = OpenFileDialog.FileName
+      End If
+      WritePrivateProfileString(S_GUNSTOCK, K_PEZDIR, System.IO.Path.GetDirectoryName(m_sPezFile))
+      IniFile.m_PEZFilePath = m_sPezFile
+
+      ' Carico ambiente lua per Gunstock
+      If Not LoadGunStock() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 2), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in LoadGunStock")
+         Return False
+      End If
+
+      ' Lettura dei parametri dal pezzo
+      If Not ReadPezParams() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in ReadPezParams")
+         Return False
+      End If
+
+      ' Eventuale modifica
+      If Not UpdatePezParams(False) Then
+         Return True
+      End If
+
+      ' Scrivo file PEZ
+      If Not WritePezParams() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in WritePezParams")
+         Return False
+      End If
+
+      ' Visualizzo dimensioni grezzo
+      If Not ShowRawDim() Then
+         MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtOutLog("Error in ShawRawDim")
+         Return False
+      End If
+
+      ' Generazione calcio di fucile
+      scene.Cursor = System.Windows.Forms.Cursors.WaitCursor
+      Dim bOk As Boolean = CreateGunStock()
+      ' Aggiorno la visualizzazione
+      EgtZoom(ZM.ALL)
+      scene.Cursor = System.Windows.Forms.Cursors.Default
+
+      Return True
+   End Function
+
+   Private Function LoadGunStock() As Boolean
+      ' Cancello ambiente Gunstock globale
+      EgtLuaResetGlobVar("GGD")
+      ' Carico il file
+      Dim sExecPath As String = String.Empty
+      GetPrivateProfileString(S_GUNSTOCK, K_GUNSTOCKEXEC, "", sExecPath)
+      Return EgtLuaExecFile(sExecPath)
+   End Function
+
+   Private Function ReadModParams() As Boolean
+      ' Lancio la lettura dei parametri del modello
+      EgtLuaSetGlobStringVar("GGD.MODFILE", m_sModFile)
+      Dim sFunction As String = String.Empty
+      GetPrivateProfileString(S_GUNSTOCK, K_READMODFUNCTION, "", sFunction)
+      Dim bOk As Boolean = EgtLuaExecLine(sFunction)
+      Dim nErr As Integer = 999
+      If Not EgtLuaGetGlobIntVar("GGD.ERR", nErr) Or nErr <> 0 Then bOk = False
+      EgtOutLog("Gunstock Err=" & nErr.ToString())
+      If Not bOk Then Return False
+      ' Acquisisco i valori letti
+      Dim nParTot As Integer = 0
+      EgtLuaGetGlobIntVar("GGD.PARTOT", nParTot)
+      Array.Resize(m_vParams, nParTot)
+      For i As Integer = 1 To nParTot
+         Dim sParNameI As String = "GGD.PARNAME" & i.ToString()
+         EgtLuaGetGlobStringVar(sParNameI, m_vParams(i - 1).sName)
+         Dim sParMinI As String = "GGD.PARMIN" & i.ToString()
+         EgtLuaGetGlobNumVar(sParMinI, m_vParams(i - 1).dMin)
+         Dim sParMaxI As String = "GGD.PARMAX" & i.ToString()
+         EgtLuaGetGlobNumVar(sParMaxI, m_vParams(i - 1).dMax)
+         Dim sParDefI As String = "GGD.PARDEF" & i.ToString()
+         EgtLuaGetGlobNumVar(sParDefI, m_vParams(i - 1).dDef)
+         m_vParams(i - 1).dVal = m_vParams(i - 1).dDef
+         Dim sParVarI As String = "GGD.PARVAR" & i.ToString()
+         EgtLuaGetGlobStringVar(sParVarI, m_vParams(i - 1).sVar)
+      Next
+      Return True
+   End Function
+
+   Private Function UpdatePezParams(bNewFile As Boolean) As Boolean
+      ' Scelta parametri pezzo
+      Dim GunStockWnd As New GunStockWndView
+      Dim GunStockWndViewModel As New GunStockWndViewModel
+      GunStockWnd.DataContext = GunStockWndViewModel
+      GunStockWnd.Owner = Application.Current.MainWindow
+      ' Creo lista dei valori
+      GunStockWndViewModel.bNewFile = bNewFile
+      GunStockWndViewModel.OrigFileName = m_sPezFile
+      GunStockWndViewModel.OrigDescription = m_sDescription
+      For i As Integer = 0 To m_vParams.Length() - 1
+         GunStockWndViewModel.AddParam(m_vParams(i).sName, m_vParams(i).dVal, m_vParams(i).dMin, m_vParams(i).dMax)
+      Next
+      If Not GunStockWnd.ShowDialog() Then
+         Return False
+      End If
+      ' Lettura valori
+      m_sPezFile = GunStockWndViewModel.FileName
+      m_sDescription = GunStockWndViewModel.Description
+      For i As Integer = 0 To m_vParams.Length() - 1
+         StringToDouble(GunStockWndViewModel.ParamList(i).Value, m_vParams(i).dVal)
+      Next
+      Return True
+   End Function
+
+   Private Function ReadPezParams() As Boolean
+      ' Lancio la lettura dei parametri del pezzo
+      EgtLuaSetGlobStringVar("GGD.PEZFILE", m_sPezFile)
+      Dim sFunction As String = String.Empty
+      GetPrivateProfileString(S_GUNSTOCK, K_READPEZFUNCTION, "", sFunction)
+      Dim bOk As Boolean = EgtLuaExecLine(sFunction)
+      Dim nErr As Integer = 999
+      If Not EgtLuaGetGlobIntVar("GGD.ERR", nErr) Or nErr <> 0 Then bOk = False
+      EgtOutLog("Gunstock Err=" & nErr.ToString())
+      If Not bOk Then Return False
+      ' Acquisisco i valori letti
+      EgtLuaGetGlobStringVar("GGD.MODFILE", m_sModFile)
+      EgtLuaGetGlobStringVar("GGD.DESCR", m_sDescription)
+      Dim nParTot As Integer = 0
+      EgtLuaGetGlobIntVar("GGD.PARTOT", nParTot)
+      Array.Resize(m_vParams, nParTot)
+      For i As Integer = 1 To nParTot
+         Dim sParNameI As String = "GGD.PARNAME" & i.ToString()
+         EgtLuaGetGlobStringVar(sParNameI, m_vParams(i - 1).sName)
+         Dim sParMinI As String = "GGD.PARMIN" & i.ToString()
+         EgtLuaGetGlobNumVar(sParMinI, m_vParams(i - 1).dMin)
+         Dim sParMaxI As String = "GGD.PARMAX" & i.ToString()
+         EgtLuaGetGlobNumVar(sParMaxI, m_vParams(i - 1).dMax)
+         Dim sParDefI As String = "GGD.PARDEF" & i.ToString()
+         EgtLuaGetGlobNumVar(sParDefI, m_vParams(i - 1).dDef)
+         m_vParams(i - 1).dVal = m_vParams(i - 1).dDef
+         Dim sParVarI As String = "GGD.PARVAR" & i.ToString()
+         EgtLuaGetGlobStringVar(sParVarI, m_vParams(i - 1).sVar)
+      Next
+      Return True
+   End Function
+
+   Private Function WritePezParams() As Boolean
+      ' Assegno i valori letti
+      For i As Integer = 1 To m_vParams.Length()
+         Dim sParValI As String = "GGD.PARVAL" & i.ToString()
+         EgtLuaSetGlobNumVar(sParValI, m_vParams(i - 1).dVal)
+      Next
+      ' Lancio la scrittura dei parametri del pezzo
+      EgtLuaSetGlobStringVar("GGD.PEZFILE", m_sPezFile)
+      EgtLuaSetGlobStringVar("GGD.DESCR", m_sDescription)
+      Dim sFunction As String = String.Empty
+      GetPrivateProfileString(S_GUNSTOCK, K_WRITEPEZFUNCTION, "", sFunction)
+      Dim bOk As Boolean = EgtLuaExecLine(sFunction)
+      Dim nErr As Integer = 999
+      If Not EgtLuaGetGlobIntVar("GGD.ERR", nErr) Or nErr <> 0 Then bOk = False
+      EgtOutLog("Gunstock Err=" & nErr.ToString())
       Return bOk
    End Function
 
-   Function CreateGunStock(ByRef sModFile As String, bNcGen As Boolean, bBatch As Boolean) As Boolean
-      ' Carico il file
-      Dim sExecPath As String = String.Empty
-      GetPrivateProfileString(S_GUNSTOCK, K_MODEXEC, "", sExecPath)
-      If Not EgtLuaExecFile(sExecPath) Then Return False
+   Private Function ShowRawDim() As Boolean
+      ' Recupero la stringa con la dimensione del grezzo
+      Dim sDimGrez As String = String.Empty
+      If Not EgtLuaGetGlobStringVar("GGD.DIMGREZ", sDimGrez) Or
+         String.IsNullOrWhiteSpace(sDimGrez) Then Return False
+      ' Visualizzo la dimensione del grezzo
+      MessageBox.Show(sDimGrez, EgtMsg(MSG_GUNSTOCK + 13), MessageBoxButton.OK, MessageBoxImage.Information)
+      Return True
+   End Function
+
+   Private Function CreateGunStock() As Boolean
       ' Lancio la creazione
-      EgtLuaSetGlobStringVar("GGD.FILE", sModFile)
+      EgtLuaSetGlobStringVar("GGD.PEZFILE", m_sPezFile)
+      EgtLuaSetGlobStringVar("GGD.MODFILE", m_sModFile)
       Dim sFunction As String = String.Empty
-      GetPrivateProfileString(S_GUNSTOCK, K_MODFUNCTION, "", sFunction)
+      GetPrivateProfileString(S_GUNSTOCK, K_CREATEFUNCTION, "", sFunction)
       Dim bOk As Boolean = EgtLuaExecLine(sFunction)
       Dim nErr As Integer = 999
       If Not EgtLuaGetGlobIntVar("GGD.ERR", nErr) Or nErr <> 0 Then bOk = False
diff --git a/Special/GunStockWindow/GunStockParamListItem.vb b/Special/GunStockWindow/GunStockParamListItem.vb
index 79c1248..cdc7c94 100644
--- a/Special/GunStockWindow/GunStockParamListItem.vb
+++ b/Special/GunStockWindow/GunStockParamListItem.vb
@@ -25,9 +25,16 @@ Public Class GunStockParamListItem
       End Set
    End Property
 
-   Private m_Min As Double = 0
+   Private m_dOrigVal As Double
+   Public ReadOnly Property dOrigVal As Double
+      Get
+         Return m_dOrigVal
+      End Get
+   End Property
 
-   Private m_Max As Double = 0
+   Private m_dMin As Double = 0
+
+   Private m_dMax As Double = 0
 
    Private m_Error As String
    Public ReadOnly Property ErrorMsg As String
@@ -38,8 +45,9 @@ Public Class GunStockParamListItem
 
    Sub New(sName As String, dValue As Double, dMin As Double, dMax As Double, ValidateList As Action)
       m_Name = sName
-      m_Min = dMin
-      m_Max = dMax
+      m_dMin = dMin
+      m_dMax = dMax
+      m_dOrigVal = dValue
       m_ValidateList = ValidateList
       Value = DoubleToString(dValue, 4)
    End Sub
@@ -54,12 +62,13 @@ Public Class GunStockParamListItem
    Private Sub ValidateValue()
       m_Error = String.Empty
       If String.IsNullOrEmpty(m_Value) Then
-         m_Error = m_Name & " " & EgtMsg(MSG_GUNSTOCK + 4)
+         m_Error = m_Name & " " & EgtMsg(MSG_GUNSTOCK + 10)
       Else
          Dim dVal As Double = 0
          StringToDouble(m_Value, dVal)
-         If Not (dVal > m_Min - EPS_SMALL And dVal < m_Max + EPS_SMALL) Then
-            m_Error = EgtMsg(MSG_GUNSTOCK + 5) & " " & m_Min & " " & EgtMsg(MSG_GUNSTOCK + 6) & " " & m_Max & "."
+         If Not (dVal > m_dMin - EPS_SMALL And dVal < m_dMax + EPS_SMALL) Then
+            m_Error = EgtMsg(MSG_GUNSTOCK + 11) & " " & DoubleToString(m_dMin, 3) & " " &
+                      EgtMsg(MSG_GUNSTOCK + 12) & " " & DoubleToString(m_dMax, 3) & "."
          End If
       End If
       NotifyPropertyChanged("ErrorMsg")
diff --git a/Special/GunStockWindow/GunStockWndView.xaml b/Special/GunStockWindow/GunStockWndView.xaml
index 1f0fa02..7a5de47 100644
--- a/Special/GunStockWindow/GunStockWndView.xaml
+++ b/Special/GunStockWindow/GunStockWndView.xaml
@@ -2,14 +2,19 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+   Title="{Binding TitleMsg}"
    TitleBarBrush="{StaticResource EgaltechBlue1}"
    BorderBrush="{StaticResource EgaltechBlue1}"
    WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
    IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False" SizeToContent="WidthAndHeight">
 
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
    <Grid Width="250">
       <Grid.RowDefinitions>
+         <RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="4.5*"/>
          <RowDefinition Height="1*"/>
@@ -23,13 +28,29 @@
 
          <TextBlock Grid.Column="0" Text="{Binding FileNameMsg}" Margin="5,0,0,0"
             VerticalAlignment="Center"/>
+         <TextBox Grid.Column="1" Margin="5" Height="24" Name="FileNameTxBx"
+            Text="{Binding FileName, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource FileNameConverter}}"
+            VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+         <TextBlock Grid.Column="1" Name="FileNameTxBl" Visibility="Hidden"
+            Text="{Binding FileName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+
+      </Grid>
+
+      <Grid Grid.Row="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+
+         <TextBlock Grid.Column="0" Text="{Binding DescriptionMsg}" Margin="5,0,0,0"
+            VerticalAlignment="Center"/>
          <TextBox Grid.Column="1" Margin="5" Height="24"
-            Text="{Binding FileName}"
+            Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
             VerticalAlignment="Center" VerticalContentAlignment="Center"/>
 
       </Grid>
 
-      <ItemsControl Grid.Row="1" ItemsSource="{Binding ParamList}" Margin="5">
+      <ItemsControl Grid.Row="2" ItemsSource="{Binding ParamList}" Margin="5">
          <ItemsControl.ItemTemplate>
             <DataTemplate>
                <Grid>
@@ -50,9 +71,10 @@
          </ItemsControl.ItemTemplate>
       </ItemsControl>
 
-      <UniformGrid Columns="2" Grid.Row="2" Margin="0,0,0,5">
+      <UniformGrid Columns="2" Grid.Row="3" Margin="0,0,0,5">
          <Button IsDefault="True" Name="OkBtn" IsEnabled="{Binding IsEnabledOkBtn,Mode=OneWay}"
-            Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+            Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"
+            Command="{Binding OkBtnCommand}"/>
          <Button IsCancel="True"
             Content="{Binding CancelMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
       </UniformGrid>
diff --git a/Special/GunStockWindow/GunStockWndView.xaml.vb b/Special/GunStockWindow/GunStockWndView.xaml.vb
index ae33f3c..409d50f 100644
--- a/Special/GunStockWindow/GunStockWndView.xaml.vb
+++ b/Special/GunStockWindow/GunStockWndView.xaml.vb
@@ -1,8 +1,22 @@
-Imports EgtWPFLib5
+Imports System.IO
+Imports EgtUILib
 
 Public Class GunStockWndView
 
    Private Sub SaveBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+      Dim ViewModel As GunStockWndViewModel = DirectCast(DataContext, GunStockWndViewModel)
+      If ViewModel.bNewFile Or ViewModel.IsModifiedParamList() Then
+         ' Calcolo la path del file
+         Dim sFile As String = System.IO.Path.GetDirectoryName(FileNameTxBl.Text) & "\" & FileNameTxBx.Text &
+                               System.IO.Path.GetExtension(FileNameTxBl.Text)
+         ' Verifico se esiste già e chiedo conferma di sovrascrittura
+         If File.Exists(sFile) Then
+            If MessageBox.Show(sFile & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4),
+                               "", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
+               Exit Sub
+            End If
+         End If
+      End If
       DialogResult = True
    End Sub
 
diff --git a/Special/GunStockWindow/GunStockWndViewModel.vb b/Special/GunStockWindow/GunStockWndViewModel.vb
index 4f9379e..e738672 100644
--- a/Special/GunStockWindow/GunStockWndViewModel.vb
+++ b/Special/GunStockWindow/GunStockWndViewModel.vb
@@ -7,6 +7,24 @@ Imports EgtUILib
 Public Class GunStockWndViewModel
    Implements INotifyPropertyChanged
 
+   Private m_bNewFile As Boolean
+   Friend Property bNewFile As Boolean
+      Get
+         Return m_bNewFile
+      End Get
+      Set(value As Boolean)
+         m_bNewFile = value
+      End Set
+   End Property
+
+   Private m_OrigFileName As String
+   Public WriteOnly Property OrigFileName As String
+      Set(value As String)
+         m_OrigFileName = value
+         FileName = value
+      End Set
+   End Property
+
    Private m_FileName As String
    Public Property FileName As String
       Get
@@ -14,6 +32,26 @@ Public Class GunStockWndViewModel
       End Get
       Set(value As String)
          m_FileName = value
+         ' verifico se il nome del file è valido per attivare/disattivare OkBtn di conseguenza
+         IsValidParamList()
+      End Set
+   End Property
+
+   Private m_OrigDescription As String
+   Public WriteOnly Property OrigDescription As String
+      Set(value As String)
+         m_OrigDescription = value
+         Description = value
+      End Set
+   End Property
+
+   Private m_Description As String
+   Public Property Description As String
+      Get
+         Return m_Description
+      End Get
+      Set(value As String)
+         m_Description = value
       End Set
    End Property
 
@@ -38,19 +76,29 @@ Public Class GunStockWndViewModel
 
 #Region "Messages"
 
+   Public ReadOnly Property TitleMsg As String
+      Get
+         Return EgtMsg(MSG_GUNSTOCK + 5)
+      End Get
+   End Property
    Public ReadOnly Property FileNameMsg As String
       Get
-         Return EgtMsg(MSG_GUNSTOCK + 1)
+         Return EgtMsg(MSG_GUNSTOCK + 6)
+      End Get
+   End Property
+   Public ReadOnly Property DescriptionMsg As String
+      Get
+         Return EgtMsg(MSG_GUNSTOCK + 7)
       End Get
    End Property
    Public ReadOnly Property OkMsg As String
       Get
-         Return EgtMsg(MSG_GUNSTOCK + 2)
+         Return EgtMsg(MSG_GUNSTOCK + 8)
       End Get
    End Property
    Public ReadOnly Property CancelMsg As String
       Get
-         Return EgtMsg(MSG_GUNSTOCK + 3)
+         Return EgtMsg(MSG_GUNSTOCK + 9)
       End Get
    End Property
 
@@ -71,7 +119,7 @@ Public Class GunStockWndViewModel
    End Function
 
    Private Sub IsValidParamList()
-      Dim bOk As Boolean = True
+      Dim bOk As Boolean = Not String.IsNullOrWhiteSpace(FileName)
       For Index As Integer = 0 To m_ParamList.Count - 1
          If Not String.IsNullOrEmpty(m_ParamList(Index).ErrorMsg) Then
             bOk = False
@@ -86,29 +134,23 @@ Public Class GunStockWndViewModel
       NotifyPropertyChanged("IsEnabledOkBtn")
    End Sub
 
+   Friend Function IsModifiedParamList() As Boolean
+      If m_OrigFileName <> m_FileName Then Return True
+      If m_OrigDescription <> m_Description Then Return True
+      For Index As Integer = 0 To m_ParamList.Count - 1
+         Dim dVal As Double
+         StringToDouble(m_ParamList(Index).Value, dVal)
+         If Math.Abs(dVal - m_ParamList(Index).dOrigVal) > EPS_SMALL Then
+            Return True
+         End If
+      Next
+      Return False
+   End Function
+
    Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged
 
    Public Sub NotifyPropertyChanged(propName As String)
       RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName))
    End Sub
 
-End Class
-
-''' <summary>
-''' Class that represent a Converter that convert the complete file path in the file name and vice versa.
-''' </summary>
-'Public Class FileNameConverter
-'   Implements IValueConverter
-
-'   Dim TempPath As String
-
-'   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
-'      TempPath = CStr(value)
-'      Return Path.GetFileNameWithoutExtension(TempPath)
-'   End Function
-
-'   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
-'      Return Path.GetDirectoryName(TempPath) & "\" & CStr(value) & Path.GetExtension(TempPath)
-'   End Function
-
-'End Class
\ No newline at end of file
+End Class
\ No newline at end of file