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

EgtMachKernel 2.1f1 :

Browse Source 
- migliorie a finitura superfici
- resi costanti alcuni metodi delle classi Operations.
This commit is contained in:
Dario Sassi
2019-06-10 07:06:17 +00:00
parent 62e2e8aae8
commit 754a9a6506
14 changed files with 462 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Operation.cpp
+23 -23
View File
@@ -122,7 +122,7 @@ Operation::UpdateFollowingOperationsStatus(int nModif)
//----------------------------------------------------------------------------
bool
Operation::GetElevation( int nPhase, const Point3d& ptP,
const Vector3d& vtDir, double& dElev)
const Vector3d& vtDir, double& dElev) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -183,7 +183,7 @@ Operation::GetElevation( int nPhase, const Point3d& ptP,
//----------------------------------------------------------------------------
bool
Operation::GetElevation( int nPhase, const Point3d& ptP1, const Point3d& ptP2,
const Vector3d& vtDir, double& dElev)
const Vector3d& vtDir, double& dElev) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -265,7 +265,7 @@ Operation::GetElevation( int nPhase, const Point3d& ptP1, const Point3d& ptP2,
//----------------------------------------------------------------------------
bool
Operation::GetElevation( int nPhase, const Point3d& ptP1, const Point3d& ptP2, const Point3d& ptP3,
const Vector3d& vtDir, double& dElev)
const Vector3d& vtDir, double& dElev) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -282,7 +282,7 @@ Operation::GetElevation( int nPhase, const Point3d& ptP1, const Point3d& ptP2, c
//----------------------------------------------------------------------------
bool
Operation::GetElevation( int nPhase, const Point3d& ptP, const Vector3d& vtTool, double dRad,
const Vector3d& vtDir, double& dElev)
const Vector3d& vtDir, double& dElev) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -308,7 +308,7 @@ Operation::GetElevation( int nPhase, const Point3d& ptP, const Vector3d& vtTool,
//----------------------------------------------------------------------------
bool
Operation::GetDistanceFromRawSide( int nPhase, const Point3d& ptP, const Vector3d& vtDir, double& dDist)
Operation::GetDistanceFromRawSide( int nPhase, const Point3d& ptP, const Vector3d& vtDir, double& dDist) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -377,7 +377,7 @@ Operation::GetDistanceFromRawSide( int nPhase, const Point3d& ptP, const Vector3
//----------------------------------------------------------------------------
bool
Operation::GetMinDistanceFromRawSide( int nPhase, const Point3d& ptP, double dExpand, double& dDist, Vector3d& vtDir)
Operation::GetMinDistanceFromRawSide( int nPhase, const Point3d& ptP, double dExpand, double& dDist, Vector3d& vtDir) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -460,7 +460,7 @@ Operation::GetMinDistanceFromRawSide( int nPhase, const Point3d& ptP, double dEx
//----------------------------------------------------------------------------
bool
Operation::GetDistanceFromRawBottom( int nPhase, int nPathId, double dToler, double& dRbDist, double& dAllRbDist)
Operation::GetDistanceFromRawBottom( int nPhase, int nPathId, double dToler, double& dRbDist, double& dAllRbDist) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -493,7 +493,7 @@ Operation::GetDistanceFromRawBottom( int nPhase, int nPathId, double dToler, dou
//----------------------------------------------------------------------------
bool
Operation::GetRawGlobBox( int nPhase, int nPathId, double dToler, BBox3d& b3Raw)
Operation::GetRawGlobBox( int nPhase, int nPathId, double dToler, BBox3d& b3Raw) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -508,7 +508,7 @@ Operation::GetRawGlobBox( int nPhase, int nPathId, double dToler, BBox3d& b3Raw)
//----------------------------------------------------------------------------
bool
Operation::GetRawGlobBox( int nPhase, const BBox3d& b3Test, double dToler, BBox3d& b3Raw)
Operation::GetRawGlobBox( int nPhase, const BBox3d& b3Test, double dToler, BBox3d& b3Raw) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -715,7 +715,7 @@ Operation::AdjustCurveFromSurf( ICurveComposite* pCrvCompo, int nToolDir, int nF
//----------------------------------------------------------------------------
bool
Operation::ApproxWithArcsIfUseful( ICurveComposite* pCompo)
Operation::ApproxWithArcsIfUseful( ICurveComposite* pCompo) const
{
// recupero estrusione e spessore
Vector3d vtExtr = Z_AX ;
@@ -751,7 +751,7 @@ Operation::ApproxWithArcsIfUseful( ICurveComposite* pCompo)
//----------------------------------------------------------------------------
bool
Operation::ApproxWithLines( ICurveComposite* pCompo)
Operation::ApproxWithLines( ICurveComposite* pCompo) const
{
// recupero estrusione e spessore
Vector3d vtExtr = Z_AX ;
@@ -774,7 +774,7 @@ Operation::ApproxWithLines( ICurveComposite* pCompo)
//----------------------------------------------------------------------------
bool
Operation::VerifyArcs( ICurveComposite* pCompo, double dMaxAngCen)
Operation::VerifyArcs( ICurveComposite* pCompo, double dMaxAngCen) const
{
// verifiche sull'ampiezza dell'angolo al centro degli eventuali archi
int nMaxInd = pCompo->GetCurveCount() - 1 ;
@@ -850,7 +850,7 @@ Operation::CalcAndSetBBox( int nClId)
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
bool
Operation::GetInitialAxesValues( DBLVECTOR& vAxVal)
Operation::GetInitialAxesValues( DBLVECTOR& vAxVal) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -866,7 +866,7 @@ Operation::GetInitialAxesValues( DBLVECTOR& vAxVal)
//----------------------------------------------------------------------------
bool
Operation::GetClPathInitialAxesValues( int nClPathId, DBLVECTOR& vAxVal)
Operation::GetClPathInitialAxesValues( int nClPathId, DBLVECTOR& vAxVal) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -883,7 +883,7 @@ Operation::GetClPathInitialAxesValues( int nClPathId, DBLVECTOR& vAxVal)
//----------------------------------------------------------------------------
bool
Operation::GetFinalAxesValues( DBLVECTOR& vAxVal)
Operation::GetFinalAxesValues( DBLVECTOR& vAxVal) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -899,7 +899,7 @@ Operation::GetFinalAxesValues( DBLVECTOR& vAxVal)
//----------------------------------------------------------------------------
bool
Operation::GetClPathFinalAxesValues( int nClPathId, DBLVECTOR& vAxVal)
Operation::GetClPathFinalAxesValues( int nClPathId, DBLVECTOR& vAxVal) const
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
@@ -916,7 +916,7 @@ Operation::GetClPathFinalAxesValues( int nClPathId, DBLVECTOR& vAxVal)
//----------------------------------------------------------------------------
string
Operation::ExtractInfo( const string& sNotes, const string& sKey)
Operation::ExtractInfo( const string& sNotes, const string& sKey) const
{
string sInfo ;
STRVECTOR vsCmd ;
@@ -934,7 +934,7 @@ Operation::ExtractInfo( const string& sNotes, const string& sKey)
//----------------------------------------------------------------------------
string
Operation::ExtractHint( const string& sNotes)
Operation::ExtractHint( const string& sNotes) const
{
return ExtractInfo( sNotes, "Hint:") ;
}
@@ -1728,7 +1728,7 @@ Operation::AdjustOneStartMovement( int nClPathId, int nPrevClPathId, const DBLVE
//----------------------------------------------------------------------------
bool
Operation::ToolChangeNeeded( const Operation& Op1, const Operation& Op2)
Operation::ToolChangeNeeded( const Operation& Op1, const Operation& Op2) const
{
// se non cambia l'utensile, non cambia la testa fisica
if ( EqualNoCase( Op1.GetToolName(), Op2.GetToolName()))
@@ -1966,7 +1966,7 @@ Operation::RemoveHome( void)
//----------------------------------------------------------------------------
bool
Operation::CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd, double& dDeltaZ)
Operation::CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd, double& dDeltaZ) const
{
if ( m_pMchMgr == nullptr)
return false ;
@@ -2020,7 +2020,7 @@ Operation::CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR
//----------------------------------------------------------------------------
bool
Operation::ForcedZmax( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd)
Operation::ForcedZmax( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd) const
{
// Recupero macchina corrente
Machine* pMch = ( m_pMchMgr != nullptr ? m_pMchMgr->GetCurrMachine() : nullptr) ;
@@ -2049,7 +2049,7 @@ Operation::ForcedZmax( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd)
//----------------------------------------------------------------------------
bool
Operation::TestCollisionAvoid( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd)
Operation::TestCollisionAvoid( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd) const
{
// Recupero macchina corrente
Machine* pMch = ( m_pMchMgr != nullptr ? m_pMchMgr->GetCurrMachine() : nullptr) ;
@@ -2235,7 +2235,7 @@ Operation::SpecialMoveZup( Vector3d& vtTool, DBLVECTOR& vAx, bool& bModif)
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
bool
Operation::GetAggrBottomData( const string& sHead, AggrBottom& agbData)
Operation::GetAggrBottomData( const string& sHead, AggrBottom& agbData) const
{
// inizializzo la struttura
agbData.Clear() ;