Merge commit 'a9540db0b2dac331592ebc959d54ecd096e7440e'

- per evitare crash quando si avvisa per chiave o licenza mancante.

Application.xaml.vb

@@ -1,14 +1,21 @@
-Class Application
+Imports EgtPHOTOLib
 
-    ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
-    ' can be handled in this file.
+Class Application
+
+   ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
+   ' can be handled in this file.
    Protected Overrides Sub OnStartup(e As StartupEventArgs)
       MyBase.OnStartup(e)
       ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose
       ' Creo la View principale
       Me.MainWindow = New MainWindowV
       ' Mostro la View principale
-      Me.MainWindow.Show()
+      If PhotoMap.ContinueApplication Then
+         Me.MainWindow.Show()
+      Else
+         End
+      End If
+
    End Sub
 
 End Class

Constants/ConstIni.vb

@@ -11,6 +11,10 @@
 '
 '----------------------------------------------------------------------------
 
+Imports System.Data
+Imports EgtPHOTOLib
+Imports EgtWPFLib5
+
 Module ConstIni
 
    Public Const INI_FILE_NAME As String = "OmagPHOTO.ini"
@@ -89,6 +93,13 @@ Module ConstIni
    Public Const K_MINLNCOLOR As String = "MinLnColor"
    Public Const K_MAJLNCOLOR As String = "MajLnColor"
 
+   Public Const S_AUTOCLICK As String = "AutoClick"
+   Public Const K_CLICKDIR As String = "ClickDir"
+   Public Const K_STATE As String = "State"
+   Public Const K_AUTOMATERIAL As String = "Material"
+   Public Const K_THICKNESS As String = "Thickness"
+   Public Const K_WAREHAOUSE As String = "WareHouse"
+
    Public Const S_CAMERA As String = "Camera"
    Public Const K_CAM_COUNT As String = "Count"
    Public Const K_CAM_EXEPATH As String = "ExePath"

MainWindow/MainWindowM.vb

@@ -5,6 +5,7 @@ Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtPHOTOLib
+Imports System.Windows.Forms.Integration
 
 Public Class MainWindowM
 
@@ -14,6 +15,12 @@ Public Class MainWindowM
    Private m_TimerIsBusy As Boolean = False
    Private m_RefreshTimer As New DispatcherTimer
 
+   ' Per lettura modifica direttorio
+   Private fsWatch As FileSystemWatcher
+   Private m_RefreshNewFileClick As New DispatcherTimer
+   Private m_bNewFileClick As Boolean = False
+   Private m_sNewFileClickPath As String = String.Empty
+
    Private m_sDataRoot As String = String.Empty
    Friend ReadOnly Property sDataRoot As String
       Get
