From 94d3a5c55df4b3c4e86248690076b0ea3fe66720 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 15 May 2019 19:12:30 +0000 Subject: [PATCH] TestEIn 2.1e3 : - modifiche per aggiornamento . --- Controller.vb | 17 +++++++++-------- EgtInterface.vb | 24 +++++++++++++++++++----- My Project/AssemblyInfo.vb | 4 ++-- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/Controller.vb b/Controller.vb index 458d7d7..e31c01b 100644 --- a/Controller.vb +++ b/Controller.vb @@ -3842,20 +3842,21 @@ Public Class Controller m_Scene.SetStatusSelPoint() m_nStep = 1 ' abilito dialogo - RaiseEvent PrepareInputBox("SCREW", "Insert First Point on Axis", "", False, False) + RaiseEvent PrepareInputBox("SCREW", "Insert First Point on Axis", "CapEnds", False, False) + RaiseEvent SetInputBoxCheck(False) m_nInpType = IBT.TY_POINT3D Case 1 m_ptP1 = m_ptLast m_nStep = 2 m_Scene.EnableDrag() - RaiseEvent PrepareInputBox("SCREW", "Insert Second Point on Axis", "", False, False) + RaiseEvent PrepareInputBox("SCREW", "Insert Second Point on Axis", "CapEnds", False, False) m_nInpType = IBT.TY_POINT3D Case 2 m_ptP2 = m_ptLast m_nStep = 3 m_Scene.SetStatusNull() m_Scene.DisableDrag() - RaiseEvent PrepareInputBox("SCREW", "Insert Angle", "", False, True) + RaiseEvent PrepareInputBox("SCREW", "Insert Angle", "CapEnds", False, True) m_nInpType = IBT.TY_DOUBLE m_dLast = 360 SetInputBoxDouble(m_dLast) @@ -3865,7 +3866,7 @@ Public Class Controller m_nStep = 4 m_Scene.SetStatusNull() m_Scene.DisableDrag() - RaiseEvent PrepareInputBox("SCREW", "Insert Move", "", False, True) + RaiseEvent PrepareInputBox("SCREW", "Insert Move", "CapEnds", False, True) m_nInpType = IBT.TY_LENGTH m_dLast = 0 SetInputBoxDouble(m_dLast, True) @@ -3876,8 +3877,8 @@ Public Class Controller EnableCommandLog() 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, m_dEpsStm, GDB_RT.GRID) + m_ptP1.Loc(GDB_ID.GRID), vtAx.Loc(GDB_ID.GRID), + m_dPrev, m_dLast, m_bLast, m_dEpsStm, GDB_RT.GRID) DisableCommandLog() EgtDraw() ' aggiorno stato @@ -3901,7 +3902,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, GDB_RT.GLOB) + m_ptP1, vtAx, m_dLast, 0, m_bLast, EPS_STM_DRAG, GDB_RT.GLOB) EgtDraw() ElseIf m_nStep = 4 Then EgtSetGeoLine(m_ptP1, m_ptP2) @@ -3910,7 +3911,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, GDB_RT.GLOB) + m_ptP1, vtAx, m_dPrev, m_dLast, m_bLast, EPS_STM_DRAG, GDB_RT.GLOB) EgtDraw() End If End Sub diff --git a/EgtInterface.vb b/EgtInterface.vb index b65b1f9..7ab7b64 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -2966,23 +2966,23 @@ End Function Private Function EgtCreateSurfTmByScrewing_32(nParentId As Integer, nCrvId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, - dAngRotDeg As Double, dMove As Double, + dAngRotDeg As Double, dMove As Double, bCapEnds As Boolean, dLinTol As Double, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Private Function EgtCreateSurfTmByScrewing_64(nParentId As Integer, nCrvId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, - dAngRotDeg As Double, dMove As Double, + dAngRotDeg As Double, dMove As Double, bCapEnds As Boolean, dLinTol As Double, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer End Function Public Function EgtCreateSurfTmByScrewing(nParentId As Integer, nCrvId As Integer, ByRef PtAx As Point3d, ByRef VtAx As Vector3d, - dAngRotDeg As Double, dMove As Double, + dAngRotDeg As Double, dMove As Double, bCapEnds As Boolean, dLinTol As Double, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer If IntPtr.Size = 4 Then - Return EgtCreateSurfTmByScrewing_32(nParentId, nCrvId, PtAx, VtAx, dAngRotDeg, dMove, dLinTol, nRefType) + Return EgtCreateSurfTmByScrewing_32(nParentId, nCrvId, PtAx, VtAx, dAngRotDeg, dMove, bCapEnds, dLinTol, nRefType) Else - Return EgtCreateSurfTmByScrewing_64(nParentId, nCrvId, PtAx, VtAx, dAngRotDeg, dMove, dLinTol, nRefType) + Return EgtCreateSurfTmByScrewing_64(nParentId, nCrvId, PtAx, VtAx, dAngRotDeg, dMove, bCapEnds, dLinTol, nRefType) End If End Function @@ -3586,6 +3586,20 @@ Public Function EgtAddCurveCompoArc2P(nId As Integer, ByRef PtMid As Point3d, By End If End Function + +Private Function EgtRemoveCurveCompoCurve_32(nId As Integer, bLast As Boolean) As Boolean +End Function + +Private Function EgtRemoveCurveCompoCurve_64(nId As Integer, bLast As Boolean) As Boolean +End Function +Public Function EgtRemoveCurveCompoCurve(nId As Integer, Optional bLast As Boolean = True) As Boolean + If IntPtr.Size = 4 Then + Return EgtRemoveCurveCompoCurve_32(nId, bLast) + Else + Return EgtRemoveCurveCompoCurve_64(nId, bLast) + End If +End Function + Private Function EgtAddCurveCompoJoint_32(nId As Integer, dU As Double) As Boolean End Function diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index c2529c2..f428f7b 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: ' - - + +