From a737a9313df9c9770f042a33dd470473abbd1d10 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 3 Jul 2024 20:00:20 +0200 Subject: [PATCH] Icarus 2.6g1 : - inserito ingrandimento area della tavola per consentire di posizionare i pezzi anche parzialmente fuori nei casi ove possibile (aree ammesse secondo tipo di estrusione). --- Icarus/MainWindow/MainWindowM.vb | 4 +-- Icarus/ManagePartPanel/ManagePartPanelVM.vb | 8 ------ Icarus/My Project/AssemblyInfo.vb | 4 +-- Icarus/SliceManager/SliceManagerVM.vb | 1 + Icarus/TopPanel/TopPanelVM.vb | 28 +-------------------- 5 files changed, 6 insertions(+), 39 deletions(-) diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb index 6c9bb74..af81d6f 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, 2606, 1, m_nKeyLevel) And - EgtGetKeyOptions(5583, 2606, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5583, 2607, 1, m_nKeyLevel) And + EgtGetKeyOptions(5583, 2607, 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/ManagePartPanel/ManagePartPanelVM.vb b/Icarus/ManagePartPanel/ManagePartPanelVM.vb index 4758342..5d7a8a8 100644 --- a/Icarus/ManagePartPanel/ManagePartPanelVM.vb +++ b/Icarus/ManagePartPanel/ManagePartPanelVM.vb @@ -471,14 +471,6 @@ Public Class ManagePartPanelVM Map.refSliceManagerVM.UpdateDimensions() Next End If - 'EgtAddMachGroup("3dPrint") - 'EgtSetTable("Tab") - - 'Dim nRawId As Integer = EgtAddRawPart(b3PrintSolid.Min, b3PrintSolid.DimX, b3PrintSolid.DimY, b3PrintSolid.DimZ, New Color3d(128, 128, 128, 30)) - 'EgtAddPartToRawPart(nPartId, b3PrintSolid.Min, nRawId) - 'EgtMoveToCornerRawPart(nRawId, New Point3d(dPosX, dPosY, 0), MCH_CR.BL) - - 'EgtResetCurrMachGroup() ' seleziono ultimo pezzo aggiunto Map.refTopPanelVM.SelLastPart() diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index c7589d1..7116116 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/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb index e2663a0..f85b9cc 100644 --- a/Icarus/SliceManager/SliceManagerVM.vb +++ b/Icarus/SliceManager/SliceManagerVM.vb @@ -456,6 +456,7 @@ Public Class SliceManagerVM ' Definisco e posiziono il grezzo sulla tavola EgtAddMachGroup("3dPrint") EgtSetTable("Tab") + EgtSetTableAreaOffset( 500, 500, 500, 500) For Each CurrPart In Map.refTopPanelVM.PartList Dim b3Part As New BBox3d Dim b3PrintSolid As New BBox3d diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb index 966a0b5..ff2210d 100644 --- a/Icarus/TopPanel/TopPanelVM.vb +++ b/Icarus/TopPanel/TopPanelVM.vb @@ -626,15 +626,6 @@ Public Class TopPanelVM ' rinomino pezzo e layer Dim nPartId As Integer = EgtGetLastPart() EgtSetName(nPartId, PART) - 'Dim nLayerId As Integer = EgtGetFirstInGroup(nPartId) - 'EgtSetName(nLayerId, ORIGINAL_SOLID) - - '' Recupero o creo layer ausiliario - 'Dim nAuxId As Integer = EgtGetFirstNameInGroup(nPartId, LAY_AUX) - 'If Not nAuxId Then - ' nAuxId = EgtCreateGroup(nPartId) - ' EgtSetName(nAuxId, LAY_AUX) - 'End If ' Richiedo posizione origine e offset pezzo Dim b3Part As New BBox3d @@ -643,24 +634,6 @@ Public Class TopPanelVM Dim nRefY As Integer = 1 Dim dPosX As Double = CurrentMachine.b3Tab.DimX / 2 - b3Part.DimX / 2 Dim dPosY As Double = CurrentMachine.b3Tab.DimY / 2 - b3Part.DimY / 2 - ' Dim Positions = EgtDialogBox( 'Part position on table:', { 'Reference', 'CB:Left,Center,Right'}, - ' { '', 'CB:Bottom,Middle,Top'}, - ' { 'X', EgtNumToString( EgtToUiUnits( dPosX), 1)}, - ' { 'Y', EgtNumToString( EgtToUiUnits( dPosY), 1)}) - - 'Dim ChooseReferenceWndVM As New ChooseReferenceWndVM - 'Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM) - 'If Not ChooseReferenceWndV.ShowDialog() Then Return - - 'Dim gg = ChooseReferenceWndVM.SelReference - '' Aggiungo il box del solido - 'Dim nBoxId As Integer = EgtSurftmb(nAuxId, b3Solid, False, GDB_RT.GLOB) - - '' posiziono il pezzo al centro - 'Dim b3Part As New BBox3d - 'EgtGetBBoxGlob(nPartId, GDB_BB.EXACT, b3Part) - 'Dim dPosX As Double = (CurrentMachine.b3Tab.DimX() / 2) - (b3Part.DimX() / 2) - 'Dim dPosY As Double = (CurrentMachine.b3Tab.DimY() / 2) - (b3Part.DimY() / 2) ' Posiziono il pezzo e aggiorno il suo box Dim vtMove As Vector3d = New Point3d(dPosX, dPosY, 0) - b3Part.Min() @@ -677,6 +650,7 @@ Public Class TopPanelVM EgtAddMachGroup("3dPrint") EgtSetTable("Tab") + EgtSetTableAreaOffset( 500, 500, 500, 500) Dim nRawId As Integer = EgtAddRawPart(b3Part.Min, b3Part.DimX, b3Part.DimY, b3Part.DimZ, New Color3d(128, 128, 128, 30)) EgtAddPartToRawPart(nPartId, b3Part.Min, nRawId)