diff --git a/EGrScene.h b/EGrScene.h index 838f7dd..f4a9faf 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -117,7 +117,11 @@ class IEGrScene virtual bool GetLastSnapDir( Vector3d& vtDir) = 0 ; // Texture virtual bool LoadTexture( const std::string& sName, const std::string& sFile, - double dDimX, double dDimY, bool bRepeat) = 0 ; + double dMMxPix, double dDimX, double dDimY, bool bRepeat) = 0 ; + virtual bool UnloadTexture( const std::string& sName) = 0 ; + virtual bool GetTexturePixels( const std::string& sName, int& nWidth, int& nHeight) = 0 ; + virtual bool GetTextureDimensions( const std::string& sName, double& dDimX, double& dDimY) = 0 ; + virtual bool ChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EInAPI.h b/EInAPI.h index 5b53244..f2c951b 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -191,6 +191,7 @@ EIN_EXPORT int __stdcall EgtCreatePolygonFromSide( int nParentId, int nNumSides const double ptFin[3], int nRefType) ; // GeomDB Create Surf +EIN_EXPORT int __stdcall EgtCreateSurfFrRectangle( int nParentId, const double ptIni[3], const double ptCross[3], int nRefType) ; EIN_EXPORT int __stdcall EgtCreateSurfFlatRegion( int nParentId, int nNumId, const int nCrvIds[]) ; EIN_EXPORT int __stdcall EgtCreateSurfTmBBox( int nParentId, const double ptMin[3], const double ptMax[3], int nRefType) ; EIN_EXPORT int __stdcall EgtCreateSurfTmBox( int nParentId, const double ptIni[3], const double ptCross[3], @@ -306,9 +307,13 @@ EIN_EXPORT BOOL __stdcall EgtRemoveName( int nId) ; EIN_EXPORT BOOL __stdcall EgtSetInfo( int nId, const wchar_t* wsKey, const wchar_t* wsInfo) ; EIN_EXPORT BOOL __stdcall EgtSetInfoInt( int nId, const wchar_t* wsKey, int nInfo) ; EIN_EXPORT BOOL __stdcall EgtSetInfoDouble( int nId, const wchar_t* wsKey, double dInfo) ; +EIN_EXPORT BOOL __stdcall EgtSetInfoFrame( int nId, const wchar_t* wsKey, const double ptOrig[3], + const double vtX[3], const double vtY[3], const double vtZ[3]) ; EIN_EXPORT BOOL __stdcall EgtGetInfo( int nId, const wchar_t* wsKey, wchar_t*& wsInfo) ; EIN_EXPORT BOOL __stdcall EgtGetInfoInt( int nId, const wchar_t* wsKey, int* pnInfo) ; EIN_EXPORT BOOL __stdcall EgtGetInfoDouble( int nId, const wchar_t* wsKey, double* pdInfo) ; +EIN_EXPORT BOOL __stdcall EgtGetInfoFrame( int nId, const wchar_t* wsKey, double ptOrig[3], + double vtX[3], double vtY[3], double vtZ[3]) ; EIN_EXPORT BOOL __stdcall EgtExistsInfo( int nId, const wchar_t* wsKey) ; EIN_EXPORT BOOL __stdcall EgtRemoveInfo( int nId, const wchar_t* wsKey) ; @@ -327,8 +332,8 @@ EIN_EXPORT int __stdcall EgtGetLastSelectedObj( void) ; EIN_EXPORT int __stdcall EgtGetPrevSelectedObj( void) ; // GeomDB Modify -EIN_EXPORT BOOL __stdcall EgtChangeGroupFrame( int nId, double ptOrig[3], - double vtX[3], double vtY[3], double vtZ[3], int nRefType) ; +EIN_EXPORT BOOL __stdcall EgtChangeGroupFrame( int nId, const double ptOrig[3], + const double vtX[3], const double vtY[3], const double vtZ[3], int nRefType) ; EIN_EXPORT BOOL __stdcall EgtChangeVectorBase( int nId, const double ptB[3], int nRefType) ; EIN_EXPORT BOOL __stdcall EgtModifyText( int nId, const wchar_t* wsNewText) ; EIN_EXPORT BOOL __stdcall EgtChangeTextFont( int nId, const wchar_t* wsNewFont) ; @@ -463,10 +468,12 @@ EIN_EXPORT BOOL __stdcall EgtModifyRawPartSize( int nRawId, double dLength, doub EIN_EXPORT BOOL __stdcall EgtModifyRawPartHeight( int nRawId, double dHeight) ; EIN_EXPORT BOOL __stdcall EgtRemoveRawPart( int nRawId) ; EIN_EXPORT BOOL __stdcall EgtMoveToCornerRawPart( int nRawId, const double ptCorner[3], int nFlag) ; +EIN_EXPORT BOOL __stdcall EgtMoveRawPart( int nRawId, const double vtMove[3]) ; EIN_EXPORT BOOL __stdcall EgtAddPartToRawPart( int nPartId, const double ptPos[3], int nRawId) ; EIN_EXPORT BOOL __stdcall EgtRemovePartFromRawPart( int nPartId) ; EIN_EXPORT BOOL __stdcall EgtSetTable( const wchar_t* wsTable) ; EIN_EXPORT BOOL __stdcall EgtGetTableRef1( double ptPos[3]) ; +EIN_EXPORT BOOL __stdcall EgtGetTableArea1( int* pnAreaId) ; EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ; // Scene @@ -521,7 +528,11 @@ EIN_EXPORT BOOL __stdcall EgtGetGenericView( double* pdAngVertDeg, double* pdAng EIN_EXPORT BOOL __stdcall EgtProjectPoint( const double ptP[3], double ptWin[3]) ; EIN_EXPORT BOOL __stdcall EgtUnProjectPoint( int nWinX, int nWinY, double ptP[3]) ; EIN_EXPORT BOOL __stdcall EgtLoadTexture( const wchar_t* wsName, const wchar_t* wsFile, - double dDimX, double dDimY, BOOL bRepeat) ; + double dMMxPix, double dDimX, double dDimY, BOOL bRepeat) ; +EIN_EXPORT BOOL __stdcall EgtUnloadTexture( const wchar_t* wsName) ; +EIN_EXPORT BOOL __stdcall EgtGetTexturePixels( const wchar_t* wsName, int* pnWidth, int* pnHeight) ; +EIN_EXPORT BOOL __stdcall EgtGetTextureDimensions( const wchar_t* wsName, double* pdDimX, double* pdDimY) ; +EIN_EXPORT BOOL __stdcall EgtChangeTextureDimensions( const wchar_t* wsName, double dDimX, double dDimY) ; // Geo Base EIN_EXPORT BOOL __stdcall EgtVectorNormalize( double* pdX, double* pdY, double* pdZ, double dEps = 0.001) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 29f800e..82fcb6d 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -70,6 +70,7 @@ class __declspec( novtable) IMachMgr // Tables and Fixtures virtual bool SetTable( const std::string& sTable) = 0 ; virtual bool GetTableRef1( Point3d& ptPos) = 0 ; + virtual bool GetTableArea1( int& nAreaId) = 0 ; virtual int AddSubPiece( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) = 0 ; virtual bool ShowOnlyTable( bool bVal) = 0 ; // Machine diff --git a/EXeExecutor.h b/EXeExecutor.h index 45508d3..d10fe0e 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -308,9 +308,11 @@ EXE_EXPORT bool ExeRemoveName( int nId) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, int nInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, double dInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const std::string& sInfo) ; +EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const Frame3d& frFrame) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, int& nInfo) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, double& dInfo) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, std::string& sInfo) ; +EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, Frame3d& frFrame) ; EXE_EXPORT bool ExeExistsInfo( int nId, const std::string& sKey) ; EXE_EXPORT bool ExeRemoveInfo( int nId, const std::string& sKey) ; @@ -485,6 +487,7 @@ EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; EXE_EXPORT bool ExeSetTable( const std::string& sTable) ; EXE_EXPORT bool ExeGetTableRef1( Point3d& ptPos) ; +EXE_EXPORT bool ExeGetTableArea1( int& nAreaId) ; EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ; EXE_EXPORT int ExeAddSubPiece( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) ; EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ; @@ -565,7 +568,11 @@ EXE_EXPORT bool ExeGetGenericView( double* pdAngVertDeg, double* pdAngHorizDeg) EXE_EXPORT bool ExeProjectPoint( const Point3d& ptP, Point3d& ptWin) ; EXE_EXPORT bool ExeUnProjectPoint( int nWinX, int nWinY, Point3d& ptP) ; EXE_EXPORT bool ExeLoadTexture( const std::string& sName, const std::string& sFile, - double dDimX, double dDimY, bool bRepeat) ; + double dMMxPix, double dDimX, double dDimY, bool bRepeat) ; +EXE_EXPORT bool ExeUnloadTexture( const std::string& sName) ; +EXE_EXPORT bool ExeGetTexturePixels( const std::string& sName, int& nWidth, int& nHeight) ; +EXE_EXPORT bool ExeGetTextureDimensions( const std::string& sName, double& dDimX, double& dDimY) ; +EXE_EXPORT bool ExeChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) ; // Messages EXE_EXPORT bool ExeLoadMessages( const std::string& sMsgFilePath) ;