diff --git a/EgtInterface.vb b/EgtInterface.vb index 7c03c56..a44d13c 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -10383,6 +10383,34 @@ Public Function EgtZoom(nZoom As ZM, Optional bRedraw As Boolean = True) As Bool End If End Function + +Private Function EgtZoomRadius_32(dRad As Double, bRedraw As Boolean) As Boolean +End Function + +Private Function EgtZoomRadius_64(dRad As Double, bRedraw As Boolean) As Boolean +End Function +Public Function EgtZoomRadius(dRad As Double, Optional bRedraw As Boolean = True) As Boolean + If IntPtr.Size = 4 Then + Return EgtZoomRadius_32(dRad, bRedraw) + Else + Return EgtZoomRadius_64(dRad, bRedraw) + End If +End Function + + +Private Function EgtZoomObject_32(nId As Integer, bRedraw As Boolean) As Boolean +End Function + +Private Function EgtZoomObject_64(nId As Integer, bRedraw As Boolean) As Boolean +End Function +Public Function EgtZoomObject(nId As Integer, Optional bRedraw As Boolean = True) As Boolean + If IntPtr.Size = 4 Then + Return EgtZoomObject_32(nId, bRedraw) + Else + Return EgtZoomObject_64(nId, bRedraw) + End If +End Function + Private Function EgtZoomOnPoint_32(nWinX As Integer, nWinY As Integer, dCoeff As Double, bRedraw As Boolean) As Boolean End Function @@ -12147,6 +12175,22 @@ Public Enum MCH_CHISEL_WS As Integer LEFT = 1 RIGHT = 2 End Enum +'Costanti per Mortasatura (mortising) + 'Lato di lavoro +Public Enum MCH_MORTISE_WS As Integer + LEFT = 1 + RIGHT = 2 +End Enum + 'Tipo di lavorazione faccia +Public Enum MCH_MORTISE_FU As Integer + NONE = 0 + PARAL_DOWN = 1 + PARAL_TOP = 2 + PARAL_FRONT = 3 + PARAL_BACK = 4 + PARAL_LEFT = 5 + PARAL_RIGHT = 6 +End Enum 'Costanti : posizione per preview utensile in lavorazione Public Enum MCH_PTM As Integer CURR = 0 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 225da5b..d7e936e 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 5785110..3a12e3f 100644 --- a/Scene.vb +++ b/Scene.vb @@ -273,7 +273,7 @@ Public Class Scene m_PrevPoint = e.Location ' se stato SELPATH, SELPATHAUTO oppure SEL + Control ElseIf m_nStatus = ST.SELPATH Or m_nStatus = ST.SELPATHAUTO Or - (m_nStatus = ST.SEL And (ModifierKeys And Keys.Control) = Keys.Control) Then + (m_nStatus = ST.SEL And (ModifierKeys And Keys.Control) = Keys.Control And (ModifierKeys And Keys.Alt) = Keys.None) Then EgtSetObjFilterForSelWin(False, m_bCurveForSel, False, False, False) ' abilito solo le curve Dim nId As Integer = ChooseOneSelectedObj(e.Location, m_nStatus) If nId <> GDB_ID.NULL Then