@@ -199,11 +206,11 @@ Public Class MainWindowM
       Dim sKey As String = String.Empty
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
-      Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
-      EgtSetNetHwKey( bNetHwKey)
+      Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
+      EgtSetNetHwKey(bNetHwKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2407, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2407, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -278,9 +285,6 @@ Public Class MainWindowM
          MessageBox.Show(EgtMsg(MSG_OMAGPHOTO + 1) & EgtMsg(MSG_OMAGPHOTO + 2), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)
          End
       End If
-
-      Dim sLastBlock As String = String.Empty
-
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       ' Imposto parametri EgtPHOTOLib
@@ -295,6 +299,7 @@ Public Class MainWindowM
       EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
       EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
       EgtPHOTOLib.MainData.SetCapsLock(m_bCapsLock)
+      Dim sLastBlock As String = String.Empty
       If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
       Dim sIdKey As String = String.Empty
       EgtGetKeyInfo(sIdKey)
@@ -303,11 +308,88 @@ Public Class MainWindowM
       AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
       m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
       m_RefreshTimer.Start()
+      ' sec onfigurato lancio il controllo di uno specifico direttorio per leggere quando scattare una nuova foto
+      Dim sClidkDir As String = String.Empty
+      Dim bEnableLineProduction As Boolean = GetMainPrivateProfileString(S_AUTOCLICK, K_CLICKDIR, "", sClidkDir) <> 0
+      If bEnableLineProduction Then
+         fsWatch = New FileSystemWatcher(sClidkDir) With {.EnableRaisingEvents = True}
+         'fsWatch.EnableRaisingEvents = True
+         AddHandler fsWatch.Created, AddressOf AutoClick
+         AddHandler fsWatch.Changed, AddressOf AutoClick
+         AddHandler fsWatch.Renamed, AddressOf AutoClick
+         m_bNewFileClick = False
+         AddHandler m_RefreshNewFileClick.Tick, AddressOf AutoClick_Cmd
+         m_RefreshNewFileClick.Interval = TimeSpan.FromMilliseconds(2000)
+         m_RefreshNewFileClick.Start()
+      End If
+   End Sub
+
+   Private Sub AutoClick(ByVal sender As Object, ByVal e As FileSystemEventArgs)
+      EgtOutLog("File '" & e.FullPath & "' has been created: ready to Click")
+      m_sNewFileClickPath = e.FullPath
+      m_bNewFileClick = True
+   End Sub
+
+   Private Sub AutoClick_Cmd()
+      If Not m_bNewFileClick Then Return
+      ' deseleziono la precedente lastra
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsSelected = 0
+      End If
+      ' verifico se esite una lastra corrente in modifica, quindi chiedo se salvare
+      Map.refTopCommandBarVM.NewCmd(True)
+      ' apro la pagina per inserire una nuova lastra, se esiste un oggetto di tipo lastra allora procedo
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         ' Autocompilazione dei campi con i dati dell'ultima lastra salvata
+         ReadLastInfoAutoClick(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab)
+         ' scatto la foto
+         EgtPHOTOLib.PhotoMap.refOptionPanelVM.Photo(Nothing)
+         ' notifico che è stata scattata una foto
+         Try
+            File.Delete(m_sNewFileClickPath)
+            EgtOutLog("File '" & m_sNewFileClickPath & "' has been deleted!")
+            m_bNewFileClick = False
+         Catch ex As Exception
+            EgtOutLog("File '" & m_sNewFileClickPath & "' can't be deleted! " & ex.ToString)
+
+         End Try
+         ' se è stata scattata una foto provvedo a salvare l'inserimento
+         If Not m_bNewFileClick Then
+            ' salvo i dati inseriti ( nel file ini e nel DB )
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.Save()
+            ' ricarico la pagina
+            EgtPHOTOLib.PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.DETAIL
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.Ok_IsEnabled = False
+            ' stampo etichetta
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.PrintLabel()
+         End If
+      End If
+   End Sub
+
+   Private Sub ReadLastInfoAutoClick(CurrSlab As Slab)
+      Dim nIndState As Integer = 1
+      Dim sMaterial As String = ""
+      Dim dThick As Double = 0
+      Dim sWarehouse As String = ""
+      nIndState = GetMainPrivateProfileInt(S_AUTOCLICK, K_STATE, nIndState)
+      GetMainPrivateProfileString(S_AUTOCLICK, K_AUTOMATERIAL, "", sMaterial)
+      dThick = GetMainPrivateProfileDouble(S_AUTOCLICK, K_THICKNESS, 1)
+      GetMainPrivateProfileString(S_AUTOCLICK, K_WAREHAOUSE, "", sWarehouse)
+      CurrSlab.State = nIndState
+      For IndexMat As Integer = 0 To EgtPHOTOLib.PhotoMap.refProjectVM.MaterialList.Count - 1
+         If EgtPHOTOLib.PhotoMap.refProjectVM.MaterialList(IndexMat).Trim = sMaterial.Trim Then
+            CurrSlab.SetMaterial(EgtPHOTOLib.PhotoMap.refProjectVM.MaterialList(IndexMat))
+            Exit For
+         End If
+      Next
+      CurrSlab.SetThickness(dThick)
+      CurrSlab.WarehousePosition = sWarehouse
    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
+      If Not m_TimerIsBusy AndAlso Not IsNothing(PhotoMap.refProjectVM) AndAlso
+         PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
          m_TimerIsBusy = True
          m_RefreshTimer.Stop()
          EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()

MainWindow/MainWindowV.xaml

@@ -6,6 +6,7 @@
    xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
    DataContext="{StaticResource MainWindowVM}"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   TitleBarForeground="{StaticResource Omag_White}"                         
    Title="{Binding Title}" Icon="/Resources/OmagPHOTO.ico"
    MinHeight="600" MinWidth="800"
    AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"

My Project/AssemblyInfo.vb

@@ -18,8 +18,8 @@ Imports System.Windows
 <Assembly: AssemblyDescription("OmagPHOTO 32 bit")> 
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
-<Assembly: AssemblyProduct("OmagPHOTO")> 
-<Assembly: AssemblyCopyright("Copyright ©  2017-2022 by Egalware s.r.l.")> 
+<Assembly: AssemblyProduct("OmagPHOTO")>
+<Assembly: AssemblyCopyright("Copyright ©  2017-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.7.1")>
-<Assembly: AssemblyFileVersion("2.4.7.1")>
+<Assembly: AssemblyVersion("2.6.2.1")>
+<Assembly: AssemblyFileVersion("2.6.2.1")>

OptionWindow/OptionWindowV.xaml

@@ -44,7 +44,7 @@
          <UniformGrid Columns="2">
             <TextBlock Text="{Binding ThicknessToleranceMsg}"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding ThicknessTolerance}"
