diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 866d3fc..b967a85 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachConst.h b/MachConst.h index acfeb20..90c328f 100644 --- a/MachConst.h +++ b/MachConst.h @@ -45,6 +45,8 @@ const std::string FIXTURES_DIR = "Fixtures" ; //---------------------------------------------------------------------------- // Nome sottodirettorio degli utensili const std::string TOOLS_DIR = "Tools" ; +// Nome sottodirettorio dei porta utensili +const std::string TOOLHOLDERS_DIR = "THolders" ; // Nome file degli utensili const std::string TOOLS_FILE = "Tools.data" ; diff --git a/MachMgr.h b/MachMgr.h index cd0a319..4e0fe60 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -115,6 +115,8 @@ class MachMgr : public IMachMgr virtual bool TdbGetCurrToolParam( int nType, double& dVal) const ; virtual bool TdbGetCurrToolParam( int nType, std::string& sVal) const ; virtual bool TdbSave( void) const ; + virtual bool TdbGetToolDir( std::string& sToolDir) const ; + virtual bool TdbGetToolHolderDir( std::string& sTHolderDir) const ; // Machinings DataBase // ... // Operations : general diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index f9d8acc..a7a002a 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -47,7 +47,7 @@ MachMgr::LoadMachine( const string& sMachineName) string sToolsFile = m_sMachinesDir + "\\" + sMachineName + "\\" + TOOLS_DIR + "\\" + TOOLS_FILE ; if ( IsNull( pTsMgr) || ! pTsMgr->Load( sToolsFile)) return false ; - // creo e carico il DB lavorazioni + // creo e carico il DB lavorazioni PtrOwner pMsMgr( new( nothrow) MachiningsMgr) ; string sMachsFile = m_sMachinesDir + "\\" + sMachineName + "\\" + MACHININGS_DIR + "\\" + MACHININGS_FILE ; if ( IsNull( pMsMgr) || ! pMsMgr->Init( sMachsFile) || ! pMsMgr->Load()) diff --git a/MachMgrTools.cpp b/MachMgrTools.cpp index 8383293..5160d6c 100644 --- a/MachMgrTools.cpp +++ b/MachMgrTools.cpp @@ -209,3 +209,23 @@ MachMgr::TdbSave( void) const // salvo il db utensili return pTsMgr->Save() ; } + +//---------------------------------------------------------------------------- +bool +MachMgr::TdbGetToolDir( string& sToolDir) const +{ + if ( GetCurrMachine() == nullptr) + return false ; + sToolDir = m_sMachinesDir + "\\" + GetCurrMachine()->GetMachineName() + "\\" + TOOLS_DIR ; + return true ; +} + +//---------------------------------------------------------------------------- +bool +MachMgr::TdbGetToolHolderDir( string& sToolDir) const +{ + if ( GetCurrMachine() == nullptr) + return false ; + sToolDir = m_sMachinesDir + "\\" + GetCurrMachine()->GetMachineName() + "\\" + TOOLHOLDERS_DIR ; + return true ; +}