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

Include :

Browse Source 
- aggiornamenti.
This commit is contained in:
Dario Sassi
2018-07-06 10:11:19 +00:00
parent beb8ca63cd
commit 44cd8c1b9f
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EGkCAvToolSurfTm.h
+1
View File
@@ -31,6 +31,7 @@ class __declspec( novtable) ICAvToolSurfTm {
virtual bool SetMoveDir( const Vector3d& vtMove) = 0 ;
virtual bool SetStdTool( double dH, double dR, double dCornR) = 0 ;
virtual bool SetAdvTool( double dH, double dR, double dTipH, double dTipR, double dCornR) = 0 ;
virtual bool SetSawTool( double dH, double dR, double dThick, double dStemR, double dCornR) = 0 ;
virtual bool SetGenTool( const ICurveComposite* pToolOutline) = 0 ;
virtual double GetToolRadius( void) const = 0 ;
virtual double GetToolHeight( void) const = 0 ;
EGkIntervals.h
+10 -10
View File
@@ -14,7 +14,7 @@
#pragma once
#include <algorithm>
#include <list>
#include <vector>
//----------------------- Macro per import/export ----------------------------
#undef EGK_EXPORT
@@ -29,9 +29,9 @@ class Intervals
{
public :
EGK_EXPORT Intervals( void)
: m_dToler( EPS_SMALL), m_Iter( m_lInts.end()) {}
: m_dToler( EPS_SMALL), m_Iter( m_vInts.end()) { m_vInts.reserve( 4) ; }
EGK_EXPORT Intervals( double dToler)
: m_dToler( std::max( dToler, EPS_ZERO)), m_Iter( m_lInts.end()) {}
: m_dToler( std::max( dToler, EPS_ZERO)), m_Iter( m_vInts.end()) { m_vInts.reserve( 4) ; }
public :
EGK_EXPORT void Reset( void) ;
@@ -42,9 +42,9 @@ class Intervals
EGK_EXPORT void Subtract( const Intervals& Other) ;
EGK_EXPORT void Intersect( const Intervals& Other) ;
EGK_EXPORT bool IsEmpty( void) const
{ return m_lInts.empty() ; }
{ return m_vInts.empty() ; }
EGK_EXPORT int GetCount( void) const
{ return int( m_lInts.size()) ; }
{ return int( m_vInts.size()) ; }
EGK_EXPORT bool GetMinMax( double& dMin, double& dMax) const ;
EGK_EXPORT bool GetFirst( double& dMin, double& dMax) const ;
EGK_EXPORT bool GetNext( double& dMin, double& dMax) const ;
@@ -52,12 +52,12 @@ class Intervals
EGK_EXPORT bool GetPrev( double& dMin, double& dMax) const ;
private :
typedef std::pair<double,double> INTERV ; // intervallo, definito come insieme di minimo e massimo
typedef std::list<INTERV> INTERVLIST ; // lista di intervalli
typedef INTERVLIST::const_iterator INTL_CINT ; // iteratore costante a lista di intervalli
typedef std::pair<double,double> INTERV ; // intervallo, definito come insieme di minimo e massimo
typedef std::vector<INTERV> INTERVVECTOR ; // lista di intervalli
typedef INTERVVECTOR::const_iterator INTV_CINT ; // iteratore costante a lista di intervalli
private :
double m_dToler ;
INTERVLIST m_lInts ;
mutable INTL_CINT m_Iter ;
INTERVVECTOR m_vInts ;
mutable INTV_CINT m_Iter ;
} ;
EGkVolZmap.h
+2
View File
@@ -41,6 +41,8 @@ class __declspec( novtable) IVolZmap : public IGeoObj
virtual bool SetStdTool( const std::string& sToolName, double dH, double dR, double dCornR, int nFlag) = 0 ;
virtual bool SetAdvTool( const std::string& sToolName,
double dH, double dR, double dTipH, double dTipR, double dCornR, int nFlag) = 0 ;
virtual bool SetSawTool( const std::string& sToolName,
double dH, double dR, double dThick, double dStemR, double dCornR, int nFlag) = 0 ;
virtual bool SetGenTool( const std::string& sToolName, const ICurveComposite* pToolOutline, int nFlag) = 0 ;
virtual bool SetMortiserTool( const std::string& sToolName, double dH, double dW, double dTh, double dRc, int nFlag) = 0 ;
virtual bool SetChiselTool( const std::string& sToolName, double dH, double dW, double dTh, int nFlag) = 0 ;
EXeExecutor.h
+3
View File
@@ -486,6 +486,8 @@ EXE_EXPORT bool ExeRemoveVolZmapPart( int nId, int nPart) ;
EXE_EXPORT bool ExeVolZmapSetStdTool( int nId, const std::string& sToolName, double dLen, double dDiam, double dCornR, int nFlag) ;
EXE_EXPORT bool ExeVolZmapSetAdvTool( int nId, const std::string& sToolName,
double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, int nFlag) ;
EXE_EXPORT bool ExeVolZmapSetSawTool( int nId, const std::string& sToolName,
double dLen, double dDiam, double dThick, double dStemDiam, double dCornR, int nFlag) ;
EXE_EXPORT bool ExeVolZmapSetGenTool( int nId, const std::string& sToolName, int nToolSectId, int nFlag) ;
EXE_EXPORT bool ExeVolZmapSetMortiserTool( int nId, const std::string& sToolName,
double dLen, double dWidth, double dThick, double dCornR, int nFlag) ;
@@ -618,6 +620,7 @@ EXE_EXPORT int ExeVerifyCutAsSplitting( int nMchId) ;
// Collision Avoidance Tool SurfaceTriMesh
EXE_EXPORT bool ExeCAvSetStdTool( double dToolLen, double dToolDiam, double dToolCornR) ;
EXE_EXPORT bool ExeCAvSetAdvTool( double dToolLen, double dToolDiam, double dTipLen, double dTipDiam, double dToolCornR) ;
EXE_EXPORT bool ExeCAvSetSawTool( double dToolLen, double dToolDiam, double dThickness, double dStemDiam, double dToolCornR) ;
EXE_EXPORT bool ExeCAvSetGenTool( int nToolSectId) ;
EXE_EXPORT int ExeCAvGetToolOutline( int nDestGrpId) ;
EXE_EXPORT double ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, int nRefType) ;