From 67221b4a04733a75b056556d00cb47e07a3ea6bb Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 1 Jun 2021 19:35:01 +0200 Subject: [PATCH] EgtInterface 2.3f1 : - modificata interfaccia EgtBeamAddProcess e EgtBeamModifyProcess per aggiunta parametro wsUserAttr. --- API_BeamMgr.cpp | 14 ++++++++++---- EgtInterface.rc | Bin 11718 -> 11718 bytes 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/API_BeamMgr.cpp b/API_BeamMgr.cpp index 92113ef..516873f 100644 --- a/API_BeamMgr.cpp +++ b/API_BeamMgr.cpp @@ -87,7 +87,7 @@ __stdcall EgtBeamSetPartBox( double dLength, double dHeight, double dWidth, BOOL int __stdcall EgtBeamAddProcess( int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId, const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3], - int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) + int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) { Frame3d frFrame ; if ( ! frFrame.Set( ptOrig, vX, vY, vZ)) @@ -97,15 +97,18 @@ __stdcall EgtBeamAddProcess( int nGroup, int nProc, int nSide, const wchar_t* ws for ( int i = 0 ; i < nPar ; ++i) { vdPar.push_back( vPar[i]) ; } + STRVECTOR vsUAtt ; + if ( ! Tokenize( string( wstrztoA( wsUAtts)), "\n", vsUAtt)) + return FALSE ; return ExeBeamAddProcess( nGroup, nProc, nSide, wstrztoA( wsDes), nProcId, frFrame, - vdPar, wstrztoA( wsPar), ( bUpdate != FALSE)) ; + vdPar, wstrztoA( wsPar), vsUAtt, ( bUpdate != FALSE)) ; } //----------------------------------------------------------------------------- int __stdcall EgtBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId, const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3], - int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) + int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) { Frame3d frFrame ; if ( ! frFrame.Set( ptOrig, vX, vY, vZ)) @@ -115,8 +118,11 @@ __stdcall EgtBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, c for ( int i = 0 ; i < nPar ; ++i) { vdPar.push_back( vPar[i]) ; } + STRVECTOR vsUAtt ; + if ( ! Tokenize( string( wstrztoA( wsUAtts)), "\n", vsUAtt)) + return FALSE ; return ExeBeamModifyProcess( nGeomId, nGroup, nProc, nSide, wstrztoA( wsDes), nProcId, frFrame, - vdPar, wstrztoA( wsPar), ( bUpdate != FALSE)) ; + vdPar, wstrztoA( wsPar), vsUAtt, ( bUpdate != FALSE)) ; } //----------------------------------------------------------------------------- diff --git a/EgtInterface.rc b/EgtInterface.rc index 0c03b541135843eb4a0d59788b8594b77468f1e1..cd847bd1faaac44a54950b24f48ba626c5a1608b 100644 GIT binary patch delta 135 zcmX>WeJpyzH#Sx?1|0^&%^&$rGEF|hS;L&hU^w}qpzh`Zt{N7&oFg+#d~yMo#bg5> joym8&o@`zvtiudf1Ju7n5}`jp3aWeJpyzH#SyN1|0_D%^&$rGEF|hS;L&lU_AMupzh`Zt{N7&oFg+#d~yMo#bg5> joym8&o@`zvtiudf1Ju7n5}`jp3a