TestEIn 1.6i4 :

- adattamenti vari.
This commit is contained in:
Dario Sassi
2015-09-07 08:26:36 +00:00
parent bd1ca260d0
commit 9552fafc0b
5 changed files with 84 additions and 11 deletions
+1 -1
View File
@@ -311,7 +311,7 @@ Public Class Component
' Ne recupero l'Id
Dim nId2 As Integer = EgtGetLastPart()
' Lo posiziono in ordine
EgtPackPart(nId2, PACK_MAX_X, PACK_OFFS)
EgtPackPart(nId2, 0, 0, PACK_MAX_X, PACK_OFFS)
Next
' disabilito registrazione
EgtDisableCommandLogger()
+78 -5
View File
@@ -3168,6 +3168,62 @@ Public Function EgtGetPrevGroup(ByVal nId As Integer) As Integer
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetFirstNameInGroup")>
Private Function EgtGetFirstNameInGroup_32(ByVal nGroupId As Integer, ByVal sName As String) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetFirstNameInGroup")>
Private Function EgtGetFirstNameInGroup_64(ByVal nGroupId As Integer, ByVal sName As String) As Integer
End Function
Public Function EgtGetFirstNameInGroup(ByVal nGroupId As Integer, ByVal sName As String) As Integer
If IntPtr.Size = 4 Then
Return EgtGetFirstNameInGroup_32(nGroupId, sName)
Else
Return EgtGetFirstNameInGroup_64(nGroupId, sName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetNextName")>
Private Function EgtGetNextName_32(ByVal nId As Integer, ByVal sName As String) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetNextName")>
Private Function EgtGetNextName_64(ByVal nId As Integer, ByVal sName As String) As Integer
End Function
Public Function EgtGetNextName(ByVal nId As Integer, ByVal sName As String) As Integer
If IntPtr.Size = 4 Then
Return EgtGetNextName_32(nId, sName)
Else
Return EgtGetNextName_64(nId, sName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetLastNameInGroup")>
Private Function EgtGetLastNameInGroup_32(ByVal nGroupId As Integer, ByVal sName As String) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetLastNameInGroup")>
Private Function EgtGetLastNameInGroup_64(ByVal nGroupId As Integer, ByVal sName As String) As Integer
End Function
Public Function EgtGetLastNameInGroup(ByVal nGroupId As Integer, ByVal sName As String) As Integer
If IntPtr.Size = 4 Then
Return EgtGetLastNameInGroup_32(nGroupId, sName)
Else
Return EgtGetLastNameInGroup_64(nGroupId, sName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetPrevName")>
Private Function EgtGetPrevName_32(ByVal nId As Integer, ByVal sName As String) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetPrevName")>
Private Function EgtGetPrevName_64(ByVal nId As Integer, ByVal sName As String) As Integer
End Function
Public Function EgtGetPrevName(ByVal nId As Integer, ByVal sName As String) As Integer
If IntPtr.Size = 4 Then
Return EgtGetPrevName_32(nId, sName)
Else
Return EgtGetPrevName_64(nId, sName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetBBox")>
Public Function EgtGetBBox_32(ByVal nId As Integer, ByVal nFlag As Integer,
ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean
@@ -3786,6 +3842,20 @@ Public Function EgtGetInfo(ByVal nId As Integer, ByVal sKey As String, ByRef nIn
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetInfoDouble")>
Private Function EgtGetInfoDouble_32(ByVal nId As Integer, ByVal sKey As String, ByRef dInfo As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetInfoDouble")>
Private Function EgtGetInfoDouble_64(ByVal nId As Integer, ByVal sKey As String, ByRef dInfo As Double) As Boolean
End Function
Public Function EgtGetInfo(ByVal nId As Integer, ByVal sKey As String, ByRef dInfo As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtGetInfoDouble_32(nId, sKey, dInfo)
Else
Return EgtGetInfoDouble_64(nId, sKey, dInfo)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtExistsInfo")>
Private Function EgtExistsInfo_32(ByVal nId As Integer, ByVal sKey As String) As Boolean
End Function
@@ -4691,16 +4761,19 @@ Public Function EgtCreateFlatParts(ByVal nType As Integer) As Boolean
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtPackPart")>
Private Function EgtPackPart_32(ByVal nId As Integer, ByVal dXmax As Double, ByVal dOffs As Double) As Boolean
Private Function EgtPackPart_32(ByVal nId As Integer, ByVal dXmin As Double, ByVal dYmin As Double,
ByVal dXmax As Double, ByVal dOffs As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtPackPart")>
Private Function EgtPackPart_64(ByVal nId As Integer, ByVal dXmax As Double, ByVal dOffs As Double) As Boolean
Private Function EgtPackPart_64(ByVal nId As Integer, ByVal dXmin As Double, ByVal dYmin As Double,
ByVal dXmax As Double, ByVal dOffs As Double) As Boolean
End Function
Public Function EgtPackPart(ByVal nId As Integer, ByVal dXmax As Double, ByVal dOffs As Double) As Boolean
Public Function EgtPackPart(ByVal nId As Integer, ByVal dXmin As Double, ByVal dYmin As Double,
ByVal dXmax As Double, ByVal dOffs As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtPackPart_32(nId, dXmax, dOffs)
Return EgtPackPart_32(nId, dXmin, dYmin, dXmax, dOffs)
Else
Return EgtPackPart_64(nId, dXmax, dOffs)
Return EgtPackPart_64(nId, dXmin, dYmin, dXmax, dOffs)
End If
End Function
+1 -1
View File
@@ -301,7 +301,7 @@ Public Class FlatParts
' Ne recupero l'Id
Dim nId2 As Integer = EgtGetLastPart()
' Lo posiziono in ordine
EgtPackPart(nId2, PACK_MAX_X, PACK_OFFS)
EgtPackPart(nId2, 0, 0, PACK_MAX_X, PACK_OFFS)
' Cancello il file
My.Computer.FileSystem.DeleteFile(sTmpfile)
End If
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.9.3")>
<Assembly: AssemblyFileVersion("1.6.9.3")>
<Assembly: AssemblyVersion("1.6.9.4")>
<Assembly: AssemblyFileVersion("1.6.9.4")>
+2 -2
View File
@@ -477,8 +477,8 @@ Public Class Scene
EgtResetWinRect(False)
EgtZoomWin(m_PrevPoint, e.Location, True)
End If
' Per solo bottone medio...
If e.Button = Windows.Forms.MouseButtons.Middle Then
' Per stati PAN, ROT e ZOOMWIN (unici compatibili con eventuale pressione tasto medio)
If m_nStatus = ST.PAN Or m_nStatus = ST.ROT Or m_nStatus = ST.ZOOMWIN Then
' eventuale ripristino vecchio stato
If RestoreStatus() Then
' non devo fare alcunché