EgtBEAMWALL 3.1.5.2:

.aggiunto controlli su rimvuovi pezzo da assemblato -aggiunto controllo su rotazione in verifica con rotazione -aggiunto controllo riabilita pulsanti machgroup in resetsupervisor -aggiunto controlli su aggiungi pezzo in assemblato -cambio versione
2026-05-29 15:53:24 +02:00
parent 272c17c2cb
commit 404dc17b24
14 changed files with 53 additions and 30 deletions
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("3.1.5.2")>
-<Assembly: AssemblyFileVersion("3.1.5.2")>
+<Assembly: AssemblyVersion("3.1.5.3")>
+<Assembly: AssemblyFileVersion("3.1.5.3")>
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.5.2")]
-[assembly: AssemblyFileVersion("3.1.5.2")]
+[assembly: AssemblyVersion("3.1.5.3")]
+[assembly: AssemblyFileVersion("3.1.5.3")]
@@ -274,14 +274,18 @@ Public Class BTLPartManagerVM

   Private Sub RemoveScenePart(BTLPartToDelete As BTLPartVM)
      ' Rimuovo pezzo dalla scena
-      Dim IdAsseBase As Integer = Map.refProdManagerVM.ListProjAsseBase(BTLPartToDelete.nPROJ)
-      If IdAsseBase < 0 Then Return
+      Dim IdAsseBase As Integer = 0
+      Dim DeletePartId As Integer = 0
+      If Not Map.refProdManagerVM.ListProjAsseBase.TryGetValue(BTLPartToDelete.nPROJ, IdAsseBase) Then
+         Return
+      End If
      ' Setto il nuovo contesto
      EgtSetCurrentContext(Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx())
      If EgtBeamGetBuildingIsOn(IdAsseBase) Then EgtBeamShowBuilding(IdAsseBase, False)
-      Dim DeletePartId As Integer = Map.refSceneShowBuldingVM.MapInfo(BTLPartToDelete.nPartId)
-      EgtErase(DeletePartId)
-      Map.refSceneShowBuldingVM.MapInfo.Remove(BTLPartToDelete.nPartId)
+      If Map.refSceneShowBuldingVM.MapInfo.TryGetValue(BTLPartToDelete.nPartId, DeletePartId) Then
+         EgtErase(DeletePartId)
+         Map.refSceneShowBuldingVM.MapInfo.Remove(BTLPartToDelete.nPartId)
+      End If
      EgtBeamShowBuilding(IdAsseBase, True)
      EgtZoom(ZM.ALL)
      ' Ritorno al contesto corrente
@@ -187,7 +187,9 @@ Public Class BTLPartVM
      Get
         Dim nOrigGroupId As Integer = nPartId
         If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
-            nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
         End If
         If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
@@ -248,7 +250,9 @@ Public Class BTLPartVM
      Get
         Dim nOrigGroupId As Integer = nPartId
         If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
-            nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
         End If
         If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
@@ -309,7 +313,9 @@ Public Class BTLPartVM
      Get
         Dim nOrigGroupId As Integer = nPartId
         If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
-            nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
         End If
         If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
@@ -101,7 +101,9 @@ Module MyExecProcessManager
         End If
         If nPreRotate > 0 Then
            Dim dAng As Integer = nPreRotate * 90
-            PartItem.ForwardRotation(True, True, dAng, False)
+            Application.Current.Dispatcher.BeginInvoke(Sub()
+                                                          PartItem.ForwardRotation(True, True, dAng, False)
+                                                       End Sub)
         End If

         Dim prefix As String = "INFONGEPART_"
@@ -160,11 +160,11 @@ Public Class MyMachGroupPanelVM
                     Dim Beam As PartVM = BeamMachGroup.PartVMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
                     EgtSetCurrMachGroup(BeamMachGroup.Id)
                     Beam.DeletePart()
+                     ' reset necessario per poter ottenere nMachGroupId corretto
+                     EgtResetCurrMachGroup()
+                     ' aggiorno dati utilizzo barra
+                     BeamMachGroup.UpdateUsage()
                  End If
-                  ' reset necessario per poter ottenere nMachGroupId corretto
-                  EgtResetCurrMachGroup()
-                  ' aggiorno dati utilizzo barra
-                  BeamMachGroup.UpdateUsage()
               Next
               ' aggiorno quantita' in prod
               Dim BTLPart As BTLPartVM = CALCPanelVM.GetBTLPartVMFromBTLPartId(nPartId)
@@ -803,6 +803,10 @@ Public Class MyMachGroupVM
         End If
         Part.nProduction_State = ItemState.ND
         Part.NotifyPropertyChanged(NameOf(Part.Background))
+         Part.NotifyPropertyChanged(NameOf(Part.ButtonIsEnabled))
+         For Each Feature As BTLFeatureVM In Part.FeatureVMList
+            Feature.NotifyPropertyChanged(NameOf(Feature.IsEnabled))
+         Next
         If bDuploToUpdate Then
            Dim Duplo As PartVM = CALCPanelVM.GetPartVMFromPartId(Part.nPartId)
            Duplo.ResetCalcTotalPart()
@@ -818,6 +822,7 @@ Public Class MyMachGroupVM
      End If
      NotifyPropertyChanged(NameOf(IsReadOnly))
      NotifyPropertyChanged(NameOf(Background))
