diff --git a/TestEGk.cpp b/TestEGk.cpp index 533882a..9c21202 100644 --- a/TestEGk.cpp +++ b/TestEGk.cpp @@ -15,8 +15,8 @@ #include "stdafx.h" #include #include -#include "\EgtDev\Include\EGKPoint3d.h" - +#include "\EgtDev\Include\EGkGeoPoint3d.h" +#include "\EgtDev\Include\EGnStringUtils.h" //--------------------------- Define ----------------------------------------- @@ -66,7 +66,20 @@ wmain( int argc, wchar_t* argv[]) vtV.Set( 1, 1, 1) ; ptP.Translate( vtV) ; - cout << "Point3d=" << ptP.x << "," << ptP.y << "," << ptP.z << endl ; + cout << "Point3d=" << ToString( ptP) << endl ; + + + IGeoPoint3d* pGPnt ; + + pGPnt = GetGeoPoint3d( CreateGeoObj( KEY_GEO_PNT3D)) ; + + if ( pGPnt != nullptr) { + pGPnt->Set( ptP) ; + pGPnt->Translate( vtV) ; + cout << "GeoPoint3d=" << ToString( *(pGPnt->GetPoint())) << endl ; + + delete pGPnt ; + } return 0; } diff --git a/TestEGk.vcxproj b/TestEGk.vcxproj index 680adde..ff5a2bd 100644 --- a/TestEGk.vcxproj +++ b/TestEGk.vcxproj @@ -87,7 +87,6 @@ - diff --git a/TestEGk.vcxproj.filters b/TestEGk.vcxproj.filters index 44c3a65..cb4952d 100644 --- a/TestEGk.vcxproj.filters +++ b/TestEGk.vcxproj.filters @@ -18,9 +18,6 @@ File di intestazione - - File di intestazione - diff --git a/stdafx.h b/stdafx.h index 2849919..a60a9df 100644 --- a/stdafx.h +++ b/stdafx.h @@ -5,16 +5,28 @@ #pragma once -#include "targetver.h" +#include "/EgtDev/Include/EgtTargetVer.h" #include #include +#include +#include -#define EGTLIBDIR "/EgtDev/Lib/" -#if NDEBUG - #define EGTLIBVER "R32" +// in Debug riconoscimento memory leakage +#ifdef _DEBUG + #define _CRTDBG_MAP_ALLOC + #include + #include +#endif + +// in Debug controllo iteratori +#ifdef _DEBUG + #define _SECURE_SCL 1 #else - #define EGTLIBVER "D32" -#endif + #define _SECURE_SCL 0 +#endif + +#include "/EgtDev/Include/EgtLibVer.h" #pragma comment(lib, EGTLIBDIR "EgtGeomKernel" EGTLIBVER ".lib") +#pragma comment(lib, EGTLIBDIR "EgtGeneral" EGTLIBVER ".lib") diff --git a/targetver.h b/targetver.h deleted file mode 100644 index 2adf1bc..0000000 --- a/targetver.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -// Includere SDKDDKVer.h per definire la piattaforma Windows maggiormente disponibile. - -// Se si desidera compilare l'applicazione per una piattaforma Windows precedente, includere WinSDKVer.h e -// impostare la macro _WIN32_WINNT sulla piattaforma da supportare prima di includere SDKDDKVer.h. - -#include