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

Merge branch 'master' into SaraP

Browse Source
This commit is contained in:
SaraP
2021-07-28 08:55:56 +02:00
parent 10309c0528 7c182e9d33
commit a5fc012779
5 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EGkCurveComposite.h
+4 -4
View File
@@ -1,13 +1,13 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2021
//----------------------------------------------------------------------------
// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3d1
// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3g2
// Contenuto : Dichiarazione della interfaccia ICurveComposite.
//
//
//
// Modifiche : 22.11.13 DS Creazione modulo.
//
// 21.07.21 LM Aggiunto parametro opzionale a Set/GetCurveTempProp.
//
//----------------------------------------------------------------------------
@@ -58,8 +58,8 @@ class __declspec( novtable) ICurveComposite : public ICurve
virtual bool IsAPoint( void) const = 0 ;
virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ;
virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ;
virtual bool SetCurveTempProp( int nCrv, int nProp) = 0 ;
virtual bool GetCurveTempProp( int nCrv, int& nProp) const = 0 ;
virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropInd = 0) = 0 ;
virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropInd = 0) const = 0 ;
} ;
//-----------------------------------------------------------------------------
EGkGdbConst.h
+3
View File
@@ -60,6 +60,9 @@ enum GdbStatus { GDB_ST_OFF = 0,
enum GdbMark { GDB_MK_OFF = 0,
GDB_MK_ON = 1} ;
//----------------- Costante per numero proprietà temporanee -------------------
const int GDB_NUM_TEMP_PROP = 2 ;
//----------------- Costanti materiale oggetti del DB geometrico ---------------
enum GdbMaterial { GDB_MT_COLOR = -1,
GDB_MT_PARENT = 0} ;
EGkGeoObj.h
+5 -4
View File
@@ -1,13 +1,14 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2014
// EgalTech 2013-2021
//----------------------------------------------------------------------------
// File : EGkGeoObj.h Data : 14.04.14 Versione : 1.5d5
// File : EGkGeoObj.h Data : 21.07.21 Versione : 2.3g2
// Contenuto : Dichiarazione della interfaccia IGeoObj.
//
//
//
// Modifiche : 20.11.13 DS Creazione modulo.
// 14.04.14 DS Tolti metodi GetKey, Save e Load.
// 21.07.21 LM Aggiunto parametro opzionale a Set/GetTempProp.
//
//----------------------------------------------------------------------------
@@ -53,8 +54,8 @@ class __declspec( novtable) IGeoObj
virtual void SetObjGraphics( IObjGraphics* pOGr) = 0 ;
virtual IObjGraphics* GetObjGraphics( void) = 0 ;
virtual const IObjGraphics* GetObjGraphics( void) const = 0 ;
virtual void SetTempProp( int nProp) = 0 ;
virtual int GetTempProp( void) const = 0 ;
virtual void SetTempProp( int nProp, int nPropInd = 0) = 0 ;
virtual int GetTempProp( int nPropInd = 0) const = 0 ;
} ;
//-----------------------------------------------------------------------------
EGkPolyLine.h
-27
View File
@@ -132,30 +132,3 @@ class PolyLine
// Raccolte di PolyLine
typedef std::vector<PolyLine> POLYLINEVECTOR ; // vettore di PolyLine
typedef std::list<PolyLine> POLYLINELIST ; // lista di PolyLine
//----------------------------------------------------------------------------
/*static*/ bool
ChangePolyLineStart( const Point3d& ptNewStart, PolyLine& Loop, double dTol = EPS_SMALL) ;
// nSegNum 0-based
/*static*/ bool
PointPositionOnPolyLine( const Point3d& ptPoint, /*const*/ PolyLine& Loop, int& nSegNum, double& dParOnSeg, double dTol = EPS_SMALL) ;
/*static*/ bool
IsPointInsidePolyLine( const Point3d& ptP, const PolyLine& plPoly) ;
/*static*/ bool
DistPointPolyLine( const Point3d& ptP, const PolyLine& plPoly, double& dPointPolyLineDist) ;
/*static*/ bool
SplitPolyLineAtPoint( const Point3d& ptPoint, /*const*/ PolyLine& Loop, PolyLine& Loop1, PolyLine& Loop2, double dTol = EPS_SMALL) ;
/*static*/ bool
AddPolyLineToPolyLine( PolyLine& Poly, PolyLine& PolyToAdd, double dTol = EPS_SMALL) ;
//----------------------------------------------------------------------------
struct PositionOnPolyLine {
int nIndexInVec ;
int nSegNum ;
double dParOnSeg ;
PositionOnPolyLine( int nIndex, int nSeg, double dPar) {
nIndexInVec = nIndex ;
nSegNum = nSeg ;
dParOnSeg = dPar ;
}
} ;
EgtKeyCodes.h
+1 -1
View File
@@ -21,7 +21,7 @@
//----------------------------------------------------------------------------
const int KEY_BASELIB_PROD = 207 ;
const int KEY_BASELIB_VER = 2306 ;
const int KEY_BASELIB_VER = 2307 ;
const int KEY_BASELIB_LEV = 1 ;
//----------------------------------------------------------------------------