+      NotifyPropertyChanged(NameOf(ButtonIsEnabled))
   End Sub

   Private Sub RefreshPartList_Tick()
@@ -269,7 +269,7 @@ Public Class MainWindowVM
            ' recupero secondo parametro
            Dim sProdId As String = Environment.GetCommandLineArgs(2)
            If Not Integer.TryParse(sProdId, nProdId) OrElse nProdId <= 0 Then Return False
-            nPage = Pages.MACHINING
+            nPage = Pages.OPTIMIZERPAGE
            Return True
         Case 2         ' apri pagina specifica senza progetto specifico
            ' recupero secondo parametro
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '

-<Assembly: AssemblyVersion("3.1.5.2")>
-<Assembly: AssemblyFileVersion("3.1.5.2")>
+<Assembly: AssemblyVersion("3.1.5.3")>
+<Assembly: AssemblyFileVersion("3.1.5.3")>
@@ -14,4 +14,5 @@
   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_PartParametersWndVM.m_CloseWindow
      Me.DialogResult = bDialogResult
   End Sub
+
 End Class
@@ -1319,7 +1319,7 @@ Public Class ProdManagerVM
   End Sub

   Public Sub OpenProjectFromSupervisor(ProjIdToOpen As Integer)
-      If Not IsNothing(ProjectManagerVM.CurrProd) Then
+      If (Not IsNothing(ProjectManagerVM.CurrProd) AndAlso ProjIdToOpen <> ProjectManagerVM.CurrProd.nProdId) OrElse Map.refMainMenuVM.SelPage <> Pages.OPTIMIZERPAGE Then
         m_nProjIdToOpen = ProjIdToOpen
         m_bOpenProj = True
      End If
@@ -1357,7 +1357,9 @@ Public Class ProdManagerVM
      While nPartLayerId <> GDB_ID.NULL
         Dim nNewId As Integer = EgtCopyEx(Map.refSceneHostVM.MainScene.GetCtx(), nPartLayerId, Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx(), nRef)
         ' Salvo le info dei pezzi per associarli in modo corretto
-         Map.refSceneShowBuldingVM.MapInfo.Add(nPartLayerId, nNewId)
+         If nNewId > 0 AndAlso Not Map.refSceneShowBuldingVM.MapInfo.ContainsKey(nPartLayerId) Then
+            Map.refSceneShowBuldingVM.MapInfo.Add(nPartLayerId, nNewId)
+         End If
         nPartLayerId = EgtGetNextPart(nPartLayerId)
      End While

@@ -1370,14 +1372,17 @@ Public Class ProdManagerVM
         While nIdF <> GDB_ID.NULL
            Dim Sou As Integer = 0
            EgtGetInfo(nIdF, "!SOU", Sou)
-            EgtSetInfo(nIdF, "!SOU", Map.refSceneShowBuldingVM.MapInfo(Sou))
+            If EgtGetInfo(nIdF, "!SOU", Sou) AndAlso Map.refSceneShowBuldingVM.MapInfo.ContainsKey(Sou) Then
+               EgtSetInfo(nIdF, "!SOU", Map.refSceneShowBuldingVM.MapInfo(Sou))
+            End If
            nIdF = EgtGetNext(nIdF)
         End While
         Map.refProjectVM.BTLStructureVM.ShowBuilding(nListAsseBase(IdAsseBase), True)
         If IdAsseBase > 0 Then EgtSetStatus(nListAsseBase(IdAsseBase), GDB_ST.OFF)
         Dim nProj As Integer = 0
-         EgtGetInfo(nListAsseBase(IdAsseBase), PROJ, nProj)
-         m_nListProjAsseBase.Add(nProj, nListAsseBase(IdAsseBase))
+         If EgtGetInfo(nListAsseBase(IdAsseBase), PROJ, nProj) AndAlso Not m_nListProjAsseBase.ContainsKey(nProj) Then
+            m_nListProjAsseBase.Add(nProj, nListAsseBase(IdAsseBase))
+         End If
      Next

      EgtZoom(ZM.ALL)
@@ -554,8 +554,8 @@ Public Class ProjectVM
   ''' Funzione che permette di eliminare un pezzo modificato e reinserirlo nell'assemblato
   ''' </summary>
   Friend Sub UpdatePart(nPartId As Integer)
-      Dim IdAsseBase As Integer = Map.refProdManagerVM.ListProjAsseBase(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPROJ)
-      If IdAsseBase < 0 Then Return
+      Dim IdAsseBase As Integer = 0
+      If Not Map.refProdManagerVM.ListProjAsseBase.TryGetValue(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPROJ, IdAsseBase) Then Return
      Dim IdPart As Integer = 0
      Dim NewId As Integer = 0
      ' Setto il nuovo contesto
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("3.1.5.2")>
-<Assembly: AssemblyFileVersion("3.1.5.2")>
+<Assembly: AssemblyVersion("3.1.5.3")>
+<Assembly: AssemblyFileVersion("3.1.5.3")>
@@ -356,7 +356,7 @@ Public Class SupervisorManagerVM
      Else
         Dim sOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sOptimizerName & ".exe"
         Try
-            Process.Start(sOptimizerPath, "2 " & Pages.OPTIMIZERPAGE)
+            Process.Start(sOptimizerPath, "1 " & CurrProd.nProdId)
         Catch ex As Exception
            EgtOutLog("Error: impossible starting optimizer from path " & sOptimizerPath)
         End Try