7 Commits

Author SHA1 Message Date
Dario Sassi c29d31d851 EgtUILib 3.1g4 :
- aggiunta interfaccia per funzione EgtVerifyCurrSetup.
2026-07-23 20:17:47 +02:00
Dario Sassi e02aaf54a9 EgtUILib 3.1g1 :
- aggiunte costanti MCH_SAWFIN_SUB.ALONG_5A e MCH_SAWFIN_SUB.SECTION.
2026-07-03 17:04:51 +02:00
Dario Sassi 106af95284 EgtUILib 3.1f2 :
- eliminate costanti MCH_SAWROU_ST.ZCONST e MCH_SAWROU_LL.INT.
2026-07-03 08:40:52 +02:00
Dario Sassi 7b1055c967 EgtUILib 3.1f1 :
- ricompilazione con cambio versione.
2026-06-10 14:40:54 +02:00
Dario Sassi 9da749521e EgtUILib 3.1d1 :
- aggiunta interfaccia per funzione EgtRedraw.
2026-04-08 19:31:26 +02:00
Dario Sassi 4c7c851394 EgtUILib :
- aggiornata interfaccia di EgtSurfBezierParamsFromPoint
- aggiunta interfaccia di EgtSurfBezierGetPointNrmD1
- in Scene ora l'evento OnMouseAnalyzedEx restituisce anche lo stato dei tasti (SHIFT, CTRL e ALT).
2026-03-13 13:36:06 +01:00
Daniele Bariletti 977f82ce26 EgtInterface :
- cambiata la restituzione di valori per EgtSurfBezParamsFromPoint.
2026-03-12 18:16:54 +01:00
3 changed files with 90 additions and 13 deletions
+72 -9
View File
@@ -5464,17 +5464,37 @@ Public Function EgtExtractSurfBezierLoops(nId As Integer, nDestGrpId As Integer,
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSurfBezParamsFromPoint"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSurfBezParamsFromPoint_32( nIdSurf As Integer, ByRef ptPBez As Point3d, nDestGroup As Integer, ByRef ptPParam As Point3d) As Boolean
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSurfBezierParamsFromPoint"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSurfBezierParamsFromPoint_32( nIdSurf As Integer, ByRef ptOnSurf As Point3d, nRefId As Integer,
ByRef dU As Double, ByRef dV As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSurfBezParamsFromPoint"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSurfBezParamsFromPoint_64( nIdSurf As Integer, ByRef ptPBez As Point3d, nDestGroup As Integer, ByRef ptPParam As Point3d) As Boolean
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSurfBezierParamsFromPoint"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSurfBezierParamsFromPoint_64( nIdSurf As Integer, ByRef ptOnSurf As Point3d, nRefId As Integer,
ByRef dU As Double, ByRef dV As Double) As Boolean
End Function
Public Function EgtSurfBezParamsFromPoint(nIdSurf As Integer, ByRef ptPBez As Point3d, nDestGroup As Integer, ByRef ptPParam As Point3d) As Boolean
Public Function EgtSurfBezierParamsFromPoint(nIdSurf As Integer, ByRef ptOnSurf As Point3d, nRefId As Integer,
ByRef dU As Double, ByRef dV As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtSurfBezParamsFromPoint_32(nIdSurf, ptPBez, nDestGroup, ptPParam)
Return EgtSurfBezierParamsFromPoint_32(nIdSurf, ptOnSurf, nRefId, dU, dV)
Else
Return EgtSurfBezParamsFromPoint_64(nIdSurf, ptPBez, nDestGroup, ptPParam)
Return EgtSurfBezierParamsFromPoint_64(nIdSurf, ptOnSurf, nRefId, dU, dV)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSurfBezierGetPointNrmD1"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSurfBezierGetPointNrmD1_32( nIdSurf As Integer, dU As Double, dV As Double, nUsd As Integer, nVsd As Integer, nRefId As Integer,
ByRef PtP As Point3d, ByRef vtNorm As Vector3d, ByRef vtDerU As Vector3d, ByRef vtDerV As Vector3d) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSurfBezierGetPointNrmD1"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSurfBezierGetPointNrmD1_64( nIdSurf As Integer, dU As Double, dV As Double, nUsd As Integer, nVsd As Integer, nRefId As Integer,
ByRef PtP As Point3d, ByRef vtNorm As Vector3d, ByRef vtDerU As Vector3d, ByRef vtDerV As Vector3d) As Boolean
End Function
Public Function EgtSurfBezierGetPointNrmD1(nIdSurf As Integer, dU As Double, dV As Double, nUsd As Integer, nVsd As Integer, nRefId As Integer,
ByRef PtP As Point3d, ByRef vtNorm As Vector3d, ByRef vtDerU As Vector3d, ByRef vtDerV As Vector3d) As Boolean
If IntPtr.Size = 4 Then
Return EgtSurfBezierGetPointNrmD1_32(nIdSurf, dU, dV, nUsd, nVsd, nRefId, ptP, vtNorm, vtDerU, vtDerV)
Else
Return EgtSurfBezierGetPointNrmD1_64(nIdSurf, dU, dV, nUsd, nVsd, nRefId, ptP, vtNorm, vtDerU, vtDerV)
End If
End Function
@@ -11651,6 +11671,30 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtVerifyCurrSetup"), SuppressUnmanagedCodeSecurity()>
Private Function EgtVerifyCurrSetup_32(ByRef psErrors As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtVerifyCurrSetup"), SuppressUnmanagedCodeSecurity()>
Private Function EgtVerifyCurrSetup_64(ByRef psErrors As IntPtr) As Boolean
End Function
Public Function EgtVerifyCurrSetup(ByRef vsErrors() As String) As Boolean
Dim psErrors As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtVerifyCurrSetup_32(psErrors)
Else
bOk = EgtVerifyCurrSetup_64(psErrors)
End If
If Not bOk Then
Dim sErrors As String = Marshal.PtrToStringUni( psErrors)
EgtFreeMemory( psErrors)
vsErrors = Split( sErrors, vbLf)
else
vsErrors = {}
End If
Return bOk
End Function
' Machinings Database
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtMdbGetMachiningNewName"), SuppressUnmanagedCodeSecurity()>
Private Function EgtMdbGetMachiningNewName_32(sName As String, ByRef psNewName As IntPtr) As Boolean
@@ -14073,6 +14117,20 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRedraw"), SuppressUnmanagedCodeSecurity()>
Private Function EgtRedraw_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtRedraw"), SuppressUnmanagedCodeSecurity()>
Private Function EgtRedraw_64() As Boolean
End Function
Public Function EgtRedraw() As Boolean
If IntPtr.Size = 4 Then
Return EgtRedraw_32()
Else
Return EgtRedraw_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSelect"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSelect_32(nWinX As Integer, nWinY As Integer,
nSelW As Integer, nSelH As Integer, ByRef nSel As Integer) As Boolean
@@ -15754,6 +15812,11 @@ Public Enum CRV_SIDE As Integer
FROM_MINUS = -1
FROM_PLUS = 1
End Enum
'Costanti : direzione di calcolo tangente lungo la curva di superficie
Public Enum SRF_SIDE As Integer
FROM_MINUS = -1
FROM_PLUS = 1
End Enum
'Costanti : TIPO VISUALIZZAZIONE
Public Enum SM As Integer
WIREFRAME = 0
@@ -16380,13 +16443,11 @@ End Enum
Public Enum MCH_SAWROU_ST As Integer
ZIGZAG = 0
ONEWAY = 1
ZCONST = 2
End Enum
'Tipo di ingresso/collegamento/uscita
Public Enum MCH_SAWROU_LL As Integer
CENT = 0
EXT = 1
INT = 2
End Enum
'Costanti per Finitura con Lama
'Lato di posizionamento della testa
@@ -16403,6 +16464,8 @@ End Enum
Public Enum MCH_SAWFIN_SUB As Integer
ALONG = 0
ACROSS = 1
ALONG_5A = 2
SECTION = 3
End Enum
'Tipo di ingresso/collegamento/uscita
Public Enum MCH_SAWFIN_LL As Integer
+2 -2
View File
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
' È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
' utilizzando l'asterisco (*) come descritto di seguito:
<Assembly: AssemblyVersion("3.1.3.2")>
<Assembly: AssemblyFileVersion("3.1.3.2")>
<Assembly: AssemblyVersion("3.1.7.4")>
<Assembly: AssemblyFileVersion("3.1.7.4")>
+16 -2
View File
@@ -20,6 +20,12 @@ Public Class Scene
'---- Constants -------
Public Const DIM_SEL As Integer = 13
Public Enum MODKEY As Integer
NONE = 0
SHIFT = 1
CTRL = 2
ALT = 3
End Enum
'---- Members ---------
Private m_nGseContext As Integer
@@ -282,7 +288,7 @@ Public Class Scene
Public Event OnMouseSelectedLayer(sender As Object, nId As Integer)
Public Event OnMouseSelectedPath(sender As Object, nId As Integer, bHaltOnFork As Boolean)
Public Event OnMouseAnalyzed(sender As Object, nId As Integer)
Public Event OnMouseAnalyzedEx(sender As Object, nId As Integer, nSub As Integer, ptP As Point3d)
Public Event OnMouseAnalyzedEx(sender As Object, nId As Integer, nSub As Integer, ptP As Point3d, nModKey As Integer)
Public Event OnMousePointFromSelection(sender As Object, nId As Integer, PtP As Point3d, nAux As Integer)
Public Event OnStartingMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs, ByRef bContinue As Boolean)
Public Event OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
@@ -403,6 +409,14 @@ Public Class Scene
m_PrevPoint = e.Location
' se stato ANALYZE
ElseIf m_nStatus = ST.ANALYZE Then
Dim nModKey As Integer = MODKEY.NONE
If (ModifierKeys And Keys.Shift) = Keys.Shift Then
nModKey = MODKEY.SHIFT
ElseIf (ModifierKeys And Keys.Control) = Keys.Control Then
nModKey = MODKEY.CTRL
ElseIf (ModifierKeys And Keys.Alt) = Keys.Alt Then
nModKey = MODKEY.ALT
End If
EgtSetObjFilterForSelWin(m_bZeroDimForSel, m_bCurveForSel, m_bSurfForSel, m_bVolumeForSel, m_bExtraForSel)
Dim nId As Integer = ChooseOneSelectedObj(e.Location, m_nStatus)
If nId <> GDB_ID.NULL Then
@@ -412,7 +426,7 @@ Public Class Scene
Dim PtTemp As Point3d
Dim nAux As Integer = -1
EgtGetPointFromSelect(nId, e.Location, PtTemp, nAux)
RaiseEvent OnMouseAnalyzedEx( Me, nId, nAux, PtTemp)
RaiseEvent OnMouseAnalyzedEx( Me, nId, nAux, PtTemp, nModKey)
End If
' se stato GETDIST (primo punto per misura di distanza)
ElseIf m_nStatus = ST.GETDIST Then