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

EgtGeomKernel 1.6v6 :

Browse Source 
- miglioramenti a interfaccia Zmap.
This commit is contained in:
Dario Sassi
2016-10-27 16:45:07 +00:00
parent b79e905909
commit 9fe8d7185d
5 changed files with 172 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GdbExecutor.cpp
+46 -50
View File
@@ -2587,10 +2587,10 @@ GdbExecutor::ExecuteVolZmap(const string& sCmd2, const STRVECTOR& vsParams)
return VolZmapMilling( vsParams) ;
}
else if ( sCmd2 == "SET") {
return VolZmapSetTool( vsParams) ;
return VolZmapSetGenTool( vsParams) ;
}
else if ( sCmd2 == "SETSTD") {
return VolZmapSetStdTool( vsParams) ;
return VolZmapSetAdvTool( vsParams) ;
}
else if ( sCmd2 == "MEASURE") {
return VolZmapDeepnessMeasure( vsParams) ;
@@ -2634,7 +2634,7 @@ GdbExecutor::VolZmapCreate( const STRVECTOR& vsParams)
return false ;
PtrOwner<VolZmap> pZprova( new VolZmap) ;
pZprova->CreateMap( ptO, dPrec, dLengthX, dLengthY, dLengthZ);
pZprova->CreateMap( ptO, dLengthX, dLengthY, dLengthZ, dPrec);
// inserisco nel DB
return AddGeoObj(vsParams[0], vsParams[1], Release( pZprova)) ;
@@ -2745,12 +2745,52 @@ GdbExecutor::VolZmapMilling( const STRVECTOR& vsParams)
return false ;
// eseguo la lavorazione
pZmap->SetTolerances( dLinTol, dAngTolDeg) ;
return pZmap->MillingStep( ptPs, ptPe, vtDs, vtDe) ;
return pZmap->MillingStep( ptPs, vtDs, ptPe, vtDe) ;
}
//----------------------------------------------------------------------------
bool
GdbExecutor::VolZmapSetTool( const STRVECTOR& vsParams)
GdbExecutor::VolZmapSetAdvTool( const STRVECTOR& vsParams)
{
// parametri : ZmapId, sToolName, dH, dTipH, dR, dTipR, dRc
if ( vsParams.size() != 7)
return false ;
// recupero lo Zmap
int nZmapId = GetIdParam( vsParams[0]) ;
VolZmap* pZmap = GetBasicVolZmap( m_pGDB->GetGeoObj( nZmapId)) ;
if ( pZmap == nullptr)
return false ;
// recupero la stringa nome dell'utensile
string sToolName ;
sToolName = vsParams[1] ;
// recupero altezza utensile
double dH ;
if ( ! FromString( vsParams[2], dH))
return false ;
// recupero altezza punta utensile
double dTipH ;
if ( ! FromString( vsParams[3], dTipH))
return false ;
// recupero raggio utensile
double dR ;
if ( ! FromString( vsParams[4], dR))
return false ;
// recupero raggio punta utensile
double dTipR ;
if ( ! FromString( vsParams[5], dTipR))
return false ;
// recupero raggio corner
double dRc ;
if ( ! FromString( vsParams[6], dRc))
return false ;
// assegno utensile
return pZmap->SetAdvTool( sToolName, dH, dR, dTipH, dTipR, dRc) ;
}
//----------------------------------------------------------------------------
bool
GdbExecutor::VolZmapSetGenTool( const STRVECTOR& vsParams)
{
// parametri : ZmapId, CrvId, sToolName
if ( vsParams.size() != 3)
@@ -2769,51 +2809,7 @@ GdbExecutor::VolZmapSetTool( const STRVECTOR& vsParams)
string sToolName ;
sToolName = vsParams[2] ;
// assegno utensile
return pZmap->SetTool( sToolName, pToolOutline) ;
}
//----------------------------------------------------------------------------
bool
GdbExecutor::VolZmapSetStdTool( const STRVECTOR& vsParams)
{
// parametri : ZmapId, sToolName, nToolType, dH, dTH, dR, dTR, dRc
if ( vsParams.size() != 8)
return false ;
// recupero lo Zmap
int nZmapId = GetIdParam( vsParams[0]) ;
VolZmap* pZmap = GetBasicVolZmap( m_pGDB->GetGeoObj( nZmapId)) ;
if ( pZmap == nullptr)
return false ;
// recupero la stringa nome dell'utensile
string sToolName ;
sToolName = vsParams[1] ;
// recupero il tipo di utensile
int nToolType ;
if ( ! FromString( vsParams[2], nToolType))
return false ;
if (nToolType < 0 || nToolType > 4)
return false ;
// recupero altezza utensile
double dH ;
if ( ! FromString( vsParams[3], dH))
return false ;
// recupero raggio utensile
double dTH ;
if ( ! FromString( vsParams[4], dTH))
return false ;
// recupero raggio corner
double dR ;
if ( ! FromString( vsParams[5], dR))
return false ;
double dTR ;
if ( ! FromString( vsParams[6], dTR))
return false ;
double dRc ;
if ( ! FromString( vsParams[7], dRc))
return false ;
// assegno utensile
return pZmap->SetStdTool( sToolName, nToolType, dH, dTH, dR, dTR, dRc) ;
return pZmap->SetGenTool( sToolName, pToolOutline) ;
}
//----------------------------------------------------------------------------