diff --git a/Controller.vb b/Controller.vb index 6ec7897..930d070 100644 --- a/Controller.vb +++ b/Controller.vb @@ -470,7 +470,7 @@ Public Class Controller ElseIf nFileType = FT.CSF Then bOk = bOk And EgtImportCsf(sFile) ElseIf nFileType = FT.BTL Then - bOk = bOk And EgtImportBtl(sFile, True, False) + bOk = bOk And EgtImportBtl(sFile, nFlag) End If EgtResetCurrPartLayer() DisableCommandLog() diff --git a/EgtInterface.vb b/EgtInterface.vb index 31fad67..144b7ef 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -1735,16 +1735,16 @@ Public Function EgtImportCsf(sFilePath As String) As Boolean End Function -Private Function EgtImportBtl_32(sFilePath As String, bFlatPos As Boolean, bSpecialTrim As Boolean) As Boolean +Private Function EgtImportBtl_32(sFilePath As String, nFlag As Integer) As Boolean End Function -Private Function EgtImportBtl_64(sFilePath As String, bFlatPos As Boolean, bSpecialTrim As Boolean) As Boolean +Private Function EgtImportBtl_64(sFilePath As String, nFlag As Integer) As Boolean End Function -Public Function EgtImportBtl(sFilePath As String, bFlatPos As Boolean, bSpecialTrim As Boolean) As Boolean +Public Function EgtImportBtl(sFilePath As String, Optional nFlag As Integer = EIB_FL.NONE) As Boolean If IntPtr.Size = 4 Then - Return EgtImportBtl_32(sFilePath, bFlatPos, bSpecialTrim) + Return EgtImportBtl_32(sFilePath, nFlag) Else - Return EgtImportBtl_64(sFilePath, bFlatPos, bSpecialTrim) + Return EgtImportBtl_64(sFilePath, nFlag) End If End Function @@ -11654,11 +11654,19 @@ Public Enum REGC As Integer OUT = 4 INTERS = 5 End Enum -'Costanti : flag per import CNC +'Costanti : flag per import CNC (sommabili tra loro) Public Enum EIC_FL As Integer NONE = 0 CHAIN = 1 - SKIP_RAPID = 2 + SKIP_ZEROMACH = 2 + SKIP_RAPID = 4 +End Enum +'Costanti : flag per import BTL (sommabili tra loro) +Public Enum EIB_FL As Integer + NONE = 0 + FLAT_POS = 1 + VERT_POS = 2 + SPECIAL_TRIM = 4 End Enum 'Costanti : interruzione di riga Public Const LINE_BREAK As String = "
" diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 69b1661..f5b176d 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: ' - - + +