From dd787f29dece495487f2e85b5aa084724a4f8522 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 20 Mar 2019 07:52:43 +0000 Subject: [PATCH] =?UTF-8?q?OmagCUT=20:=20-=20correzione=20a=20InsertPart?= =?UTF-8?q?=20(se=20pezzo=20gi=C3=A0=20inserito=20lo=20parcheggiava).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NestPageUC.xaml.vb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/NestPageUC.xaml.vb b/NestPageUC.xaml.vb index d5d686f..a76dbd7 100644 --- a/NestPageUC.xaml.vb +++ b/NestPageUC.xaml.vb @@ -758,9 +758,9 @@ Public Class NestPageUC End If ' Lo metto in tavola, se possibile If InsertOnePart(nId) Then - ' Eventuale notifica al VeinMatching VeinMatching.OnInsertPartInRaw(nId) Else + EgtSetStatus(nId, GDB_ST.ON_) VeinMatching.OnDeselectPart(nId) End If ' Costringo ad aggiornare UI @@ -848,8 +848,10 @@ Public Class NestPageUC End Function Friend Function InsertOnePart(nId As Integer) As Boolean - Dim bFit As Boolean = False + ' Se il pezzo non è in parcheggio, non si può inserire + If Not EgtIsPart(nId) Then Return False ' Metto pezzo in centro grezzo con lavorazioni e sistemazioni varie + Dim bFit As Boolean = False If PreInsertOnePart( nId) Then ' Eseguo nesting If UpdateNestRegions() Then @@ -871,8 +873,8 @@ Public Class NestPageUC Else ' Ripristino lo stato originale PreRemoveOnePart( nId) + Return False End If - Return False End Function Private Function AdjustPartSideAngleHeel(nPartId As Integer, dTh As Double) As Boolean