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

Merge commit '67b34008c514359dc8ef3c440de02127f970b0ed' into NewLink

Browse Source
This commit is contained in:
Riccardo Elitropi
2026-04-09 08:16:55 +02:00
parent 1bb839e9f4 67b34008c5
commit e1c69e207d
7 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtMachKernel.rc
BIN
View File
Binary file not shown.
Milling.cpp
+3 -5
View File
@@ -6533,13 +6533,11 @@ Milling::CalcAndSetCorrAuxDir( const ICurveComposite* pCompo, double dU, bool bI
return true ;
}
}
// se impostato come parametro di lavorazione nelle UserNotes
// reset o assegnamento da parametro di lavorazione nelle UserNotes
Vector3d vtAux ;
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux)) {
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux))
vtAux.Normalize() ;
SetAuxDir( vtAux) ;
return true ;
}
SetAuxDir( vtAux) ;
return true ;
}
Operation.cpp
+6 -2
View File
@@ -2727,11 +2727,15 @@ Operation::CalculateClPathRobotAxesValues( int nClPathId, double dAngDeltaMinFor
Vector3d vtDir = pCamData->GetToolDir() ;
Vector3d vtAux ;
if ( ! bUseRefAux) {
if ( nSolCh == MCH_SCC_ADIR_NEAR || nSolCh == MCH_SCC_ADIR_FAR) {
if (( nSolCh == MCH_SCC_ADIR_NEAR || nSolCh == MCH_SCC_STD) && ! pCamData->GetAuxDir().IsSmall()) {
vtAux = OrthoCompo( pCamData->GetAuxDir(), vtDir) ;
vtAux.Normalize() ;
}
else {
else if (( nSolCh == MCH_SCC_ADIR_FAR || nSolCh == MCH_SCC_OPPOSITE) && ! pCamData->GetAuxDir().IsSmall()) {
vtAux = - OrthoCompo( pCamData->GetAuxDir(), vtDir) ;
vtAux.Normalize() ;
}
else { // MCH_SCC_NONE (o riconducibili a questo)
Frame3d frTool ;
frTool.Set( ORIG, vtDir) ;
frTool.Rotate( frTool.Orig(), frTool.VersZ(), 0, 1) ;
Pocketing.cpp
+2 -3
View File
@@ -5169,10 +5169,9 @@ Pocketing::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafe
else {
// se impostato come parametro di lavorazione nelle UserNotes
Vector3d vtAux ;
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux)) {
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux))
vtAux.Normalize() ;
SetAuxDir( vtAux) ;
}
SetAuxDir( vtAux) ;
}
// se sopra attacco c'è spazio per sicurezza o approccio
double dSafeDist = ( m_bAggrBottom ? dSafeAggrBottZ : dSafeZ) ;
PocketingNT.cpp
+2 -3
View File
@@ -5261,10 +5261,9 @@ PocketingNT::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSa
else {
// se impostato come parametro di lavorazione nelle UserNotes
Vector3d vtAux ;
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux)) {
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux))
vtAux.Normalize() ;
SetAuxDir( vtAux) ;
}
SetAuxDir( vtAux) ;
}
// se sopra attacco c'è spazio per sicurezza o approccio
double dSafeDist = ( m_bAggrBottom ? dSafeAggrBottZ : dSafeZ) ;
SurfFinishing.cpp
+9
View File
@@ -1797,6 +1797,11 @@ SurfFinishing::ProcessCrvCompo( int nPathId, int nPvId, int nClId)
// Imposto dati comuni
SetPathId( nPxId) ;
SetToolDir( vtTool) ;
Vector3d vtAux ;
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux))
vtAux.Normalize() ;
SetAuxDir( vtAux) ;
// assegno il vettore estrusione al gruppo del percorso
m_pGeomDB->SetInfo( nPxId, KEY_EXTR, vtTool) ;
@@ -2042,6 +2047,10 @@ SurfFinishing::ProcessSfr( int nPathId, int nPvId, int nClId)
// Imposto dati comuni
SetPathId( nPxId) ;
SetToolDir( vtTool) ;
Vector3d vtAux ;
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux))
vtAux.Normalize() ;
SetAuxDir( vtAux) ;
// assegno il vettore estrusione al gruppo del percorso
m_pGeomDB->SetInfo( nPxId, KEY_EXTR, vtTool) ;
SurfRoughing.cpp
+4
View File
@@ -2098,6 +2098,10 @@ SurfRoughing::ProcessPath( int nPathId, int nPvId, int nClId)
// Imposto dati comuni
SetPathId( nPxId) ;
SetToolDir( vtTool) ;
Vector3d vtAux ;
if ( GetValInNotes( m_Params.m_sUserNotes, UN_VTAUXDIR, vtAux))
vtAux.Normalize() ;
SetAuxDir( vtAux) ;
// se richiesto ordine per ZChunk, aggiusto le geometrie inserite nel gruppo
if ( m_bOrderZ)