Egalware/EgtCAM5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtCAM5 1.9c3 :

Browse Source 
- corretto controllo uscita da simulazione in corso (non in Home o Stop)
- per MTable lettura da GeometryNameList.ini elimina tutto quanto dopo ";".
This commit is contained in:
Dario Sassi
2018-03-14 11:05:44 +00:00
parent e946d6ce37
commit 6d5af149ae
8 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+8 -9
View File
@@ -28,7 +28,7 @@ Namespace EgtCAM5
End Get
Set(value As SIM_ST)
m_nStatus = value
If IniFile.m_nUserLevel >= 10 AndAlso (value = SIM_ST.ST_PAUSE OrElse value = SIM_ST.ST_STOP) Then
If IniFile.m_nUserLevel >= 5 AndAlso (value = SIM_ST.ST_PAUSE OrElse value = SIM_ST.ST_STOP) Then
For Index = 0 To m_MachineAxisList.Count - 1
m_MachineAxisList(Index).IsReadOnlyAxesValue = False
Next
@@ -37,11 +37,6 @@ Namespace EgtCAM5
m_MachineAxisList(Index).IsReadOnlyAxesValue = True
Next
End If
If value = SIM_ST.ST_PAUSE OrElse value = SIM_ST.ST_STOP Then
Application.Msn.NotifyColleagues(Application.SETDRAWISENABLED, True)
Else
Application.Msn.NotifyColleagues(Application.SETDRAWISENABLED, False)
End If
EgtSimSetUiStatus(m_nStatus)
End Set
End Property
@@ -75,6 +70,7 @@ Namespace EgtCAM5
InitializeSimulation()
EgtDraw()
Else
If m_bSimExecuting Then Return
CloseSimulation()
If IniFile.m_bShowOnlyTable Then
EgtShowOnlyTable(True)
@@ -605,6 +601,8 @@ Namespace EgtCAM5
Private Sub ExecSim()
m_bSimExecuting = True
Application.Msn.NotifyColleagues(Application.SETDRAWISENABLED, False)
Application.Msn.NotifyColleagues(Application.OPERATIONVIEWEXPANDERISENABLED, False)
EgtSimStart(False)
EgtSimSetStep(SliderValue * m_SliderX)
Dim nShowDataCounter As Integer = 0
@@ -650,8 +648,7 @@ Namespace EgtCAM5
' Aggiorno visualizzazione
EgtDraw()
' Aggiorno dati CNC
If nShowDataCounter = 5 Or
SimulationStatus = SIM_ST.ST_PAUSE Or SimulationStatus = SIM_ST.ST_STOP Then
If nShowDataCounter = 5 Or SimulationStatus = SIM_ST.ST_PAUSE Or SimulationStatus = SIM_ST.ST_STOP Then
ShowCncData()
nShowDataCounter = 0
ElseIf nShowDataCounter > 5 Then
@@ -661,12 +658,14 @@ Namespace EgtCAM5
End If
Else
' Per evitare di ciclare rapidissimamente e consumare inutilmente CPU
System.Threading.Thread.Sleep(1)
System.Threading.Thread.Sleep(4)
End If
' Costringo ad aggiornare UI
UpdateUI()
End While
m_bSimExecuting = False
Application.Msn.NotifyColleagues(Application.SETDRAWISENABLED, True)
Application.Msn.NotifyColleagues(Application.OPERATIONVIEWEXPANDERISENABLED, True)
End Sub
Private Sub ShowCncData()