From 4548e468a1e7488e0cea7b9a2e63d36bc2cfd19e Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 1 Feb 2022 15:25:47 +0100 Subject: [PATCH] EgtBEAMWALL 2.4b1 : - corretta gestione flip e rotazione dei duplo e loro aggiornamento. --- EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb | 4 ++-- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 ++-- EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs | 4 ++-- EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb | 4 ++-- EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb | 4 ++-- EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb | 4 ++-- EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb | 4 ++-- EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb b/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb index d6367383..91dfc0de 100644 --- a/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb +++ b/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb @@ -284,9 +284,9 @@ Public Class MyMachGroupPanelM EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part) ' faccio flip e rotazione rispetto all'originale che ha sovrascritto posizione del duplo dRotAng = RotArray(Duploindex) - dRotated - EgtRotate(DuploArray(Duploindex), b3Part.Center, -Vector3d.Z_AX, dRotAng, GDB_RT.GLOB) + 'EgtRotate(DuploArray(Duploindex), b3Part.Center, -Vector3d.Z_AX, dRotAng, GDB_RT.GLOB) dFlipAng = FlipArray(Duploindex) - dInverted - EgtRotate(DuploArray(Duploindex), b3Part.Center, Vector3d.X_AX, dFlipAng, GDB_RT.GLOB) + 'EgtRotate(DuploArray(Duploindex), b3Part.Center, Vector3d.X_AX, dFlipAng, GDB_RT.GLOB) EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex)) EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex)) If nBWType = BWType.WALL Then diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index 96ad8e94..218aef5f 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 58babf06..206357a9 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.1.5")] -[assembly: AssemblyFileVersion("2.4.1.5")] +[assembly: AssemblyVersion("2.4.2.1")] +[assembly: AssemblyFileVersion("2.4.2.1")] diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb index 479e0db5..61e4ab63 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb @@ -229,8 +229,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, 2401, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2401, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2402, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2402, 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 f0c44735..a31e60bb 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb index 1b017375..9e07e8fe 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb @@ -454,9 +454,9 @@ Public Class PartVM EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part) ' faccio flip e rotazione rispetto all'originale che ha sovrascritto posizione del duplo dRotAng = RotArray(Duploindex) - dRotated - EgtRotate(DuploArray(Duploindex), b3Part.Center, -Vector3d.Z_AX, dRotAng) + 'EgtRotate(DuploArray(Duploindex), b3Part.Center, -Vector3d.Z_AX, dRotAng) dFlipAng = FlipArray(Duploindex) - dInverted - EgtRotate(DuploArray(Duploindex), b3Part.Center, Vector3d.X_AX, dFlipAng) + 'EgtRotate(DuploArray(Duploindex), b3Part.Center, Vector3d.X_AX, dFlipAng) EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex)) EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex)) If nBWType = BWType.WALL Then diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb index 52039422..c0cdbbf8 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb @@ -221,8 +221,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, 2401, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2401, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2402, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2402, 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 2d6ee27e..f158451a 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: ' - - + +