From 730200d4fa6b7aa2e025379daeb645f2910c49e8 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 12 Jul 2016 06:13:34 +0000 Subject: [PATCH] TestEIn : - aggiornamenti. --- AboutBox1.vb | 5 +- EgtInterface.vb | 130 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 126 insertions(+), 9 deletions(-) diff --git a/AboutBox1.vb b/AboutBox1.vb index f71cca2..da5b230 100644 --- a/AboutBox1.vb +++ b/AboutBox1.vb @@ -13,7 +13,10 @@ Public NotInheritable Class AboutBox1 Me.Text = String.Format("Informazioni su {0}", My.Application.Info.ProductName) ' Inizializza tutto il testo visualizzato nella finestra di dialogo Informazioni su. Me.LabelProductName.Text = ApplicationTitle - Me.LabelVersion.Text = String.Format("Versione {0}", My.Application.Info.Version.ToString) + Me.LabelVersion.Text = "Version : " & My.Application.Info.Version.Major.ToString() & + "." & My.Application.Info.Version.Minor.ToString() & + (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() & + My.Application.Info.Version.Revision.ToString() Me.LabelCopyright.Text = My.Application.Info.Copyright Me.LabelCompanyName.Text = My.Application.Info.CompanyName Dim sTemp As String = String.Empty diff --git a/EgtInterface.vb b/EgtInterface.vb index 9535635..14b1108 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -705,6 +705,18 @@ Class BBox3d Return False End If End Function + ' Sovrapposizione con altro box + Public Function Overlaps(ByRef b3Other As BBox3d) As Boolean + If PtMax.x < b3Other.PtMin.x - EPS_SMALL Or PtMin.x > b3Other.PtMax.x + EPS_SMALL Then Return False + If PtMax.y < b3Other.PtMin.y - EPS_SMALL Or PtMin.y > b3Other.PtMax.y + EPS_SMALL Then Return False + If PtMax.z < b3Other.PtMin.z - EPS_SMALL Or PtMin.z > b3Other.PtMax.z + EPS_SMALL Then Return False + Return True + End Function + Public Function OverlapsXY(ByRef b3Other As BBox3d) As Boolean + If PtMax.x < b3Other.PtMin.x - EPS_SMALL Or PtMin.x > b3Other.PtMax.x + EPS_SMALL Then Return False + If PtMax.y < b3Other.PtMin.y - EPS_SMALL Or PtMin.y > b3Other.PtMax.y + EPS_SMALL Then Return False + Return True + End Function End Class Structure Color3d @@ -5263,6 +5275,34 @@ Public Function EgtCurveThickness(nId As Integer, ByRef dThick As Double) As Boo End If End Function + +Private Function EgtCurveSelfIntersCount_32(nId As Integer, ByRef nCount As Integer) As Boolean +End Function + +Private Function EgtCurveSelfIntersCount_64(nId As Integer, ByRef nCount As Integer) As Boolean +End Function +Public Function EgtCurveSelfIntersCount(nId As Integer, ByRef nCount As Integer) As Boolean + If IntPtr.Size = 4 Then + Return EgtCurveSelfIntersCount_32(nId, nCount) + Else + Return EgtCurveSelfIntersCount_64(nId, nCount) + End If +End Function + + +Private Function EgtClosedCurveClassify_32(nId1 As Integer, nId2 As Integer) As Integer +End Function + +Private Function EgtClosedCurveClassify_64(nId1 As Integer, nId2 As Integer) As Integer +End Function +Public Function EgtClosedCurveClassify(nId1 As Integer, nId2 As Integer) As Integer + If IntPtr.Size = 4 Then + Return EgtClosedCurveClassify_32(nId1, nId2) + Else + Return EgtClosedCurveClassify_64(nId1, nId2) + End If +End Function + Private Function EgtGetMinDistPointCurve_32(ByRef ptP As Point3d, nId As Integer, ByRef dDist As Double, ByRef dU As Double) As Boolean End Function @@ -9843,6 +9883,15 @@ Public Enum INS_POS As Integer BC = 8 BR = 9 End Enum +'Costanti : classificazione di due curve chiuse come fossero regioni +Public Enum CCREGC As Integer + NULL = 0 + IN1 = 1 + IN2 = 2 + SAME = 3 + OUT = 4 + INTERS = 5 +End Enum 'Costanti : semplice classificazione dei chunk di due regioni Public Enum REGC As Integer NULL = 0 @@ -10028,18 +10077,25 @@ Public Enum MCH_MP As Integer OVERLAP_STR = 32775 OFFSET_STR = 32776 End Enum -'Costanti : lato di lavoro per il taglio +'Costanti per Taglio Con Lama : + 'Lato di lavoro Public Enum MCH_SAW_WS As Integer CENTER = 0 LEFT = 1 RIGHT = 2 End Enum -'Costanti : lato di posizionamento della testa per il taglio + 'Lato di posizionamento della testa Public Enum MCH_SAW_HS As Integer LEFT = 1 RIGHT = 2 End Enum -'Costanti : tipi di attacco per il taglio + 'Tipo di lavorazione a step +Public Enum MCH_SAW_ST As Integer + ZIGZAG = 0 + ONEWAY = 1 + TOANDFROM = 2 +End Enum + 'Tipo di attacco Public Enum MCH_SAW_LI As Integer CENT = 0 STRICT = 1 @@ -10047,30 +10103,88 @@ Public Enum MCH_SAW_LI As Integer EXT_CENT = 3 EXT_OUT = 4 End Enum -'Costanti : tipi di link esterni per il taglio + 'Tipo di link esterno Public Enum MCH_SAW_EL As Integer CENT = 0 EXT_PREV = 1 EXT_NEXT = 2 EXT_BOTH = 3 End Enum -'Costanti : tipi di uscite per il taglio + 'Tipo di uscita Public Enum MCH_SAW_LO As Integer CENT = 0 STRICT = 1 EXT = 2 End Enum -'Costanti : tipi di ingresso/collegamento/uscita per sgrossatura con lama + 'Tipo di utilizzazione delle curve +Public Enum MCH_SAW_CU As Integer + SKIP = 0 + APPROX = 1 + CONVEX = 2 + KEEP = 3 +End Enum +'Costanti per Fresatura : + 'Lato di lavoro +Public Enum MCH_MIL_WS As Integer + CENTER = 0 + LEFT = 1 + RIGHT = 2 +End Enum + 'Tipo di lavorazione a step +Public Enum MCH_MIL_ST As Integer + ZIGZAG = 0 + ONEWAY = 1 + SPIRAL = 2 +End Enum + 'Tipo di attacco +Public Enum MCH_MIL_LI As Integer + NONE = 0 + LINEAR = 1 + TANGENT = 2 + GLIDE = 3 + HELIX = 4 +End Enum + 'Tipo di uscita +Public Enum MCH_MIL_LO As Integer + NONE = 0 + LINEAR = 1 + TANGENT = 2 + GLIDE = 3 + AS_LI = 4 +End Enum +'Costanti per Sgrossatura con Lama + 'Lato di posizionamento della testa +Public Enum MCH_SAWROU_HS As Integer + LEFT = 1 + RIGHT = 2 +End Enum + 'Tipo di lavorazione a step +Public Enum MCH_SAWROU_ST As Integer + ZIGZAG = 0 + ONEWAY = 1 +End Enum + 'Tipo di ingresso/collegamento/uscita Public Enum MCH_SAWROU_LL As Integer CENT = 0 EXT = 1 End Enum -'Costanti : tipo di finituta con lama +'Costanti per Finitura con Lama + 'Lato di posizionamento della testa +Public Enum MCH_SAWFIN_HS As Integer + LEFT = 1 + RIGHT = 2 +End Enum + 'Tipo di lavorazione a step +Public Enum MCH_SAWFIN_ST As Integer + ZIGZAG = 0 + ONEWAY = 1 +End Enum + 'Tipo di finitura Public Enum MCH_SAWFIN_SUB As Integer ALONG = 0 ACROSS = 1 End Enum -'Costanti : tipi di ingresso/collegamento/uscita per finitura con lama + 'Tipo di ingresso/collegamento/uscita Public Enum MCH_SAWFIN_LL As Integer STD = 0 CENT = 1