From 624eb0566f7c5cc19c4471aa3edbcdd2da48610d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 28 Aug 2023 19:50:01 +0200 Subject: [PATCH] Icarus 2.5h1 : - modifiche per visualizzare meglio l'area di valido posizionamento dei pezzi. --- Icarus/Constants/Const3dPrint.vb | 1 + Icarus/MainWindow/MainWindowM.vb | 4 ++-- Icarus/My Project/AssemblyInfo.vb | 4 ++-- Icarus/Utility/CurrentMachine.vb | 15 ++++++++++----- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb index e9d4107..28c6c14 100644 --- a/Icarus/Constants/Const3dPrint.vb +++ b/Icarus/Constants/Const3dPrint.vb @@ -3,6 +3,7 @@ Public Const TABLE = "Table" Public Const TABLE_OUTLINE = "TableOutline" Public Const EXTRUSION_AREA = "ExtrusionArea" + Public Const EXTRUSION_RECT = "ExtrusionRect" Public Const PART = "Part" Public Const PRINT_SOLID = "PrintSolid" Public Const LAY_MACH_START = "MachStart" diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb index 107cc6c..7e944e7 100644 --- a/Icarus/MainWindow/MainWindowM.vb +++ b/Icarus/MainWindow/MainWindowM.vb @@ -191,8 +191,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5583, 2507, 1, m_nKeyLevel) And - EgtGetKeyOptions(5583, 2507, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5583, 2508, 1, m_nKeyLevel) And + EgtGetKeyOptions(5583, 2508, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index 1ddaf55..047d64c 100644 --- a/Icarus/My Project/AssemblyInfo.vb +++ b/Icarus/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Icarus/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb index 539514b..689e28b 100644 --- a/Icarus/Utility/CurrentMachine.vb +++ b/Icarus/Utility/CurrentMachine.vb @@ -161,10 +161,9 @@ Public Module CurrentMachine Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE) Dim nTabLayerId As Integer = EgtGetFirstNameInGroup(nTabPartId, TABLE) Dim nExtrusionAreaId As Integer = EgtGetFirstNameInGroup(nTabLayerId, EXTRUSION_AREA) - If nExtrusionAreaId <> GDB_ID.NULL Then - ' e la cancello - EgtErase(nExtrusionAreaId) - End If + If nExtrusionAreaId <> GDB_ID.NULL Then EgtErase(nExtrusionAreaId) + Dim nExtrusionRectId As Integer = EgtGetFirstNameInGroup(nTabLayerId, EXTRUSION_RECT) + If nExtrusionRectId <> GDB_ID.NULL Then EgtErase(nExtrusionRectId) ' se lavorazione corrente nulla, esco If IsNothing(Map.refTopPanelVM.CurrMachining) Then Return ' se non esiste file dati macchina, esco @@ -188,11 +187,17 @@ Public Module CurrentMachine Dim dExtrXMin = GetPrivateProfileDouble(sExtrusionType, K_MINX, 0, m_sMachDataIniFile) Dim dExtrYMax = GetPrivateProfileDouble(sExtrusionType, K_MAXY, 0, m_sMachDataIniFile) Dim dExtrYMin = GetPrivateProfileDouble(sExtrusionType, K_MINY, 0, m_sMachDataIniFile) - nExtrusionAreaId = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0)) + Const AREA_WIDTH As Double = 10 + Dim nAuxRectId As Integer = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin - AREA_WIDTH, dExtrYMin - AREA_WIDTH, 0), New Point3d(dExtrXMax + AREA_WIDTH, dExtrYMax + AREA_WIDTH, 0)) + nExtrusionRectId = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0)) + nExtrusionAreaId = EgtCreateSurfTmByRegion( nTabLayerId, { nAuxRectId, nExtrusionRectId}, EPS_STM) + EgtErase( nAuxRectId) Dim c3Temp As New Color3d c3Temp.FromColor(System.Drawing.Color.Lime) EgtSetColor(nExtrusionAreaId, c3Temp) EgtSetName(nExtrusionAreaId, EXTRUSION_AREA) + EgtSetColor(nExtrusionRectId, c3Temp) + EgtSetName(nExtrusionRectId, EXTRUSION_RECT) m_b3ExtrusionArea = New BBox3d(New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0)) EgtDraw() End Sub