From c550fb18487e56810be1b7b5729ae600bfeda07d Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Thu, 4 Sep 2025 12:43:16 +0200 Subject: [PATCH] EgtGeomKernel : - piccoli aggiustamenti. --- VolZmap.h | 8 ++++---- VolZmapVolume.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VolZmap.h b/VolZmap.h index 3a36b3f..a538bf5 100644 --- a/VolZmap.h +++ b/VolZmap.h @@ -306,10 +306,10 @@ class VolZmap : public IVolZmap, public IGeoObjRW bool GenTool_Drilling( int nGrid, const Point3d& ptS, const Point3d& ptE, const Vector3d& vtToolDir) ; bool GenTool_Milling( int nGrid, const Point3d& ptS, const Point3d& ptE, const Vector3d& vtToolDir) ; // lavorazioni a 5 assi - bool GenTool_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, int n5AxisType = VolZmap::Move5Axis::ACROSS) ; - bool Cyl_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, double dHeightCorr = 0, int n5AxisType = VolZmap::Move5Axis::ACROSS) ; - bool CylBall_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, int n5AxisType = VolZmap::Move5Axis::ACROSS) ; - bool Conus_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, int n5AxisType = VolZmap::Move5Axis::ACROSS) ; + bool GenTool_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, int n5AxisType = ACROSS) ; + bool Cyl_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, double dHeightCorr = 0, int n5AxisType = ACROSS) ; + bool CylBall_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, int n5AxisType = ACROSS) ; + bool Conus_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& ptE, const VCT3DVECTOR& vtLs, const VCT3DVECTOR& vtLe, int nToolNum, int n5AxisType = ACROSS) ; // COMPONENTI // Asse di simmetria diretto come l'asse Z diff --git a/VolZmapVolume.cpp b/VolZmapVolume.cpp index b4b9253..1f36956 100644 --- a/VolZmapVolume.cpp +++ b/VolZmapVolume.cpp @@ -2217,7 +2217,7 @@ VolZmap::Comp_5AxisMilling( int nGrid, const PNTVECTOR& ptS, const PNTVECTOR& pt if ( ! bForward && vStartEnds.size() > 1) { // salvo la prima intersezione dubbia e comincio a scorrere al contrario per trovare l'ultima e capire se è dello stesso tipo della prima - if( ! bAllSameType || true) { // DEBUG !!!!!!!!!!! + if( ! bAllSameType || false) { // DEBUG se a true !!!!!!!!!!! bUseOnlyExtremes = false ; // calcolo le intersezioni anche sugli altri due spilloni passanti per un punto a metà tra due dei vari intervalli // ho almeno due intervalli; prendo un punto a metà tra la fine del primo e l'inzio del secondo