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

EgtMachKernel :

Browse Source 
- piccole migliorie di programmazione.
This commit is contained in:
Dario Sassi
2017-03-14 12:06:53 +00:00
parent bb9f2bd2a3
commit fdb622516f
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GenMachining.cpp
+1 -1
View File
@@ -1276,7 +1276,7 @@ GenMachining::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d&
// curva corrente
const ICurve* pCrvC = pCompo->GetCurve( i) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
// aggiungo affondamento
Milling.cpp
+4 -4
View File
@@ -1568,7 +1568,7 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
// curva corrente
const ICurve* pCrvC = pCompo->GetCurve( i) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
// aggiungo affondamento
@@ -1691,7 +1691,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
// curva corrente
const ICurve* pCrvC = pCompo->GetCurve( ( bInvert ? nMaxInd - i : i)) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
if ( bInvert)
@@ -1829,7 +1829,7 @@ Milling::AddOneWayMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
// curva corrente
const ICurve* pCrvC = pCompo->GetCurve( i) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
// aggiungo affondamento
@@ -2071,7 +2071,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
// curva corrente
const ICurve* pCrvC = pCompo->GetCurve( ( bInvert ? nMaxInd - i : i)) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
if ( bInvert)
Pocketing.cpp
+5 -5
View File
@@ -1429,7 +1429,7 @@ Pocketing::AddSpiralIn( const ICurveComposite* pCompo, const Vector3d& vtTool, c
// curva corrente
const ICurve* pCrvC = pMCrv->GetCurve( i) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
// aggiungo affondamento
@@ -1501,7 +1501,7 @@ Pocketing::AddSpiralIn( const ICurveComposite* pCompo, const Vector3d& vtTool, c
// se step intermedio, ritorno all'inizio direttamente
if ( j < nStep) {
// copio la curva di ritorno
PtrOwner<ICurve> pRet( ::GetCurve( pRCrv->Clone())) ;
PtrOwner<ICurve> pRet( pRCrv->Clone()) ;
if ( IsNull( pRet))
return false ;
// aggiungo affondamento
@@ -1573,7 +1573,7 @@ Pocketing::AddSpiralOut( const ICurveComposite* pCompo, const Vector3d& vtTool,
// curva corrente
const ICurve* pCrvC = pMCrv->GetCurve( i) ;
// copio la curva
PtrOwner<ICurve> pCurve( ::GetCurve( pCrvC->Clone())) ;
PtrOwner<ICurve> pCurve( pCrvC->Clone()) ;
if ( IsNull( pCurve))
return false ;
// aggiungo affondamento
@@ -1647,7 +1647,7 @@ Pocketing::AddSpiralOut( const ICurveComposite* pCompo, const Vector3d& vtTool,
// se step intermedio, ritorno all'inizio direttamente
if ( j < nStep) {
// copio la curva di ritorno
PtrOwner<ICurve> pRet( ::GetCurve( pRCrv->Clone())) ;
PtrOwner<ICurve> pRet( pRCrv->Clone()) ;
if ( IsNull( pRet))
return false ;
// aggiungo affondamento
@@ -2083,7 +2083,7 @@ Pocketing::AddLeadOut( const Point3d& ptEnd, const Vector3d& vtEnd, const Vector
return false ;
}
else {
if ( ! pCrv.Set( GetCurveComposite( pRCrv->Clone())))
if ( ! pCrv.Set( pRCrv->Clone()))
return false ;
}
// la porto alla giusta quota
Sawing.cpp
+7 -7
View File
@@ -1192,7 +1192,7 @@ Sawing::ProcessLine( const ICurve* pCrvP, const ICurveLine* pLineC, const ICurve
const string& sName, int nPvId, int nClId)
{
// copio la curva
PtrOwner<ICurveLine> pLine( GetCurveLine( pLineC->Clone())) ;
PtrOwner<ICurveLine> pLine( pLineC->Clone()) ;
if ( IsNull( pLine))
return false ;
// direzione linea corrente
@@ -1556,7 +1556,7 @@ Sawing::ProcessExtArc( const ICurve* pCrvP, const ICurveArc* pArcC, const ICurve
const string& sName, int nPvId, int nClId)
{
// copio la curva
PtrOwner<ICurveArc> pArc( GetCurveArc( pArcC->Clone())) ;
PtrOwner<ICurveArc> pArc( pArcC->Clone()) ;
if ( IsNull( pArc))
return false ;
// verifico che il raggio sia superiore al minimo
@@ -1789,11 +1789,11 @@ ICurveComposite*
Sawing::GenerateExtArcPvTrueCut( const ICurveArc* pArc, double dIntRad, double dExtRad, double dSafety)
{
// arco interno
PtrOwner<ICurveArc> pIntArc( GetCurveArc( pArc->Clone())) ;
PtrOwner<ICurveArc> pIntArc( pArc->Clone()) ;
if ( IsNull( pIntArc) || ! pIntArc->ChangeRadius( dIntRad))
return nullptr ;
// arco esterno
PtrOwner<ICurveArc> pExtArc( GetCurveArc( pArc->Clone())) ;
PtrOwner<ICurveArc> pExtArc( pArc->Clone()) ;
if ( IsNull( pExtArc) || ! pExtArc->ChangeRadius( dExtRad + dSafety))
return nullptr ;
pExtArc->Invert() ;
@@ -2177,7 +2177,7 @@ Sawing::ProcessIntArc( const ICurve* pCrvP, const ICurveArc* pArcC, const ICurve
const string& sName, int nPvId, int nClId)
{
// copio la curva
PtrOwner<ICurveArc> pArc( GetCurveArc( pArcC->Clone())) ;
PtrOwner<ICurveArc> pArc( pArcC->Clone()) ;
if ( IsNull( pArc))
return false ;
// determino l'inclinazione per ottenere il raggio e ne verifico il limite
@@ -2435,11 +2435,11 @@ ICurveComposite*
Sawing::GenerateIntArcPvTrueCut( const ICurveArc* pArc, double dDeltaInt, double dDeltaExt, double dSafety)
{
// arco interno
PtrOwner<ICurveArc> pIntArc( GetCurveArc( pArc->Clone())) ;
PtrOwner<ICurveArc> pIntArc( pArc->Clone()) ;
if ( IsNull( pIntArc) || ! pIntArc->ChangeRadius( pArc->GetRadius() - dDeltaInt - dSafety))
return nullptr ;
// arco esterno
PtrOwner<ICurveArc> pExtArc( GetCurveArc( pArc->Clone())) ;
PtrOwner<ICurveArc> pExtArc( pArc->Clone()) ;
if ( IsNull( pExtArc) || ! pExtArc->ChangeRadius( pArc->GetRadius() + dDeltaExt))
return nullptr ;
pExtArc->Invert() ;