diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 50909e0..a63ecc2 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgr.h b/MachMgr.h index 1273bb5..4c72dd1 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -345,13 +345,15 @@ class MachMgr : public IMachMgr // Machine Calc bool SetCalcTable( const std::string& sTable) override ; bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) override ; - bool GetAllCurrAxesNames( STRVECTOR& vAxName) const override ; + bool SetCalcSolCh( int nScc, bool bExact) override ; bool SetRotAxisBlock( const std::string& sAxis, double dVal) override ; - bool GetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) const override ; bool GetCalcTable( std::string& sTable) const override ; bool GetCalcTool( std::string& sTool) const override ; bool GetCalcHead( std::string& sHead) const override ; bool GetCalcExit( int& nExit) const override ; + bool GetCalcSolCh( int& nScc, bool& bExact) const override ; + bool GetAllCurrAxesNames( STRVECTOR& vAxName) const override ; + bool GetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) const override ; bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) const override ; bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, @@ -478,7 +480,6 @@ class MachMgr : public IMachMgr double GetCalcRot1W( void) const ; bool GetCalcMaxDeltaR2OnFirst( void) const ; bool GetCalcPartDirFromAngles( const Vector3d& vtPart, const DBLVECTOR& vAng, Vector3d& vtDir) const ; - bool SetCalcSolCh( int nScc, bool bExact) ; bool VerifyAngleOutstroke( int nInd, double dAng) const ; bool VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, bool bClear, int& nStat) const ; bool ExistProtectedAreas( void) const ; diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index 4346a07..b2d1fdf 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -555,6 +555,17 @@ MachMgr::SetCalcSolCh( int nScc, bool bExact) return pMch->SetSolCh( nScc, bExact) ; } +//---------------------------------------------------------------------------- +bool +MachMgr::GetCalcSolCh( int& nScc, bool& bExact) const +{ + Machine* pMch = GetCurrMachine() ; + if ( pMch == nullptr) + return false ; + // recupero il criterio di scelta della soluzione + return pMch->GetSolCh( nScc, bExact) ; +} + //---------------------------------------------------------------------------- bool MachMgr::GetCalcTable( string& sTable) const diff --git a/Machine.h b/Machine.h index 90a0b74..5fbc446 100644 --- a/Machine.h +++ b/Machine.h @@ -149,6 +149,8 @@ class Machine bool IsKinematicRotAxisBlocked( int nInd) const ; bool GetKinematicRotAxisBlocked( int nInd, std::string& sName, double& dVal) const ; bool SetSolCh( int nScc, bool bExact) ; + bool GetSolCh( int& nScc, bool& bExact) + { nScc = m_nCalcSolCh ; bExact = m_bSolChExact ; return true ; } int GetCurrLinAxes( void) const ; int GetCurrRotAxes( void) const ; bool GetCurrAxisName( int nInd, std::string& sAxName) const ;