diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp index 30c4782..6263fe9 100644 --- a/EXE_GdbModifyCurve.cpp +++ b/EXE_GdbModifyCurve.cpp @@ -237,7 +237,8 @@ ExeApproxCurve( int nId, int nApprType, double dLinTol, double dMaxSegmLen) if ( IsCmdLog()) { string sLua = "EgtApproxCurve(" + ToString( nId) + "," + ApproxTypeToString( nApprType) + "," + - ToString( dLinTol) + ")" + + ToString( dLinTol) + "," + + ToString( dMaxSegmLen) + ")" + " -- Ok=" + ToString( bOk) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 5a3e372..2207683 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_GdbGetCurve.cpp b/LUA_GdbGetCurve.cpp index eca8813..e22d111 100644 --- a/LUA_GdbGetCurve.cpp +++ b/LUA_GdbGetCurve.cpp @@ -558,7 +558,7 @@ LuaCurveCompoNormVersor( lua_State* L) int nRefId = nId ; LuaGetParam( L, 3, nRefId) ; LuaClearStack( L) ; - // recupero l'angolo al centro della curva semplice indicizzata + // recupero il versore normale della curva semplice indicizzata (non nullo solo se arco) Vector3d vtNorm ; if ( ExeCurveCompoNormVersor( nId, nCrv, nRefId, vtNorm)) LuaSetParam( L, vtNorm) ; @@ -571,13 +571,15 @@ LuaCurveCompoNormVersor( lua_State* L) static int LuaCurveCompoGetTempProp( lua_State* L) { - // 1 parametro : Id + // 1 o 2 parametri : Id [, nPropInd] int nId ; LuaCheckParam( L, 1, nId) + int nPropInd = 0 ; + LuaGetParam( L, 2, nPropInd) ; LuaClearStack( L) ; - // recupero l'angolo al centro della curva semplice indicizzata + // recupero il vettore delle proprietà temporanee di indice dato INTVECTOR vProp ; - if ( ExeCurveCompoGetTempProp( nId, vProp, 0)) + if ( ExeCurveCompoGetTempProp( nId, vProp, nPropInd)) LuaSetParam( L, vProp) ; else LuaSetParam( L) ; @@ -588,13 +590,15 @@ LuaCurveCompoGetTempProp( lua_State* L) static int LuaCurveCompoGetTempParam( lua_State* L) { - // 1 parametro : Id + // 1 o 2 parametri : Id [, nParamInd] int nId ; LuaCheckParam( L, 1, nId) + int nParamInd = 0 ; + LuaGetParam( L, 2, nParamInd) ; LuaClearStack( L) ; - // recupero l'angolo al centro della curva semplice indicizzata + // recupero il vettore dei parametri temporanei di indice dato DBLVECTOR vParam ; - if ( ExeCurveCompoGetTempParam( nId, vParam, 0)) + if ( ExeCurveCompoGetTempParam( nId, vParam, nParamInd)) LuaSetParam( L, vParam) ; else LuaSetParam( L) ; diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 6a51f08..6e1e133 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -3708,7 +3708,7 @@ LuaGetCalcPositions( lua_State* L) static int LuaGetCalcTipFromPositions( lua_State* L) { - // da 4 a 10 parametri : dX, dY, dZ, dAngR1[, dAngR2][, dAngR3][, dAngR4][, dAngR5][, dAngR6][, bBottom] + // da 3 a 10 parametri : dX, dY, dZ [, dAngR1] [, dAngR2] [, dAngR3] [, dAngR4] [, dAngR5] [, dAngR6] [, bBottom] double dX ; LuaCheckParam( L, 1, dX) double dY ; @@ -3742,7 +3742,7 @@ LuaGetCalcTipFromPositions( lua_State* L) static int LuaGetCalcToolDirFromAngles( lua_State* L) { - // da 1 a 6 parametri : dAngR1, dAngR2, dAngR3, dAngR4, dAngR5, dAngR6 + // da 0 a 6 parametri : [dAngR1] [, dAngR2] [, dAngR3] [, dAngR4] [, dAngR5] [, dAngR6] DBLVECTOR vAng ; for ( int i = 1 ; i <= 6 ; ++ i) { double dAng ; @@ -3767,7 +3767,7 @@ LuaGetCalcToolDirFromAngles( lua_State* L) static int LuaGetCalcAuxDirFromAngles( lua_State* L) { - // da 1 a 6 parametri : dAngR1, dAngR2, dAngR3, dAngR4, dAngR5, dAngR6 + // da 0 a 6 parametri : [dAngR1] [, dAngR2] [, dAngR3] [, dAngR4] [, dAngR5] [, dAngR6] DBLVECTOR vAng ; for ( int i = 1 ; i <= 6 ; ++ i) { double dAng ;