diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index fc5a30ea..80b80ff1 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index 3320ae57..c6e57481 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.7.5")] -[assembly: AssemblyFileVersion("2.4.7.5")] +[assembly: AssemblyVersion("2.4.8.1")] +[assembly: AssemblyFileVersion("2.4.8.1")] diff --git a/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb index 1398d15d..1c106e9b 100644 --- a/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb +++ b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb @@ -24,6 +24,9 @@ Public Class AboutBoxV sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine + Dim sOpSys As String = String.Empty + EgtGetOsInfo( sOpSys) + sInfo &= sOpSys & Environment.NewLine Dim sCPU As String = String.Empty EgtGetCpuInfo( sCPU) sInfo &= sCPU & Environment.NewLine diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj index 0acda3ee..4c100213 100644 --- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj +++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj @@ -99,6 +99,9 @@ MinimumRecommendedRules.ruleset false + + app.manifest + ..\ExtLibs\APLog.dll @@ -543,6 +546,7 @@ My.Resources + SettingsSingleFileGenerator Settings.Designer.vb diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index d585c63a..6fe2caae 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb index 5f0e40ef..8c60e1a9 100644 --- a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb +++ b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb @@ -77,21 +77,21 @@ Public Class SupervisorManagerVM 'Private m_cmdSave As ICommand Private m_cmdGoToProd As ICommand - '#Region "ToolTip" + #Region "ToolTip" - ' 'Proprietà ToolTip - ' Public ReadOnly Property OpenToolTip As String - ' Get - ' Return EgtMsg(MSG_TOPCOMMANDBAR + 2) - ' End Get - ' End Property - ' Public ReadOnly Property SaveToolTip As String - ' Get - ' Return EgtMsg(MSG_TOPCOMMANDBAR + 3) - ' End Get - ' End Property + 'Proprietà ToolTip + Public ReadOnly Property OpenToolTip As String + Get + Return EgtMsg(MSG_TOPCOMMANDBAR + 2) + End Get + End Property + Public ReadOnly Property GoToProd_ToolTip As String + Get + Return EgtMsg(61835) + End Get + End Property - '#End Region ' ToolTip + #End Region ' ToolTip #End Region ' Fields & Properties diff --git a/EgtBEAMWALL.Supervisor/app.manifest b/EgtBEAMWALL.Supervisor/app.manifest new file mode 100644 index 00000000..1c015185 --- /dev/null +++ b/EgtBEAMWALL.Supervisor/app.manifest @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb index 4f4de7cd..5a1e019e 100644 --- a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb @@ -596,6 +596,12 @@ Public Class FreeContourManagerVM Friend Sub UpdateUi() ' se attiva operazione in piu' passaggi, esco If Map.refSceneHostVM.MainController.GetContinue() Then Return + ' se finita creazione curva (è stata chiusa) + If Map.refFreeContourManagerVM.bIsCreatingPath Then + Dim nNewPathLayerId As Integer = EgtGetFirstNameInGroup(nSelPartId, "NewPathLayer") + Dim nNewPathId As Integer = EgtGetFirstInGroup(nNewPathLayerId) + If EgtGetType(nNewPathId) = GDB_TY.CRV_COMPO Then Map.refFreeContourManagerVM.CreatingPathEnd() + End If ' se non ci sono piu' i percorsi, permetto di aggiungerli If EgtGetType(m_nNewPathId) = GDB_TY.NONE Then m_nNewPathId = GDB_ID.NULL diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb index b9efe14a..2690cfe9 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb @@ -227,8 +227,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2407, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2407, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2408, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2408, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb index 854f311b..2a616c00 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb index ecb93f84..ffafd6b4 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb @@ -114,6 +114,11 @@ Public Class ProdManagerVM Return EgtMsg(61922) End Get End Property + Public ReadOnly Property GoToSupervisor_ToolTip As String + Get + Return EgtMsg(61974) + End Get + End Property #End Region ' ToolTip diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll index e3f57394..955aa3af 100644 Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll index 112ec3cf..5f7e0c6f 100644 Binary files a/ExtLibs/EgtWPFLib5.dll and b/ExtLibs/EgtWPFLib5.dll differ