diff --git a/Controller.vb b/Controller.vb index afe1a61..4017011 100644 --- a/Controller.vb +++ b/Controller.vb @@ -1476,7 +1476,7 @@ Public Class Controller End If EnableCommandLog() ' inserisco un nuovo gruppo (layer) sotto il pezzo corrente - Dim nIdNewLayer As Integer = EgtCreateGroup(EgtGetCurrPart(), Frame3d.GLOB(), REF_TY.GRID) + Dim nIdNewLayer As Integer = EgtCreateGroup(EgtGetCurrPart(), Frame3d.GLOB(), GDB_RT.GRID) ' se ok, salvo nuova situazione If nIdNewLayer <> GDB_ID.NULL Then EgtSetCurrPartLayer(EgtGetCurrPart(), nIdNewLayer) @@ -1505,8 +1505,8 @@ Public Class Controller Return False ' se Part ElseIf nParentId = GDB_ID.ROOT Then - ' cerco il primo Layer del Part - Dim nIdLayer As Integer = EgtGetFirstVisibleLayer(nId) + ' cerco il primo Layer visibile del Part + Dim nIdLayer As Integer = EgtGetFirstLayer(nId, True) EgtSetCurrPartLayer(nId, nIdLayer) ' se Layer ElseIf EgtGetParent(nParentId) = GDB_ID.ROOT Then @@ -1883,7 +1883,7 @@ Public Class Controller Case 1 ' creo il punto (i dati sono in globale) EnableCommandLog() - If EgtCreateGeoPoint(GetCurrLayer(), m_ptLast.Loc(GDB_ID.GRID), REF_TY.GRID) <> GDB_ID.NULL Then + If EgtCreateGeoPoint(GetCurrLayer(), m_ptLast.Loc(GDB_ID.GRID), GDB_RT.GRID) <> GDB_ID.NULL Then m_ptCont = m_ptLast End If DisableCommandLog() @@ -1940,7 +1940,7 @@ Public Class Controller EnableCommandLog() Dim nId As Integer = EgtCreateCurveLineEx(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), m_sepP1, m_nIdP1, - m_ptLast.Loc(GDB_ID.GRID), m_sepLast, m_nIdLast, REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), m_sepLast, m_nIdLast, GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then m_ptCont = m_ptLast @@ -1971,14 +1971,14 @@ Public Class Controller ' se punti entrambi già definiti If m_sepP1 = SEP.PT_STD And m_sepLast = SEP.PT_STD Then If nId = GDB_ID.NULL Then - EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, REF_TY.GLOB) + EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, GDB_RT.GLOB) Else - EgtModifyCurveEndPoint(nId, m_ptLast, REF_TY.GLOB) + EgtModifyCurveEndPoint(nId, m_ptLast, GDB_RT.GLOB) End If ' altrimenti, uno dei punti tangente o normale Else EgtErase(nId) - EgtCreateCurveLineEx(m_Scene.GetDragGroup(), m_ptP1, m_sepP1, m_nIdP1, m_ptLast, m_sepLast, m_nIdLast, REF_TY.GLOB) + EgtCreateCurveLineEx(m_Scene.GetDragGroup(), m_ptP1, m_sepP1, m_nIdP1, m_ptLast, m_sepLast, m_nIdLast, GDB_RT.GLOB) End If EgtDraw() End If @@ -2051,7 +2051,7 @@ Public Class Controller ' creo la linea (i punti sono in globale) EnableCommandLog() Dim nId As Integer = EgtCreateCurveLinePVL(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), - m_vtLast.Loc(GDB_ID.GRID), m_dLast, REF_TY.GRID) + m_vtLast.Loc(GDB_ID.GRID), m_dLast, GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then m_ptCont = m_ptLast @@ -2077,10 +2077,10 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then ' creo la linea di direzione - EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dAux, REF_TY.GLOB) + EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dAux, GDB_RT.GLOB) Else Dim ptP2 As Point3d = m_ptP1 + m_vtLast * m_dAux - EgtModifyCurveEndPoint(nId, ptP2, REF_TY.GLOB) + EgtModifyCurveEndPoint(nId, ptP2, GDB_RT.GLOB) End If EgtDraw() ElseIf m_nStep = 3 Then ' inserimento lunghezza @@ -2088,7 +2088,7 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then ' creo la linea di direzione - EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dLast, REF_TY.GLOB) + EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dLast, GDB_RT.GLOB) Else Dim ptP2 As Point3d = m_ptP1 + m_vtLast * m_dLast EgtModifyCurveEndPoint(nId, ptP2) @@ -2142,7 +2142,7 @@ Public Class Controller ' creo la linea (i punti sono in globale) EnableCommandLog() Dim nId As Integer = EgtCreateCurveLinePVL(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), - m_vtLast.Loc(GDB_ID.GRID), m_dLast, REF_TY.GRID) + m_vtLast.Loc(GDB_ID.GRID), m_dLast, GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then m_ptCont = m_ptLast @@ -2166,11 +2166,11 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then ' creo la linea di direzione - EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dAux, REF_TY.GLOB) + EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dAux, GDB_RT.GLOB) Else m_vtLast.Normalize() Dim ptP2 As Point3d = m_ptP1 + m_vtLast * m_dAux - EgtModifyCurveEndPoint(nId, ptP2, REF_TY.GLOB) + EgtModifyCurveEndPoint(nId, ptP2, GDB_RT.GLOB) End If EgtDraw() ElseIf m_nStep = 3 Then ' inserimento lunghezza @@ -2178,7 +2178,7 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then ' creo la linea di direzione - EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dLast, REF_TY.GLOB) + EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dLast, GDB_RT.GLOB) Else m_vtLast.Normalize() Dim ptP2 As Point3d = m_ptP1 + m_vtLast * m_dLast @@ -2214,7 +2214,7 @@ Public Class Controller ' creo la circonferenza (i punti sono in globale) EnableCommandLog() Dim nId As Integer = EgtCreateCurveCircleCPNEx(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), - m_ptLast.Loc(GDB_ID.GRID), m_sepLast, m_nIdLast, Vector3d.Z_AX, REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), m_sepLast, m_nIdLast, Vector3d.Z_AX, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -2232,9 +2232,9 @@ Public Class Controller ' durante la creazione di oggetti il gruppo di Drag ha riferimento globale Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then - EgtCreateCurveCircleCPN(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, EgtGetGridVersZ(), REF_TY.GLOB) + EgtCreateCurveCircleCPN(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, EgtGetGridVersZ(), GDB_RT.GLOB) Else - EgtModifyCurveCircleCPN(nId, m_ptLast, REF_TY.GLOB) + EgtModifyCurveCircleCPN(nId, m_ptLast, GDB_RT.GLOB) End If EgtDraw() End If @@ -2271,7 +2271,7 @@ Public Class Controller ' creo la circonferenza (i punti sono in globale) EnableCommandLog() Dim nId As Integer = EgtCreateCurveCircle(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), - Vector3d.Z_AX, 0.5 * m_dLast, REF_TY.GRID) + Vector3d.Z_AX, 0.5 * m_dLast, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -2289,7 +2289,7 @@ Public Class Controller ' durante la creazione di oggetti il gruppo di Drag ha riferimento globale Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then - EgtCreateCurveCircle(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), 0.5 * m_dLast, REF_TY.GLOB) + EgtCreateCurveCircle(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), 0.5 * m_dLast, GDB_RT.GLOB) Else EgtModifyCurveArcRadius(nId, 0.5 * m_dLast) End If @@ -2333,7 +2333,7 @@ Public Class Controller EnableCommandLog() Dim nId = EgtCreateCurveArcC2PNEx(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), m_ptP2.Loc(GDB_ID.GRID), m_sepP2, m_nIdP2, - m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then Dim PtP As Point3d @@ -2367,9 +2367,9 @@ Public Class Controller nId = GDB_ID.NULL End If If nId = GDB_ID.NULL Then - EgtCreateCurveArcC2PNEx(m_Scene.GetDragGroup(), m_ptP1, m_ptP2, m_sepP2, m_nIdP2, m_ptLast, EgtGetGridVersZ(), REF_TY.GLOB) + EgtCreateCurveArcC2PNEx(m_Scene.GetDragGroup(), m_ptP1, m_ptP2, m_sepP2, m_nIdP2, m_ptLast, EgtGetGridVersZ(), GDB_RT.GLOB) Else - EgtModifyCurveArcC2PN(nId, m_ptLast, REF_TY.GLOB) + EgtModifyCurveArcC2PN(nId, m_ptLast, GDB_RT.GLOB) End If EgtDraw() End If @@ -2407,7 +2407,7 @@ Public Class Controller ' creo l'arco (i punti sono in globale) EnableCommandLog() Dim nId = EgtCreateCurveArc3P(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), - m_ptLast.Loc(GDB_ID.GRID), m_ptP2.Loc(GDB_ID.GRID), REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), m_ptP2.Loc(GDB_ID.GRID), GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then m_ptCont = m_ptP2 @@ -2431,7 +2431,7 @@ Public Class Controller ' durante la creazione di oggetti il gruppo di Drag ha riferimento globale Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then - EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, REF_TY.GLOB) + EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, GDB_RT.GLOB) Else EgtModifyCurveEndPoint(nId, m_ptLast) End If @@ -2445,13 +2445,13 @@ Public Class Controller End If If nId = GDB_ID.NULL Then ' creazione arco 3P, in alcuni casi crea una retta - EgtCreateCurveArc3P(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, m_ptP2, REF_TY.GLOB) + EgtCreateCurveArc3P(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, m_ptP2, GDB_RT.GLOB) Else ' se modifica arco 3P impossibile, provo con una retta - If (Not EgtModifyCurveArc3P(nId, m_ptLast, REF_TY.GLOB) AndAlso + If (Not EgtModifyCurveArc3P(nId, m_ptLast, GDB_RT.GLOB) AndAlso (m_ptLast - m_ptP1) * (m_ptP2 - m_ptLast) > EPS_ZERO) Then EgtErase(nId) - EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptP2, REF_TY.GLOB) + EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptP2, GDB_RT.GLOB) End If End If EgtDraw() @@ -2500,7 +2500,7 @@ Public Class Controller ' creo l'arco (i punti sono in globale) EnableCommandLog() Dim nId = EgtCreateCurveArc2PVNEx(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), m_ptLast.Loc(GDB_ID.GRID), - m_sepLast, m_nIdLast, m_vtLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, REF_TY.GRID) + m_sepLast, m_nIdLast, m_vtLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then m_ptCont = m_ptLast @@ -2532,10 +2532,10 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then ' creo la linea di direzione - EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, vtDirS, m_dAux, REF_TY.GLOB) + EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, vtDirS, m_dAux, GDB_RT.GLOB) Else Dim ptP2 As Point3d = m_ptP1 + vtDirS * m_dAux - EgtModifyCurveEndPoint(nId, ptP2, REF_TY.GLOB) + EgtModifyCurveEndPoint(nId, ptP2, GDB_RT.GLOB) End If EgtDraw() ElseIf m_nStep = 3 Then @@ -2550,14 +2550,14 @@ Public Class Controller ' se arco da creare If nId = GDB_ID.NULL Then ' creo l'arco (i punti sono in globale), in alcuni casi particolari crea una retta - EgtCreateCurveArc2PVN(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, vtDirS, EgtGetGridVersZ(), REF_TY.GLOB) + EgtCreateCurveArc2PVN(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, vtDirS, EgtGetGridVersZ(), GDB_RT.GLOB) ' altrimenti da modificare Else ' se modifica arco impossibile, provo con una retta If (Not EgtModifyCurveEndPoint(nId, m_ptLast) AndAlso (m_ptLast - m_ptP1) * vtDirS > EPS_ZERO) Then EgtErase(nId) - EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, REF_TY.GLOB) + EgtCreateCurveLine(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, GDB_RT.GLOB) End If End If EgtDraw() @@ -2629,7 +2629,7 @@ Public Class Controller ' creo l'arco (i punti sono in globale) EnableCommandLog() Dim nId = EgtCreateCurveArc2PVN(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), m_ptLast.Loc(GDB_ID.GRID), - m_vtLast.Loc(GDB_ID.GRID), vtNorm.Loc(GDB_ID.GRID), REF_TY.GRID) + m_vtLast.Loc(GDB_ID.GRID), vtNorm.Loc(GDB_ID.GRID), GDB_RT.GRID) DisableCommandLog() If nId <> GDB_ID.NULL Then m_ptCont = m_ptLast @@ -2654,11 +2654,11 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) If nId = GDB_ID.NULL Then ' creo la linea di direzione - EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dAux, REF_TY.GLOB) + EgtCreateCurveLinePVL(m_Scene.GetDragGroup(), m_ptP1, m_vtLast, m_dAux, GDB_RT.GLOB) Else m_vtLast.Normalize() Dim ptP2 As Point3d = m_ptP1 + m_vtLast * m_dAux - EgtModifyCurveEndPoint(nId, ptP2, REF_TY.GLOB) + EgtModifyCurveEndPoint(nId, ptP2, GDB_RT.GLOB) End If EgtDraw() ElseIf m_nStep = 3 Then @@ -2675,13 +2675,13 @@ Public Class Controller vtNorm = EgtGetGridVersZ() End If ' creo l'arco (i punti sono in globale), in alcuni casi particolari crea una retta - EgtCreateCurveArc2PVN(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, m_vtLast, vtNorm, REF_TY.GLOB) + EgtCreateCurveArc2PVN(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, m_vtLast, vtNorm, GDB_RT.GLOB) EgtDraw() End If End Sub Private Function ProcessFillet() As Boolean - Select m_nStep + Select Case m_nStep Case 0 ' deve esistere un gruppo corrente e devo poter creare il gruppo di drag If GetCurrLayer() = GDB_ID.NULL Or Not m_Scene.CreateDragGroup() Then @@ -2703,7 +2703,7 @@ Public Class Controller EnableCommandLog() EgtCreateCurveFillet(GetCurrLayer(), nId1, m_ptPrevSel.Loc(GDB_ID.GRID), nId2, m_ptLastSel.Loc(GDB_ID.GRID), - Vector3d.Z_AX, m_dLast, m_bLast, REF_TY.GRID) + Vector3d.Z_AX, m_dLast, m_bLast, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -2727,7 +2727,7 @@ Public Class Controller ' creo fillet (il gruppo di Drag ha riferimento globale) EgtCreateCurveFillet(m_Scene.GetDragGroup(), nId1, m_ptPrevSel, nId2, m_ptLastSel, - EgtGetGridVersZ(), m_dLast, m_bLast, REF_TY.GLOB) + EgtGetGridVersZ(), m_dLast, m_bLast, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -2755,7 +2755,7 @@ Public Class Controller EnableCommandLog() EgtCreateCurveChamfer(GetCurrLayer(), nId1, m_ptPrevSel.Loc(GDB_ID.GRID), nId2, m_ptLastSel.Loc(GDB_ID.GRID), - Vector3d.Z_AX, m_dLast, m_bLast, REF_TY.GRID) + Vector3d.Z_AX, m_dLast, m_bLast, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -2779,7 +2779,7 @@ Public Class Controller ' creo chamfer (il gruppo di Drag ha riferimento globale) EgtCreateCurveChamfer(m_Scene.GetDragGroup(), nId1, m_ptPrevSel, nId2, m_ptLastSel, - EgtGetGridVersZ(), m_dLast, m_bLast, REF_TY.GLOB) + EgtGetGridVersZ(), m_dLast, m_bLast, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -2812,7 +2812,7 @@ Public Class Controller Dim ptDir As Point3d = m_ptP1 + ((m_ptLast - m_ptP1) * vtGridX * vtGridX) EnableCommandLog() Dim nId As Integer = EgtCreateRectangle3P(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), - m_ptLast.Loc(GDB_ID.GRID), ptDir.Loc(GDB_ID.GRID), REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), ptDir.Loc(GDB_ID.GRID), GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -2834,7 +2834,7 @@ Public Class Controller ' creo il rettangolo (drag è in globale) Dim vtGridX As Vector3d = EgtGetGridVersX() Dim ptDir As Point3d = m_ptP1 + ((m_ptLast - m_ptP1) * vtGridX * vtGridX) - EgtCreateRectangle3P(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, ptDir, REF_TY.GLOB) + EgtCreateRectangle3P(m_Scene.GetDragGroup(), m_ptP1, m_ptLast, ptDir, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -2875,10 +2875,10 @@ Public Class Controller Dim nId As Integer = GDB_ID.NULL If Not m_bLast Then nId = EgtCreatePolygonFromRadius(GetCurrLayer(), m_nLast, m_ptP1.Loc(GDB_ID.GRID), - m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, GDB_RT.GRID) Else nId = EgtCreatePolygonFromApothem(GetCurrLayer(), m_nLast, m_ptP1.Loc(GDB_ID.GRID), - m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -2902,10 +2902,10 @@ Public Class Controller ' creo il poligono (drag è in globale) If Not m_bLast Then EgtCreatePolygonFromRadius(m_Scene.GetDragGroup(), m_nLast, m_ptP1, m_ptLast, - Vector3d.Z_AX().Glob(GDB_ID.GRID), REF_TY.GLOB) + Vector3d.Z_AX().Glob(GDB_ID.GRID), GDB_RT.GLOB) Else EgtCreatePolygonFromApothem(m_Scene.GetDragGroup(), m_nLast, m_ptP1, m_ptLast, - Vector3d.Z_AX().Glob(GDB_ID.GRID), REF_TY.GLOB) + Vector3d.Z_AX().Glob(GDB_ID.GRID), GDB_RT.GLOB) End If EgtDraw() End If @@ -2944,7 +2944,7 @@ Public Class Controller ' creo il poligono (i punti sono in globale) EnableCommandLog() Dim nId As Integer = EgtCreatePolygonFromSide(GetCurrLayer(), m_nLast, m_ptP1.Loc(GDB_ID.GRID), - m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, REF_TY.GRID) + m_ptLast.Loc(GDB_ID.GRID), Vector3d.Z_AX, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -2964,7 +2964,7 @@ Public Class Controller Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) EgtErase(nId) ' creo il poligono (drag è in globale) - EgtCreatePolygonFromSide(m_Scene.GetDragGroup(), m_nLast, m_ptP1, m_ptLast, Vector3d.Z_AX().Glob(GDB_ID.GRID), REF_TY.GLOB) + EgtCreatePolygonFromSide(m_Scene.GetDragGroup(), m_nLast, m_ptP1, m_ptLast, Vector3d.Z_AX().Glob(GDB_ID.GRID), GDB_RT.GLOB) EgtDraw() End If End Sub @@ -3003,7 +3003,7 @@ Public Class Controller EnableCommandLog() Dim nId As Integer = EgtCreateTextEx(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), Vector3d.Z_AX, Vector3d.X_AX, - m_sLast, "", False, m_dLast, REF_TY.GRID) + m_sLast, "", False, m_dLast, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -3024,7 +3024,7 @@ Public Class Controller EgtErase(nId) ' creo il testo (drag è in globale) EgtCreateTextEx(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), EgtGetGridVersX(), - m_sLast, "", False, 10, REF_TY.GLOB) + m_sLast, "", False, 10, GDB_RT.GLOB) EgtDraw() ElseIf m_nStep = 3 Then ' recupero possibile entità già nel gruppo di drag @@ -3032,7 +3032,7 @@ Public Class Controller EgtErase(nId) ' creo il testo (drag è in globale) EgtCreateTextEx(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), EgtGetGridVersX(), - m_sLast, "", False, m_dLast, REF_TY.GLOB) + m_sLast, "", False, m_dLast, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -3096,7 +3096,7 @@ Public Class Controller EnableCommandLog() Dim nId As Integer = EgtCreateTextEx(GetCurrLayer(), m_ptP1.Loc(GDB_ID.GRID), Vector3d.Z_AX, (m_ptP2 - m_ptP1).Loc(GDB_ID.GRID), - m_sLast, sFont, m_bLast, m_dLast, REF_TY.GRID) + m_sLast, sFont, m_bLast, m_dLast, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -3122,7 +3122,7 @@ Public Class Controller EgtErase(nId) ' creo il testo (drag è in globale) EgtCreateTextEx(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), (m_ptP2 - m_ptP1), - m_sLast, "", False, 10, REF_TY.GLOB) + m_sLast, "", False, 10, GDB_RT.GLOB) EgtDraw() ElseIf m_nStep = 4 Then ' linea di base @@ -3137,7 +3137,7 @@ Public Class Controller End If ' creo il testo (drag è in globale) EgtCreateTextEx(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), (m_ptP2 - m_ptP1), - m_sLast, sFont, m_bLast, m_dLast, REF_TY.GLOB) + m_sLast, sFont, m_bLast, m_dLast, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -3219,10 +3219,10 @@ Public Class Controller EnableCommandLog() If Not m_bLast Then EgtCreateSurfTmByExtrusion(GetCurrLayer(), nCrvNum, nCrvIds, VtExtr, - EPS_STM, REF_TY.GRID) + EPS_STM, GDB_RT.GRID) Else EgtCreateSurfTmByRegionExtrusion(GetCurrLayer(), nCrvNum, nCrvIds, VtExtr, - EPS_STM, REF_TY.GRID) + EPS_STM, GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -3256,10 +3256,10 @@ Public Class Controller ' eseguo If Not m_bLast Then EgtCreateSurfTmByExtrusion(m_Scene.GetDragGroup(), nCrvNum, nCrvIds, VtExtr, - EPS_STM_DRAG, REF_TY.GLOB) + EPS_STM_DRAG, GDB_RT.GLOB) Else EgtCreateSurfTmByRegionExtrusion(m_Scene.GetDragGroup(), nCrvNum, nCrvIds, VtExtr, - EPS_STM_DRAG, REF_TY.GLOB) + EPS_STM_DRAG, GDB_RT.GLOB) End If EgtDraw() End If @@ -3293,7 +3293,7 @@ Public Class Controller Dim vtAx As Vector3d = m_ptLast - m_ptP1 EgtCreateSurfTmByRevolve(GetCurrLayer(), EgtGetLastSelectedObj(), m_ptP1.Loc(GDB_ID.GRID), vtAx.Loc(GDB_ID.GRID), - m_bLast, EPS_STM, REF_TY.GRID) + m_bLast, EPS_STM, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -3314,7 +3314,7 @@ Public Class Controller ' creo la superficie di rivoluzione (i punti sono in globale) Dim vtAx As Vector3d = m_ptLast - m_ptP1 EgtCreateSurfTmByRevolve(m_Scene.GetDragGroup(), EgtGetLastSelectedObj(), - m_ptP1, vtAx, m_bLast, EPS_STM_DRAG, REF_TY.GLOB) + m_ptP1, vtAx, m_bLast, EPS_STM_DRAG, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -3365,7 +3365,7 @@ Public Class Controller Dim vtAx As Vector3d = m_ptP2 - m_ptP1 EgtCreateSurfTmByScrewing(GetCurrLayer(), EgtGetLastSelectedObj(), m_ptP1.Loc(GDB_ID.GRID), vtAx.Loc(GDB_ID.GRID), - m_dPrev, m_dLast, EPS_STM, REF_TY.GRID) + m_dPrev, m_dLast, EPS_STM, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -3389,7 +3389,7 @@ Public Class Controller ' creo la superficie di rivoluzione (i punti sono in globale) Dim vtAx As Vector3d = m_ptP2 - m_ptP1 EgtCreateSurfTmByScrewing(m_Scene.GetDragGroup(), EgtGetLastSelectedObj(), - m_ptP1, vtAx, m_dLast, 0, EPS_STM_DRAG, REF_TY.GLOB) + m_ptP1, vtAx, m_dLast, 0, EPS_STM_DRAG, GDB_RT.GLOB) EgtDraw() ElseIf m_nStep = 4 Then EgtSetGeoLine(m_ptP1, m_ptP2) @@ -3398,7 +3398,7 @@ Public Class Controller ' creo la superficie di rivoluzione (i punti sono in globale) Dim vtAx As Vector3d = m_ptP2 - m_ptP1 EgtCreateSurfTmByScrewing(m_Scene.GetDragGroup(), EgtGetLastSelectedObj(), - m_ptP1, vtAx, m_dPrev, m_dLast, EPS_STM_DRAG, REF_TY.GLOB) + m_ptP1, vtAx, m_dPrev, m_dLast, EPS_STM_DRAG, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -3676,7 +3676,7 @@ Public Class Controller ' eseguo estensione sull'estremo più vicino al punto di selezione Dim nId As Integer = EgtGetLastSelectedObj() EnableCommandLog() - EgtTrimExtendCurveByLen(nId, m_dLast, m_ptP1.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtTrimExtendCurveByLen(nId, m_dLast, m_ptP1.Loc(GDB_ID.GRID), GDB_RT.GRID) DisableCommandLog() ' reset stato scena m_Scene.ResetStatus() @@ -3701,7 +3701,7 @@ Public Class Controller Dim dAddLen As Double = IIf(bSpecial, EXTEND_ADD, 0) ' eseguo trim/estensione sull'estremo più vicino al punto di selezione Dim nId As Integer = EgtGetFirstInGroup(m_Scene.GetDragGroup()) - EgtTrimExtendCurveByLen(nId, m_dLast + dAddLen, m_ptP1, REF_TY.GLOB) + EgtTrimExtendCurveByLen(nId, m_dLast + dAddLen, m_ptP1, GDB_RT.GLOB) EgtDraw() End If Return False @@ -3747,7 +3747,7 @@ Public Class Controller ' eseguo spezzatura Dim nId As Integer = EgtGetLastSelectedObj() EnableCommandLog() - EgtSplitCurveAtPoint(nId, m_ptLast.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtSplitCurveAtPoint(nId, m_ptLast.Loc(GDB_ID.GRID), GDB_RT.GRID) DisableCommandLog() ' reset stato scena EgtDeselectObj(nId) @@ -3804,7 +3804,7 @@ Public Class Controller EnableCommandLog() Dim nCrvIds(0) As Integer nCrvIds(0) = GDB_ID.SEL - EgtCreateCurveCompoByChain(GetCurrLayer(), 1, nCrvIds, New Point3d, Not m_bLast, REF_TY.GRID) + EgtCreateCurveCompoByChain(GetCurrLayer(), 1, nCrvIds, New Point3d, Not m_bLast, GDB_RT.GRID) DisableCommandLog() ' reset stato scena m_Scene.ResetStatus() @@ -3863,7 +3863,7 @@ Public Class Controller ' eseguo cambio inizio Dim nId As Integer = EgtGetLastSelectedObj() EnableCommandLog() - EgtChangeClosedCurveStartPoint(nId, m_ptLast.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtChangeClosedCurveStartPoint(nId, m_ptLast.Loc(GDB_ID.GRID), GDB_RT.GRID) DisableCommandLog() ' reset stato scena EgtDeselectObj(nId) @@ -3901,7 +3901,7 @@ Public Class Controller EnableCommandLog() ' se richiesto, imposto direzione estrusione If m_bLast Then - EgtModifyCurveExtrusion(GDB_ID.SEL, Vector3d.Z_AX, REF_TY.GRID) + EgtModifyCurveExtrusion(GDB_ID.SEL, Vector3d.Z_AX, GDB_RT.GRID) End If ' eseguo impostazione spessore curve selezionate EgtModifyCurveThickness(GDB_ID.SEL, m_dLast) @@ -3922,7 +3922,7 @@ Public Class Controller If m_nStep = 1 Then ' imposto direzione estrusione da Z griglia If m_bLast Then - EgtModifyCurveExtrusion(m_Scene.GetDragGroup(), EgtGetGridVersZ(), REF_TY.GLOB) + EgtModifyCurveExtrusion(m_Scene.GetDragGroup(), EgtGetGridVersZ(), GDB_RT.GLOB) ' ripristino direzione estrusione originale Else ' ogni entità deve riprendere la sua propria estrusione originale @@ -3931,7 +3931,7 @@ Public Class Controller Dim nOrigId As Integer Dim vtOrigExtr As Vector3d If EgtGetInfo(nId, "Id", nOrigId) And EgtCurveExtrusion(nOrigId, vtOrigExtr) Then - EgtModifyCurveExtrusion(nId, vtOrigExtr.Glob(nOrigId), REF_TY.GLOB) + EgtModifyCurveExtrusion(nId, vtOrigExtr.Glob(nOrigId), GDB_RT.GLOB) End If nId = EgtGetNext(nId) End While @@ -3970,12 +3970,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtMove(nCopyId, (m_ptLast - m_ptP1).Loc(GDB_ID.GRID), REF_TY.GRID) + EgtMove(nCopyId, (m_ptLast - m_ptP1).Loc(GDB_ID.GRID), GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo movimento Else - EgtMove(GDB_ID.SEL, (m_ptLast - m_ptP1).Loc(GDB_ID.GRID), REF_TY.GRID) + EgtMove(GDB_ID.SEL, (m_ptLast - m_ptP1).Loc(GDB_ID.GRID), GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -3994,7 +3994,7 @@ Public Class Controller ' ripristino lo stato iniziale EgtChangeGroupFrame(m_Scene.GetDragGroup(), Frame3d.GLOB) ' eseguo tutto il movimento - EgtMove(m_Scene.GetDragGroup(), (m_ptLast - m_ptP1), REF_TY.GLOB) + EgtMove(m_Scene.GetDragGroup(), (m_ptLast - m_ptP1), GDB_RT.GLOB) EgtSetGeoLine(m_ptP1, m_ptLast) EgtDraw() End If @@ -4039,12 +4039,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtRotate(nCopyId, m_ptP1.Loc(GDB_ID.GRID), Vector3d.Z_AX, dAngRotDeg, REF_TY.GRID) + EgtRotate(nCopyId, m_ptP1.Loc(GDB_ID.GRID), Vector3d.Z_AX, dAngRotDeg, GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo rotazione Else - EgtRotate(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), Vector3d.Z_AX, dAngRotDeg, REF_TY.GRID) + EgtRotate(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), Vector3d.Z_AX, dAngRotDeg, GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -4070,7 +4070,7 @@ Public Class Controller Dim dAngRotDeg As Double = 0 Dim bDet As Boolean = True EgtGetVectorRotation((m_ptP2 - m_ptP1), (m_ptLast - m_ptP1), EgtGetGridVersZ(), dAngRotDeg, bDet) - EgtRotate(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), dAngRotDeg, REF_TY.GLOB) + EgtRotate(m_Scene.GetDragGroup(), m_ptP1, EgtGetGridVersZ(), dAngRotDeg, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -4114,12 +4114,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtRotate(nCopyId, m_ptP1.Loc(GDB_ID.GRID), VtAx.Loc(GDB_ID.GRID), m_dLast, REF_TY.GRID) + EgtRotate(nCopyId, m_ptP1.Loc(GDB_ID.GRID), VtAx.Loc(GDB_ID.GRID), m_dLast, GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo rotazione Else - EgtRotate(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), VtAx.Loc(GDB_ID.GRID), m_dLast, REF_TY.GRID) + EgtRotate(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), VtAx.Loc(GDB_ID.GRID), m_dLast, GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -4143,7 +4143,7 @@ Public Class Controller EgtChangeGroupFrame(m_Scene.GetDragGroup(), Frame3d.GLOB) ' eseguo rotazione Dim VtAx As Vector3d = m_ptP2 - m_ptP1 - EgtRotate(m_Scene.GetDragGroup(), m_ptP1, VtAx, m_dLast, REF_TY.GLOB) + EgtRotate(m_Scene.GetDragGroup(), m_ptP1, VtAx, m_dLast, GDB_RT.GLOB) EgtDraw() End If End Sub @@ -4180,12 +4180,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtMirror(nCopyId, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtMirror(nCopyId, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo mirror Else - EgtMirror(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtMirror(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), GDB_RT.GRID) End If DisableCommandLog() End If @@ -4207,12 +4207,12 @@ Public Class Controller ' ripristino lo stato iniziale, tramite annullo mirror precedente Dim VtNorm As Vector3d = (m_ptP2 - m_ptP1) ^ EgtGetGridVersZ() If VtNorm.Len > EPS_SMALL Then - EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, REF_TY.GLOB) + EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, GDB_RT.GLOB) End If ' eseguo mirror VtNorm = (m_ptLast - m_ptP1) ^ EgtGetGridVersZ() If VtNorm.Len > EPS_SMALL Then - EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, REF_TY.GLOB) + EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, GDB_RT.GLOB) End If ' salvo il punto m_ptP2 = m_ptLast @@ -4259,12 +4259,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtMirror(nCopyId, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtMirror(nCopyId, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo mirror Else - EgtMirror(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), REF_TY.GRID) + EgtMirror(GDB_ID.SEL, m_ptP1.Loc(GDB_ID.GRID), VtNorm.Loc(GDB_ID.GRID), GDB_RT.GRID) End If DisableCommandLog() End If @@ -4290,12 +4290,12 @@ Public Class Controller ' ripristino lo stato iniziale, tramite annullo mirror precedente Dim VtNorm As Vector3d = (m_ptP3 - m_ptP1) ^ (m_ptP2 - m_ptP1) If VtNorm.Len > EPS_SMALL Then - EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, REF_TY.GLOB) + EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, GDB_RT.GLOB) End If ' eseguo mirror VtNorm = (m_ptLast - m_ptP1) ^ (m_ptP2 - m_ptP1) If VtNorm.Len > EPS_SMALL Then - EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, REF_TY.GLOB) + EgtMirror(m_Scene.GetDragGroup(), m_ptP1, VtNorm, GDB_RT.GLOB) End If ' salvo il punto m_ptP3 = m_ptLast @@ -4334,12 +4334,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtScale(nCopyId, New Frame3d(m_ptP1), m_dLast, m_dLast, m_dLast, REF_TY.GRID) + EgtScale(nCopyId, New Frame3d(m_ptP1), m_dLast, m_dLast, m_dLast, GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo scalatura Else - EgtScale(GDB_ID.SEL, New Frame3d(m_ptP1), m_dLast, m_dLast, m_dLast, REF_TY.GRID) + EgtScale(GDB_ID.SEL, New Frame3d(m_ptP1), m_dLast, m_dLast, m_dLast, GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -4364,7 +4364,7 @@ Public Class Controller frScale.ChangeOrigin(m_ptP1) Dim dScale As Double = m_dLast / m_dPrev ' eseguo scalatura - EgtScale(m_Scene.GetDragGroup(), frScale, dScale, dScale, dScale, REF_TY.GLOB) + EgtScale(m_Scene.GetDragGroup(), frScale, dScale, dScale, dScale, GDB_RT.GLOB) m_dPrev = m_dLast EgtDraw() End If @@ -4406,12 +4406,12 @@ Public Class Controller Dim nId As Integer = EgtGetFirstSelectedObj() While nId <> GDB_ID.NULL Dim nCopyId As Integer = EgtCopyGlob(nId, GetCurrLayer()) - EgtScale(nCopyId, New Frame3d(m_ptP1), m_d3Last(0), m_d3Last(1), m_d3Last(2), REF_TY.GRID) + EgtScale(nCopyId, New Frame3d(m_ptP1), m_d3Last(0), m_d3Last(1), m_d3Last(2), GDB_RT.GRID) nId = EgtGetNextSelectedObj() End While ' eseguo scalatura Else - EgtScale(GDB_ID.SEL, New Frame3d(m_ptP1), m_d3Last(0), m_d3Last(1), m_d3Last(2), REF_TY.GRID) + EgtScale(GDB_ID.SEL, New Frame3d(m_ptP1), m_d3Last(0), m_d3Last(1), m_d3Last(2), GDB_RT.GRID) End If DisableCommandLog() EgtDraw() @@ -4448,7 +4448,7 @@ Public Class Controller d3Scale(1) = m_d3Last(1) / m_d3Prev(1) d3Scale(2) = m_d3Last(2) / m_d3Prev(2) ' eseguo scalatura - EgtScale(m_Scene.GetDragGroup(), frScale, d3Scale(0), d3Scale(1), d3Scale(2), REF_TY.GLOB) + EgtScale(m_Scene.GetDragGroup(), frScale, d3Scale(0), d3Scale(1), d3Scale(2), GDB_RT.GLOB) m_d3Prev(0) = m_d3Last(0) m_d3Prev(1) = m_d3Last(1) m_d3Prev(2) = m_d3Last(2) diff --git a/EgtInterface.vb b/EgtInterface.vb index 9b19026..4f3371f 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -889,130 +889,130 @@ End Function '---------- GeomDb Objects Create ---------------------------------------------- Private Function EgtCreateGroup(ByVal nParentId As Integer, - ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, ByVal nRefType As REF_TY) As Integer + ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, ByVal nRefType As GDB_RT) As Integer End Function -Public Function EgtCreateGroup(ByVal nParentId As Integer, ByRef frRef As Frame3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer +Public Function EgtCreateGroup(ByVal nParentId As Integer, ByRef frRef As Frame3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer Return EgtCreateGroup(nParentId, frRef.Orig(), frRef.VersX(), frRef.VersY(), frRef.VersZ(), nRefType) End Function Public Function EgtCreateGroup(ByVal nParentId As Integer) As Integer - Return EgtCreateGroup(nParentId, Point3d.ORIG(), Vector3d.X_AX, Vector3d.Y_AX, Vector3d.Z_AX, REF_TY.LOC) + Return EgtCreateGroup(nParentId, Point3d.ORIG(), Vector3d.X_AX, Vector3d.Y_AX, Vector3d.Z_AX, GDB_RT.LOC) End Function Public Function EgtCreateGeoPoint(ByVal nParentId As Integer, - ByRef PtP As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtP As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateGeoVector(ByVal nParentId As Integer, - ByRef vtV As Vector3d, ByRef PtB As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef vtV As Vector3d, ByRef PtB As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Private Function EgtCreateGeoFrame(ByVal nParentId As Integer, - ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, ByVal nRefType As REF_TY) As Integer + ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, ByVal nRefType As GDB_RT) As Integer End Function -Public Function EgtCreateGeoFrame(ByVal nParentId As Integer, ByRef frRef As Frame3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer +Public Function EgtCreateGeoFrame(ByVal nParentId As Integer, ByRef frRef As Frame3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer Return EgtCreateGeoFrame(nParentId, frRef.Orig(), frRef.VersX(), frRef.VersY(), frRef.VersZ(), nRefType) End Function Public Function EgtCreateCurveLine(ByVal nParentId As Integer, - ByRef PtStart As Point3d, ByRef PtEnd As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtStart As Point3d, ByRef PtEnd As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveLineEx(ByVal nParentId As Integer, ByRef PtStart As Point3d, ByVal nSepS As SEP, ByVal nIdS As Integer, - ByRef PtEnd As Point3d, ByVal nSepE As SEP, ByVal nIdE As Integer, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtEnd As Point3d, ByVal nSepE As SEP, ByVal nIdE As Integer, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveLinePVL(ByVal nParentId As Integer, - ByRef PtStart As Point3d, ByRef VtDir As Vector3d, ByVal dLen As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtStart As Point3d, ByRef VtDir As Vector3d, ByVal dLen As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveCircle(ByVal nParentId As Integer, - ByRef PtCen As Point3d, ByRef VtNorm As Vector3d, ByVal dRad As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtCen As Point3d, ByRef VtNorm As Vector3d, ByVal dRad As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveCircleCPN(ByVal nParentId As Integer, - ByRef PtCen As Point3d, ByRef PtOn As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtCen As Point3d, ByRef PtOn As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveCircleCPNEx(ByVal nParentId As Integer, ByRef PtCen As Point3d, ByRef PtOn As Point3d, ByVal nSepO As SEP, ByVal nIdO As Integer, - ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveArc3P(ByVal nParentId As Integer, - ByRef PtStart As Point3d, ByRef PtMid As Point3d, ByRef PtEnd As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtStart As Point3d, ByRef PtMid As Point3d, ByRef PtEnd As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveArcC2PN(ByVal nParentId As Integer, ByRef PtCen As Point3d, ByRef PtStart As Point3d, ByRef PtEnd As Point3d, - ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveArcC2PNEx(ByVal nParentId As Integer, ByRef PtCen As Point3d, ByRef PtStart As Point3d, ByVal nSepS As SEP, ByVal nIdS As Integer, - ByRef PtEnd As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtEnd As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveArc2PVN(ByVal nParentId As Integer, ByRef PtStart As Point3d, ByRef PtEnd As Point3d, ByRef VtDirS As Vector3d, - ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveArc2PVNEx(ByVal nParentId As Integer, ByRef PtStart As Point3d, ByRef PtEnd As Point3d, ByVal nSepE As SEP, ByVal nIdE As Integer, - ByRef VtDirS As Vector3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef VtDirS As Vector3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveFillet(ByVal nParentId As Integer, ByVal nCrv1 As Integer, ByRef PtNear1 As Point3d, ByVal nCrv2 As Integer, ByRef PtNear2 As Point3d, - ByRef VtNorm As Vector3d, ByVal dRad As Double, ByVal bTrimExt As Boolean, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef VtNorm As Vector3d, ByVal dRad As Double, ByVal bTrimExt As Boolean, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveChamfer(ByVal nParentId As Integer, ByVal nCrv1 As Integer, ByRef PtNear1 As Point3d, ByVal nCrv2 As Integer, ByRef PtNear2 As Point3d, - ByRef VtNorm As Vector3d, ByVal dDist As Double, ByVal bTrimExt As Boolean, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef VtNorm As Vector3d, ByVal dDist As Double, ByVal bTrimExt As Boolean, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateCurveCompoByChain(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer, - ByRef PtNearStart As Point3d, ByVal bCrvErase As Boolean, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtNearStart As Point3d, ByVal bCrvErase As Boolean, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateRectangle3P(ByVal nParentId As Integer, ByRef PtStart As Point3d, ByRef PtCross As Point3d, - ByRef PtDir As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtDir As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreatePolygonFromRadius(ByVal nParentId As Integer, ByVal nNumSides As Integer, ByRef PtCen As Point3d, - ByRef PtCorn As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtCorn As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreatePolygonFromApothem(ByVal nParentId As Integer, ByVal nNumSides As Integer, ByRef PtCen As Point3d, - ByRef PtMid As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtMid As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreatePolygonFromSide(ByVal nParentId As Integer, ByVal nNumSides As Integer, ByRef PtStart As Point3d, - ByRef PtFin As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByRef PtFin As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function @@ -1026,27 +1026,27 @@ End Function Public Function EgtCreateSurfTmByExtrusion(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer, ByRef VtExtr As Vector3d, ByVal dLinTol As Double, - Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateSurfTmByRegionExtrusion(ByVal nParentId As Integer, ByVal nNumCrv As Integer, ByVal nCrvId() As Integer, ByRef VtExtr As Vector3d, ByVal dLinTol As Double, - Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateSurfTmByRevolve(ByVal nParentId As Integer, ByVal nCrvId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, ByVal bCapEnds As Boolean, ByVal dLinTol As Double, - Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateSurfTmByScrewing(ByVal nParentId As Integer, ByVal nCrvId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, ByVal dAngRotDeg As Double, ByVal dMove As Double, - ByVal dLinTol As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByVal dLinTol As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function @@ -1059,34 +1059,34 @@ End Function Public Function EgtCreateText(ByVal nParentId As Integer, ByRef ptP As Point3d, ByVal dAngRotDeg As Double, - ByVal sText As String, ByVal dH As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + ByVal sText As String, ByVal dH As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateTextEx(ByVal nParentId As Integer, ByRef ptP As Point3d, ByRef vtN As Vector3d, ByRef vtD As Vector3d, ByVal sText As String, ByVal sFont As String, ByVal bItalic As Boolean, ByVal dH As Double, - Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateTextAdv(ByVal nParentId As Integer, ByRef ptP As Point3d, ByRef vtN As Vector3d, ByRef vtD As Vector3d, ByVal sText As String, ByVal sFont As String, ByVal nW As Integer, ByVal bItalic As Boolean, ByVal dH As Double, ByVal dRat As Double, ByVal dAddAdv As Double, ByVal nInsPos As Integer, - Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer + Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function '---------- GeomDb Objects Modify ---------------------------------------------- Private Function EgtChangeGroupFrame(ByVal nId As Integer, ByRef PtOrig As Point3d, - ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, ByVal nRefType As REF_TY) As Boolean + ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, ByVal nRefType As GDB_RT) As Boolean End Function -Public Function EgtChangeGroupFrame(ByVal nId As Integer, ByRef frRef As Frame3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtChangeGroupFrame(ByVal nId As Integer, ByRef frRef As Frame3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean Return EgtChangeGroupFrame(nId, frRef.Orig(), frRef.VersX(), frRef.VersY(), frRef.VersZ(), nRefType) End Function -Public Function EgtChangeVectorBase(ByVal nId As Integer, ByRef PtBase As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtChangeVectorBase(ByVal nId As Integer, ByRef PtBase As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function @@ -1112,19 +1112,19 @@ Public Function EgtInvertCurve(ByVal nId As Integer) As Boolean End Function -Public Function EgtChangeClosedCurveStartPoint(ByVal nId As Integer, ByRef PtStart As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtChangeClosedCurveStartPoint(ByVal nId As Integer, ByRef PtStart As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function -Public Function EgtModifyCurveStartPoint(ByVal nId As Integer, ByRef PtStart As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtModifyCurveStartPoint(ByVal nId As Integer, ByRef PtStart As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function -Public Function EgtModifyCurveEndPoint(ByVal nId As Integer, ByRef PtEnd As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtModifyCurveEndPoint(ByVal nId As Integer, ByRef PtEnd As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function -Public Function EgtModifyCurveExtrusion(ByVal nId As Integer, ByRef VtExtr As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtModifyCurveExtrusion(ByVal nId As Integer, ByRef VtExtr As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function @@ -1140,7 +1140,7 @@ Public Function EgtExtendCurveEndByLen(ByVal nId As Integer, ByVal dLen As Doubl End Function -Public Function EgtTrimExtendCurveByLen(ByVal nId As Integer, ByVal dLen As Double, ByRef PtNear As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtTrimExtendCurveByLen(ByVal nId As Integer, ByVal dLen As Double, ByRef PtNear As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function @@ -1148,7 +1148,7 @@ Public Function EgtSplitCurve(ByVal nId As Integer, ByVal nParts As Integer) As End Function -Public Function EgtSplitCurveAtPoint(ByVal nId As Integer, ByRef PtOn As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Integer +Public Function EgtSplitCurveAtPoint(ByVal nId As Integer, ByRef PtOn As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function @@ -1156,7 +1156,7 @@ Public Function EgtOffsetCurve(ByVal nId As Integer, ByVal dDist As Double, ByVa End Function -Public Function EgtModifyCurveCircleCPN(ByVal nId As Integer, ByRef PtOn As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtModifyCurveCircleCPN(ByVal nId As Integer, ByRef PtOn As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function @@ -1164,11 +1164,11 @@ Public Function EgtModifyCurveArcRadius(ByVal nId As Integer, ByVal dRad As Doub End Function -Public Function EgtModifyCurveArcC2PN(ByVal nId As Integer, ByRef PtEnd As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtModifyCurveArcC2PN(ByVal nId As Integer, ByRef PtEnd As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function -Public Function EgtModifyCurveArc3P(ByVal nId As Integer, ByRef PtMid As Point3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtModifyCurveArc3P(ByVal nId As Integer, ByRef PtMid As Point3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function @@ -1198,19 +1198,19 @@ Public Function EgtResetCurrPartLayer() As Integer End Function -Public Function EgtGetFirstVisiblePart() As Integer +Public Function EgtGetFirstPart(Optional ByVal bOnlyVisible As Boolean = False) As Integer End Function -Public Function EgtGetNextVisiblePart(ByVal nPartId As Integer) As Integer +Public Function EgtGetNextPart(ByVal nPartId As Integer, Optional ByVal bOnlyVisible As Boolean = False) As Integer End Function -Public Function EgtGetFirstVisibleLayer(ByVal nPartId As Integer) As Integer +Public Function EgtGetFirstLayer(ByVal nPartId As Integer, Optional ByVal bOnlyVisible As Boolean = False) As Integer End Function -Public Function EgtGetNextVisibleLayer(ByVal nLayerId As Integer) As Integer +Public Function EgtGetNextLayer(ByVal nLayerId As Integer, Optional ByVal bOnlyVisible As Boolean = False) As Integer End Function @@ -1581,30 +1581,30 @@ End Function '---------- GeomDb Obj Transform ----------------------------------------------- -Public Function EgtMove(ByVal nId As Integer, ByRef VtMove As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtMove(ByVal nId As Integer, ByRef VtMove As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function -Public Function EgtRotate(ByVal nId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, ByVal dAngRotDeg As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtRotate(ByVal nId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, ByVal dAngRotDeg As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function Private Function EgtScale(ByVal nId As Integer, ByRef PtOrig As Point3d, ByRef VtX As Vector3d, ByRef VtY As Vector3d, ByRef VtZ As Vector3d, - ByVal dCoeffX As Double, ByVal dCoeffY As Double, ByVal dCoeffZ As Double, ByVal nRefType As REF_TY) As Boolean + ByVal dCoeffX As Double, ByVal dCoeffY As Double, ByVal dCoeffZ As Double, ByVal nRefType As GDB_RT) As Boolean End Function Public Function EgtScale(ByVal nId As Integer, ByRef Frame As Frame3d, - ByVal dCoeffX As Double, ByVal dCoeffY As Double, ByVal dCoeffZ As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean + ByVal dCoeffX As Double, ByVal dCoeffY As Double, ByVal dCoeffZ As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean Return EgtScale(nId, Frame.Orig(), Frame.VersX(), Frame.VersY(), Frame.VersZ(), dCoeffX, dCoeffY, dCoeffZ, nRefType) End Function -Public Function EgtMirror(ByVal nId As Integer, ByRef PtOn As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean +Public Function EgtMirror(ByVal nId As Integer, ByRef PtOn As Point3d, ByRef VtNorm As Vector3d, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function Public Function EgtShear(ByVal nId As Integer, ByRef PtOn As Point3d, ByRef VtNorm As Vector3d, - ByRef VtDir As Vector3d, ByVal dCoeff As Double, Optional ByVal nRefType As REF_TY = REF_TY.LOC) As Boolean + ByRef VtDir As Vector3d, ByVal dCoeff As Double, Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Boolean End Function @@ -2267,10 +2267,10 @@ Public Enum GDB_TY As Integer EXT_TEXT = 2048 End Enum 'Costanti : TIPO RIFERIMENTO DI DATI GEOMETRICI -Public Enum REF_TY As Integer +Public Enum GDB_RT As Integer GLOB = 0 - LOC = 1 - GRID = 2 + GRID = -3 + LOC = -4 End Enum 'Costanti : POSIZIONE DI COPIA DI UN OGGETTO Public Enum GDB_POS As Integer @@ -2347,7 +2347,7 @@ Public Enum SEP As Integer PT_MINDIST = 3 End Enum 'Costanti : flag per BBOX -Public Enum BBF As Integer +Public Enum GDB_BB As Integer STANDARD = 0 ONLY_VISIBLE = 1 EXACT = 2 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 2f2a441..f797ff3 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + +