From 3787b4e1f5348bd47a2dd33febf1fc1ceef7cc00 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Mon, 12 Jun 2023 09:16:44 +0200 Subject: [PATCH] - commentati log --- .../MachManagingThread/MachManaging.vb | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb b/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb index 5310dee3..cd7b8d82 100644 --- a/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb +++ b/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb @@ -58,18 +58,18 @@ Public Class MachManaging End Property Friend Shared Sub AddToCommandList(value As ThreadCommand) SyncLock Lock_CommandList - EgtOutLog("Inizio ciclo rimozioni") + ' EgtOutLog("Inizio ciclo rimozioni") For CommandIndex = m_CommandList.Count - 1 To 0 Step -1 Dim Command As ThreadCommand = m_CommandList(CommandIndex) If Command.ProcessingStatus = ThreadCommand.ProcessingStatuses.DONE Then - EgtOutLog("Inizio rimozione comando") + ' EgtOutLog("Inizio rimozione comando") m_CommandList.Remove(Command) - EgtOutLog("Fine rimozione comando") + ' EgtOutLog("Fine rimozione comando") End If Next - EgtOutLog("Fine ciclo rimozioni") + ' EgtOutLog("Fine ciclo rimozioni") CommandList.Add(value) - EgtOutLog("Count dopo aggiunta: " & CommandList.Count) + ' EgtOutLog("Count dopo aggiunta: " & CommandList.Count) End SyncLock End Sub @@ -657,7 +657,7 @@ Public Class MachManaging ' se non impostata data start If MachGroup.dtStartTime = DateTime.MinValue Then - EgtOutLog("Start date not set on Prod " & nP_Prod & " Machgroup " & nP_Machgroup) + ' EgtOutLog("Start date not set on Prod " & nP_Prod & " Machgroup " & nP_Machgroup) Dim dtStart As DateTime = MachGroup.dtEndTime - TimeSpan.FromSeconds(60) ' provo a recuperare tempo stimato If MachGroup.nCALC_TIME > 0 Then @@ -741,7 +741,7 @@ Public Class MachManaging End Function Private Function SendNextProgram() As Boolean - EgtOutLog("Inizio SendNextProgram") + ' EgtOutLog("Inizio SendNextProgram") Dim bSent As Boolean = False If (CurrentMachine.NCType = NCTypes.TPA AndAlso Not m_bStartPending AndAlso Tpa.opState = MachineOperatingState.Pending) OrElse (CurrentMachine.NCType = NCTypes.NUM_FLEXIUM AndAlso Not Num_Flexium.bIsTransferActive) OrElse @@ -749,20 +749,20 @@ Public Class MachManaging (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso Not Num_Axium_PCToolkit.bIsTransferActive) Then ' Or Tpa.opState = MachineOperatingState.Start) Then ' verifico se c'e' un programma da lanciare If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then - EgtOutLog("Start " & DateTime.Now()) + ' EgtOutLog("Start " & DateTime.Now()) Dim bMachGroupNotReady As Boolean = False SyncLock m_Lock_SendProgram For Each MyMachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList - EgtOutLog("Ciclo su name: " & MyMachGroup.Name & " id: " & MyMachGroup.Id) + ' EgtOutLog("Ciclo su name: " & MyMachGroup.Name & " id: " & MyMachGroup.Id) If Not MyMachGroup.bSentToMachine AndAlso (MyMachGroup.dtStartTime = DateTime.MinValue OrElse (Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL AndAlso MyMachGroup.bResetWhileCutting)) Then - EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " è da fare") + ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " è da fare") ' verifico se ricalcolo finito If MyMachGroup.bReadyForMachining AndAlso If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER OrElse CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT, Not MyMachGroup.bSendingToMachine, True) Then - EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " pronto per essere lavorato") + ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " pronto per essere lavorato") ' lo lancio bSent = SendProgram(MyMachGroup.CnFilePath(), MyMachGroup.Name) - EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " mandato " & DateTime.Now() & " " & MyMachGroup.Name & " " & bSent.ToString()) + ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " mandato " & DateTime.Now() & " " & MyMachGroup.Name & " " & bSent.ToString()) Select Case CurrentMachine.NCType Case NCTypes.TPA MyMachGroup.SetSentToMachine(bSent) @@ -774,7 +774,7 @@ Public Class MachManaging Else ' programma non ancora pronto, esco per attendere bMachGroupNotReady = True - EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " non ancora pronto per essere mandato") + ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " non ancora pronto per essere mandato") Exit For 'Return False End If @@ -782,7 +782,7 @@ Public Class MachManaging Next End SyncLock If bMachGroupNotReady Then Return False - EgtOutLog("End " & DateTime.Now()) + ' EgtOutLog("End " & DateTime.Now()) End If End If Return bSent @@ -790,7 +790,7 @@ Public Class MachManaging Private Sub CommandList_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs) If Not IsNothing(e.NewItems) Then - EgtOutLog("Inizio ciclo esecuzione comandi") + ' EgtOutLog("Inizio ciclo esecuzione comandi") Dim nCommandCount As Integer = e.NewItems.Count For CommandIndex = 0 To nCommandCount - 1 Dim Command As ThreadCommand = e.NewItems(CommandIndex) @@ -800,7 +800,7 @@ Public Class MachManaging Command.SetProcessingStatus(ThreadCommand.ProcessingStatuses.DONE) End If Next - EgtOutLog("Fine ciclo esecuzione di " & nCommandCount & " comandi") + ' EgtOutLog("Fine ciclo esecuzione di " & nCommandCount & " comandi") End If End Sub @@ -1070,7 +1070,7 @@ Public Class MachManaging Num_Axium_APServer.StartTransfer() Return True Case NCTypes.NUM_AXIUM_PCTOOLKIT - EgtOutLog("Pre Download") + ' EgtOutLog("Pre Download") Dim nFileType As Integer = 0 If Integer.TryParse(ProgramId, nFileType) AndAlso nFileType > 0 Then Num_Axium_PCToolkit.FileDownload(nFileType * 10, ProgramPath)