diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 7dea14d..74a4a46 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgr.h b/MachMgr.h index a5801ed..eef5b99 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -357,6 +357,8 @@ class MachMgr : public IMachMgr int& nStat, double& dX, double& dY, double& dZ) const override ; bool GetCalcPositions( const Point3d& ptP, const DBLVECTOR& vAng, int& nStat, double& dX, double& dY, double& dZ) const override ; + bool GetRobotAngles( const Point3d& ptP, const Vector3d& vtDirT, const Vector3d& vtDirA, + DBLVECTOR& vAng1, DBLVECTOR& vAng2) const override ; bool GetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bOverall, bool bBottom, Point3d& ptTip) const override ; bool GetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECTOR& vAng, diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index 65f1319..e079bcb 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -796,6 +796,15 @@ MachMgr::GetCalcPositions( const Point3d& ptP, const DBLVECTOR& vAng, return ( ( pMch != nullptr) ? pMch->GetPositions( ptP, vAng, nStat, dX, dY, dZ) : false) ; } +//---------------------------------------------------------------------------- +bool +MachMgr::GetRobotAngles( const Point3d& ptP, const Vector3d& vtDirT, const Vector3d& vtDirA, + DBLVECTOR& vAng1, DBLVECTOR& vAng2) const +{ + Machine* pMch = GetCurrMachine() ; + return ( ( pMch != nullptr) ? pMch->GetRobotAngles( ptP, vtDirT, vtDirA, vAng1, vAng2) : false) ; +} + //---------------------------------------------------------------------------- bool MachMgr::GetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB,