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

EgtExecutor 2.5j1 :

Browse Source 
- riallineamento
- sistemazioni per chiave di rete esposta su Internet.
This commit is contained in:
Dario Sassi
2023-10-09 13:07:33 +02:00
parent 206f3bdf61
commit 5ec4ed439f
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXE_GdbModifySurf.cpp
+6 -4
View File
@@ -929,9 +929,9 @@ ExeSurfTmCut( int nId, int nCutterId, bool bInVsOut, bool bSaveOnEq)
//----------------------------------------------------------------------------
bool
ExeSubtractProjectedFacesOnStmFace( int nSurfId, int nFaceInd, int nDestGrpId,
INTVECTOR vSurfsId, INTVECTOR vSurfFacesInd, bool bOCFlag,
int& nNewId, bool& bExistProjection, int& nNewFaceNbr)
ExeSurfTmSubtractProjectedFacesOnFace( int nSurfId, int nFaceInd, int nDestGrpId,
INTVECTOR vSurfsId, INTVECTOR vSurfFacesInd, bool bOCFlag,
bool& bExistProjection, int& nNewId, int& nNewFaceNbr)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
@@ -965,8 +965,10 @@ ExeSubtractProjectedFacesOnStmFace( int nSurfId, int nFaceInd, int nDestGrpId,
ISurfTriMesh* pStmRes = nullptr ;
bool bOk = SubtractProjectedFacesOnStmFace( *pStm, nFaceInd, vpStmOthers, vSurfFacesInd, bOCFlag,
bExistProjection, pStmRes, nNewFaceNbr) ;
if ( ! bOk)
if ( ! bOk) {
delete( pStmRes) ;
pStmRes = nullptr ;
}
nNewId = GDB_ID_NULL ;
if ( bOk && pStmRes != nullptr) {
EXE_General.cpp
+8 -5
View File
@@ -278,9 +278,12 @@ ExeSetLockId( const string& sLockId)
bOk = ( s_nKeyType != KEY_LOCK_TYPE_HW) ;
break ;
case KEY_LOCK_TYPE_HW :
ExeSetNetHwKey( bNetKey, nUserId) ;
bOk = true ;
break ;
{ string sAddrPort ;
GetLockIdStringNetData( sLockId, sAddrPort) ;
ExeSetNetHwKey( bNetKey, nUserId, sAddrPort) ;
bOk = true ;
break ;
}
}
if ( bOk)
s_sLockId = sLockId ;
@@ -300,11 +303,11 @@ ExeGetLockId( void)
//-----------------------------------------------------------------------------
bool
ExeSetNetHwKey( bool bNetHwKey, int nUserId)
ExeSetNetHwKey( bool bNetHwKey, int nUserId, const string& sAddrPort)
{
s_bNetHwKey = bNetHwKey ;
SetEGnNetHwKey( s_bNetHwKey) ;
return SetNetHwKey( s_bNetHwKey, nUserId) ;
return SetNetHwKey( s_bNetHwKey, nUserId, sAddrPort) ;
}
//-----------------------------------------------------------------------------
EgtExecutor.rc
BIN
View File
Binary file not shown.
LUA_GdbGetSurf.cpp
+5 -3
View File
@@ -723,7 +723,7 @@ LuaExtractSurfTmLoops( lua_State* L)
static int
LuaGetSurfTmSilhouette( lua_State* L)
{
// 4 o 5 o 6 parametri : nId, vtDir, dToler, nDestGrpId [, nRefType] [, bAllTria]
// 4 o 5 o 6 parametri : nId, vtDir, dToler, nDestGrpId [, nRefType [, bAllTria]]
int nId ;
LuaCheckParam( L, 1, nId)
Vector3d vtDir ;
@@ -733,9 +733,11 @@ LuaGetSurfTmSilhouette( lua_State* L)
int nDestGrpId ;
LuaCheckParam( L, 4, nDestGrpId)
int nRefType = RTY_DEFAULT ;
LuaGetParam( L, 5, nRefType) ;
bool bAllTria = false ;
LuaGetParam( L, 6, bAllTria) ;
if ( LuaGetParam( L, 5, nRefType))
LuaGetParam( L, 6, bAllTria) ;
else
LuaGetParam( L, 5, bAllTria) ;
LuaClearStack( L) ;
// recupero i contorni della superficie
int nCount = 0 ;
LUA_GdbModifySurf.cpp
+11 -8
View File
@@ -392,7 +392,7 @@ LuaSurfTmCut( lua_State* L)
static int
LuaSubtractProjectedFacesOnStmFace( lua_State* L)
{
// 3 o 4 o 5 o 6 parametri : nSurfId, nFaceInd, nDestGrpId [, vSurfsId] [, vSurfFacesInd] [, bOCFlag]
// 3 o 4 o 5 o 6 parametri : nSurfId, nFaceInd, nDestGrpId [, vSurfsId, vSurfFacesInd] [, bOCFlag]
int nSurfId ;
LuaCheckParam( L, 1, nSurfId) ;
int nFaceInd ;
@@ -400,25 +400,28 @@ LuaSubtractProjectedFacesOnStmFace( lua_State* L)
int nDestGrpId ;
LuaCheckParam( L, 3, nDestGrpId) ;
INTVECTOR vSurfsId ;
LuaGetParam( L, 4, vSurfsId) ;
INTVECTOR vSurfFacesInd ;
LuaGetParam( L, 5, vSurfFacesInd) ;
bool bOCFlag = true ;
LuaGetParam( L, 6, bOCFlag) ;
if ( LuaGetParam( L, 4, vSurfsId)) {
LuaCheckParam( L, 5, vSurfFacesInd)
LuaGetParam( L, 6, bOCFlag) ;
}
else
LuaGetParam( L, 4, bOCFlag) ;
LuaClearStack( L) ;
// sottraggo alla faccia scelta la proiezione delle altre
int nNewId = GDB_ID_NULL;
bool bExistProjection = false ;
int nNewFaceNbr = -1 ;
bool bOk = ExeSubtractProjectedFacesOnStmFace( nSurfId, nFaceInd, nDestGrpId, vSurfsId, vSurfFacesInd,
bOCFlag, nNewId, bExistProjection, nNewFaceNbr) ;
int nNewFaceNbr = 0 ;
bool bOk = ExeSurfTmSubtractProjectedFacesOnFace( nSurfId, nFaceInd, nDestGrpId, vSurfsId, vSurfFacesInd,
bOCFlag, bExistProjection, nNewId, nNewFaceNbr) ;
LuaSetParam( L, bOk) ;
LuaSetParam( L, bExistProjection) ;
LuaSetParam( L, nNewFaceNbr) ;
if ( nNewId != GDB_ID_NULL)
LuaSetParam( L, nNewId) ;
else
LuaSetParam( L) ;
LuaSetParam( L, nNewFaceNbr) ;
return 4 ;
}