Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel 1.6f1 :

Browse Source 
- aggiunta gestione DB utensili
- aggiunta gestione DB lavorazioni.
This commit is contained in:
Dario Sassi
2015-06-06 17:50:38 +00:00
parent b373807375
commit 64ed8babd1
24 changed files with 2124 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachMgrMachines.cpp
+45 -35
View File
@@ -15,6 +15,9 @@
#include "stdafx.h"
#include "MachMgr.h"
#include "MachConst.h"
#include "ToolsMgr.h"
#include "MachiningsMgr.h"
#include "SawingData.h"
#include "/EgtDev/Include/EGkGdbIterator.h"
#include "/EgtDev/Include/EgnStringUtils.h"
#include "/EgtDev/Include/EgnFileUtils.h"
@@ -35,16 +38,23 @@ MachMgr::LoadMachine( const string& sMachineName)
// creo gruppo ausiliario di base per le macchine
if ( ! CreateMachAux())
return false ;
// creo una nuova macchina
// creo e carico la macchina
PtrOwner<Machine> pMch( new( nothrow) Machine) ;
if ( IsNull( pMch))
if ( IsNull( pMch) || ! pMch->Init( m_sMachinesDir, sMachineName, this))
return false ;
// tento di caricarla
if ( pMch->Init( m_sMachinesDir, sMachineName, this)) {
m_vMachines.push_back( Release( pMch)) ;
return true ;
}
return false ;
// creo e carico il DB utensili
PtrOwner<ToolsMgr> pTsMgr( new( nothrow) ToolsMgr) ;
string sToolsFile = m_sMachinesDir + "\\" + sMachineName + "\\" + TOOLS_DIR + "\\" + TOOLS_FILE ;
if ( IsNull( pTsMgr) || ! pTsMgr->Init( sToolsFile) || ! pTsMgr->Load())
return false ;
// creo e carico il DB lavorazioni
PtrOwner<MachiningsMgr> pMsMgr( new( nothrow) MachiningsMgr) ;
string sMachsFile = m_sMachinesDir + "\\" + sMachineName + "\\" + MACHININGS_DIR + "\\" + MACHININGS_FILE ;
if ( IsNull( pMsMgr) || ! pMsMgr->Init( sMachsFile) || ! pMsMgr->Load())
return false ;
// salvo nel vettore
m_vMachines.emplace_back( Release( pMch), Release( pTsMgr), Release( pMsMgr)) ;
return true ;
}
//----------------------------------------------------------------------------
@@ -53,8 +63,8 @@ MachMgr::GetMachine( const string& sMachineName) const
{
// ciclo sulle macchine
for ( size_t i = 0 ; i < m_vMachines.size() ; ++ i) {
if ( m_vMachines[i] != nullptr &&
EqualNoCase( m_vMachines[i]->GetMachineName(), sMachineName))
if ( m_vMachines[i].pMachine != nullptr &&
EqualNoCase( m_vMachines[i].pMachine->GetMachineName(), sMachineName))
return int( i) ;
}
return - 1 ;
@@ -65,9 +75,9 @@ int
MachMgr::GetCurrMGeoId( void) const
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return GDB_ID_NULL ;
return m_vMachines[m_nCurrMch]->GetMGeoId() ;
return m_vMachines[m_nCurrMch].pMachine->GetMGeoId() ;
}
//----------------------------------------------------------------------------
@@ -76,7 +86,7 @@ MachMgr::GetCurrMachine( void) const
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()))
return nullptr ;
return m_vMachines[m_nCurrMch] ;
return m_vMachines[m_nCurrMch].pMachine ;
}
//----------------------------------------------------------------------------
@@ -84,9 +94,9 @@ bool
MachMgr::SetAxisPos( const string& sAxis, double dVal)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return GDB_ID_NULL ;
return m_vMachines[m_nCurrMch]->SetAxisPos( sAxis, dVal) ;
return m_vMachines[m_nCurrMch].pMachine->SetAxisPos( sAxis, dVal) ;
}
//----------------------------------------------------------------------------
@@ -94,9 +104,9 @@ bool
MachMgr::GetAxisPos( const string& sAxis, double& dVal)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return GDB_ID_NULL ;
return m_vMachines[m_nCurrMch]->GetAxisPos( sAxis, dVal) ;
return m_vMachines[m_nCurrMch].pMachine->GetAxisPos( sAxis, dVal) ;
}
//----------------------------------------------------------------------------
@@ -104,9 +114,9 @@ bool
MachMgr::GetAxisHomePos( const string& sAxis, double& dHomeVal)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return GDB_ID_NULL ;
return m_vMachines[m_nCurrMch]->GetAxisHomePos( sAxis, dHomeVal) ;
return m_vMachines[m_nCurrMch].pMachine->GetAxisHomePos( sAxis, dHomeVal) ;
}
//----------------------------------------------------------------------------
@@ -114,9 +124,9 @@ bool
MachMgr::ResetAxisPos( const string& sAxis)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return GDB_ID_NULL ;
return m_vMachines[m_nCurrMch]->ResetAxisPos( sAxis) ;
return m_vMachines[m_nCurrMch].pMachine->ResetAxisPos( sAxis) ;
}
//----------------------------------------------------------------------------
@@ -124,9 +134,9 @@ bool
MachMgr::LoadTool( const string& sHead, int nExit, const string& sTool)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->LoadTool( sHead, nExit, sTool) ;
return m_vMachines[m_nCurrMch].pMachine->LoadTool( sHead, nExit, sTool) ;
}
//----------------------------------------------------------------------------
@@ -134,9 +144,9 @@ bool
MachMgr::ResetHeadSet( const string& sHead)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->ResetHeadSet( sHead) ;
return m_vMachines[m_nCurrMch].pMachine->ResetHeadSet( sHead) ;
}
//----------------------------------------------------------------------------
@@ -144,9 +154,9 @@ bool
MachMgr::SetCalcTable( const string& sTable)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->SetCurrTable( sTable) ;
return m_vMachines[m_nCurrMch].pMachine->SetCurrTable( sTable) ;
}
//----------------------------------------------------------------------------
@@ -154,9 +164,9 @@ bool
MachMgr::SetCalcTool( const string& sTool, const string& sHead, int nExit)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->SetCurrTool( sTool, sHead, nExit) ;
return m_vMachines[m_nCurrMch].pMachine->SetCurrTool( sTool, sHead, nExit) ;
}
//----------------------------------------------------------------------------
@@ -165,9 +175,9 @@ MachMgr::GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,
int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->GetAngles( vtDirT, vtDirA, nStat, dAngA1, dAngB1, dAngA2, dAngB2) ;
return m_vMachines[m_nCurrMch].pMachine->GetAngles( vtDirT, vtDirA, nStat, dAngA1, dAngB1, dAngA2, dAngB2) ;
}
//----------------------------------------------------------------------------
@@ -176,9 +186,9 @@ MachMgr::GetCalcPositions( const Point3d& ptP, double dAngA, double dAngB,
int& nStat, double& dX, double& dY, double& dZ)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->GetPositions( ptP, dAngA, dAngB, nStat, dX, dY, dZ) ;
return m_vMachines[m_nCurrMch].pMachine->GetPositions( ptP, dAngA, dAngB, nStat, dX, dY, dZ) ;
}
//----------------------------------------------------------------------------
@@ -186,7 +196,7 @@ bool
MachMgr::VerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat)
{
if ( m_nCurrMch < 0 || m_nCurrMch >= int( m_vMachines.size()) ||
m_vMachines[m_nCurrMch] == nullptr)
m_vMachines[m_nCurrMch].pMachine == nullptr)
return false ;
return m_vMachines[m_nCurrMch]->VerifyOutOfStroke( dX, dY, dZ, dAngA, dAngB, nStat) ;
return m_vMachines[m_nCurrMch].pMachine->VerifyOutOfStroke( dX, dY, dZ, dAngA, dAngB, nStat) ;
}