diff --git a/EXE_GdbCreate.cpp b/EXE_GdbCreate.cpp index ba6b722..a46376f 100644 --- a/EXE_GdbCreate.cpp +++ b/EXE_GdbCreate.cpp @@ -583,7 +583,7 @@ ExeCreateDiametralDimension( int nParentId, int nCrvId, const Point3d& ptDim, //------------------------------------------------------------------------------- static int -MyCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptCen, const Point3d& ptP2, +MyCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptV, const Point3d& ptP2, const Point3d& ptDim, const string& sText, int nRefType) { IGeomDB* pGeomDB = GetCurrGeomDB() ; @@ -594,7 +594,7 @@ MyCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptC if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc)) return GDB_ID_NULL ; // porto in locale i punti e assegno i versori - Point3d ptP0L = GetPointLocal( pGeomDB, ptCen, nRefType, frLoc) ; + Point3d ptVL = GetPointLocal( pGeomDB, ptV, nRefType, frLoc) ; Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ; Point3d ptP2L = GetPointLocal( pGeomDB, ptP2, nRefType, frLoc) ; Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ; @@ -603,7 +603,7 @@ MyCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptC PtrOwner pDim( CreateExtDimension()) ; if ( IsNull( pDim) || ! MySetDimensionStyle( pDim ) || - ! pDim->SetAngular( ptP1L, ptP0L, ptP2L, ptDimL, vtNL, sText)) + ! pDim->SetAngular( ptP1L, ptVL, ptP2L, ptDimL, vtNL, sText)) return GDB_ID_NULL ; // inserisco la quota nel DB return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ; @@ -611,16 +611,16 @@ MyCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptC //------------------------------------------------------------------------------- int -ExeCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptCen, const Point3d& ptP2, +ExeCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptV, const Point3d& ptP2, const Point3d& ptDim, const string& sText, int nRefType) { // eseguo - int nId = MyCreateAngularDimension( nParentId, ptP1, ptCen, ptP2, ptDim, sText, nRefType) ; + int nId = MyCreateAngularDimension( nParentId, ptP1, ptV, ptP2, ptDim, sText, nRefType) ; ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { string sLua = "EgtAngularDimension(" + IdToString( nParentId) + ",{" + - ToString( ptCen) + "},{" + + ToString( ptV) + "},{" + ToString( ptP1) + "},{" + ToString( ptP2) + "},{" + ToString( ptDim) + "},'" + diff --git a/LUA_GdbCreate.cpp b/LUA_GdbCreate.cpp index a599f81..e9f51ec 100644 --- a/LUA_GdbCreate.cpp +++ b/LUA_GdbCreate.cpp @@ -400,13 +400,13 @@ LuaCreateDiametralDimension( lua_State* L ) static int LuaCreateAngularDimension(lua_State* L) { - // 6 o 7 parametri : ParentId, ptP1, ptP0, ptP2, ptDim, Text [, nRefType] + // 6 o 7 parametri : ParentId, ptP1, ptV, ptP2, ptDim, Text [, nRefType] int nParentId ; LuaCheckParam( L, 1, nParentId) Point3d ptP1 ; LuaCheckParam( L, 2, ptP1) ; - Point3d ptP0 ; - LuaCheckParam( L, 3, ptP0) ; + Point3d ptV ; + LuaCheckParam( L, 3, ptV) ; Point3d ptP2 ; LuaCheckParam( L, 4, ptP2) ; Point3d ptDim ; @@ -417,7 +417,7 @@ LuaCreateAngularDimension(lua_State* L) LuaGetParam( L, 7, nRefType) ; LuaClearStack( L) ; // creo la quota angolare - int nId = ExeCreateAngularDimension( nParentId, ptP1, ptP0, ptP2, ptDim, sText, nRefType) ; + int nId = ExeCreateAngularDimension( nParentId, ptP1, ptV, ptP2, ptDim, sText, nRefType) ; // restituisco il risultato if ( nId != GDB_ID_NULL) LuaSetParam( L, nId) ;