From f6e028d12ef6007c7e0ac42f743b1bf8d46b3bc1 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 21 Jan 2016 18:06:31 +0000 Subject: [PATCH] SarmaxWall 1.6l9 : - adattamenti per modifiche a libreria nesting. --- DrawPageUC.xaml.vb | 4 ++-- ImportPageUC.xaml.vb | 4 ++-- My Project/AssemblyInfo.vb | 6 +++--- PlacePageUC.xaml.vb | 28 ++++++++++++++-------------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/DrawPageUC.xaml.vb b/DrawPageUC.xaml.vb index 619e49f..8cd34c2 100644 --- a/DrawPageUC.xaml.vb +++ b/DrawPageUC.xaml.vb @@ -596,9 +596,9 @@ Public Class DrawPageUC EgtCreateSurfTmBBox(nIdRaw, ptMin, ptMax, GDB_RT.GLOB) End If ' Lo posiziono nel parcheggio - EgtPackPart(nId2, dMinX, -INFINITO, dMaxX, dParkMaxY, dOffset, False) + EgtPackBox(nId2, dMinX, -INFINITO, dMaxX, dParkMaxY, dOffset, False) ' Cerco di spostarlo nella tavola - EgtPackPart(nId2, dMinX, dMinY, dMaxX, dMaxY, dOffset, False) + EgtPackBox(nId2, dMinX, dMinY, dMaxX, dMaxY, dOffset, False) ' Cancello il file My.Computer.FileSystem.DeleteFile(sTmpfile) End If diff --git a/ImportPageUC.xaml.vb b/ImportPageUC.xaml.vb index 915a446..4e7bebd 100644 --- a/ImportPageUC.xaml.vb +++ b/ImportPageUC.xaml.vb @@ -315,9 +315,9 @@ Public Class ImportPageUC ptMax.y += dOffsetY EgtCreateSurfTmBBox(nIdRaw, ptMin, ptMax, GDB_RT.GLOB) ' Lo posiziono nel parcheggio - EgtPackPart(nId2, dMinX, -INFINITO, dMaxX, dParkMaxY, dOffset, False) + EgtPackBox(nId2, dMinX, -INFINITO, dMaxX, dParkMaxY, dOffset, False) ' Cerco di spostarlo nella tavola - EgtPackPart(nId2, dMinX, dMinY, dMaxX, dMaxY, dOffset, False) + EgtPackBox(nId2, dMinX, dMinY, dMaxX, dMaxY, dOffset, False) ' Cancello il file My.Computer.FileSystem.DeleteFile(sTmpfile) End If diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 4d9c56b..46ccc6a 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -20,7 +20,7 @@ Imports System.Windows #End If - + @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/PlacePageUC.xaml.vb b/PlacePageUC.xaml.vb index 5f2ca86..73f30da 100644 --- a/PlacePageUC.xaml.vb +++ b/PlacePageUC.xaml.vb @@ -319,7 +319,7 @@ Public Class PlacePageUC ' Ricavo il vettore di movimento Dim vtMove As Vector3d = ptCurr - m_ptPrev ' Muovo i pezzi selezionati di quanto possibile - EgtMoveSelectedCluster(vtMove, 0, -m_dWidth, m_dLength, 0, m_dMinDist) + EgtMoveBox(GDB_ID.SEL, vtMove, 0, -m_dWidth, m_dLength, 0, m_dMinDist) MyDraw() ' Aggiorno il punto precedente 'm_ptPrev += vtMove @@ -349,25 +349,25 @@ Public Class PlacePageUC Private Sub UpBtn_Click(sender As Object, e As RoutedEventArgs) Handles UpBtn.Click Dim dStep As Double = IIf(m_bMaximizeMove, m_dMaxStep, m_dStep) - EgtMoveSelectedCluster(New Vector3d(0, dStep, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) + EgtMoveBox(GDB_ID.SEL, New Vector3d(0, dStep, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) MyDraw() End Sub Private Sub DownBtn_Click(sender As Object, e As RoutedEventArgs) Handles DownBtn.Click Dim dStep As Double = IIf(m_bMaximizeMove, m_dMaxStep, m_dStep) - EgtMoveSelectedCluster(New Vector3d(0, -dStep, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) + EgtMoveBox(GDB_ID.SEL, New Vector3d(0, -dStep, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) MyDraw() End Sub Private Sub RightBtn_Click(sender As Object, e As RoutedEventArgs) Handles RightBtn.Click Dim dStep As Double = IIf(m_bMaximizeMove, m_dMaxStep, m_dStep) - EgtMoveSelectedCluster(New Vector3d(dStep, 0, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) + EgtMoveBox(GDB_ID.SEL, New Vector3d(dStep, 0, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) MyDraw() End Sub Private Sub LeftBtn_Click(sender As Object, e As RoutedEventArgs) Handles LeftBtn.Click Dim dStep As Double = IIf(m_bMaximizeMove, m_dMaxStep, m_dStep) - EgtMoveSelectedCluster(New Vector3d(-dStep, 0, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) + EgtMoveBox(GDB_ID.SEL, New Vector3d(-dStep, 0, 0), 0, -m_dWidth, m_dLength, 0, m_dMinDist) MyDraw() End Sub @@ -392,7 +392,7 @@ Public Class PlacePageUC ' Recupero il box del cluster di pezzi Dim ptMin As Point3d Dim ptMax As Point3d - If Not EgtGetSelectedClusterBBoxGlob(ptMin, ptMax) Then + If Not EgtGetPartBBoxGlob(GDB_ID.SEL, ptMin, ptMax) Then Return End If ' Ne derivo il centro di rotazione come centro del cluster @@ -415,7 +415,7 @@ Public Class PlacePageUC ' Recupero il box del cluster di pezzi Dim ptMin As Point3d Dim ptMax As Point3d - If Not EgtGetSelectedClusterBBoxGlob(ptMin, ptMax) Then + If Not EgtGetPartBBoxGlob(GDB_ID.SEL, ptMin, ptMax) Then Return False End If ' Ne derivo il centro di rotazione come centro del cluster @@ -425,17 +425,17 @@ Public Class PlacePageUC ' Se pezzi in parcheggio, li risistemo qui (sempre possibile) If m_nPartPos <> PART_POS.IN_TABLE Then - EgtPackSelectedCluster(m_dOffsetX, -INFINITO, m_dLength, m_dParkMaxY, m_dMinDist, False) + EgtPackBox(GDB_ID.SEL, m_dOffsetX, -INFINITO, m_dLength, m_dParkMaxY, m_dMinDist, False) Return True End If ' Se pezzi in tavola, cerco di sistemarli qui (se impossibile, annullo la rotazione) ' Recupero nuovo box - EgtGetSelectedClusterBBoxGlob(ptMin, ptMax) + EgtGetPartBBoxGlob(GDB_ID.SEL, ptMin, ptMax) ' Se non esce dalla tavola, provo un pack sul posto If ptMin.x > 0 - EPS_SMALL And ptMin.y > -m_dWidth - EPS_SMALL And ptMax.x < m_dLength + EPS_SMALL And ptMax.y < 0 + EPS_SMALL Then - If EgtPackSelectedCluster(ptMin.x, ptMin.y, ptMax.x + 1, ptMax.y + 1, m_dMinDist, True) Then + If EgtPackBox(GDB_ID.SEL, ptMin.x, ptMin.y, ptMax.x + 1, ptMax.y + 1, m_dMinDist, True) Then Return True End If End If @@ -465,11 +465,11 @@ Public Class PlacePageUC ptMin.y = Math.Max(ptMin.y, -m_dWidth) ptMax.y = 0 End If - If EgtPackSelectedCluster(ptMin.x, ptMin.y, ptMax.x + 1, ptMax.y + 1, m_dMinDist, True) Then + If EgtPackBox(GDB_ID.SEL, ptMin.x, ptMin.y, ptMax.x + 1, ptMax.y + 1, m_dMinDist, True) Then Return True End If ' Provo un pack sull'intera tavola - If EgtPackSelectedCluster(0, -m_dWidth, m_dLength, 0, m_dMinDist, True) Then + If EgtPackBox(GDB_ID.SEL, 0, -m_dWidth, m_dLength, 0, m_dMinDist, True) Then Return True End If ' Non è possibile ruotare rimanendo in tavola, annullo l'azione @@ -486,7 +486,7 @@ Public Class PlacePageUC Dim nNextId = EgtGetNextSelectedObj() ' Se pezzo in parcheggio, metto nella tavola If EgtIsPart(nId) And Not IsPartInTable(nId) Then - If Not EgtPackPart(nId, 0, -m_dWidth, m_dLength, 0, m_dMinDist, False) Then + If Not EgtPackBox(nId, 0, -m_dWidth, m_dLength, 0, m_dMinDist, False) Then EgtDeselectObj(nId) bAllOk = False End If @@ -518,7 +518,7 @@ Public Class PlacePageUC While nId <> GDB_ID.NULL ' Se pezzo, metto in parcheggio (sempre possibile) If EgtIsPart(nId) Then - EgtPackPart(nId, dMinX, -INFINITO, dMaxX, dParkMaxY, dOffset, False) + EgtPackBox(nId, dMinX, -INFINITO, dMaxX, dParkMaxY, dOffset, False) End If ' Passo al successivo selezionato nId = EgtGetNextSelectedObj()