TestEIn 1.8k2 :

- aggiornamento.
This commit is contained in:
Dario Sassi
2017-11-22 07:45:43 +00:00
parent 4a2cf5ffa0
commit 3e5f773771
3 changed files with 37 additions and 36 deletions
+7 -9
View File
@@ -206,7 +206,6 @@ Public Class Controller
If Not ManageModified() Then Return False
' reset controller e scena
ResetStatus()
m_Scene.ResetStatus(False)
' eseguo
Cursor.Current = Cursors.WaitCursor
EnableCommandLog()
@@ -237,7 +236,6 @@ Public Class Controller
If Not ManageModified() Then Return False
' reset controller e scena
ResetStatus()
m_Scene.ResetStatus(False)
' eseguo
Dim sFile As String = sDir
' Scelta file con dialogo
@@ -426,7 +424,6 @@ Public Class Controller
If Not ManageModified() Then Return False
' reset controller e scena
ResetStatus()
m_Scene.ResetStatus(False)
' eseguo
Dim sFile As String = sDir
'Scelta file con dialogo
@@ -966,17 +963,18 @@ Public Class Controller
End Function
Public Function ExecuteCommand(ByVal nCmd As CMD) As Boolean
' posso partire solo con stato libero
If m_nStep <> 0 Then
Return False
End If
' se non è linea 2P reset punti speciali (tg, perp e mindist)
' Posso partire solo con stato libero
If m_nStep <> 0 Then Return False
' Reset eventuali analisi e distanza in corso
m_Scene.ResetStatusAnalyze()
m_Scene.ResetStatusGetDistance()
' Se non è linea 2P reset punti speciali (tg, perp e mindist)
If (nCmd <> CMD.LINE2P) Then
m_Scene.DisableTangentPoint()
m_Scene.DisablePerpendicularPoint()
m_Scene.DisableMinDistPoint()
End If
' salvo ed eseguo il comando
' Salvo ed eseguo il comando
m_nLastCmd = nCmd
Return ProcessStatus()
End Function
+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.8.10.7")>
<Assembly: AssemblyFileVersion("1.8.10.7")>
<Assembly: AssemblyVersion("1.8.11.2")>
<Assembly: AssemblyFileVersion("1.8.11.2")>
+28 -25
View File
@@ -241,6 +241,8 @@ Public Class Scene
Public Event OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
Public Event OnCursorPos(sender As Object, sCursorPos As String)
Public Event OnShowDistance(sender As Object, sDistance As String)
Public Event OnShowDistanceVector(sender As Object, vtDist As Vector3d)
Public Event OnCloseAnalyze(sender As Object)
Public Event OnCloseGetDist(sender As Object)
Public Event OnMouseDone(sender As Object)
Public Event OnMouseSelectedPoint(sender As Object, PtP As Point3d, nSep As SEP, nId As Integer)
@@ -364,8 +366,8 @@ Public Class Scene
sOut.Append(EgtToUiUnits(vtDist.z).ToString("F4", CultureInfo.InvariantCulture))
' lancio l'evento per visualizzare la distanza
RaiseEvent OnShowDistance(Me, sOut.ToString())
RaiseEvent OnShowDistanceVector(Me, vtDist)
m_nStatus = ST.GETDIST
m_nOldStatus = ST.SEL
End If
' se stato selezione punto
ElseIf m_nStatus = ST.SELPOINT Then
@@ -923,10 +925,10 @@ Public Class Scene
End Select
Next
MenuScene.Visible = True
' per selezione punti
ElseIf m_nStatus = ST.GETDIST Or m_nStatus = ST.GETDIST2 Or m_nStatus = ST.SELPOINT Then
' se drag abilitato
If m_bDragOn Then
' per selezione punti o distanza
ElseIf m_nStatus = ST.SELPOINT Or m_nStatus = ST.GETDIST Or m_nStatus = ST.GETDIST2 Then
' se drag abilitato o distanza
If m_bDragOn Or m_nStatus = ST.GETDIST Or m_nStatus = ST.GETDIST2 Then
For Each i As ToolStripItem In MenuScene.Items
Select Case i.Name
Case "cmdSketchPoint"
@@ -1000,7 +1002,7 @@ Public Class Scene
i.Visible = False
End Select
Next
' altrimenti con drag disabilitato
' altrimenti con selezione punto e drag disabilitato
Else
For Each i As ToolStripItem In MenuScene.Items
If i.Name = "cmdRestartDrag" Then
@@ -1231,54 +1233,55 @@ Public Class Scene
End Sub
Public Sub SetStatusAnalyze()
SaveCurrStatus()
m_nStatus = ST.ANALYZE
m_nOldStatus = ST.ANALYZE
End Sub
Public Sub SetStatusGetDistance()
SaveCurrStatus()
m_nStatus = ST.GETDIST
m_nOldStatus = ST.GETDIST
End Sub
Public Sub SetStatusSelPoint(Optional ByVal bAlsoDir As Boolean = False)
SaveCurrStatus()
m_nStatus = ST.SELPOINT
m_nOldStatus = ST.SELPOINT
m_bAlsoSelDir = bAlsoDir
End Sub
Public Sub ResetStatus(Optional ByVal bRedraw As Boolean = True)
' pulisco eventuali geometrie temporanee
ResetStatusAnalyze()
ResetStatusGetDistance()
' Pulisco eventuali geometrie temporanee
EraseDragGroup()
EgtResetGeoLine(False)
EgtResetGeoTria(False)
EgtResetWinRect(False)
' reset entità non selezionabili
' Reset entità non selezionabili
EgtSetObjFilterForSelWin(True, True, True, True, True)
EgtUnselectableClearAll()
m_bAlsoDragIntersForSnap = False
' imposto lo stato
' Imposto lo stato
m_nStatus = ST.SEL
m_nOldStatus = ST.SEL
' abilito drag
' Abilito drag
m_bDragOn = True
' aggiorno visualizzazione
If bRedraw Then
EgtDraw()
End If
' Se richiesto, aggiorno visualizzazione
If bRedraw Then EgtDraw()
End Sub
Public Sub ResetStatusAnalyze()
If m_nStatus = ST.ANALYZE Then
m_nStatus = ST.SEL
m_nOldStatus = ST.SEL
End If
If m_nStatus <> ST.ANALYZE Then Return
' Reset analisi
m_nStatus = ST.SEL
m_nOldStatus = ST.SEL
RaiseEvent OnCloseAnalyze(Me)
End Sub
Public Sub ResetStatusGetDistance()
If m_nStatus = ST.GETDIST Or m_nStatus = ST.GETDIST2 Then
m_nStatus = ST.SEL
m_nOldStatus = ST.SEL
End If
If m_nStatus <> ST.GETDIST And m_nStatus <> ST.GETDIST2 Then Return
' Reset misura distanza
m_nStatus = m_nOldStatus
'm_nOldStatus = ST.SEL
EgtResetGeoLine()
RaiseEvent OnCloseGetDist(Me)
End Sub