From d474f151b0f87e2443f68c76a3f9ddc1226ee832 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 13 Apr 2017 18:24:14 +0000
Subject: [PATCH] EgtMachKernel 1.8d4 : - aggiunta funzione GetAxisType.

---
 EgtMachKernel.rc    | Bin 11774 -> 11774 bytes
 MachMgr.h           |   1 +
 MachMgrMachines.cpp |   9 +++++++++
 3 files changed, 10 insertions(+)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 43ff634e2551b09574ec81a8c53aecc63e8ddd87..6a0e82b09540ad7bd247bb95a721ee80b2af6c85 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&P#&A-`fnHfzcKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUI`BbWdH

delta 97
zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUD-Bai?9

diff --git a/MachMgr.h b/MachMgr.h
index 51f6045..4414281 100644
--- a/MachMgr.h
+++ b/MachMgr.h
@@ -293,6 +293,7 @@ class MachMgr : public IMachMgr
       int  GetHeadId( const std::string& sHead) const override ;
       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 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 8da6e54..dd53656 100644
--- a/MachMgrMachines.cpp
+++ b/MachMgrMachines.cpp
@@ -242,6 +242,15 @@ MachMgr::GetAxisToken( const string& sAxis, string& sToken) const
    return ( ( pMch != nullptr) ? pMch->GetAxisToken( sAxis, sToken) : false) ;
 }
 
+//----------------------------------------------------------------------------
+bool
+MachMgr::GetAxisType( const string& sAxis, bool& bLinear) const
+{
+   Machine* pMch = GetCurrMachine() ;
+  // restituisco il tipo dell'asse indicato nella macchina corrente
+   return ( ( pMch != nullptr) ? pMch->GetAxisType( sAxis, bLinear) : false) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 MachMgr::SetAxisPos( const string& sAxis, double dVal)