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

Merge commit '47baf33ac2955f9865fa3285731fba22ec818a96' into feature/Svuotature

Browse Source
This commit is contained in:
Riccardo Elitropi
2024-10-28 08:24:34 +01:00
parent ca81e7e5ab 47baf33ac2
commit 130093561e
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FiveAxisMilling.cpp
+12
View File
@@ -917,6 +917,18 @@ FiveAxisMilling::GetGeometry( SELVECTOR& vIds) const
return true ;
}
//----------------------------------------------------------------------------
bool
FiveAxisMilling::AdjustEndPointForAxesCalc( const CamData* pCamData, Point3d& ptP) const
{
// se utensile lama
if ( ( m_TParams.m_nType & TF_SAWBLADE) != 0) {
// compenso il raggio dell'utensile
ptP += pCamData->GetCorrDir() * ( m_TParams.m_dDiam / 2) ;
}
return true ;
}
//----------------------------------------------------------------------------
bool
FiveAxisMilling::VerifyGeometry( SelData Id, int& nSubs, int& nType)
FiveAxisMilling.h
+1
View File
@@ -43,6 +43,7 @@ class FiveAxisMilling : public Machining
protected : // Operation
int GetSolCh( void) const override
{ return m_Params.m_nSolCh ; }
bool AdjustEndPointForAxesCalc( const CamData* pCamData, Point3d& ptP) const override ;
public : // Machining
bool Prepare( const std::string& sMillName) override ;
FiveAxisMillingData.cpp
+1 -1
View File
@@ -324,7 +324,7 @@ FiveAxisMillingData::VerifyTool( const ToolsMgr* pToolsMgr, const string& sVal,
pTdata = pToolsMgr->GetTool( sVal) ;
if ( pTdata == nullptr)
return false ;
if ( ( pTdata->m_nType & TF_MILL) == 0)
if ( ( pTdata->m_nType & TF_MILL) == 0 && ( pTdata->m_nType & TF_SAWBLADE) == 0)
return false ;
return true ;
}