From 9552fafc0bb78c8963b3e26e4e7b32ec7f6cca3e Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 7 Sep 2015 08:26:36 +0000 Subject: [PATCH] TestEIn 1.6i4 : - adattamenti vari. --- Component.vb | 2 +- EgtInterface.vb | 83 +++++++++++++++++++++++++++++++++++--- FlatParts.vb | 2 +- My Project/AssemblyInfo.vb | 4 +- Scene.vb | 4 +- 5 files changed, 84 insertions(+), 11 deletions(-) diff --git a/Component.vb b/Component.vb index 27dccf7..a472b53 100644 --- a/Component.vb +++ b/Component.vb @@ -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() diff --git a/EgtInterface.vb b/EgtInterface.vb index be79d2e..2bcdbdf 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -3168,6 +3168,62 @@ Public Function EgtGetPrevGroup(ByVal nId As Integer) As Integer End If End Function + +Private Function EgtGetFirstNameInGroup_32(ByVal nGroupId As Integer, ByVal sName As String) As Integer +End Function + +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 + + +Private Function EgtGetNextName_32(ByVal nId As Integer, ByVal sName As String) As Integer +End Function + +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 + + +Private Function EgtGetLastNameInGroup_32(ByVal nGroupId As Integer, ByVal sName As String) As Integer +End Function + +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 + + +Private Function EgtGetPrevName_32(ByVal nId As Integer, ByVal sName As String) As Integer +End Function + +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 + 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 + +Private Function EgtGetInfoDouble_32(ByVal nId As Integer, ByVal sKey As String, ByRef dInfo As Double) As Boolean +End Function + +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 + 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 -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 -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 diff --git a/FlatParts.vb b/FlatParts.vb index 062bc48..c099864 100644 --- a/FlatParts.vb +++ b/FlatParts.vb @@ -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 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index a45435d..41773a8 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: ' - - + + diff --git a/Scene.vb b/Scene.vb index e7cda3a..7f4480f 100644 --- a/Scene.vb +++ b/Scene.vb @@ -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é