-                                   Margin="13,0,0,0"
+                                   Margin="36,0,0,0"
                                    TextAlignment="Right"/>
          </UniformGrid>
       </GroupBox>
@@ -58,7 +58,7 @@
                  <ColumnDefinition Width="3*"/>
                  <ColumnDefinition Width="1*"/>
              </Grid.ColumnDefinitions>
-             <TextBlock Text="{Binding LabelFileName}"/>
+             <TextBlock Text="{Binding LabelFileName}" VerticalAlignment="Center"/>
              <Button Content="{Binding BrowseMsg}" Grid.Column="1"
                   Command="{Binding BrowseCommand}"
                   Style="{StaticResource OptionPanel_TextButton}"
@@ -112,6 +112,9 @@
 
              <ListBox ItemsSource="{Binding MaterialList}"
                   SelectedItem="{Binding SelMaterial}"
+                  Background="{StaticResource Omag_Black}"
+                  Foreground="{StaticResource Omag_White}"
+                  BorderThickness="0"
                   Grid.RowSpan="2"
                   Margin="0,0,0,5"
                   Height="150"/>

TopCommandBar/TopCommandBarV.xaml

@@ -6,12 +6,14 @@
 
    <!--Barra superiore dei comandi-->
    <Button Command="{Binding NewCommand}"
-           ToolTip="{Binding NewToolTip}">
+           ToolTip="{Binding NewToolTip}"
+           Style="{StaticResource TopCmdBar_Button}">
       <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
    </Button>
     <ToggleButton IsChecked="{Binding Search_IsChecked}"
                  IsEnabled="{Binding Search_IsEnabled}"
-                 ToolTip="{Binding SearchToolTip}">
+                 ToolTip="{Binding SearchToolTip}"
+                 Style="{StaticResource TopCmdBar_ToggleButton}">
       <Image Source="/Resources/TopCommandBar/Search.png" Stretch="Uniform"/>
    </ToggleButton>
    <!--<Button Command="{Binding OpenCommand}"
@@ -41,7 +43,8 @@
    </Button>-->
    <Button Command="{Binding OptionsCommand}"
            ToolTip="{Binding OptionsToolTip}"
-           IsEnabled="{Binding IsEnabled}">
+           IsEnabled="{Binding IsEnabled}"
+           Style="{StaticResource TopCmdBar_Button}">
       <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform"/>
    </Button>
    

TopCommandBar/TopCommandBarVM.vb

@@ -156,6 +156,23 @@ Public Class TopCommandBarVM
    Friend Sub NewCmd(Optional bUseDefaults As Boolean = False)
       ' passo alla libreria l'oggetto Camera che è stato inizializzato nel Omag-PHOTO
       EgtPHOTOLib.MainData.SetCamera(Map.refMainWindowVM.m_Camera)
+      Dim bIsSaved As Boolean = False
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         If EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsModified Then
+            ' 91125: Salvare le modifiche correnti? - 92201: Avviso
+            If MessageBox.Show(EgtMsg(91125), EgtMsg(92201), MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.Yes Then
+               EgtPHOTOLib.PhotoMap.refOptionPanelVM.Save()
+               bIsSaved = True
+            End If
+         Else
+            bIsSaved = True
+         End If
+         If Not bIsSaved Then
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.Cancel(Nothing)
+         Else
+            EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()
+         End If
+      End If
       Map.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.NEWSLAB
    End Sub