From 2035c83062f53cf38d2159e3bb209cb2c2d0a331 Mon Sep 17 00:00:00 2001 From: NicolaP Date: Wed, 22 Sep 2021 10:00:14 +0200 Subject: [PATCH] Correzione errore in VeinMatch --- VeinMatching/VeinMatchingWindow.xaml.vb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/VeinMatching/VeinMatchingWindow.xaml.vb b/VeinMatching/VeinMatchingWindow.xaml.vb index 329c833..f32236d 100644 --- a/VeinMatching/VeinMatchingWindow.xaml.vb +++ b/VeinMatching/VeinMatchingWindow.xaml.vb @@ -177,10 +177,9 @@ Public Class VeinMatchingWindow bDeselected = True End If End If - End If - EgtSetCurrentContext(VeinMatchingScene.GetCtx()) - ' Se deselezione riuscita, la eseguo anche in VME - If bDeselected Then EgtDeselectObj(m_nIdToDesel) + EgtSetCurrentContext(VeinMatchingScene.GetCtx()) + ' Se deselezione riuscita, la eseguo anche in VME + If bDeselected Then EgtDeselectObj(m_nIdToDesel) End If ' Reset m_nIdToSel = GDB_ID.NULL @@ -198,7 +197,7 @@ Public Class VeinMatchingWindow Private Sub AssemblyBtn_Click(sender As Object, e As RoutedEventArgs) Handles AssemblyBtn.Click Dim ThicknessRAw As Double = m_MainWindow.m_CurrentProjectPageUC.m_dRawHeight - VeinMatching.AssemblyParts() + VeinMatching.AssemblyParts(ThicknessRAw) End Sub End Class @@ -600,7 +599,7 @@ Friend Module VeinMatching Return bFound End Function - Friend Function AssemblyParts() As Boolean + Friend Function AssemblyParts(ByVal ThicknessRAw As Double) As Boolean CreateListAlzAndFront() LinkReferencesOnAlette() EgtSetCurrentContext(m_nVeinCtx) @@ -615,6 +614,7 @@ Friend Module VeinMatching If Not EgtEndPoint(Item.IdSideRef, GDB_ID.ROOT, ptERef) Then Return False If Not EgtEndPoint(Item.SideId, GDB_ID.ROOT, ptE) Then Return False Dim vtMove As Vector3d = ptSRef - ptE + EgtMove(Item.PartId, vtMove, GDB_RT.GLOB) ' ruoto i pezzi Dim vtRot As Vector3d = ptERef - ptSRef