-aggiunto rimozione machgroup su scelta macchina onlyprodpage

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

@@ -19,28 +19,28 @@ Public Class ProjFileM
    End Property
 
    Protected m_sBTLFileName As String = String.Empty
-    Public Property sBTLFileName As String
-        Get
-            Return m_sBTLFileName
-        End Get
-        Set(value As String)
-            m_sBTLFileName = value
-        End Set
-    End Property
+   Public Property sBTLFileName As String
+      Get
+         Return m_sBTLFileName
+      End Get
+      Set(value As String)
+         m_sBTLFileName = value
+      End Set
+   End Property
 
-    Protected m_sDescription As String = String.Empty
-    Public Property sDescription As String
-        Get
-            Return m_sDescription
-        End Get
-        Set(value As String)
-            m_sDescription = value
-        End Set
-    End Property
+   Protected m_sDescription As String = String.Empty
+   Public Property sDescription As String
+      Get
+         Return m_sDescription
+      End Get
+      Set(value As String)
+         m_sDescription = value
+      End Set
+   End Property
 
 #Region "CONSTRUCTORS"
 
-    Protected Sub New()
+   Protected Sub New()
    End Sub
 
    Public Shared Function CreateNewProjFileM() As ProjFileM

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -1165,21 +1165,17 @@ Public Class CALCPanelVM
       m_IsMachineApplied = True
       SetChooseMachine_Visibility(False)
       ' resetto i parametri errori integration ciclando su ogni Part e per ogni Part ogni Feature
-      Dim ProjId As Integer = GDB_ID.NULL
+      Dim ProjId As Integer
+      Dim nPartProjId As Integer
       'Dim TempList As New List(Of BTLPartM)
       Dim nPartId As Integer = EgtGetFirstPart()
-      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         EgtGetInfo(nPartId, PROJ, ProjId)
-      Else
-         ProjId = ProjectManagerVM.CurrProj.nProjId
-      End If
+      ProjId = ProjectManagerVM.CurrProj.nProjId
+      EgtGetInfo(nPartId, BTL_PRT_PROJ, nPartProjId)
       While nPartId <> GDB_ID.NULL
          ' se devo filtrare un progetto
-         If ProjId > 0 Then
+         If ProjId > 0 OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
             ' verifico se il pezzo appartiene al ProjId
-            Dim nPartProjId As Integer
-            EgtGetInfo(nPartId, BTL_PRT_PROJ, nPartProjId)
-            If nPartProjId = ProjId Then
+            If nPartProjId = ProjId OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
                EgtRemoveInfo(nPartId, ITG_PROJ_ERR)
                EgtRemoveInfo(nPartId, ITG_PROJ_MSG)
                EgtRemoveInfo(nPartId, ITG_PROJ_ROT)
@@ -1226,7 +1222,11 @@ Public Class CALCPanelVM
          End If
       End If
       ' rigenero struttura BTL
-      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjId))
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+         Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(nPartProjId))
+      Else
+         Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjId))
+      End If
    End Sub
 
 #End Region ' Ok