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

EgtMachKernel :

Browse Source 
- GetCalcToolDirFromAngles e GetCalcAuxDirFromAngles ora usano vettore di angoli.
This commit is contained in:
Dario Sassi
2017-11-13 09:13:14 +00:00
parent 74a5047b6b
commit a053c1e579
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachMgr.h
+2 -2
View File
@@ -290,8 +290,8 @@ class MachMgr : public IMachMgr
bool bOverall, bool bBottom, Point3d& ptTip) const override ;
bool GetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECTOR& vAng,
bool bOverall, bool bBottom, Point3d& ptTip) const ;
bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const override ;
bool GetCalcAuxDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const override ;
bool GetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const override ;
bool GetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const override ;
bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const override ;
bool LimitAngleToStroke( int nInd, double& dAng) const override ;
bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) const override ;
MachMgrMachines.cpp
+2 -4
View File
@@ -578,23 +578,21 @@ MachMgr::GetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECT
//----------------------------------------------------------------------------
bool
MachMgr::GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const
MachMgr::GetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const
{
Machine* pMch = GetCurrMachine() ;
if ( pMch == nullptr)
return false ;
DBLVECTOR vAng( 2) ; vAng[0] = dAngA ; vAng[1] = dAngB ;
return pMch->GetToolDirFromAngles( vAng, vtDir) ;
}
//----------------------------------------------------------------------------
bool
MachMgr::GetCalcAuxDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const
MachMgr::GetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const
{
Machine* pMch = GetCurrMachine() ;
if ( pMch == nullptr)
return false ;
DBLVECTOR vAng( 2) ; vAng[0] = dAngA ; vAng[1] = dAngB ;
return pMch->GetAuxDirFromAngles( vAng, vtDir) ;
}