diff --git a/Controller.vb b/Controller.vb index 137b25d..b1a9ede 100644 --- a/Controller.vb +++ b/Controller.vb @@ -432,6 +432,7 @@ Public Class Controller Dim nFileType As Integer = EgtGetFileType(sFile) Dim bOkType = (nFileType = FT.DXF Or nFileType = FT.STL Or nFileType = FT.CNC Or nFileType = FT.CSF Or nFileType = FT.BTL) + If Not bOkType Then nFileType = FT.NULL 'Prima del caricamento Dim nFlag As Integer = 0 RaiseEvent OnImportingProject(Me, nFileType, nFlag) diff --git a/EgtInterface.vb b/EgtInterface.vb index e59d376..5fbf221 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -6822,6 +6822,20 @@ Public Function EgtVerifyRawPartPhase(nRawId As Integer, nPhase As Integer) As B End If End Function + +Private Function EgtVerifyRawPartCurrPhase_32(nRawId As Integer) As Boolean +End Function + +Private Function EgtVerifyRawPartCurrPhase_64(nRawId As Integer) As Boolean +End Function +Public Function EgtVerifyRawPartCurrPhase(nRawId As Integer) As Boolean + If IntPtr.Size = 4 Then + Return EgtVerifyRawPartCurrPhase_32(nRawId) + Else + Return EgtVerifyRawPartCurrPhase_64(nRawId) + End If +End Function + Private Function EgtRemoveRawPartFromCurrPhase_32(nRawId As Integer) As Boolean End Function @@ -7110,6 +7124,20 @@ Public Function EgtRemoveFixture(nFixtId As Integer) As Boolean End If End Function + +Private Function EgtVerifyFixture_32(nFixtId As Integer) As Boolean +End Function + +Private Function EgtVerifyFixture_64(nFixtId As Integer) As Boolean +End Function +Public Function EgtVerifyFixture(nFixtId As Integer) As Boolean + If IntPtr.Size = 4 Then + Return EgtVerifyFixture_32(nFixtId) + Else + Return EgtVerifyFixture_64(nFixtId) + End If +End Function + Private Function EgtGetFirstFixture_32() As Integer End Function @@ -9305,6 +9333,20 @@ Public Function EgtGetLastSnapDir(ByRef VtDir As Vector3d) As Boolean End If End Function + +Private Function EgtGetPlaneSnapPoint_32(nWinX As Integer, nWinY As Integer, ByRef VtN As Vector3d, dDist As Double, ByRef ptP As Point3d) As Boolean +End Function + +Private Function EgtGetPlaneSnapPoint_64(nWinX As Integer, nWinY As Integer, ByRef VtN As Vector3d, dDist As Double, ByRef ptP As Point3d) As Boolean +End Function +Public Function EgtGetPlaneSnapPoint(PtWin As Point, VtN As Vector3d, dDist As Double, ByRef ptP As Point3d) As Boolean + If IntPtr.Size = 4 Then + Return EgtGetPlaneSnapPoint_32(PtWin.X, PtWin.Y, VtN, dDist, ptP) + Else + Return EgtGetPlaneSnapPoint_64(PtWin.X, PtWin.Y, VtN, dDist, ptP) + End If +End Function + Private Function EgtSetShowMode_32(nShowMode As SM, bRedraw As Boolean) As Boolean End Function diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 607c71b..0d4d509 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: ' - - + +