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

EgtInterface :

Browse Source 
- piccoli miglioramenti.
This commit is contained in:
Dario Sassi
2014-09-20 22:05:32 +00:00
parent 9c5d823190
commit 6735c79753
6 changed files with 160 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API_Exchange.cpp
+136
View File
@@ -0,0 +1,136 @@
//----------------------------------------------------------------------------
// EgalTech 2014-2014
//----------------------------------------------------------------------------
// File : API_Exchange.cpp Data : 20.09.14 Versione : 1.5i4
// Contenuto : Funzioni import/export per API.
//
//
//
// Modifiche : 20.09.14 DS Creazione modulo.
//
//
//----------------------------------------------------------------------------
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "API.h"
#include "API_Macro.h"
#include "/EgtDev/Include/EInAPI.h"
#include "/EgtDev/Include/EExImportStl.h"
#include "/EgtDev/Include/EExImportDxf.h"
#include "/EgtDev/Include/EExImportCnc.h"
#include "/EgtDev/Include/EExExportStl.h"
#include "/EgtDev/Include/EExExportDxf.h"
#include "/EgtDev/Include/EGnStringUtils.h"
#include "/EgtDev/Include/EGnStringConverter.h"
#include "/EgtDev/Include/EgtPointerOwner.h"
using namespace std ;
//-----------------------------------------------------------------------------
int
__stdcall EgtGetFileType( const wchar_t* wsFilePath)
{
// divido in nome e direttorio
string sFileDir, sFileName ;
SplitLast( wstrztoA( wsFilePath), "\\", sFileDir, sFileName) ;
// recupero l'estensione
string sFileTitle, sFileExt ;
SplitLast( sFileName, ".", sFileTitle, sFileExt) ;
ToUpper( sFileExt) ;
if ( sFileExt == "NGE")
return 1 ;
else if ( sFileExt == "NFE")
return 2 ;
else if ( sFileExt == "DXF")
return 11 ;
else if ( sFileExt == "STL")
return 12 ;
else if ( sFileExt == "CNC")
return 13 ;
else {
// emetto info
string sInfo = "File type (" + sFileExt + ") not recognized" ;
LOG_INFO( GetLogger(), sInfo.c_str())
return 0 ;
}
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtImportDxf( int nGseCtx, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// importo il file DXF
// aggiungo un gruppo pezzo
int nPartId = pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
// preparo l'importatore
PtrOwner<IImportDxf> pImpDxf( CreateImportDxf()) ;
VERIFY_NULL( Get( pImpDxf), "Error in CreateImportDxf", FALSE)
// eseguo l'importazione
return ( pImpDxf->Import( wstrztoA( wsFilePath), pGeomDB, nPartId) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtImportStl( int nGseCtx, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// importo il file STL
// aggiungo un gruppo pezzo e un gruppo layer
int nPartId = pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
int nLayerId = pGeomDB->AddGroup( GDB_ID_NULL, nPartId, Frame3d()) ;
// preparo l'importatore
PtrOwner<IImportStl> pImpStl( CreateImportStl()) ;
VERIFY_NULL( Get( pImpStl), "Error in CreateImportStl", FALSE)
// eseguo l'importazione
return ( pImpStl->Import( wstrztoA( wsFilePath), pGeomDB, nLayerId) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtImportCnc( int nGseCtx, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// importo il file CNC
// aggiungo un gruppo pezzo
int nPartId = pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
// preparo l'importatore
PtrOwner<IImportCnc> pImpCnc( CreateImportCnc()) ;
VERIFY_NULL( Get( pImpCnc), "Error in CreateImportCnc", FALSE)
// eseguo l'importazione
return ( pImpCnc->Import( wstrztoA( wsFilePath), pGeomDB, nPartId) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtExportDxf( int nGseCtx, int nId, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// esporto il file DXF
// preparo l'esportatore
PtrOwner<IExportDxf> pExpDxf( CreateExportDxf()) ;
VERIFY_NULL( Get( pExpDxf), "Error in CreateExportDxf", FALSE)
// eseguo l'esportazione
return ( pExpDxf->Export( pGeomDB, nId, wstrztoA( wsFilePath)) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtExportStl( int nGseCtx, int nId, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// esporto il file STL
// preparo l'esportatore
PtrOwner<IExportStl> pExpStl( CreateExportStl()) ;
VERIFY_NULL( Get( pExpStl), "Error in CreateExportStl", FALSE)
// eseguo l'esportazione
return ( pExpStl->Export( pGeomDB, nId, wstrztoA( wsFilePath)) ? TRUE : FALSE) ;
}
API_GdbObjects.cpp
+10
View File
@@ -33,6 +33,16 @@ BOOL
return ( pGeomDB->ExistsObj( nId) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
int
__stdcall EgtGetGroupObjs( int nGseCtx, int nId)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
// recupero il primo oggetto nel gruppo
return ( pGeomDB->GetGroupObjs( nId)) ;
}
//-----------------------------------------------------------------------------
int
__stdcall EgtGetFirstInGroup( int nGseCtx, int nGroupId)
API_GeomDB.cpp
-94
View File
@@ -16,10 +16,6 @@
#include "API.h"
#include "API_Macro.h"
#include "/EgtDev/Include/EInAPI.h"
#include "/EgtDev/Include/EExImportStl.h"
#include "/EgtDev/Include/EExImportDxf.h"
#include "/EgtDev/Include/EExExportStl.h"
#include "/EgtDev/Include/EExExportDxf.h"
#include "/EgtDev/Include/EGnStringUtils.h"
#include "/EgtDev/Include/EGnStringConverter.h"
#include "/EgtDev/Include/EgtPointerOwner.h"
@@ -95,93 +91,3 @@ __stdcall EgtSaveFile( int nGseCtx, const wchar_t* wsFilePath, int nFlag)
// salvo il file
return ( pGeomDB->Save( wstrztoA( wsFilePath), nFlag) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
int
__stdcall EgtGetFileType( const wchar_t* wsFilePath)
{
// divido in nome e direttorio
string sFileDir, sFileName ;
SplitLast( wstrztoA( wsFilePath), "\\", sFileDir, sFileName) ;
// recupero l'estensione
string sFileTitle, sFileExt ;
SplitLast( sFileName, ".", sFileTitle, sFileExt) ;
ToUpper( sFileExt) ;
if ( sFileExt == "NGE")
return 1 ;
else if ( sFileExt == "NFE")
return 2 ;
else if ( sFileExt == "DXF")
return 11 ;
else if ( sFileExt == "STL")
return 12 ;
else {
// emetto info
string sInfo = "File type (" + sFileExt + ") not recognized" ;
LOG_INFO( GetLogger(), sInfo.c_str())
return 0 ;
}
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtImportDxf( int nGseCtx, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// importo il file DXF
// aggiungo un gruppo pezzo
int nPartId = pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
// preparo l'importatore
PtrOwner<IImportDxf> pImpDxf( CreateImportDxf()) ;
VERIFY_NULL( Get( pImpDxf), "Error in CreateImportDxf", FALSE)
// eseguo l'importazione
return ( pImpDxf->Import( wstrztoA( wsFilePath), pGeomDB, nPartId) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtImportStl( int nGseCtx, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// importo il file STL
// aggiungo un gruppo pezzo e un gruppo layer
int nPartId = pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
int nLayerId = pGeomDB->AddGroup( GDB_ID_NULL, nPartId, Frame3d()) ;
// preparo l'importatore
PtrOwner<IImportStl> pImpStl( CreateImportStl()) ;
VERIFY_NULL( Get( pImpStl), "Error in CreateImportStl", FALSE)
// eseguo l'importazione
return ( pImpStl->Import( wstrztoA( wsFilePath), pGeomDB, nLayerId) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtExportDxf( int nGseCtx, int nId, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// esporto il file DXF
// preparo l'esportatore
PtrOwner<IExportDxf> pExpDxf( CreateExportDxf()) ;
VERIFY_NULL( Get( pExpDxf), "Error in CreateExportDxf", FALSE)
// eseguo l'esportazione
return ( pExpDxf->Export( pGeomDB, nId, wstrztoA( wsFilePath)) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtExportStl( int nGseCtx, int nId, const wchar_t* wsFilePath)
{
IGeomDB* pGeomDB = GetGeomDB( nGseCtx) ;
VERIFY_GEOMDB( pGeomDB, FALSE)
// esporto il file STL
// preparo l'esportatore
PtrOwner<IExportStl> pExpStl( CreateExportStl()) ;
VERIFY_NULL( Get( pExpStl), "Error in CreateExportStl", FALSE)
// eseguo l'esportazione
return ( pExpStl->Export( pGeomDB, nId, wstrztoA( wsFilePath)) ? TRUE : FALSE) ;
}
EInDllMain.cpp
+2 -2
View File
@@ -31,7 +31,7 @@
const char* EIN_STR = "EgtInterfaceR32.dll ver. " ;
#endif
#endif
const int STR_DIM = 40 ;
const int STR_DIM = 50 ;
//-----------------------------------------------------------------------------
static HINSTANCE s_hModule = NULL ;
@@ -63,7 +63,7 @@ DllMain( HMODULE hModule, DWORD dwReason, LPVOID lpReserved)
//-----------------------------------------------------------------------------
const char*
GetEInVersion( void)
__stdcall GetEInVersion( void)
{
std::string sVer ;
EgtInterface.vcxproj
+9 -6
View File
@@ -105,7 +105,7 @@ copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\DllD32</Command>
</PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;_DEB32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;_DEB32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,11 +114,13 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_AM_EIN;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<OmitFramePointers>false</OmitFramePointers>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
@@ -126,7 +128,7 @@ copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\DllD64</Command>
</PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;_DEB64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;_DEB64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -142,7 +144,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -152,7 +154,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
copy $(TargetPath) \EgtProg\Dll32</Command>
</PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NDEB32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;NDEB32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -169,7 +171,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -179,7 +181,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
copy $(TargetPath) \EgtProg\Dll64</Command>
</PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NDEB64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;NDEB64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -192,6 +194,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="API_Exchange.cpp" />
<ClCompile Include="API_GdbObjAttribs.cpp" />
<ClCompile Include="API_GdbObjects.cpp" />
<ClCompile Include="API_General.cpp" />
EgtInterface.vcxproj.filters
+3
View File
@@ -65,6 +65,9 @@
<ClCompile Include="API_GdbObjAttribs.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="API_Exchange.cpp">
<Filter>File di origine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EgtInterface.rc">