From def78ff90abe0207f2c8b5fa17c861c3c98ab360 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 8 Aug 2018 11:08:31 +0000 Subject: [PATCH] EgtMachKernel 1.9h1 : - piccole correzioni per std:: - controllo versione da chiave portato a 19. --- Drilling.h | 4 ++-- EgtMachKernel.rc | Bin 11774 -> 11774 bytes MachMgr.h | 6 +++--- Pocketing.h | 6 +++--- Sawing.h | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Drilling.h b/Drilling.h index 8663cf2..f72eba1 100644 --- a/Drilling.h +++ b/Drilling.h @@ -71,8 +71,8 @@ class Drilling : public Machining bool Chain( int nGrpDestId) ; ICurve* GetCurve( SelData Id) ; bool ProcessPath( int nPathId, int nPvId, int nClId) ; - bool GenerateHolePv( int nInd, const SelData& nCircId, const string& sPName, int nPvId) ; - bool GenerateHoleCl( int nInd, const SelData& nCircId, const string& sPName, int nClId) ; + bool GenerateHolePv( int nInd, const SelData& nCircId, const std::string& sPName, int nPvId) ; + bool GenerateHoleCl( int nInd, const SelData& nCircId, const std::string& sPName, int nClId) ; bool GenerateHoleRegionPv( int nFirstId, int nCount, int nPvId) ; bool VerifyDiameter( double dHdiam, double dTdiam, double ddiamTol) ; bool VerifyHoleFromBottom( const Hole& hole, SelData Id) ; diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 147a01bfe747518ceb98515ed423f5c40201ebbe..4919a680c0b88dd28b914a3a3221199ddb76a5c9 100644 GIT binary patch delta 105 zcmewt{V#gMH#SC#&F|%|GEF|inZ=yJU^w}qr0(W4t{xV!xHB_COb9B5q1JpF delta 105 zcmewt{V#gMH#SD|&F|%|GEF|inZ=yWU^w}qr0(W4t{xV!xHB_COb9B5q1J( m_stuMgr) ; } diff --git a/Pocketing.h b/Pocketing.h index b024588..4cdc7d3 100644 --- a/Pocketing.h +++ b/Pocketing.h @@ -116,15 +116,15 @@ class Pocketing : public Machining double GetOffsR( void) const { return ( IsUnknownValue( m_Params.m_dOffsR) ? m_TParams.m_dOffsR : m_Params.m_dOffsR) ; } double GetSideStep( void) const - { return Clamp( m_Params.m_dSideStep, min( 0.1 * m_TParams.m_dDiam, 1.0), m_TParams.m_dDiam) ; } + { return Clamp( m_Params.m_dSideStep, std::min( 0.1 * m_TParams.m_dDiam, 1.0), m_TParams.m_dDiam) ; } int GetLeadInType( void) const - { if ( m_Params.m_dLiTang < min( 0.1 * m_TParams.m_dDiam, 1.0)) + { if ( m_Params.m_dLiTang < std::min( 0.1 * m_TParams.m_dDiam, 1.0)) return POCKET_LI_NONE ; if ( m_Params.m_nLeadInType != POCKET_LI_GLIDE && m_Params.m_dLiElev < 10 * EPS_SMALL) return POCKET_LI_NONE ; return m_Params.m_nLeadInType ; } int GetLeadOutType( void) const - { if ( m_Params.m_dLoTang < min( 0.1 * m_TParams.m_dDiam, 1.0)) + { if ( m_Params.m_dLoTang < std::min( 0.1 * m_TParams.m_dDiam, 1.0)) return POCKET_LO_NONE ; return m_Params.m_nLeadOutType ; } diff --git a/Sawing.h b/Sawing.h index e8dc308..8344946 100644 --- a/Sawing.h +++ b/Sawing.h @@ -81,14 +81,14 @@ class Sawing : public Machining double dDepth, double dExtraCut, double dRbHeight, bool bIsFirst, bool bIsLast, const std::string& sName, int nPvId, int nClId) ; bool GenerateLinePv( const ICurveLine* pLine, const Vector3d& vtTool, const Vector3d& vtCorr, - double dElev, double dExtraCut, double dRbHeight, const string& sName, int nPvId) ; + double dElev, double dExtraCut, double dRbHeight, const std::string& sName, int nPvId) ; bool GenerateLineCl( const ICurveLine* pLine, const Vector3d& vtTool, const Vector3d& vtCorr, - double dElev, double dExtraCut, const string& sName, double dDeltaLiExt, double dDeltaLoExt, const FseVar& FvVar, int nClId) ; + double dElev, double dExtraCut, const std::string& sName, double dDeltaLiExt, double dDeltaLoExt, const FseVar& FvVar, int nClId) ; bool ProcessExtCurve( const ICurve* pCrvP, const ICurveComposite* pCrvC, const ICurve* pCrvN, double dDepth, double dExtraCut, double dRbHeight, bool bIsFirst, bool bIsLast, - const string& sName, int nPvId, int nClId) ; + const std::string& sName, int nPvId, int nClId) ; bool GenerateExtCurvePv( const ICurveComposite* pCrv, - double dElev, double dExtraCut, double dRbHeight, const string& sName, int nPvId) ; + double dElev, double dExtraCut, double dRbHeight, const std::string& sName, int nPvId) ; ICurveComposite* GenerateExtArcPvTrueCut( const ICurveArc* pArc, double dIntRad, double dExtRad, double dSafety) ; ICurveComposite* GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dExtRad, @@ -96,14 +96,14 @@ class Sawing : public Machining ICurveComposite* GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double dExtRad, double dDeltaT, double dSafety) ; bool GenerateExtCurveCl( const ICurveComposite* pCrv, - double dElev, double dExtraCut, const string& sName, int nClId) ; + double dElev, double dExtraCut, const std::string& sName, int nClId) ; bool ProcessIntArc( const ICurve* pCrvP, const ICurveArc* pArcC, const ICurve* pCrvN, double dDepth, double dExtraCut, double dRbHeight, bool bIsFirst, bool bIsLast, - const string& sName, int nPvId, int nClId) ; + const std::string& sName, int nPvId, int nClId) ; bool GenerateIntArcPv( const ICurveArc* pArc, const Vector3d& vtStaTool, const Vector3d& vtMidTool, const Vector3d& vtEndTool, const Vector3d& vtStaCorr, const Vector3d& vtMidCorr, const Vector3d& vtEndCorr, - double dElev, double dExtraCut, double dRbHeight, double dLenCoeff, const string& sName, int nPvId) ; + double dElev, double dExtraCut, double dRbHeight, double dLenCoeff, const std::string& sName, int nPvId) ; ICurveComposite* GenerateIntArcPvTrueCut( const ICurveArc* pArc, double dDeltaInt, double dDeltaExt, double dSafety) ; ICurveComposite* GenerateIntArcPvPreCut( const ICurveArc* pArc, double dDeltaInt, double dDeltaExt, @@ -113,7 +113,7 @@ class Sawing : public Machining bool GenerateIntArcCl( const ICurveArc* pArc, const Vector3d& vtStaTool, const Vector3d& vtMidTool, const Vector3d& vtEndTool, const Vector3d& vtStaCorr, const Vector3d& vtMidCorr, const Vector3d& vtEndCorr, - double dElev, double dExtraCut, const string& sName, int nClId) ; + double dElev, double dExtraCut, const std::string& sName, int nClId) ; bool CalculateToolAndCorrVersors( const Vector3d& vtTang, int nHeadSide, int nWorkSide, double dSideAng, Vector3d& vtTool, Vector3d& vtCorr) ; bool AdjustForSide( ICurve* pCurve) ;