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

TestEIn 2.1e1 :

Browse Source 
- aggiornamento come EgtCAM5.
This commit is contained in:
Dario Sassi
2019-05-06 07:38:48 +00:00
parent c2042ce051
commit 82fc56ad84
8 changed files with 710 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controller.vb
+123 -18
View File
@@ -97,6 +97,7 @@ Public Class Controller
EXTRUDE
REVOLVE
SCREW
SWEPT
RULED
MERGESURF
EXPLODESURF
@@ -123,6 +124,7 @@ Public Class Controller
SCALE
SCALE3D
OFFSET
SELECTGROUP
End Enum
Public Enum GRID_TYPE As Integer
NONE = 0
@@ -1185,6 +1187,9 @@ Public Class Controller
' Revolve Plus
Case CMD.SCREW
Return ProcessScrew()
' Swept
Case CMD.SWEPT
Return ProcessSwept()
' Ruled
Case CMD.RULED
Return ProcessRuled()
@@ -1263,6 +1268,9 @@ Public Class Controller
' Offset
Case CMD.OFFSET
Return ProcessOffset()
' Selezione gruppo
case CMD.SELECTGROUP
Return ProcessSelectGroup()
End Select
Return False
End Function
@@ -1322,6 +1330,10 @@ Public Class Controller
DragRevolve()
Case CMD.SCREW
DragScrew()
Case CMD.SWEPT
DragSwept()
Case CMD.RULED
DragRuled()
Case CMD.TRIMEXTENDCURVE
DragExtendCurve()
Case CMD.SETCURVETHICKNESS
@@ -1658,6 +1670,12 @@ Public Class Controller
End If
Dim nId As Integer = EgtGetLastSelectedObj()
Select Case EgtGetType(nId)
Case GDB_TY.GROUP
Dim frNew As New Frame3d
If Not EgtFrame(nId, GDB_ID.ROOT, frNew) Then Return False
EnableCommandLog()
EgtSetGridFrame(frNew)
DisableCommandLog()
Case GDB_TY.GEO_POINT
Dim ptOrig As Point3d
If Not EgtStartPoint(nId, GDB_ID.ROOT, ptOrig) Then Return False
@@ -1825,6 +1843,19 @@ Public Class Controller
Return True
End Function
Private Function ProcessSelectGroup() As Boolean
If m_nStep <> 0 Then Return False
' Lo seleziono
EnableCommandLog()
Dim bOk As Boolean = EgtSelectObj(m_nLast)
DisableCommandLog()
If Not bOk Then Return False
' Aggiorno visualizzazione
RaiseEvent UpdateUI(Me, False)
EgtDraw()
Return True
End Function
Private Function ProcessSelectPartLayerObj() As Boolean
If m_nStep <> 0 Then
Return False
@@ -2338,6 +2369,7 @@ Public Class Controller
m_ptP1 = m_ptLast
m_sepP1 = m_sepLast
m_nIdP1 = m_nIdLast
m_ptCont = m_ptLast
m_nStep = 2
m_Scene.EnableDrag()
RaiseEvent PrepareInputBox("LINE 2P", "Insert End Point ", "", False, True)
@@ -2910,6 +2942,7 @@ Public Class Controller
m_ptP1 = m_ptLast
m_vtLast = m_vtCont
m_dAux = LEN_STD
m_ptCont = m_ptLast
m_Scene.SetStatusSelPoint(False)
m_nStep = 2
m_Scene.DisableDrag()
@@ -3882,28 +3915,100 @@ Public Class Controller
End If
End Sub
Private Function ProcessRuled() As Boolean
If m_nStep <> 0 Then
Private Function ProcessSwept() As Boolean
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 Return False
' imposto nuovo stato
m_nStep = 1
' abilito dialogo
RaiseEvent PrepareInputBox("SWEPT", "", "CapEnds", False, True)
RaiseEvent SetInputBoxCheck(m_bLastExtrudeCheck)
m_nInpType = IBT.TY_NULL
' anteprima
EgtDisableModified()
DragSwept()
EgtEnableModified()
Case 1
' creo la superficie swept (a partire da due contorni selezionati)
EnableCommandLog()
Dim nGuideId As Integer = EgtGetLastSelectedObj()
Dim nSectId As Integer = EgtGetPrevSelectedObj()
EgtCreateSurfTmSwept(GetCurrLayer(), nSectId, nGuideId, m_bLast, m_dEpsStm)
DisableCommandLog()
' reset stato scena
m_Scene.ResetStatus()
' reset stato
m_nStep = 0
RaiseEvent UpdateUI(Me, True)
Case Else
m_nStep = 0
Return False
End If
' posso partire solo se esiste un gruppo corrente
If GetCurrLayer() = GDB_ID.NULL Then
Return False
End If
' creo la superficie rigata (a partire da due contorni selezionati)
EnableCommandLog()
Dim nLastId As Integer = EgtGetLastSelectedObj()
Dim nPrevId As Integer = EgtGetPrevSelectedObj()
EgtCreateSurfTmRuled(GetCurrLayer(), nPrevId, nLastId, m_dEpsStm)
DisableCommandLog()
' reset stato scena
m_Scene.ResetStatus()
' reset stato
m_nStep = 0
RaiseEvent UpdateUI(Me, True)
End Select
Return True
End Function
Private Sub DragSwept()
If m_nStep = 1 Then
' cancello eventuale vecchia superficie di swept
EgtEmptyGroup(m_Scene.GetDragGroup())
' creo la superficie di swept (a partire dai contorni selezionati)
Dim nGuideId As Integer = EgtGetLastSelectedObj()
Dim nSectId As Integer = EgtGetPrevSelectedObj()
' eseguo
EgtCreateSurfTmSwept(m_Scene.GetDragGroup(), nSectId, nGuideId, m_bLast, EPS_STM_DRAG)
EgtDraw()
End If
End Sub
Private Function ProcessRuled() As Boolean
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 Return False
' imposto nuovo stato
m_nStep = 1
' abilito dialogo
RaiseEvent PrepareInputBox("RULED", "", "MinDist", False, True)
RaiseEvent SetInputBoxCheck(m_bLastExtrudeCheck)
m_nInpType = IBT.TY_NULL
' anteprima
EgtDisableModified()
DragRuled()
EgtEnableModified()
Case 1
' creo la superficie rigata (a partire da due contorni selezionati)
EnableCommandLog()
Dim nLastId As Integer = EgtGetLastSelectedObj()
Dim nPrevId As Integer = EgtGetPrevSelectedObj()
EgtCreateSurfTmRuled(GetCurrLayer(), nPrevId, nLastId, If( m_bLast, RUL_TYPE.MINDIST, RUL_TYPE.ISOPAR), m_dEpsStm)
DisableCommandLog()
' reset stato scena
m_Scene.ResetStatus()
' reset stato
m_nStep = 0
RaiseEvent UpdateUI(Me, True)
Case Else
m_nStep = 0
Return False
End Select
Return True
End Function
Private Sub DragRuled()
If m_nStep = 1 Then
' cancello eventuale vecchia superficie rigata
EgtEmptyGroup(m_Scene.GetDragGroup())
' creo la superficie rigatat (a partire dai contorni selezionati)
Dim nGuideId As Integer = EgtGetLastSelectedObj()
Dim nSectId As Integer = EgtGetPrevSelectedObj()
' eseguo
EgtCreateSurfTmRuled(m_Scene.GetDragGroup(), nSectId, nGuideId, If( m_bLast, RUL_TYPE.MINDIST, RUL_TYPE.ISOPAR), EPS_STM_DRAG)
EgtDraw()
End If
End Sub
Private Function ProcessMergeSurf() As Boolean
If m_nStep <> 0 Then
Return False
EgtInterface.vb
+153 -6
View File
@@ -1109,6 +1109,34 @@ Public Function EgtGetKeyOptions(nProd As Integer, nVer As Integer, nLev As Inte
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyLeftDays"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetKeyLeftDays_32(ByRef nLeftDays As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyLeftDays"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetKeyLeftDays_64(ByRef nLeftDays As Integer) As Boolean
End Function
Public Function EgtGetKeyLeftDays(ByRef nLeftDays As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtGetKeyLeftDays_32(nLeftDays)
Else
Return EgtGetKeyLeftDays_64(nLeftDays)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyOptLeftDays"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetKeyOptLeftDays_32(ByRef nOptLeftDays As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyOptLeftDays"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetKeyOptLeftDays_64(ByRef nOptLeftDays As Integer) As Boolean
End Function
Public Function EgtGetKeyOptLeftDays(ByRef nOptLeftDays As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtGetKeyOptLeftDays_32(nOptLeftDays)
Else
Return EgtGetKeyOptLeftDays_64(nOptLeftDays)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOsInfo"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetOsInfo_32(ByRef psOsInfo As IntPtr) As Boolean
End Function
@@ -1289,6 +1317,43 @@ Public Function EgtSetMainWindowHandle(hMainWnd As IntPtr) As Boolean
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetStringUtf8FromIni"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetStringUtf8FromIni_32(sSec As String, sKey As String, sDef As String, ByRef sVal As IntPtr, sIniFile As String) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetStringUtf8FromIni"), SuppressUnmanagedCodeSecurity()>
Private Function EgtGetStringUtf8FromIni_64(sSec As String, sKey As String, sDef As String, ByRef sVal As IntPtr, sIniFile As String) As Boolean
End Function
Public Function EgtGetStringUtf8FromIni(sSec As String, sKey As String, sDef As String, ByRef sVal As String, sIniFile As String) As Boolean
Dim psVal As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtGetStringUtf8FromIni_32(sSec, sKey, sDef, psVal, sIniFile)
Else
bOk = EgtGetStringUtf8FromIni_64(sSec, sKey, sDef, psVal, sIniFile)
End If
If bOk Then
sVal = Marshal.PtrToStringUni(psVal)
EgtFreeMemory(psVal)
Else
sVal = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtWriteStringUtf8ToIni"), SuppressUnmanagedCodeSecurity()>
Private Function EgtWriteStringUtf8toIni_32(sSec As String, sKey As String, sVal As String, sIniFile As String) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtWriteStringUtf8ToIni"), SuppressUnmanagedCodeSecurity()>
Private Function EgtWriteStringUtf8toIni_64(sSec As String, sKey As String, sVal As String, sIniFile As String) As Boolean
End Function
Public Function EgtWriteStringUtf8toIni(sSec As String, sKey As String, sVal As String, sIniFile As String) As Boolean
If IntPtr.Size = 4 Then
Return EgtWriteStringUtf8toIni_32(sSec, sKey, sVal, sIniFile)
Else
Return EgtWriteStringUtf8toIni_64(sSec, sKey, sVal, sIniFile)
End If
End Function
'---------- UiUnits ------------------------------------------------------------
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetUiUnits"), SuppressUnmanagedCodeSecurity()>
@@ -2401,6 +2466,23 @@ Public Function EgtCreateCircleCPEx(nParentId As Integer, ByRef PtCen As Point3d
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateArc"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateArc_32(nParentId As Integer, ByRef PtCen As Point3d, dRad As Double,
dAngIniDeg As Double, dAngCenDeg As Double, dDeltaN As Double, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateArc"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateArc_64(nParentId As Integer, ByRef PtCen As Point3d, dRad As Double,
dAngIniDeg As Double, dAngCenDeg As Double, dDeltaN As Double, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer
End Function
Public Function EgtCreateArc(nParentId As Integer, ByRef PtCen As Point3d, dRad As Double,
dAngIniDeg As Double, dAngCenDeg As Double, dDeltaN As Double, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer
If IntPtr.Size = 4 Then
Return EgtCreateArc_32(nParentId, PtCen, dRad, dAngIniDeg, dAngCenDeg, dDeltaN, nRefType)
Else
Return EgtCreateArc_64(nParentId, PtCen, dRad, dAngIniDeg, dAngCenDeg, dDeltaN, nRefType)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateArc3P"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateArc3P_32(nParentId As Integer,
ByRef PtStart As Point3d, ByRef PtMid As Point3d, ByRef PtEnd As Point3d, Optional nRefType As GDB_RT = GDB_RT.LOC) As Integer
@@ -2904,17 +2986,31 @@ Public Function EgtCreateSurfTmByScrewing(nParentId As Integer, nCrvId As Intege
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmSwept"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateSurfTmSwept_32(nParentId As Integer, nSectId As Integer, nGuideId As Integer, bCapEnds As Boolean, dLinTol As Double) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmSwept"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateSurfTmSwept_64(nParentId As Integer, nSectId As Integer, nGuideId As Integer, bCapEnds As Boolean, dLinTol As Double) As Integer
End Function
Public Function EgtCreateSurfTmSwept(nParentId As Integer, nSectId As Integer, nGuideId As Integer, bCapEnds As Boolean, dLinTol As Double) As Integer
If IntPtr.Size = 4 Then
Return EgtCreateSurfTmSwept_32(nParentId, nSectId, nGuideId, bCapEnds, dLinTol)
Else
Return EgtCreateSurfTmSwept_64(nParentId, nSectId, nGuideId, bCapEnds, dLinTol)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmRuled"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateSurfTmRuled_32(nParentId As Integer, nCrvId1 As Integer, nCrvId2 As Integer, dLinTol As Double) As Integer
Private Function EgtCreateSurfTmRuled_32(nParentId As Integer, nCrvId1 As Integer, nCrvId2 As Integer, nType As Integer, dLinTol As Double) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateSurfTmRuled"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateSurfTmRuled_64(nParentId As Integer, nCrvId1 As Integer, nCrvId2 As Integer, dLinTol As Double) As Integer
Private Function EgtCreateSurfTmRuled_64(nParentId As Integer, nCrvId1 As Integer, nCrvId2 As Integer, nType As Integer, dLinTol As Double) As Integer
End Function
Public Function EgtCreateSurfTmRuled(nParentId As Integer, nCrvId1 As Integer, nCrvId2 As Integer, dLinTol As Double) As Integer
Public Function EgtCreateSurfTmRuled(nParentId As Integer, nCrvId1 As Integer, nCrvId2 As Integer, nType As Integer, dLinTol As Double) As Integer
If IntPtr.Size = 4 Then
Return EgtCreateSurfTmRuled_32(nParentId, nCrvId1, nCrvId2, dLinTol)
Return EgtCreateSurfTmRuled_32(nParentId, nCrvId1, nCrvId2, nType, dLinTol)
Else
Return EgtCreateSurfTmRuled_64(nParentId, nCrvId1, nCrvId2, dLinTol)
Return EgtCreateSurfTmRuled_64(nParentId, nCrvId1, nCrvId2, nType, dLinTol)
End If
End Function
@@ -6519,6 +6615,23 @@ End Function
'---------- Nestings -----------------------------------------------------------
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateAdjustFlatParts"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateAdjustFlatParts_32(nType As Integer, dToler As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateAdjustFlatParts"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateAdjustFlatParts_64(nType As Integer, dToler As Double) As Boolean
End Function
Public Function EgtCreateAdjustFlatParts(nType As Integer, dToler As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtCreateAdjustFlatParts_32(nType, dToler)
Else
Return EgtCreateAdjustFlatParts_64(nType, dToler)
End If
End Function
Public Function EgtCreateAdjustFlatParts(nType As Integer) As Boolean
Return EgtCreateAdjustFlatParts(nType, 0.1)
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateFlatParts"), SuppressUnmanagedCodeSecurity()>
Private Function EgtCreateFlatParts_32(nType As Integer, dToler As Double) As Boolean
End Function
@@ -6536,6 +6649,34 @@ Public Function EgtCreateFlatParts(nType As Integer) As Boolean
Return EgtCreateFlatParts(nType, 0.10000000000000001)
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdjustFlatParts"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAdjustFlatParts_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdjustFlatParts"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAdjustFlatParts_64() As Boolean
End Function
Public Function EgtAdjustFlatParts() As Boolean
If IntPtr.Size = 4 Then
Return EgtAdjustFlatParts_32()
Else
Return EgtAdjustFlatParts_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdjustFlatPart"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAdjustFlatPart_32(nPartId As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdjustFlatPart"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAdjustFlatPart_64(nPartId As Integer) As Boolean
End Function
Public Function EgtAdjustFlatPart(nPartId As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtAdjustFlatPart_32(nPartId)
Else
Return EgtAdjustFlatPart_64(nPartId)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdjustFlatPartLayer"), SuppressUnmanagedCodeSecurity()>
Private Function EgtAdjustFlatPartLayer_32(nLayerId As Integer) As Boolean
End Function
@@ -12164,6 +12305,11 @@ Public Enum SLI_TYPE As Integer
TG_FIN = 4
TOUCH = 5
End Enum
'Costanti : tipo di costruzione di superficie rigata
Public Enum RUL_TYPE As Integer
ISOPAR = 0
MINDIST = 1
End Enum
'Costanti : flag per import CNC (sommabili tra loro)
Public Enum EIC_FL As Integer
NONE = 0
@@ -12640,7 +12786,8 @@ Public Enum MCH_SIM As Integer
STOP_ = 3
OUTSTROKE = 4
DIR_ERR = 5
ERR = 6
COLLISION = 6
ERR = 7
End Enum
'Costanti : stato di simulazione
Public Enum MCH_SIM_ST As Integer
Form1.Designer.vb
Generated
+371 -351
View File
File diff suppressed because it is too large Load Diff
Form1.resx
+41 -2
View File
@@ -883,7 +883,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADS
DgAAAk1TRnQBSQFMAgEBEAEAAWABEQFgAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DgAAAk1TRnQBSQFMAgEBEAEAAWgBEQFoAREBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -957,7 +957,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW
CAAAAk1TRnQBSQFMAgEBAgEAAYABCAGAAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAYgBCAGIAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1113,6 +1113,45 @@
LAcyLAEJCZkmOZChAhISMs1yIEMPJCRkuuRAhgwkJGS65UCGEUhIyAyRgzwoSyP9x057ZBOG+opFhsiN
Le7lJ1N5WmKY/LjfS/gFxQK8rhUbkHKBzS+4tQCANLm6ydIz0H38ERvlAseEfwuGyYGN99GXCsxGhjOR
4UxkOBMZzkSG8wjLC3uFfZK6X129AAAAAElFTkSuQmCC
</value>
</data>
<data name="btnSwept.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="btnExplodeSurf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
Form1.vb
+19 -5
View File
@@ -730,6 +730,7 @@ Public Class Form1
btnExtrude.Enabled = bLayerOk And bSelOk
btnRevolve.Enabled = bLayerOk And bSelOk
btnScrew.Enabled = bLayerOk And bSelOk
btnSwept.Enabled = bLayerOk And bSelOk
btnRuled.Enabled = bLayerOk And bSelOk
btnMergeSurf.Enabled = bSelOk
btnExplodeSurf.Enabled = bSelOk
@@ -819,6 +820,7 @@ Public Class Form1
SetTextAndToolTip(btnExtrude, 405, 406) ' Extrude / Surface : curve extrusion
SetTextAndToolTip(btnRevolve, 407, 408) ' Revolve / Surface : curve revolution
SetTextAndToolTip(btnScrew, 409, 410) ' Screw / Surface : curve screwing
SetTextAndToolTip(btnSwept, 419, 420) ' Swept / Surface : sweeping one curve around another
SetTextAndToolTip(btnRuled, 411, 412) ' Ruled / Surface : ruled between 2 curves
SetTextAndToolTip(btnMergeSurf, 413, 414) ' Merge / Merge Surfaces
SetTextAndToolTip(btnExplodeSurf, 417, 418) ' Explode / Explode Surfaces
@@ -1208,6 +1210,10 @@ Public Class Form1
m_Controller.ExecuteCommand(CMD.SCREW)
End Sub
Private Sub btnSwept_Click(sender As System.Object, e As System.EventArgs) Handles btnSwept.Click
m_Controller.ExecuteCommand(CMD.SWEPT)
End Sub
Private Sub btnRuled_Click(sender As System.Object, e As System.EventArgs) Handles btnRuled.Click
m_Controller.ExecuteCommand(CMD.RULED)
End Sub
@@ -1391,10 +1397,12 @@ Public Class Form1
ByVal bShowCombo As Boolean, ByVal bShowBtn As Boolean)
InputBox.Text = sTitle
InputBox.Show()
InputLabel.Text = sLabel
InputLabel.Show()
InputText.Text = ""
InputText.Show()
If sLabel <> "" Then
InputLabel.Text = sLabel
InputLabel.Show()
InputText.Text = ""
InputText.Show()
End If
If sCheckLabel <> "" Then
InputCheck.Text = sCheckLabel
InputCheck.Show()
@@ -1411,6 +1419,8 @@ Public Class Form1
Private Sub ResetInputBox()
InputBox.Hide()
InputLabel.Hide()
InputText.Hide()
InputCheck.Hide()
InputCombo.Hide()
btnShow.Hide()
@@ -1827,7 +1837,11 @@ Public Class Form1
Private Sub MenuObjTree_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ContextMenuTreeView1.ItemClicked
If e.ClickedItem.Name = "cmdSelectPartLayObj" Then
m_Controller.SetLastInteger(m_nObjTreeMenuId)
m_Controller.ExecuteCommand(CMD.SELECTPARTLAYEROBJ)
If ((ModifierKeys And Keys.Shift) <> Keys.Shift) Then
m_Controller.ExecuteCommand(CMD.SELECTPARTLAYEROBJ)
Else
m_Controller.ExecuteCommand(CMD.SELECTGROUP)
End If
ElseIf e.ClickedItem.Name = "cmdDeselectPartLayObj" Then
m_Controller.SetLastInteger(m_nObjTreeMenuId)
m_Controller.ExecuteCommand(CMD.DESELECTPARTLAYEROBJ)
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.1.5")>
<Assembly: AssemblyFileVersion("2.1.1.5")>
<Assembly: AssemblyVersion("2.1.5.1")>
<Assembly: AssemblyFileVersion("2.1.5.1")>
Resources/Swept.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

TestEIn.vbproj
+1
View File
@@ -237,6 +237,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FlatParts.resx">
<DependentUpon>FlatParts.vb</DependentUpon>