TestEIn 1.6s3 :
- aggiornamenti.
This commit is contained in:
+22
-6
@@ -202,6 +202,9 @@ Public Class Controller
|
||||
If Not ManageModified() Then
|
||||
Return False
|
||||
End If
|
||||
' reset controller e scena
|
||||
ResetStatus()
|
||||
m_Scene.ResetStatus(False)
|
||||
' eseguo
|
||||
EnableCommandLog()
|
||||
Dim bOk As Boolean = EgtNewFile()
|
||||
@@ -236,6 +239,9 @@ Public Class Controller
|
||||
If Not ManageModified() Then
|
||||
Return False
|
||||
End If
|
||||
' reset controller e scena
|
||||
ResetStatus()
|
||||
m_Scene.ResetStatus(False)
|
||||
' eseguo
|
||||
Dim sFile As String = sDir
|
||||
' Scelta file con dialogo
|
||||
@@ -411,6 +417,9 @@ Public Class Controller
|
||||
If Not ManageModified() Then
|
||||
Return False
|
||||
End If
|
||||
' reset controller e scena
|
||||
ResetStatus()
|
||||
m_Scene.ResetStatus(False)
|
||||
' eseguo
|
||||
Dim sFile As String = sDir
|
||||
'Scelta file con dialogo
|
||||
@@ -781,7 +790,7 @@ Public Class Controller
|
||||
Case IBT.TY_3DOUBLE
|
||||
Return TextTo3Double(sText, m_d3Last)
|
||||
Case IBT.TY_POINT3D
|
||||
Dim d3Val(3) As Double
|
||||
Dim d3Val(2) As Double
|
||||
If TextTo3Double(sText, d3Val) Then
|
||||
' converto da unità di misura in UI a unità standard
|
||||
d3Val(0) = EgtFromUiUnits(d3Val(0))
|
||||
@@ -792,7 +801,7 @@ Public Class Controller
|
||||
Return True
|
||||
End If
|
||||
Case IBT.TY_VECTOR3D
|
||||
Dim d3Val(3) As Double
|
||||
Dim d3Val(2) As Double
|
||||
If TextTo3Double(sText, d3Val) Then
|
||||
' converto da unità di misura in UI a unità standard
|
||||
d3Val(0) = EgtFromUiUnits(d3Val(0))
|
||||
@@ -803,7 +812,7 @@ Public Class Controller
|
||||
Return True
|
||||
End If
|
||||
Case IBT.TY_DOUBLE_OR_POINT3d
|
||||
Dim d3Val(3) As Double
|
||||
Dim d3Val(2) As Double
|
||||
If TextTo3Double(sText, d3Val) Then
|
||||
m_bPnt3dVsDbl = True
|
||||
' converto da unità di misura in UI a unità standard
|
||||
@@ -845,7 +854,13 @@ Public Class Controller
|
||||
Dim bOk As Boolean = True
|
||||
For i As Integer = 0 To 2
|
||||
d3Val(i) = 0
|
||||
If sItems.Length <= i OrElse Not EgtLuaEvalNumExpr(sItems(i), d3Val(i)) Then
|
||||
If sItems.Length() <= i Then
|
||||
If i = 2 Then
|
||||
d3Val(i) = 0
|
||||
Else
|
||||
bOk = False
|
||||
End If
|
||||
ElseIf Not EgtLuaEvalNumExpr(sItems(i), d3Val(i)) Then
|
||||
bOk = False
|
||||
End If
|
||||
Next
|
||||
@@ -1681,8 +1696,9 @@ Public Class Controller
|
||||
' se Part
|
||||
ElseIf nParentId = GDB_ID.ROOT Then
|
||||
' cerco il primo Layer visibile del Part
|
||||
Dim nIdLayer As Integer = EgtGetFirstLayer(nId, True)
|
||||
EgtSetCurrPartLayer(nId, nIdLayer)
|
||||
'Dim nIdLayer As Integer = EgtGetFirstLayer(nId, True)
|
||||
'EgtSetCurrPartLayer(nId, nIdLayer)
|
||||
EgtSetCurrPartLayer(nId, GDB_ID.NULL)
|
||||
' se Layer
|
||||
ElseIf EgtGetParent(nParentId) = GDB_ID.ROOT Then
|
||||
EgtSetCurrPartLayer(nParentId, nId)
|
||||
|
||||
@@ -969,6 +969,37 @@ Public Function EgtGetKeyInfo(ByRef sKeyInfo As String) As Boolean
|
||||
Return bOk
|
||||
End Function
|
||||
|
||||
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetLockType")>
|
||||
Private Function EgtSetLockType_32(nType As Integer) As Boolean
|
||||
End Function
|
||||
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetLockType")>
|
||||
Private Function EgtSetLockType_64(nType As Integer) As Boolean
|
||||
End Function
|
||||
Public Function EgtSetLockType(nType As Integer) As Boolean
|
||||
If IntPtr.Size = 4 Then
|
||||
Return EgtSetLockType_32(nType)
|
||||
Else
|
||||
Return EgtSetLockType_64(nType)
|
||||
End If
|
||||
End Function
|
||||
|
||||
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyLevel")>
|
||||
Private Function EgtGetKeyLevel_32(nProd As Integer, nVer As Integer, nLev As Integer,
|
||||
ByRef nKLev As Integer) As Boolean
|
||||
End Function
|
||||
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyLevel")>
|
||||
Private Function EgtGetKeyLevel_64(nProd As Integer, nVer As Integer, nLev As Integer,
|
||||
ByRef nKLev As Integer) As Boolean
|
||||
End Function
|
||||
Public Function EgtGetKeyLevel(nProd As Integer, nVer As Integer, nLev As Integer,
|
||||
ByRef nKLev As Integer) As Boolean
|
||||
If IntPtr.Size = 4 Then
|
||||
Return EgtGetKeyLevel_32(nProd, nVer, nLev, nKLev)
|
||||
Else
|
||||
Return EgtGetKeyLevel_64(nProd, nVer, nLev, nKLev)
|
||||
End If
|
||||
End Function
|
||||
|
||||
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetKeyOptions")>
|
||||
Private Function EgtGetKeyOptions_32(nProd As Integer, nVer As Integer, nLev As Integer,
|
||||
ByRef nOpt2 As UInteger) As Boolean
|
||||
@@ -9711,6 +9742,12 @@ Public Const EPS_ANG_SMALL As Double = 0.001
|
||||
Public Const INFINITO As Double = 10000000000.0
|
||||
Public Const EPS_STM As Double = 0.05
|
||||
Public Const EPS_STM_DRAG As Double = 0.5
|
||||
'Cosatnti : TIPO DI CHIAVE
|
||||
Public Enum KEY_TYPE As Integer
|
||||
ANY = 0
|
||||
SW = 1
|
||||
HW = 2
|
||||
End Enum
|
||||
'Costanti : TIPO DI FILE
|
||||
Public Enum FT As Integer
|
||||
NULL = 0
|
||||
|
||||
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
|
||||
' utilizzando l'asterisco (*) come descritto di seguito:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.6.19.2")>
|
||||
<Assembly: AssemblyFileVersion("1.6.19.2")>
|
||||
<Assembly: AssemblyVersion("1.6.19.3")>
|
||||
<Assembly: AssemblyFileVersion("1.6.19.3")>
|
||||
|
||||
Reference in New Issue
Block a user