From 3016bcf90b1d34a53271829da18c0449065e94a7 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 11 Sep 2018 18:35:54 +0000 Subject: [PATCH] EgtMachKernel 1.9i1 : - aggiunta in interfaccia funzione GetAxisInvert. --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes MachMgr.h | 1 + MachMgrMachines.cpp | 9 +++++++++ MachineAxes.cpp | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index a047d979c1f969c747348a7555ab347f56516705..d480eedf7ce6fa32bd66765ad1fe5c648173b699 100644 GIT binary patch delta 121 zcmewt{V#gMH#SyF1|0^&&A-{KnVB;g3@1O7)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL R=2g-z%(yjz6ex#q0RVOLCb$3q delta 121 zcmewt{V#gMH#Sxa1|0_D&A-{KnVB;fj3+;o)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL R=2g-z%(yjz6ex#q0RVU1Ccppy diff --git a/MachMgr.h b/MachMgr.h index 66f4195..b799272 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -309,6 +309,7 @@ class MachMgr : public IMachMgr int GetHeadExitCount( const std::string& sHead) const override ; bool GetAxisToken( const std::string& sAxis, std::string& sToken) const override ; bool GetAxisType( const std::string& sAxis, bool& bLinear) const override ; + bool GetAxisInvert( const std::string& sAxis, bool& bInvert) const override ; bool SetAxisPos( const std::string& sAxis, double dVal) override ; bool GetAxisPos( const std::string& sAxis, double& dVal) const override ; bool GetAxisHomePos( const std::string& sAxis, double& dHomeVal) const override ; diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index a990f39..ce1b3fd 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -270,6 +270,15 @@ MachMgr::GetAxisType( const string& sAxis, bool& bLinear) const return ( ( pMch != nullptr) ? pMch->GetAxisType( sAxis, bLinear) : false) ; } +//---------------------------------------------------------------------------- +bool +MachMgr::GetAxisInvert( const string& sAxis, bool& bInvert) const +{ + Machine* pMch = GetCurrMachine() ; + // restituisco il flag di inversione asse in visualizzazione + return ( ( pMch != nullptr) ? pMch->GetAxisInvert( sAxis, bInvert) : false) ; +} + //---------------------------------------------------------------------------- bool MachMgr::SetAxisPos( const string& sAxis, double dVal) diff --git a/MachineAxes.cpp b/MachineAxes.cpp index 084ac96..187637d 100644 --- a/MachineAxes.cpp +++ b/MachineAxes.cpp @@ -49,7 +49,7 @@ Machine::GetAxisInvert( const string& sAxis, bool& bInvert) const Axis* pAx = GetAxis( GetGroup( sAxis)) ; if ( pAx == nullptr) return false ; - // recupero il flag di inversione dell'asse + // recupero il flag di inversione dell'asse in visualizzazione bInvert = pAx->GetInvert() ; return true ; }