Egalware/TestEIn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TestEIn 2.1e3 :

Browse Source 
- modifiche per aggiornamento .
This commit is contained in:
Dario Sassi
2019-05-15 19:12:30 +00:00
parent 82fc56ad84
commit 94d3a5c55d
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controller.vb
+9 -8
View File
@@ -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
EgtInterface.vb
+19 -5
View File
@@ -2966,23 +2966,23 @@ End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmByScrewing"), SuppressUnmanagedCodeSecurity()>
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
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmByScrewing"), SuppressUnmanagedCodeSecurity()>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRemoveCurveCompoCurve"), SuppressUnmanagedCodeSecurity()>
Private Function EgtRemoveCurveCompoCurve_32(nId As Integer, bLast As Boolean) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtRemoveCurveCompoCurve"), SuppressUnmanagedCodeSecurity()>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddCurveCompoJoint"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAddCurveCompoJoint_32(nId As Integer, dU As Double) As Boolean
End Function
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.5.1")>
<Assembly: AssemblyFileVersion("2.1.5.1")>
<Assembly: AssemblyVersion("2.1.5.3")>
<Assembly: AssemblyFileVersion("2.1.5.3")>