diff --git a/MoveRawPartPage.xaml.vb b/MoveRawPartPage.xaml.vb index b8eb47f..8107ea4 100644 --- a/MoveRawPartPage.xaml.vb +++ b/MoveRawPartPage.xaml.vb @@ -57,6 +57,7 @@ Public Class MoveRawPartPage SplitRawParts(nPrevPhase, Cuts, vNewRaws) Else EgtSetCurrPhase(nPrevPhase + 1) + HideAllMachinings() End If m_nCurrPhase = EgtGetCurrPhase() ' Aggiorno visualizzazione diff --git a/SplitAuto.vb b/SplitAuto.vb index 45e03a0..7b8e76e 100644 --- a/SplitAuto.vb +++ b/SplitAuto.vb @@ -144,16 +144,21 @@ Public Module SplitAuto ' Cambio il colore Dim nGrpId As Integer = EgtGetFirstGroupInGroup(nPvId) While nGrpId <> GDB_ID.NULL - Dim nCutId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_CUT) - Dim nCut2Id As Integer = EgtGetNextName(nCutId, NAME_PV_CUT) + Dim vCutId As New List(Of Integer) + Dim nId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_CUT) + While nId <> GDB_ID.NULL + vCutId.Add(nId) + nId = EgtGetNextName(nId, NAME_PV_CUT) + End While Dim nPrcId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_PRECUT) Dim nPocId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_POSTCUT) Dim nDwnCutId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_DOWN_CUT) Dim nDwnPrcId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_DOWN_PRECUT) Dim nDwnPocId As Integer = EgtGetFirstNameInGroup(nGrpId, NAME_PV_DOWN_POSTCUT) If Not bEnabled Then - EgtSetColor(nCutId, COL_MCH_DISABLED) - EgtSetColor(nCut2Id, COL_MCH_DISABLED) + For Each nId In vCutId + EgtSetColor(nId, COL_MCH_DISABLED) + Next EgtSetColor(nDwnCutId, COL_MCH_DISABLED) Dim bFreeStart As Boolean = (nInterf And FMI_TYPE.LI) <> FMI_TYPE.LI EgtSetColor(nPrcId, If(bFreeStart, COL_MCH_DISABLED, COL_MCH_DIS_INTERF)) @@ -163,8 +168,9 @@ Public Module SplitAuto EgtSetColor(nDwnPocId, If(bFreeEnd, COL_MCH_DISABLED, COL_MCH_DIS_INTERF)) Else Dim colCut As Color3d = If(bDrip, COL_MCH_DRIPCUT, COL_MCH_CUT) - EgtSetColor(nCutId, colCut) - EgtSetColor(nCut2Id, colCut) + For Each nId In vCutId + EgtSetColor(nId, colCut) + Next EgtSetColor(nDwnCutId, colCut) Dim colStart As Color3d = COL_MCH_INTERF() If (nInterf And FMI_TYPE.LI) <> FMI_TYPE.LI Then