From b82cdd0bc7b0b352f68d61ffc76272444251522d Mon Sep 17 00:00:00 2001 From: DarioS Date: Sat, 26 Feb 2022 17:53:11 +0100 Subject: [PATCH] EgtMachKernel : - corretto link tra lavorazioni quando HomeZ standard non va bene ma serve GetExtraZ - disabilitate svuotature a spirale ottimizzate per problemi quando ci sono tre lati aperti - sistemate maiuscole/minuscole nei nomi dei file inclusi. --- GenMachining.cpp | 2 +- MachMgrBasic.cpp | 2 +- MachMgrMachines.cpp | 4 ++-- MachMgrRawParts.cpp | 2 +- Operation.cpp | 9 ++++++--- Pocketing.cpp | 2 +- SawFinishing.cpp | 4 ++-- SawRoughing.cpp | 4 ++-- SurfFinishing.cpp | 4 ++-- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/GenMachining.cpp b/GenMachining.cpp index b99b083..1abd971 100644 --- a/GenMachining.cpp +++ b/GenMachining.cpp @@ -20,7 +20,7 @@ #include "/EgtDev/Include/EGkCurveLine.h" #include "/EgtDev/Include/EGkCurveArc.h" #include "/EgtDev/Include/EGkCurveComposite.h" -#include "/EgtDev/Include/EgkArcSpecial.h" +#include "/EgtDev/Include/EGkArcSpecial.h" #include "/EgtDev/Include/EGkSfrCreate.h" #include "/EgtDev/Include/EGkSurfTriMesh.h" #include "/EgtDev/Include/EGkUserObjFactory.h" diff --git a/MachMgrBasic.cpp b/MachMgrBasic.cpp index f292147..ae9c0a8 100644 --- a/MachMgrBasic.cpp +++ b/MachMgrBasic.cpp @@ -18,7 +18,7 @@ #include "DllMain.h" #include "/EgtDev/Include/EMkDllMain.h" #include "/EgtDev/Include/EGnStringUtils.h" -#include "/EgtDev/Include/EgnFileUtils.h" +#include "/EgtDev/Include/EGnFileUtils.h" #include "/EgtDev/Include/EgtKeyCodes.h" #include "/EgtDev/Include/SELkKeyProc.h" #include diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index c0adbcb..60c9097 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -19,8 +19,8 @@ #include "MachiningsMgr.h" #include "SawingData.h" #include "/EgtDev/Include/EGkGdbIterator.h" -#include "/EgtDev/Include/EgnStringUtils.h" -#include "/EgtDev/Include/EgnFileUtils.h" +#include "/EgtDev/Include/EGnStringUtils.h" +#include "/EgtDev/Include/EGnFileUtils.h" #include "/EgtDev/Include/EgtPointerOwner.h" using namespace std ; diff --git a/MachMgrRawParts.cpp b/MachMgrRawParts.cpp index 3ca21b0..4a4873d 100644 --- a/MachMgrRawParts.cpp +++ b/MachMgrRawParts.cpp @@ -24,7 +24,7 @@ #include "/EgtDev/Include/EGkGeoPoint3d.h" #include "/EgtDev/Include/EGkCurveAux.h" #include "/EgtDev/Include/EGkOffsetCurve.h" -#include "/EgtDev/Include/EgkDistPointCurve.h" +#include "/EgtDev/Include/EGkDistPointCurve.h" #include "/EgtDev/Include/EGkSfrCreate.h" #include "/EgtDev/Include/EGkStmStandard.h" #include "/EgtDev/Include/EGkStmFromCurves.h" diff --git a/Operation.cpp b/Operation.cpp index fb1b81a..cf8c71b 100644 --- a/Operation.cpp +++ b/Operation.cpp @@ -1889,6 +1889,7 @@ Operation::AdjustStartEndMovements( bool bVerifyPreviousLink) } // Verifico non ci sia collisione a HomeZ bool bToZmax = false ; + bool bToMyHomeZ = false ; DBLVECTOR vAxVal2 = vAxVal ; vAxVal2[2] = dHomeZ ; DBLVECTOR vAxIni2 = vAxIni ; vAxIni2[2] = dHomeZ ; if ( ! TestCollisionAvoid( vAxVal2, vAxIni2)) { @@ -1901,8 +1902,10 @@ Operation::AdjustStartEndMovements( bool bVerifyPreviousLink) double dMyHomeZ = dHomeZ + dExtraZ ; vAxVal2[2] = dMyHomeZ ; vAxIni2[2] = dMyHomeZ ; - if ( TestCollisionAvoid( vAxVal2, vAxIni2)) + if ( TestCollisionAvoid( vAxVal2, vAxIni2)) { dHomeZ = dMyHomeZ ; + bToMyHomeZ = true ; + } else bToZmax = true ; } @@ -1947,7 +1950,7 @@ Operation::AdjustStartEndMovements( bool bVerifyPreviousLink) bMaxZ = true ; } // altrimenti, verifico se la testa interferisce con i pezzi o i bloccaggi sulla tavola - else if ( ! TestCollisionAvoid( vAxVal, vAxIni)) { + else if ( bToMyHomeZ || ! TestCollisionAvoid( vAxVal, vAxIni)) { // riprovo con risalita parziale bool bPartRise = false ; double dSafeZ = dHomeZ ; @@ -1977,7 +1980,7 @@ Operation::AdjustStartEndMovements( bool bVerifyPreviousLink) } // se necessario, riprovo appena prima di Zmax if ( ! bPartRise) { - double dOffsZ = 5 * ( bZHomeDown ? 1 : -1) ; + double dOffsZ = 1 * ( bZHomeDown ? 1 : -1) ; vAxVal2[2] = dHomeZ + dOffsZ ; vAxIni2[2] = dHomeZ + dOffsZ ; if ( TestCollisionAvoid( vAxVal2, vAxIni2)) { diff --git a/Pocketing.cpp b/Pocketing.cpp index 5f12d37..40c6c0a 100644 --- a/Pocketing.cpp +++ b/Pocketing.cpp @@ -3720,7 +3720,7 @@ Pocketing::CalcSpiral( const ICurveComposite* pCompo, int nReg, bool bSplitArcs, Point3d pt ; Vector3d vtB1, vtL1, vtB2 ; - if ( pCrvPocket->IsATrapezoid( 100 * EPS_SMALL, pt, vtB1, vtL1, vtB2)) { + if ( false && pCrvPocket->IsATrapezoid( 100 * EPS_SMALL, pt, vtB1, vtL1, vtB2)) { Vector3d vtDir( vtB1), vtOtherDir( vtL1) ; // se parallelogramma scelgo come base i lati lunghi Vector3d vtL2( -vtB1 + vtL1 + vtB2) ; diff --git a/SawFinishing.cpp b/SawFinishing.cpp index 67c0a58..0f8ef8d 100644 --- a/SawFinishing.cpp +++ b/SawFinishing.cpp @@ -23,8 +23,8 @@ #include "/EgtDev/Include/EGkCurveLine.h" #include "/EgtDev/Include/EGkCurveArc.h" #include "/EgtDev/Include/EGkCurveComposite.h" -#include "/EgtDev/Include/EgkOffsetCurve.h" -#include "/EgtDev/Include/EgkOffsetCurveOnX.h" +#include "/EgtDev/Include/EGkOffsetCurve.h" +#include "/EgtDev/Include/EGkOffsetCurveOnX.h" #include "/EgtDev/Include/EGkSfrCreate.h" #include "/EgtDev/Include/EGkIntervals.h" #include "/EgtDev/Include/EGkUserObjFactory.h" diff --git a/SawRoughing.cpp b/SawRoughing.cpp index 1b6aa2e..13db5e6 100644 --- a/SawRoughing.cpp +++ b/SawRoughing.cpp @@ -23,8 +23,8 @@ #include "/EgtDev/Include/EGkCurveLine.h" #include "/EgtDev/Include/EGkCurveArc.h" #include "/EgtDev/Include/EGkCurveComposite.h" -#include "/EgtDev/Include/EgkOffsetCurve.h" -#include "/EgtDev/Include/EgkOffsetCurveOnX.h" +#include "/EgtDev/Include/EGkOffsetCurve.h" +#include "/EgtDev/Include/EGkOffsetCurveOnX.h" #include "/EgtDev/Include/EGkSfrCreate.h" #include "/EgtDev/Include/EGkIntervals.h" #include "/EgtDev/Include/EGkUserObjFactory.h" diff --git a/SurfFinishing.cpp b/SurfFinishing.cpp index 58c287f..720f875 100644 --- a/SurfFinishing.cpp +++ b/SurfFinishing.cpp @@ -24,8 +24,8 @@ #include "/EgtDev/Include/EGkCurveArc.h" #include "/EgtDev/Include/EGkCurveComposite.h" #include "/EgtDev/Include/EGkChainCurves.h" -#include "/EgtDev/Include/EgkOffsetCurve.h" -#include "/EgtDev/Include/EgkOffsetCurveOnX.h" +#include "/EgtDev/Include/EGkOffsetCurve.h" +#include "/EgtDev/Include/EGkOffsetCurveOnX.h" #include "/EgtDev/Include/EGkSfrCreate.h" #include "/EgtDev/Include/EGkSurfLocal.h" #include "/EgtDev/Include/EGkCAvToolSurfTm.h"