From 14e1c254f0a08707d62d2dff5286eeebee60c5fa Mon Sep 17 00:00:00 2001 From: NicolaP Date: Wed, 8 Feb 2023 19:02:46 +0100 Subject: [PATCH] Nuova gestione OffsetLama per tagli diretti --- CadCuts/MoveRawPartPage.xaml.vb | 2 -- DirectCuts/SingleCutUC.xaml.vb | 11 +++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CadCuts/MoveRawPartPage.xaml.vb b/CadCuts/MoveRawPartPage.xaml.vb index 2c2c3c6..e1b2adb 100644 --- a/CadCuts/MoveRawPartPage.xaml.vb +++ b/CadCuts/MoveRawPartPage.xaml.vb @@ -329,8 +329,6 @@ Public Class MoveRawPartPage VacuumCups.SetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger) VacuumCups.SetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0) VacuumCups.SetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0) - ' se su scarico frontale allora devo modificare la scelta delle ventose - VacuumCups.bUnloadingOnAuxTab = m_SplitPage.m_bOnAuxTab If PutVacuumCupsOnRaw(nId, rmData) Then ' Visualizzo le ventose EgtSetStatus(GetVacuumId(), GDB_ST.ON_) diff --git a/DirectCuts/SingleCutUC.xaml.vb b/DirectCuts/SingleCutUC.xaml.vb index 40f65b3..cf07aab 100644 --- a/DirectCuts/SingleCutUC.xaml.vb +++ b/DirectCuts/SingleCutUC.xaml.vb @@ -583,7 +583,7 @@ Public Class SingleCutUC Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing EgtTdbSetCurrTool(sSaw) Dim dThick As Double = 0 - ' se è impostata una lavorazione di lama + ' Se è impostata una lavorazione di lama If Not String.IsNullOrEmpty(sSawing) Then EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick) End If @@ -599,9 +599,12 @@ Public Class SingleCutUC Dim ptStart As Point3d = m_ptTipP1 ptStart.z = 0 Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen) - If Math.Abs(m_dOffset) > 10 * EPS_SMALL Then - Dim dTotOffset = m_dOffset - If m_bSawTh Then dTotOffset += If( m_dOffset > 0, dThick, -dThick) + ' Applico la correzione di spessore lama -> anche se Offset=0! ver_2.5b1 + Dim dTotOffset = m_dOffset + If m_bSawTh Then + dTotOffset += If(m_dOffset > 0, dThick, -dThick) + EgtOffsetCurve(nCutId, dTotOffset, OFF_TYPE.EXTEND) + Else EgtOffsetCurve(nCutId, dTotOffset, OFF_TYPE.EXTEND) End If ' Imposto affondamento e angolo di fianco sul taglio