EgtMachKernel :

- modifiche per rinviare caricamento macchina e DB utensili e lavorazioni a quando servono.
This commit is contained in:
Dario Sassi
2016-09-15 08:21:11 +00:00
parent a2f39ab432
commit ea319d1fa9
6 changed files with 78 additions and 46 deletions
+6 -4
View File
@@ -259,9 +259,10 @@ MachMgr::TdbSave( void) const
bool
MachMgr::TdbGetToolDir( string& sToolDir) const
{
if ( GetCurrMachine() == nullptr)
string sMachineName ;
if ( ! GetCurrMachineName( sMachineName))
return false ;
sToolDir = m_sMachinesDir + "\\" + GetCurrMachine()->GetMachineName() + "\\" + TOOLS_DIR ;
sToolDir = m_sMachinesDir + "\\" + sMachineName + "\\" + TOOLS_DIR ;
return true ;
}
@@ -269,8 +270,9 @@ MachMgr::TdbGetToolDir( string& sToolDir) const
bool
MachMgr::TdbGetToolHolderDir( string& sToolDir) const
{
if ( GetCurrMachine() == nullptr)
string sMachineName ;
if ( ! GetCurrMachineName( sMachineName))
return false ;
sToolDir = m_sMachinesDir + "\\" + GetCurrMachine()->GetMachineName() + "\\" + TOOLHOLDERS_DIR ;
sToolDir = m_sMachinesDir + "\\" + sMachineName + "\\" + TOOLHOLDERS_DIR ;
return true ;
}