From db9089b6ae661d62c19bd1b07f242026f217eddc Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 1 Jun 2021 20:06:06 +0200 Subject: [PATCH 1/9] EgtCAM5 2.3f1 : - ricompilazione con cambio versione. --- MainWindow/MainWindowVM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 7ff50f4..668ba46 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -347,8 +347,8 @@ 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, 2306, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2306, 1, IniFile.m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0) IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString()) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 45ea67c..7747f12 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From d3d7f239c58e18e76d1cd26eda9d7baba3867df0 Mon Sep 17 00:00:00 2001 From: DarioS Date: Fri, 11 Jun 2021 07:59:39 +0200 Subject: [PATCH 2/9] EgtCAM5 2.3f2 : - ricompilazione per cambio versione. --- My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 7747f12..f316626 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 742b238c05dc9782f4b503aee7c0a00199eafd60 Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 15 Jun 2021 10:40:26 +0200 Subject: [PATCH 3/9] EgtCAM5 2.3f3 : - ricompilazione per cambio versione. --- My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f316626..06b3321 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 600a2e8fb23548e9807afaa47017e72239251ab0 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 16 Jun 2021 17:25:47 +0200 Subject: [PATCH 4/9] EgtCAM5 2.3f4 : - aggiunta versione dell'eseguibile nelle info dei programmi CN. --- MainWindow/MainWindowVM.vb | 17 ++++++++++++----- My Project/AssemblyInfo.vb | 4 ++-- .../SimulationExpander/SimulationExpanderVM.vb | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 668ba46..b2bd024 100644 --- a/MainWindow/MainWindowVM.vb +++ b/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 @@ -351,13 +358,13 @@ Public Class MainWindowVM EgtGetKeyOptions(3279, 2306, 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 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 06b3321..ff9e28a 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb index f98060a..3e422b1 100644 --- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb +++ b/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 From bb132fdcf40e896f705f88c313ebb8d2688ca76e Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 1 Jul 2021 08:44:10 +0200 Subject: [PATCH 5/9] EgtCAM5 2.3f5 : - ricompilazione per cambio versione. --- My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index ff9e28a..ff6a88f 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 028cbc750c7eba9d01f14c070f0fb5f79f4d3002 Mon Sep 17 00:00:00 2001 From: DarioS Date: Fri, 2 Jul 2021 08:42:52 +0200 Subject: [PATCH 6/9] EgtCAM5 2.3g1 : - cambio di versione e aggiornamento codici protezione per nuovo mese. --- MainWindow/MainWindowVM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index b2bd024..d18cb7b 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -354,8 +354,8 @@ 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, 2306, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 2306, 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() & "." & diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index ff6a88f..73b6c53 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 6d69aea4b196b53c949e74ec513467d6d934e0a7 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 5 Jul 2021 11:11:23 +0200 Subject: [PATCH 7/9] EgtCAM5 2.3g3 : - ricompilazione per cambio versione. --- My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 73b6c53..46e2a9c 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From b0d50eaaebf3cf2db8447b0cc8ab275f42023dec Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 20 Jul 2021 14:50:58 +0200 Subject: [PATCH 8/9] EgtCAM5 2.3g3 : - ricompilazione per cambio versione. --- My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 46e2a9c..bbc185c 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 2697a2d65039376c4cd46b58e9ea3a6472204a95 Mon Sep 17 00:00:00 2001 From: RenzoL Date: Tue, 27 Jul 2021 11:16:53 +0200 Subject: [PATCH 9/9] EgtCAM5 2.3g3 : - rimosso Offset radiale dal Taglio di lama negli expander delle Operazioni --- .../StoneSawingParameterExpanderV.xaml | 6 ------ .../WoodSawingParameterExpanderV.xaml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml index e145735..a0dfbc9 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml @@ -284,12 +284,6 @@ - -