Mantegno attive le lavorazioni della fase corrente

MainWindow/MainWindowM.vb

@@ -269,14 +269,10 @@ Public Class MainWindowM
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
-      EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions))
+      EgtPHOTOLib.MainData.SetKeyOptions( CInt( m_nKeyOptions))
       EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)
       EgtPHOTOLib.MainData.SetBackUpDir(m_sBackUpDir)
       EgtPHOTOLib.MainData.SetIsOmagOFFICE(True)
-      EgtPHOTOLib.MainData.SetUser(Environment.MachineName & "\" & Environment.UserName & " (" & nInstance.ToString() & ")")
-      Dim sIdKey As String = String.Empty
-      EgtGetKeyInfo(sIdKey)
-      EgtPHOTOLib.MainData.SetKey(sIdKey)
    End Sub
 
    Private Sub ManageInstance()

OptionPanel/MachiningTab/SplitModeVM.vb

@@ -595,8 +595,32 @@ Public Class SplitModeVM
          ' assegno numerazione
          NumberDirectionMachining(nI)
       Next
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
+      Dim ActiveMachLst As New List(Of Integer)
+      For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
+         ActiveMachLst.Add(ItemSplitMach.Ind)
+      Next
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
       ' Preparo la lista degli Item
       ShowMachiningList()
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
+      For Each Item As SplitMach In m_MachiningList
+         EgtSetInfo(Item.m_nId, INFO_MCH_USER_OFF, True)
+      Next
+
+      For nIndex As Integer = 0 To ActiveMachLst.Count - 1
+         For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
+            If ItemSplitMach.Ind = ActiveMachLst(nIndex) Then
+               EgtRemoveInfo(m_MachiningList(ItemSplitMach.Ind).m_nId, INFO_MCH_USER_OFF)
+               m_MachiningList(ItemSplitMach.Ind).m_bEnabled = True
+               ItemSplitMach.bIsActive = True
+               ' sistemo colore
+               ColorMachining(m_MachiningList(ItemSplitMach.Ind))
+               Exit For
+            End If
+         Next
+      Next
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
       ' Aggiorno visualizzazione
       EgtDraw()
       ' Aggiono abilitazione bottoni

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -1,6 +1,4 @@
-Imports System.Threading
-Imports System.Windows.Threading
-Imports System.IO
+Imports System.IO
 Imports System.Collections.ObjectModel
 Imports EgtWPFLib5
 Imports EgtPHOTOLib
@@ -9,10 +7,6 @@ Imports EgtUILib
 Public Class RawPartTabVM
    Inherits VMBase
 
-   ' Timer
-   Private m_TimerIsBusy As Boolean = False
-   Private m_RefreshTimer As New DispatcherTimer
-
    Friend OmagPhoto As OmagPhotoV
 
    Private m_OmagPhotoVM As OmagPhotoVM
@@ -2040,17 +2034,11 @@ Public Class RawPartTabVM
          ' inserisco in elenco solo i materiali della macchina corrente
          AddHandler PhotoMap.refOptionPanelVM.SlabIsSelectedOFFICE, AddressOf OmagOFFICEMap.refRawPartTabVM.ClosePhotoWnd
 
-         ' lancio il timer di aggiornamento dell'interfaccia, per la gestione di due OmagPHOTO che accedono allo stesso SQL
-         AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
-         m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
-         m_RefreshTimer.Start()
-
-         ' apro la finestra per accedere al DB delle lastre
+         ' Dim OmagPhotoWnd As New OmagPhotoV(Application.Current.MainWindow(), New OmagPhotoVM)
+         'OmagPhotoWnd.ShowDialog()
          Me.OmagPhoto = New OmagPhotoV
          OmagPhoto.ShowDialog()
 
-         m_RefreshTimer.Stop()
-
          EgtSetCurrentContext(EgtPHOTOLib.MainData.PreviousContext)
          EgtSetCurrentContext(OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())
 
@@ -2168,17 +2156,6 @@ Public Class RawPartTabVM
       EgtDraw()
    End Sub
 
-   ' per la gestione di due OmagPHOTO che accedono allo stesso SQL
-   Private Sub RefreshTimer_Tick()
-      If Not m_TimerIsBusy And PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
-         m_TimerIsBusy = True
-         m_RefreshTimer.Stop()
-         EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()
-         m_TimerIsBusy = False
-         m_RefreshTimer.Start()
-      End If
-   End Sub
-
 #End Region ' PhotoCommand
 
 #Region "ConfirmPhotoCommand"