From 4499a042f8e0766db683c16dbf7d4baa19a59a0b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 3 Jun 2024 18:19:24 +0200 Subject: [PATCH] EgtBEAMWALL 2.6f1 : - correzioni a gestione riferimento di feature entrando in modifica Freecontour. --- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 6 +++--- EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs | 6 +++--- EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb | 4 ++-- EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb | 6 +++--- .../FreeContourManager/FreeContourManagerVM.vb | 2 +- EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb | 4 ++-- EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index 6899f1de..5ec2d0a1 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -16,7 +16,7 @@ Imports System.Runtime.InteropServices - + @@ -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 72c46d8e..55dee0b1 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Egalware s.r.l.")] [assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")] -[assembly: AssemblyCopyright("Copyright © 2020-2023 by Egalware s.r.l.")] +[assembly: AssemblyCopyright("Copyright © 2020-2024 by Egalware s.r.l.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.5.12.2")] -[assembly: AssemblyFileVersion("2.5.12.2")] +[assembly: AssemblyVersion("2.6.6.1")] +[assembly: AssemblyFileVersion("2.6.6.1")] diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb index bf3acc24..4331c0c5 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb @@ -248,8 +248,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2606, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2606, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index e62f11e2..aeb15e71 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -30,7 +30,7 @@ Imports System.Windows #End if - + @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb index d5172fcb..a5314aef 100644 --- a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb @@ -427,7 +427,7 @@ Public Class FreeContourManagerVM ' posiziono la griglia sul riferimento del contorno libero Dim frFace As New Frame3d EgtBeamGetSideData(SelFeature.nSelSIDE, frFace) - Dim frFrame As Frame3d = SelFeature.BTLFeatureM.frFRAME + Dim frFrame As New Frame3d( SelFeature.BTLFeatureM.frFRAME) frFrame.ToGlob( frFace) EgtSetGridFrame(frFrame) EgtSetGridShow(True, True) diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb index 8c1a3821..ecdf9632 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb @@ -242,8 +242,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2606, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2606, 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 fe7c8a16..983007ff 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -30,7 +30,7 @@ Imports System.Windows #End If - + @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +