From e2b0a333da40b567327fd84b32144106273771a1 Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 1 Aug 2021 10:54:29 +0200 Subject: [PATCH] EgtExecutor 2.3h1 : - la versione x64 compilata con clang-cl - migliorie e correzioni suggerite dal nuovo compilatore. --- EXE_GdbCreateCurve.cpp | 6 ++-- EXE_GdbCreateSurf.cpp | 1 - EXE_GdbGetSurf.cpp | 4 +-- EXE_GdbGetVol.cpp | 2 +- EXE_GdbModifyCurve.cpp | 3 +- EXE_GdbPartLayers.cpp | 2 -- EXE_GeomDB.cpp | 2 +- EXE_MachMgr.cpp | 2 +- EXE_Macro.h | 30 ++++++++++++----- EXE_ShortestPath.cpp | 2 +- EgtExecutor.rc | Bin 16176 -> 16176 bytes EgtExecutor.vcxproj | 6 ++-- LUA_Base.cpp | 74 ++++++++++++++++++++--------------------- LUA_GdbCreateSurf.cpp | 1 - PhotoObj.h | 2 +- resource.h | Bin 2652 -> 1290 bytes 16 files changed, 74 insertions(+), 63 deletions(-) diff --git a/EXE_GdbCreateCurve.cpp b/EXE_GdbCreateCurve.cpp index b68a4ec..3076ada 100644 --- a/EXE_GdbCreateCurve.cpp +++ b/EXE_GdbCreateCurve.cpp @@ -243,7 +243,7 @@ CreateLinePointTgCurve( IGeomDB* pGeomDB, int nParentId, // recupero la curva const ICurve* pCurve = GetCurve( pGeomDB->GetGeoObj( nIdF)) ; if ( pCurve == nullptr) - return false ; + return nullptr ; // calcolo la retta tangente alla curva PtrOwner pCrvLine ; pCrvLine.Set( GetLinePointTgCurve( ptSloc, *pCurve, ptNloc)) ; @@ -359,7 +359,7 @@ CreateLineTgTwoCurves( IGeomDB* pGeomDB, int nParentId, // recupero la seconda curva const ICurve* pCrv2 = GetCurve( pGeomDB->GetGeoObj( nIdF)) ; if ( pCrv2 == nullptr) - return false ; + return nullptr ; // porto la seconda curva nel riferimento della prima PtrOwner pCrv2Loc( pCrv2->Clone()) ; if ( IsNull( pCrv2Loc)) @@ -2432,7 +2432,7 @@ CalcExtrusion( IGeomDB* pGeomDB, int nParentId, int nRefType) // riferimento dell'entità Frame3d frEnt ; if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frEnt)) - return false ; + return V_NULL ; // versore estrusione Vector3d vtExtr = Z_AX ; if ( nRefType == RTY_GLOB) diff --git a/EXE_GdbCreateSurf.cpp b/EXE_GdbCreateSurf.cpp index 208779e..5e6cf74 100644 --- a/EXE_GdbCreateSurf.cpp +++ b/EXE_GdbCreateSurf.cpp @@ -278,7 +278,6 @@ MyCreateSurfFlatRegion( int nParentId, const INTVECTOR& vCrvIds, int* pnCount) // costruisco la regione piana SurfFlatRegionByContours SfrCntr ; // creo le copie locali delle curve - bool bFirst = true ; for ( size_t i = 0 ; i < vCrvIds.size() ; ++ i) { int nId = (( vCrvIds[i] != GDB_ID_SEL) ? vCrvIds[i] : pGeomDB->GetFirstSelectedObj()) ; while ( nId != GDB_ID_NULL) { diff --git a/EXE_GdbGetSurf.cpp b/EXE_GdbGetSurf.cpp index 70f62bc..34db40b 100644 --- a/EXE_GdbGetSurf.cpp +++ b/EXE_GdbGetSurf.cpp @@ -530,11 +530,11 @@ ExeSurfTmFacetOppositeSideEx( int nId, int nFacet, const Vector3d& vtDir, int nR else break ; } - // elimino le curve estreme molto corte ( 0.1 mm) + // elimino le curve estreme molto corte ( 0.5 mm) const double REF_LEN = 10.0 ; double dCompoLen ; if ( pCrvCompo->GetLength( dCompoLen) && dCompoLen > REF_LEN) { - const double MIN_LEN = 0.1 ; + const double MIN_LEN = 0.5 ; double dCrvLen ; pCrv = pCrvCompo->GetFirstCurve() ; if ( pCrv != nullptr && pCrv->GetLength( dCrvLen) && dCrvLen < MIN_LEN) diff --git a/EXE_GdbGetVol.cpp b/EXE_GdbGetVol.cpp index 2437022..46e32a5 100644 --- a/EXE_GdbGetVol.cpp +++ b/EXE_GdbGetVol.cpp @@ -196,7 +196,7 @@ ExeVolZmapGetDepth( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRef Vector3d vtVL = GetVectorLocal( pGeomDB, vtDir, nRefType, frLoc) ; // recupero lo Zmap e calcolo profondità IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ; - bOk = bOk && ( pVZM != nullptr && pVZM->GetDepth( ptP, vtDir, dInLen, dOutLen, bExact)) ; + bOk = bOk && ( pVZM != nullptr && pVZM->GetDepth( ptPL, vtVL, dInLen, dOutLen, bExact)) ; ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp index d04d9cb..b9fbbf9 100644 --- a/EXE_GdbModifyCurve.cpp +++ b/EXE_GdbModifyCurve.cpp @@ -1772,7 +1772,7 @@ ExeMoveCurveCompoCurve( int nId, int nCrv, const Vector3d& vtMove, int nRefType) // porto in locale il movimento Vector3d vtMoveL = GetVectorLocal( pGeomDB, vtMove, nRefType, frLoc) ; // eseguo la modifica - bOk = bOk && pCompo->MoveCurve( nCrv, vtMove) ; + bOk = bOk && pCompo->MoveCurve( nCrv, vtMoveL) ; ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -1962,7 +1962,6 @@ MyChainCurvesInGroup( int nGroupId, const Point3d& ptNear, bool bAllowInvert, in nId = pGeomDB->GetNext( nId) ; } // recupero i percorsi concatenati - int nFirstId = GDB_ID_NULL ; Point3d ptNearL = GetPointLocal( pGeomDB, ptNear, nRefType, frGrp) ; INTVECTOR vId2s ; while ( chainC.GetChainFromNear( ptNearL, false, vId2s)) { diff --git a/EXE_GdbPartLayers.cpp b/EXE_GdbPartLayers.cpp index 602f51a..b893715 100644 --- a/EXE_GdbPartLayers.cpp +++ b/EXE_GdbPartLayers.cpp @@ -193,7 +193,6 @@ ExeResetCurrPartLayer( void) { GseContext* pGseCtx = GetCurrGseContext() ; VERIFY_CTX_GEOMDB( pGseCtx, false) - IGeomDB* pGeomDB = pGseCtx->m_pGeomDB ; // reset pGseCtx->m_nCurrPart = GDB_ID_NULL ; pGseCtx->m_nCurrLayer = GDB_ID_NULL ; @@ -600,7 +599,6 @@ ExeSelectPathObjs( int nId, bool bHaltOnFork) } } // recupero il primo percorso concatenato - int nFirstId = GDB_ID_NULL ; INTVECTOR vId2s ; bOk = bOk && chainC.GetChainFromNear( ptNear, bHaltOnFork, vId2s) ; for ( size_t i = 0 ; i < vId2s.size() ; ++i) { diff --git a/EXE_GeomDB.cpp b/EXE_GeomDB.cpp index 5057fc1..01d43bb 100644 --- a/EXE_GeomDB.cpp +++ b/EXE_GeomDB.cpp @@ -32,7 +32,7 @@ ExeInitContext( void) int nGseCtx = CreateGseContext() ; if ( nGseCtx == 0) { ResetCurrGseContext() ; - LOG_ERROR( GetLogger(), "Error in CreateGseContext (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in CreateGseContext (ExeInitContext)") return 0 ; } GseContext* pGseCtx = GetGseContext( nGseCtx) ; diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 8cd83fd..a476519 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -15,7 +15,7 @@ #include "stdafx.h" #include "EXE.h" #include "EXE_Macro.h" -#include "Lua_Base.h" +#include "LUA_Base.h" #include "AuxTools.h" #include "DllMachKernel.h" #include "/EgtDev/Include/EXeExecutor.h" diff --git a/EXE_Macro.h b/EXE_Macro.h index f738890..03c5314 100644 --- a/EXE_Macro.h +++ b/EXE_Macro.h @@ -15,16 +15,30 @@ //----------------------------------------------------------------------------- -#define VERIFY_NULL( pO, Msg, Ret) if ( pO == nullptr) { \ - LOG_ERROR( GetLogger(), Msg " (" __FUNCTION__ ")") \ - return Ret ; \ - } +#ifdef __clang__ + #define VERIFY_NULL( pO, Msg, Ret) if ( pO == nullptr) { \ + LOG_ERROR( GetLogger(), ( std::string( Msg) + " (" + __func__ + ")").c_str()) \ + return Ret ; \ + } +#else + #define VERIFY_NULL( pO, Msg, Ret) if ( pO == nullptr) { \ + LOG_ERROR( GetLogger(), Msg " (" __FUNCTION__ ")") \ + return Ret ; \ + } +#endif //----------------------------------------------------------------------------- -#define VERIFY_2NULL( pO, pQ, Msg, Ret) if ( pO == nullptr || pQ == nullptr) { \ - LOG_ERROR( GetLogger(), Msg " (" __FUNCTION__ ")") \ - return Ret ; \ - } +#ifdef __clang__ + #define VERIFY_2NULL( pO, pQ, Msg, Ret) if ( pO == nullptr || pQ == nullptr) { \ + LOG_ERROR( GetLogger(), ( std::string( Msg) + " (" + __func__ + ")").c_str()) \ + return Ret ; \ + } +#else + #define VERIFY_2NULL( pO, pQ, Msg, Ret) if ( pO == nullptr || pQ == nullptr) { \ + LOG_ERROR( GetLogger(), Msg " (" __FUNCTION__ ")") \ + return Ret ; \ + } +#endif //----------------------------------------------------------------------------- #define VERIFY_CTX( pC, Ret) VERIFY_NULL( pC, "Context invalid", Ret) diff --git a/EXE_ShortestPath.cpp b/EXE_ShortestPath.cpp index ebac7b5..6718372 100644 --- a/EXE_ShortestPath.cpp +++ b/EXE_ShortestPath.cpp @@ -15,7 +15,7 @@ #include "stdafx.h" #include "EXE.h" #include "EXE_Macro.h" -#include "Lua_Base.h" +#include "LUA_Base.h" #include "AuxTools.h" #include "/EgtDev/Include/EXeExecutor.h" #include "/EgtDev/Include/ENkShortestPath.h" diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 68bb55df1a1cc4d1de72ab56d31837f16b552337..aaf16f7d819f299b9d659da4a4fbefee6b311087 100644 GIT binary patch delta 103 zcmdl`x1nysH#Sxa1|0^&&A-{4nVBoOp`YVR)EAOJ8~s&?h~?r$(psNd^E|xgLW6 delta 103 zcmdl`x1nysH#Syt1|0^Y&A-{4nVHjp3`efTEO4>oOp`YVR)EAOJ8~s&?h~?r$(psNd^E|p&o+( diff --git a/EgtExecutor.vcxproj b/EgtExecutor.vcxproj index d1c54f3..ba8008d 100644 --- a/EgtExecutor.vcxproj +++ b/EgtExecutor.vcxproj @@ -35,7 +35,7 @@ DynamicLibrary true Unicode - v142 + ClangCL DynamicLibrary @@ -49,7 +49,7 @@ false true Unicode - v142 + ClangCL @@ -129,6 +129,7 @@ copy $(TargetPath) \EgtProg\DllD32 false true false + stdcpp17 Windows @@ -196,6 +197,7 @@ copy $(TargetPath) \EgtProg\Dll32 true true AdvancedVectorExtensions2 + stdcpp17 Windows diff --git a/LUA_Base.cpp b/LUA_Base.cpp index 04b9e48..3aa00e4 100644 --- a/LUA_Base.cpp +++ b/LUA_Base.cpp @@ -27,151 +27,151 @@ bool LuaInstallEgtFunctions( LuaMgr& LuaMgr) { if ( ! LuaInstallGeneral( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeneral (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeneral (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallUiUnits( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallUiUnits (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallUiUnits (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGeoBase( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeoBase (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeoBase (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGeomDB( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeomDB (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeomDB (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbCreate( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreate (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreate (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbCreateCurve( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateCurve (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateCurve (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbCreateSurf( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateSurf (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateSurf (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbCreateVol( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateVol (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateVol (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbModify( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModify (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModify (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbModifyCurve( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyCurve (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyCurve (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbModifySurf( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifySurf (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifySurf (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbModifyVol( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyVol (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyVol (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbGet( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGet (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGet (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbGetCurve( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetCurve (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetCurve (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbGetSurf( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetSurf (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetSurf (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbGetVol( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetVol (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetVol (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbPartLayer( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbPartLayer (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbPartLayer (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbObjects( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjects (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjects (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbObjSelection( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjSelection (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjSelection (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGdbObjAttribs( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjAttribs (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjAttribs (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGeoSnap( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeoSnap (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeoSnap (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGeoTransform( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeoTransform (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeoTransform (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGeoDist( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeoDist (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeoDist (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallGeoInters( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallGeoInters (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallGeoInters (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallCDeObjSolid( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallCDeObjSolid (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallCDeObjSolid (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallMachMgr( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallMachMgr (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallMachMgr (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallMaxFiller( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallMaxFiller (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallMaxFiller (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallNesting( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallNesting (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallNesting (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallScene( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallScene (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallScene (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallPhoto( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallPhoto (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallPhoto (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallPicture( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallPicture (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallPicture (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallImage( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallImage (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallImage (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallExchange( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallExchange (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallExchange (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallBeamMgr( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallBeamMgr (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallBeamMgr (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallPolynomialRoots( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallPolynomialRoots (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallPolynomialRoots (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallShortestPath( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallShortestPath (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallShortestPath (LuaInstallEgtFunctions)") return false ; } if ( ! LuaInstallCAvTool( LuaMgr)) { - LOG_ERROR( GetLogger(), "Error in LuaInstallCAvTool (" __FUNCTION__ ")") + LOG_ERROR( GetLogger(), "Error in LuaInstallCAvTool (LuaInstallEgtFunctions)") return false ; } return true ; diff --git a/LUA_GdbCreateSurf.cpp b/LUA_GdbCreateSurf.cpp index d75cee8..f859db0 100644 --- a/LUA_GdbCreateSurf.cpp +++ b/LUA_GdbCreateSurf.cpp @@ -160,7 +160,6 @@ LuaCreateSurfFrFatCurve( lua_State* L) LuaCheckParam( L, 4, bSquared) LuaClearStack( L) ; // creo una regione piana - int nCount = 0 ; int nId = ExeCreateSurfFrFatCurve( nParentId, nCrvId, dRad, bSquared) ; // restituisco il risultato if ( nId != GDB_ID_NULL) diff --git a/PhotoObj.h b/PhotoObj.h index 29f444e..7271422 100644 --- a/PhotoObj.h +++ b/PhotoObj.h @@ -29,6 +29,7 @@ class PhotoObj : public IUserObj bool SetOwner( int nId, IGeomDB* pGDB) override ; int GetOwner( void) const override ; IGeomDB* GetGeomDB( void) const override ; + bool GetDimensions( double& dDimX, double& dDimY) const override ; public : PhotoObj( void) ; @@ -41,7 +42,6 @@ class PhotoObj : public IUserObj bool ChangeOrigin( const Point3d& ptOri) ; bool GetCenter( Point3d& ptCen) const ; bool ChangeCenter( const Point3d& ptCen) ; - bool GetDimensions( double& dDimX, double& dDimY) const ; private : int m_nOwnerId ; diff --git a/resource.h b/resource.h index add2a5f63fa0bbd4f3a7a89bdba0c70ae33de7dd..234ef52cfb9f4ec14c6d8d1ae028ff569f8e4275 100644 GIT binary patch literal 1290 zcmaLXU2lRg6oBD-e#J?=G?`YNyJoao$go{N$ad8z6vILw;bR|J_TP8P;%1f38zVfP zl-JhT?DLZgN!cUglyT2z(btzVo57|?o4T#@4w9nncO`h!DI8R#nq8+dD5|vVGX;53 zsw?f|7O(C7N?JOsBEE z1~F@BY_CDg8XDVc5VMBH_8P>jp|QONF>82Yb1N*HgUlCZjR9M7AU10Z*pdUWS!2MK z9Ei;t1GeNqY}OdCB?scQqfaMS?;YSd-1TJ#ue-8WE#!3rm3o7E|Dw{a)y$a`IVx}; zqisxmfd@4a4~**Tm2o3vE)_g@meDiz4Wi#2DDk_J<1Zvb7Ku3Ym`vOtX2;!&OB%8G r5F3|Mlfr6#dU*dPdxCF65u9n9JT@8^$j%1?{w>@%6IEqJeti1|VJ9cl literal 2652 zcmbW3U2oGc6o%hxB>qDrE|DndKDdT1polb^+OC4DiggVtnl`B)dHT3Rg7;H#aWu={;_2@z>JJ_w;UwiqdhT(pSF`Kj=nZ_}h}P+wzWbxq)-x zHRByG!XdBl-WgtLo@QBw`R|<8`_kv?8TXz!6ULg?nuBNh2xUs`G@a3Ia{tBS+6(5m zdvZY@VEN1?yP1%sByi@8GAB>?s(*_+v94tIyNsb(_T=M6+%o3V$DF!p-$u_l#R>1M ih3@v<{GZjtb|+~$hkw_0I>vtWc-ofR-I8k+jqzWSrYo2L