From 27b9bc897997e7eeb61f64edf52f333a2f2f8ff5 Mon Sep 17 00:00:00 2001 From: "riccardo.elitropi" Date: Mon, 22 Aug 2022 17:52:29 +0200 Subject: [PATCH 1/5] Include : - Aggiunti prototipi per ExportThreeJS. --- EExExportThreeJS.h | 41 +++++++++++++++++++++++++++++++++++++++++ EGrScene.h | 4 ++++ EXeExecutor.h | 1 + 3 files changed, 46 insertions(+) create mode 100644 EExExportThreeJS.h diff --git a/EExExportThreeJS.h b/EExExportThreeJS.h new file mode 100644 index 0000000..c37496e --- /dev/null +++ b/EExExportThreeJS.h @@ -0,0 +1,41 @@ +//---------------------------------------------------------------------------- +// EgalTech 2014-2014 +//---------------------------------------------------------------------------- +// File : EExExportStl.h Data : 07.08.14 Versione : 1.5h2 +// Contenuto : Dichiarazione della interfaccia IExportStl. +// +// +// +// Modifiche : 07.08.14 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include "/EgtDev/Include/EGkGeomDB.h" +#include "/EgtDev/Include/EExExportConst.h" +#include +#include "/EgtDev/Include/EGrScene.h" + +//----------------------- Macro per import/export ---------------------------- +#undef EEK_EXPORT +#if defined( I_AM_EEX) // da definirsi solo nella DLL +#define EEX_EXPORT __declspec( dllexport) +#else +#define EEX_EXPORT __declspec( dllimport) +#endif + +//----------------------------------------------------------------------------- +class __declspec(novtable) IExportThreeJS +{ +public: + virtual ~IExportThreeJS( void) {} + virtual bool SetOptions( int nFilter) = 0 ; + virtual bool Export( IGeomDB* pGDB, int nId, const std::string& sFile, const std::string& sFileM, IEGrScene* pScene) = 0 ; +}; + +//----------------------------------------------------------------------------- +extern "C" { + EEX_EXPORT IExportThreeJS* CreateExportThreeJS( void) ; +} diff --git a/EGrScene.h b/EGrScene.h index 1db0e8c..0bc8b3a 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -72,6 +72,7 @@ class IEGrScene virtual bool ZoomChange( double dCoeff) = 0 ; virtual bool ZoomOnPoint( const Point3d& ptWin, double dCoeff) = 0 ; virtual bool ZoomWin( const Point3d& ptWin1, const Point3d& ptWin2) = 0 ; + virtual void GetOrthoCamParam(double* pdWidth, double* pdHeight, double* pdNear, double* pdFar) const = 0; // ShowMode virtual bool SetShowMode( int nShowMode) = 0 ; virtual int GetShowMode( void) const = 0 ; @@ -93,6 +94,7 @@ class IEGrScene virtual bool SetGridShow( bool bShowGrid, bool bShowFrame) = 0 ; virtual bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) = 0 ; virtual bool SetGridColor( Color colMinLine, Color colMajLine) = 0 ; + virtual void GetGridParam(double* pdSnapStep, int* pnExtStep) const = 0; // Glob Frame virtual bool SetGlobFrameShow( bool bShow) = 0 ; // Direct @@ -139,6 +141,8 @@ class IEGrScene // Image virtual bool GetImage( int nShowMode, Color colBackTop, Color colBackBottom, int nDestWidth, int nDestHeight, const std::string& sFile) = 0 ; + + } ; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index 1ea3964..163c997 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -125,6 +125,7 @@ EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath, int nFlag = EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExport3MF( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExportSvg( int nId, const std::string& sFilePath, int nFilter = 393) ; +EXE_EXPORT bool ExeExportThreeJS( int nId, const std::string& sFilePath, const std::string& sFilePathM) ; // BeamManager EXE_EXPORT bool ExeInitBeamMgr( int nFlag) ; From ea621cd6e058b15d807f980b75e635abce0e703d Mon Sep 17 00:00:00 2001 From: "riccardo.elitropi" Date: Fri, 26 Aug 2022 14:16:36 +0200 Subject: [PATCH 2/5] Include : - modifica parametri funzioni exportThreejs. --- EExExportThreeJS.h | 2 +- EXeExecutor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EExExportThreeJS.h b/EExExportThreeJS.h index c37496e..ee063da 100644 --- a/EExExportThreeJS.h +++ b/EExExportThreeJS.h @@ -32,7 +32,7 @@ class __declspec(novtable) IExportThreeJS public: virtual ~IExportThreeJS( void) {} virtual bool SetOptions( int nFilter) = 0 ; - virtual bool Export( IGeomDB* pGDB, int nId, const std::string& sFile, const std::string& sFileM, IEGrScene* pScene) = 0 ; + virtual bool Export( IGeomDB* pGDB, int nId, const std::string& sFile, IEGrScene* pScene) = 0 ; }; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index 163c997..7f58e73 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -125,7 +125,7 @@ EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath, int nFlag = EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExport3MF( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExportSvg( int nId, const std::string& sFilePath, int nFilter = 393) ; -EXE_EXPORT bool ExeExportThreeJS( int nId, const std::string& sFilePath, const std::string& sFilePathM) ; +EXE_EXPORT bool ExeExportThreeJS( int nId, const std::string& sFilePath) ; // BeamManager EXE_EXPORT bool ExeInitBeamMgr( int nFlag) ; From b7f2dadcfe7e727a189b5efc73966da69a6ae17b Mon Sep 17 00:00:00 2001 From: "riccardo.elitropi" Date: Tue, 20 Sep 2022 17:37:25 +0200 Subject: [PATCH 3/5] Include: - Modifica ExeExportThreeJS terzo parametro controllo gruppi. --- EExExportThreeJS.h | 2 +- EXeExecutor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EExExportThreeJS.h b/EExExportThreeJS.h index ee063da..730de87 100644 --- a/EExExportThreeJS.h +++ b/EExExportThreeJS.h @@ -32,7 +32,7 @@ class __declspec(novtable) IExportThreeJS public: virtual ~IExportThreeJS( void) {} virtual bool SetOptions( int nFilter) = 0 ; - virtual bool Export( IGeomDB* pGDB, int nId, const std::string& sFile, IEGrScene* pScene) = 0 ; + virtual bool Export( IGeomDB* pGDB, int nId, const std::string& sFile, IEGrScene* pScene, bool bUdm) = 0 ; }; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index c3f3757..142b027 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -125,7 +125,7 @@ EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath, int nFlag = EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExport3MF( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExportSvg( int nId, const std::string& sFilePath, int nFilter = 393) ; -EXE_EXPORT bool ExeExportThreeJS( int nId, const std::string& sFilePath) ; +EXE_EXPORT bool ExeExportThreeJS( int nId, const std::string& sFilePath, int nFilter = 393) ; // BeamManager EXE_EXPORT bool ExeInitBeamMgr( int nFlag) ; From c0073596fd516ef70114f58a3b906ac739709570 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Wed, 5 Oct 2022 12:07:17 +0200 Subject: [PATCH 4/5] Include : - Aggiornamento prototipi. --- EGrScene.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EGrScene.h b/EGrScene.h index 0bc8b3a..ccc425c 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -64,6 +64,7 @@ class IEGrScene virtual void GetCamera( double* pdAngVertDeg, double* pdAngOrizzDeg, double* pdDist = nullptr) const = 0 ; virtual int GetCameraDir( void) const = 0 ; virtual const Vector3d& GetCameraUp( void) const = 0 ; + virtual void GetOrthoCamParam(double* pdWidth, double* pdHeight, double* pdNear, double* pdFar) const = 0 ; virtual bool PanCamera( const Point3d& ptWinOld, const Point3d& ptWinNew) = 0 ; virtual bool RotateCamera( const Point3d& ptWinOld, const Point3d& ptWinNew) = 0 ; virtual bool ZoomAll( void) = 0 ; @@ -72,7 +73,6 @@ class IEGrScene virtual bool ZoomChange( double dCoeff) = 0 ; virtual bool ZoomOnPoint( const Point3d& ptWin, double dCoeff) = 0 ; virtual bool ZoomWin( const Point3d& ptWin1, const Point3d& ptWin2) = 0 ; - virtual void GetOrthoCamParam(double* pdWidth, double* pdHeight, double* pdNear, double* pdFar) const = 0; // ShowMode virtual bool SetShowMode( int nShowMode) = 0 ; virtual int GetShowMode( void) const = 0 ; @@ -94,7 +94,7 @@ class IEGrScene virtual bool SetGridShow( bool bShowGrid, bool bShowFrame) = 0 ; virtual bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) = 0 ; virtual bool SetGridColor( Color colMinLine, Color colMajLine) = 0 ; - virtual void GetGridParam(double* pdSnapStep, int* pnExtStep) const = 0; + virtual void GetGridParam(double& dSnapStep, int& nExtStep) const = 0 ; // Glob Frame virtual bool SetGlobFrameShow( bool bShow) = 0 ; // Direct From 24c1414752e47a903d107978105b888142d61a98 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Thu, 20 Oct 2022 15:56:25 +0200 Subject: [PATCH 5/5] Include : - aggiornamento e aggiunta prototipi ExportThreeJS. --- EExExportThreeJS.h | 1 + EGrScene.h | 3 ++- EXeExecutor.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/EExExportThreeJS.h b/EExExportThreeJS.h index 730de87..7909441 100644 --- a/EExExportThreeJS.h +++ b/EExExportThreeJS.h @@ -37,5 +37,6 @@ public: //----------------------------------------------------------------------------- extern "C" { + EEX_EXPORT bool SetThreeJSAuxDir( const std::string& sThreeJSAuxDir) ; EEX_EXPORT IExportThreeJS* CreateExportThreeJS( void) ; } diff --git a/EGrScene.h b/EGrScene.h index ccc425c..cc27b30 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -94,7 +94,8 @@ class IEGrScene virtual bool SetGridShow( bool bShowGrid, bool bShowFrame) = 0 ; virtual bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) = 0 ; virtual bool SetGridColor( Color colMinLine, Color colMajLine) = 0 ; - virtual void GetGridParam(double& dSnapStep, int& nExtStep) const = 0 ; + virtual void GetGridParam( double& dSnapStep, int& nExtStep) const = 0 ; + virtual bool GetShowGrid() = 0 ; // Glob Frame virtual bool SetGlobFrameShow( bool bShow) = 0 ; // Direct diff --git a/EXeExecutor.h b/EXeExecutor.h index d4f6602..40acddf 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -111,6 +111,7 @@ EXE_EXPORT bool ExeSaveMachGroupToFile( int nMGroupId, const std::string& sFileP // Exchange EXE_EXPORT int ExeGetFileType( const std::string& sFilePath) ; EXE_EXPORT bool ExeSetBtlAuxDir( const std::string& sBtlAuxDir) ; +EXE_EXPORT bool ExeSetThreeJSAuxDir( const std::string & sThreeJSAuxDir) ; EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportBtlx( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportCnc( const std::string& sFilePath, int nFlag) ;