TestEIn 1.8k4 :
- aggiornamento.
This commit is contained in:
+5
-5
@@ -205,7 +205,7 @@ Public Class Controller
|
||||
' gestisco eventuale file corrente modificato
|
||||
If Not ManageModified() Then Return False
|
||||
' reset controller e scena
|
||||
ResetStatus()
|
||||
ResetStatus(False)
|
||||
' eseguo
|
||||
Cursor.Current = Cursors.WaitCursor
|
||||
EnableCommandLog()
|
||||
@@ -235,7 +235,7 @@ Public Class Controller
|
||||
' gestisco eventuale file corrente modificato
|
||||
If Not ManageModified() Then Return False
|
||||
' reset controller e scena
|
||||
ResetStatus()
|
||||
ResetStatus(False)
|
||||
' eseguo
|
||||
Dim sFile As String = sDir
|
||||
' Scelta file con dialogo
|
||||
@@ -423,7 +423,7 @@ Public Class Controller
|
||||
' gestisco eventuale file corrente modificato
|
||||
If Not ManageModified() Then Return False
|
||||
' reset controller e scena
|
||||
ResetStatus()
|
||||
ResetStatus(False)
|
||||
' eseguo
|
||||
Dim sFile As String = sDir
|
||||
'Scelta file con dialogo
|
||||
@@ -941,13 +941,13 @@ Public Class Controller
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Sub ResetStatus()
|
||||
Public Sub ResetStatus(Optional bRedraw As Boolean = True)
|
||||
m_nStep = 0
|
||||
m_bContinue = False
|
||||
m_sepP1 = SEP.PT_STD
|
||||
m_sepP2 = SEP.PT_STD
|
||||
m_sepLast = SEP.PT_STD
|
||||
m_Scene.ResetStatus()
|
||||
m_Scene.ResetStatus(bRedraw)
|
||||
End Sub
|
||||
|
||||
Public Sub SetContinue()
|
||||
|
||||
@@ -806,6 +806,12 @@ End Function
|
||||
Private Function EgtInit_64(nDebug As Integer, sLogFile As String, Optional sLogMsg As String = "") As Boolean
|
||||
End Function
|
||||
Public Function EgtInit(nDebug As Integer, sLogFile As String, Optional sLogMsg As String = "") As Boolean
|
||||
Dim MyDll As System.Reflection.AssemblyName = System.Reflection.Assembly.GetExecutingAssembly().GetName()
|
||||
sLogMsg &= vbLf & "EgtUILib.dll ver. " &
|
||||
MyDll.Version.Major.ToString() & "." &
|
||||
MyDll.Version.Minor.ToString() &
|
||||
(ChrW(97 - 1 + MyDll.Version.Build)).ToString() &
|
||||
MyDll.Version.Revision.ToString()
|
||||
If IntPtr.Size = 4 Then
|
||||
Return EgtInit_32(nDebug, sLogFile, sLogMsg)
|
||||
Else
|
||||
|
||||
@@ -1011,6 +1011,7 @@ Public Class Form1
|
||||
Scene1.SetStatusAnalyze()
|
||||
Else
|
||||
Scene1.ResetStatusAnalyze()
|
||||
ObjTreeTickEvent(Nothing, Nothing)
|
||||
SelectIdInObjTree(GDB_ID.NULL)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
|
||||
' utilizzando l'asterisco (*) come descritto di seguito:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.8.11.2")>
|
||||
<Assembly: AssemblyFileVersion("1.8.11.2")>
|
||||
<Assembly: AssemblyVersion("1.8.11.4")>
|
||||
<Assembly: AssemblyFileVersion("1.8.11.4")>
|
||||
|
||||
@@ -1233,13 +1233,20 @@ Public Class Scene
|
||||
End Sub
|
||||
|
||||
Public Sub SetStatusAnalyze()
|
||||
If m_nStatus = ST.ANALYZE Then Return
|
||||
SaveCurrStatus()
|
||||
m_nStatus = ST.ANALYZE
|
||||
If m_nOldStatus = ST.GETDIST Or m_nOldStatus = ST.GETDIST2 Then
|
||||
EgtResetGeoLine()
|
||||
RaiseEvent OnCloseGetDist(Me)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Sub SetStatusGetDistance()
|
||||
If m_nStatus = ST.GETDIST Or m_nStatus = ST.GETDIST2 Then Return
|
||||
SaveCurrStatus()
|
||||
m_nStatus = ST.GETDIST
|
||||
If m_nOldStatus = ST.ANALYZE Then RaiseEvent OnCloseAnalyze(Me)
|
||||
End Sub
|
||||
|
||||
Public Sub SetStatusSelPoint(Optional ByVal bAlsoDir As Boolean = False)
|
||||
@@ -1272,7 +1279,7 @@ Public Class Scene
|
||||
Public Sub ResetStatusAnalyze()
|
||||
If m_nStatus <> ST.ANALYZE Then Return
|
||||
' Reset analisi
|
||||
m_nStatus = ST.SEL
|
||||
m_nStatus = If(m_nOldStatus <> ST.ANALYZE And m_nOldStatus <> ST.GETDIST And m_nOldStatus <> ST.GETDIST2, m_nOldStatus, ST.SEL)
|
||||
m_nOldStatus = ST.SEL
|
||||
RaiseEvent OnCloseAnalyze(Me)
|
||||
End Sub
|
||||
@@ -1280,8 +1287,8 @@ Public Class Scene
|
||||
Public Sub ResetStatusGetDistance()
|
||||
If m_nStatus <> ST.GETDIST And m_nStatus <> ST.GETDIST2 Then Return
|
||||
' Reset misura distanza
|
||||
m_nStatus = m_nOldStatus
|
||||
'm_nOldStatus = ST.SEL
|
||||
m_nStatus = If(m_nOldStatus <> ST.ANALYZE And m_nOldStatus <> ST.GETDIST And m_nOldStatus <> ST.GETDIST2, m_nOldStatus, ST.SEL)
|
||||
m_nOldStatus = ST.SEL
|
||||
EgtResetGeoLine()
|
||||
RaiseEvent OnCloseGetDist(Me)
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user