diff --git a/EXE_GdbCreate.cpp b/EXE_GdbCreate.cpp index 94ebfc8..0d09256 100644 --- a/EXE_GdbCreate.cpp +++ b/EXE_GdbCreate.cpp @@ -766,17 +766,17 @@ MyCreateAngularDimensionFromLines( int nParentId, INTVECTOR vLineIds, const Poin return false ; if ( abs(( ptDim1 - ptP1L).Len() + ( ptP0L - ptDim1).Len() - ( ptP0L - ptP1L).Len()) < EPS_SMALL || abs(( ptDim1 - ptP1L).Len() + ( ptP0L - ptP1L ).Len() - ( ptDim1 - ptP0L).Len()) < EPS_SMALL) - // ptDim è dal lato di ptP1L - ptP1L = ptP1L ; + // ptDim è dal lato di ptP1L, quindi tengo ptP1L + ; else - // ptDim è dal lato di ptP2L + // ptDim è dal lato di ptP2L ptP1L = ptP2L ; if ( abs(( ptDim2 - ptP3L).Len() + ( ptP0L - ptDim2).Len() - ( ptP0L - ptP3L).Len()) < EPS_SMALL || abs(( ptDim2 - ptP3L).Len() + ( ptP0L - ptP3L).Len() - ( ptDim2 - ptP0L).Len()) < EPS_SMALL) - // ptDim è dal lato di ptP1L - ptP3L = ptP3L ; + // ptDim è dal lato di ptP1L, quindi tengo ptP3L + ; else - // ptDim è dal lato di ptP2L + // ptDim è dal lato di ptP2L ptP3L = ptP4L ; } diff --git a/EXE_GdbCreateCurve.cpp b/EXE_GdbCreateCurve.cpp index 850345c..299c046 100644 --- a/EXE_GdbCreateCurve.cpp +++ b/EXE_GdbCreateCurve.cpp @@ -1948,7 +1948,7 @@ ExeCreateCurveCompoByInterpolation( int nParentId, const PolyLine& PL, int nType bFound ; bFound = PL.GetNextPoint( ptP)) crvByInterp.AddPoint( ptP) ; - PtrOwner pCrvCompo( crvByInterp.GetCurve( nMethod, nType)) ; + PtrOwner pCrvCompo( crvByInterp.GetCurve( nMethod, nCrvType)) ; bOk = bOk && ! IsNull( pCrvCompo) ; // assegno il versore estrusione bOk = bOk && pCrvCompo->SetExtrusion( Z_AX) ; diff --git a/EXE_GdbGetCurve.cpp b/EXE_GdbGetCurve.cpp index 04bbe0b..54b6702 100644 --- a/EXE_GdbGetCurve.cpp +++ b/EXE_GdbGetCurve.cpp @@ -188,6 +188,8 @@ ExeCurveIsACircle( int nId, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& b bCCW = ( pArc->GetAngCenter() > 0) ; return true ; } + else + return false ; } case CRV_COMPO : { ICurveComposite* pCompo = GetCurveComposite( pGObj) ; diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 1b98ab1..a403e49 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_General.cpp b/LUA_General.cpp index 1ba55aa..1066edb 100644 --- a/LUA_General.cpp +++ b/LUA_General.cpp @@ -256,7 +256,10 @@ LuaSetVal( lua_State* L) } break ; } // restituisco il risultato - LuaSetParam( L, sNotes) ; + if ( bOk) + LuaSetParam( L, sNotes) ; + else + LuaSetParam(L, "") ; return 1 ; }