Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel 1.9h1 :

Browse Source 
- piccole correzioni per std::
- controllo versione da chiave portato a 19.
This commit is contained in:
Dario Sassi
2018-08-08 11:08:31 +00:00
parent db12d64998
commit def78ff90a
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Drilling.h
+2 -2
View File
@@ -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) ;
EgtMachKernel.rc
BIN
View File
Binary file not shown.
MachMgr.h
+3 -3
View File
@@ -49,13 +49,13 @@ struct AxisBlock {
//----------------------------------------------------------------------------
struct MachineData {
string sName ;
std::string sName ;
Machine* pMachine ;
ToolsMgr* pTsMgr ;
MachiningsMgr* pMsMgr ;
MachineData( void)
: pMachine( nullptr), pTsMgr( nullptr), pMsMgr( nullptr) {}
MachineData( const string& sN, Machine* pM, ToolsMgr* pTM, MachiningsMgr* pMM)
MachineData( const std::string& sN, Machine* pM, ToolsMgr* pTM, MachiningsMgr* pMM)
{ sName = sN ; pMachine = pM ; pTsMgr = pTM ; pMsMgr = pMM ; }
} ;
@@ -364,7 +364,7 @@ class MachMgr : public IMachMgr
// Tables and Fixtures
bool VerifyFixtureInGroup( int nFxtId, bool bLinkedAllowed = true) const ;
bool GetFixturePhases( int nFxtId, INTVECTOR& vPhase) const ;
int GetUnusedFixture( const string& sName, int nPhase) ;
int GetUnusedFixture( const std::string& sName, int nPhase) ;
// Setup
SetupMgr& GetCurrSetupMgr( void) const
{ return const_cast<SetupMgr&>( m_stuMgr) ; }
Pocketing.h
+3 -3
View File
@@ -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 ; }
Sawing.h
+8 -8
View File
@@ -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) ;