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

OmagCUT :

Browse Source 
- altre modifiche per SimpleStatistics (non si lanciano su restart dopo prima fase, viene notificato se taglio diretto)
- nel caso di tagli diretti in simulazione si ignora info di restart (non è inerente).
This commit is contained in:
Dario Sassi
2021-02-26 11:40:36 +00:00
parent 117a870b5b
commit 08e486f324
10 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DirectCuts/FlatteningCut.xaml.vb
+1 -1
View File
@@ -580,7 +580,7 @@ Public Class FlatteningCut
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
DirectCuts/GridCut.xaml.vb
+1 -1
View File
@@ -514,7 +514,7 @@ Public Class GridCut
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
DirectCuts/MultipleCut.xaml.vb
+1 -1
View File
@@ -558,7 +558,7 @@ Public Class MultipleCut
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
DirectCuts/Polishing.xaml.vb
+1 -1
View File
@@ -182,7 +182,7 @@ Public Class Polishing
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
DirectCuts/SawTestUC.xaml.vb
+1 -1
View File
@@ -453,7 +453,7 @@ Public Class SawTestUC
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
DirectCuts/SingleCutAuto.xaml.vb
+1 -1
View File
@@ -659,7 +659,7 @@ Public Class SingleCutAuto
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
DirectCuts/SingleCutUC.xaml.vb
+1 -1
View File
@@ -538,7 +538,7 @@ Public Class SingleCutUC
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript()
m_MainWindow.ExecSentProgScript( True)
End If
#End If
End Sub
MainWindow.xaml.vb
+2 -1
View File
@@ -1611,7 +1611,7 @@ Class MainWindow
Return True
End Function
Friend Function ExecSentProgScript( Optional bAlreadySent As Boolean = False) As Boolean
Friend Function ExecSentProgScript( bDirectCut As Boolean, Optional bAlreadySent As Boolean = False) As Boolean
' Verifico esistenza script
Dim sLuaPath As String = m_CurrentMachine.sMachDir() & "\Scripts\SentProg.lua"
If Not My.Computer.FileSystem.FileExists(sLuaPath) Then Return True
@@ -1620,6 +1620,7 @@ Class MainWindow
EgtLuaSetGlobBoolVar("SPS.NCLINK", m_bNCLink)
EgtLuaSetGlobBoolVar("SPS.PRODLINE", m_CurrentMachine.bProdLine)
EgtLuaSetGlobBoolVar("SPS.ALREADYSENT", bAlreadySent)
EgtLuaSetGlobBoolVar("SPS.DIRECTCUT", bDirectCut)
' Esecuzione
Dim nErr As Integer = 999
If EgtLuaExecFile(sLuaPath) AndAlso
Project/ProjectMgrUC.xaml.vb
+7 -6
View File
@@ -324,6 +324,7 @@ Public Class ProjectMgrUC
Case 2 ' NO
EgtEnableModified()
m_CurrProjPage.ResetProjectNcRestart()
nPhaseRestart = 0
EgtDisableModified()
Case Else ' CANCEL
Return
@@ -358,9 +359,9 @@ Public Class ProjectMgrUC
' copio il progetto corrente come progetto in lavorazione
Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
' se abilitato, lancio eventuale lua post-trasmissione
If m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.SIMPLESTATISTICS) Then
m_MainWindow.ExecSentProgScript()
' se abilitato e non è restart, lancio eventuale lua post-trasmissione
If m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.SIMPLESTATISTICS) And nPhaseRestart = 0 Then
m_MainWindow.ExecSentProgScript( False)
End If
End If
' Altrimenti linea di produzione
@@ -436,7 +437,7 @@ Public Class ProjectMgrUC
' Salvo il progetto
m_CurrProjPage.SaveProject()
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript( bAlreadySent)
m_MainWindow.ExecSentProgScript( False, bAlreadySent)
Return
End If
' Leggo variabile relativa al programma 1 (standard E80021)
@@ -488,7 +489,7 @@ Public Class ProjectMgrUC
' Dichiaro programma inviato
m_CurrNcComm.m_CN.DVariables_WriteVariables2(m_CurrMachine.sVarProg1, "1")
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript( bAlreadySent)
m_MainWindow.ExecSentProgScript( False, bAlreadySent)
End If
m_CurrNcComm.SetProgramMainOrSub(True)
' Altrimenti verifico se posso scrivere nell'area 2
@@ -505,7 +506,7 @@ Public Class ProjectMgrUC
' Dichiaro programma inviato
m_CurrNcComm.m_CN.DVariables_WriteVariables2(m_CurrMachine.sVarProg2, "1")
' lancio eventuale lua post-trasmissione
m_MainWindow.ExecSentProgScript( bAlreadySent)
m_MainWindow.ExecSentProgScript( False, bAlreadySent)
End If
m_CurrNcComm.SetProgramMainOrSub(True)
' Altrimenti aree di memoria non disponibili
Simulation/SimulationPageUC.xaml.vb
+2
View File
@@ -293,6 +293,8 @@ Public Class SimulationPageUC
Private Sub SkipForRestart()
' Se non c'è restart esco
If m_nRestart = 0 Then Return
' Se tagli diretti restart non valido ed esco
If GetDirectCutPart() <> GDB_ID.NULL Then Return
' Info
m_CurrProjPage.SetInfoMessage( EgtMsg(90359) & " (" & m_nRestart.ToString() & ")") 'Restart (n)
' Salto