EgtMachKernel 1.8c4 :

- aggiunta GetAllTablesNames.
This commit is contained in:
Dario Sassi
2017-03-09 10:53:00 +00:00
parent 6fce5b366d
commit bb9f2bd2a3
7 changed files with 60 additions and 0 deletions
BIN
View File
Binary file not shown.
+1
View File
@@ -232,6 +232,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<ClCompile Include="MachineLua.cpp" />
<ClCompile Include="MachineHeads.cpp" />
<ClCompile Include="MachineLuaCL.cpp" />
<ClCompile Include="MachineTables.cpp" />
<ClCompile Include="MachineWriter.cpp" />
<ClCompile Include="Machining.cpp" />
<ClCompile Include="MachiningsMgr.cpp" />
+3
View File
@@ -201,6 +201,9 @@
<ClCompile Include="Chiseling.cpp">
<Filter>Source Files\Operations</Filter>
</ClCompile>
<ClCompile Include="MachineTables.cpp">
<Filter>Source Files\Machine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="DllMain.h">
+1
View File
@@ -296,6 +296,7 @@ class MachMgr : public IMachMgr
bool ResetAxisPos( const std::string& sAxis) override ;
bool ResetAllAxesPos( void) override ;
bool GetAllHeadsNames( STRVECTOR& vNames) const override ;
bool GetAllTablesNames( STRVECTOR& vNames) const override ;
bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) override ;
bool GetLoadedTool( const std::string& sHead, int nExit, std::string& sTool) const override ;
bool UnloadTool( const std::string& sHead, int nExit) override ;
+14
View File
@@ -428,6 +428,20 @@ MachMgr::GetAllHeadsNames( STRVECTOR& vNames) const
return pMch->GetAllHeadsNames( vNames) ;
}
//----------------------------------------------------------------------------
bool
MachMgr::GetAllTablesNames( STRVECTOR& vNames) const
{
// pulisco il vettore
vNames.clear() ;
// recupero la macchina corrente
Machine* pMch = GetCurrMachine() ;
if ( pMch == nullptr)
return false ;
// richiedo elenco tavole alla macchina
return pMch->GetAllTablesNames( vNames) ;
}
//----------------------------------------------------------------------------
int
MachMgr::GetCurrLinAxes( void) const
+1
View File
@@ -53,6 +53,7 @@ class Machine
{ int nId = GetGroup( sHead) ;
return ( IsHeadGroup( nId) ? nId : GDB_ID_NULL) ; }
bool GetAllHeadsNames( STRVECTOR& vNames) const ;
bool GetAllTablesNames( STRVECTOR& vNames) const ;
int GetHeadExitCount( const std::string& sHead) const ;
bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) ;
bool GetLoadedTool( const std::string& sHead, int nExit, std::string& sTool) const ;
+40
View File
@@ -0,0 +1,40 @@
//----------------------------------------------------------------------------
// EgalTech 2017-2017
//----------------------------------------------------------------------------
// File : MachineTables.cpp Data : 09.03.15 Versione : 1.8c4
// Contenuto : Implementazione gestione macchina : funzioni per tavole.
//
//
//
// Modifiche : 09.03.17 DS Creazione modulo.
//
//
//----------------------------------------------------------------------------
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "MachMgr.h"
#include "DllMain.h"
#include "Head.h"
#include "Exit.h"
#include "/EgtDev/Include/EMkToolConst.h"
#include "/EgtDev/Include/EGnStringUtils.h"
#include "/EgtDev/Include/EGnFileUtils.h"
using namespace std ;
//----------------------------------------------------------------------------
bool
Machine::GetAllTablesNames( STRVECTOR& vNames) const
{
// reset lista nomi
vNames.clear() ;
// ricerca delle tavole
for each ( const auto& snGro in m_mapGroups) {
if ( IsTableGroup( snGro.second))
vNames.push_back( snGro.first) ;
}
// ordino alfabeticamente
std::sort( vNames.begin(), vNames.end()) ;
return true ;
}