TestEIn 1.8j7 :
- aggiornamento.
This commit is contained in:
+1
-1
@@ -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()
|
||||
|
||||
+15
-7
@@ -1735,16 +1735,16 @@ Public Function EgtImportCsf(sFilePath As String) As Boolean
|
||||
End Function
|
||||
|
||||
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtImportBtl"), SuppressUnmanagedCodeSecurity()>
|
||||
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
|
||||
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtImportBtl"), SuppressUnmanagedCodeSecurity()>
|
||||
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 = "<br/>"
|
||||
|
||||
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
|
||||
' utilizzando l'asterisco (*) come descritto di seguito:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.8.10.6")>
|
||||
<Assembly: AssemblyFileVersion("1.8.10.6")>
|
||||
<Assembly: AssemblyVersion("1.8.10.7")>
|
||||
<Assembly: AssemblyFileVersion("1.8.10.7")>
|
||||
|
||||
Reference in New Issue
Block a user