Merge branch 'RenzoL' into develop

MainWindow/MainWindowVM.vb

@@ -22,6 +22,13 @@ Public Class MainWindowVM
    ' Event commands
    ' MainWindow ContentRendered Event
 
+   Private m_sVersion As String = "1.1a1"
+   Public ReadOnly Property Version As String
+      Get
+         Return m_sVersion
+      End Get
+   End Property
+
    Private m_Title As String = String.Empty
    Public Property Title As String
       Get
@@ -347,17 +354,17 @@ Public Class MainWindowVM
       EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2305, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2305, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2307, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2307, 1, IniFile.m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
+      m_sVersion = My.Application.Info.Version.Major.ToString() & "." &
+                   My.Application.Info.Version.Minor.ToString() &
+                   (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+                   My.Application.Info.Version.Revision.ToString()
       IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
       Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName & " (" & IniFile.m_nInstance.ToString() & ")" & vbLf &
-                              My.Application.Info.Title.ToString() & " ver. " &
-                              My.Application.Info.Version.Major.ToString() &
-                              "." & My.Application.Info.Version.Minor.ToString() &
-                              (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
-                              My.Application.Info.Version.Revision.ToString()
+                              My.Application.Info.Title.ToString() & " ver. " & m_sVersion
       EgtInit(m_nDebug, IniFile.m_sLogFile, sLogMsg)
       ' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
       Dim sMsgDir As String = String.Empty

My Project/AssemblyInfo.vb

@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.5.5")>
-<Assembly: AssemblyFileVersion("2.3.5.5")>
+<Assembly: AssemblyVersion("2.3.7.3")>
+<Assembly: AssemblyFileVersion("2.3.7.3")>
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml

@@ -284,12 +284,6 @@
             <Expander Header="{Binding OffsetGpBxLbl}"
             Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
                 <StackPanel>
-                    <EgtWPFLib5:StringParamV 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBx="{Binding Path=OffSr,
-                                UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
                     <EgtWPFLib5:StringParamV 
                                ParamTxBl="{Binding OffsetSlTxBl}" 
                                ParamTxBx="{Binding Path=OffSl,

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml

@@ -148,12 +148,6 @@
                                 UpdateSourceTrigger=PropertyChanged,
                                 ValidatesOnDataErrors=True}" 
                                Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBx="{Binding Path=OffSr,
-                                UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
                     <EgtWPFLib5:StringParamV 
                                ParamTxBl="{Binding OffsetSlTxBl}" 
                                ParamTxBx="{Binding Path=OffSl,

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -385,7 +385,7 @@ Public Class SimulationExpanderVM
          End If
       End If
       sCncFile = ""
-      sInfo = "EgtCAM5 - " & sCurrFilePath
+      sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
       If EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_NCNAME, sCncFile) AndAlso Not String.IsNullOrWhiteSpace(sCncFile) Then
          sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
       Else