OmagPHOTO 3.1c3 :

- ricompilazione con cambio versione.

AboutBoxWindow/AboutBoxV.xaml

@@ -1,7 +1,7 @@
 <Window x:Class="AboutBoxV"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="AboutBox" Height="320" Width="300" WindowStyle="None" ResizeMode="NoResize"
+    Title="AboutBox" Height="320" Width="440" WindowStyle="None" ResizeMode="NoResize"
     ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
@@ -31,7 +31,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/LogoOmag.jpg" Stretch="Uniform"/>
+               <Image Source="/Resources/Logo-Egalware.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

Constants/ConstIni.vb

@@ -100,23 +100,7 @@ Module ConstIni
    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"
-   Public Const K_CAM_IMAGE As String = "Image"
-   Public Const K_CAM_INFO As String = "Info"
-   Public Const K_CAM_RESULT As String = "Result"
-   Public Const K_CAM_CONTOUR As String = "Contour"
-   Public Const K_CAM_EXEPATH2 As String = "ExePath2"
-   Public Const K_CAM_IMAGE2 As String = "Image2"
-   Public Const K_CAM_INFO2 As String = "Info2"
-   Public Const K_CAM_RESULT2 As String = "Result2"
-   Public Const K_CAM_CONTOUR2 As String = "Contour2"
-   Public Const K_CAM_THRESHOLD As String = "Threshold"
-   Public Const K_CAM_TOLERANCE As String = "Tolerance"
-   Public Const K_CAM_TIMEOUT As String = "Timeout"
-   Public Const K_CAM_TABLEDIMX As String = "TableDimX"
-   Public Const K_CAM_TABLEDIMY As String = "TableDimY"
+   ' La macchina fotografica (Camera) è gestita da EgtPHOTOLIB
 
    Public Const S_MATERIALS As String = "Materials"
    Public Const K_MATERIAL As String = "Material"

MainWindow/MainWindowM.vb

@@ -209,8 +209,8 @@ Public Class MainWindowM
       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, 2508, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2508, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 3103, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 3103, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -288,6 +288,7 @@ Public Class MainWindowM
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       ' Imposto parametri EgtPHOTOLib
+      EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
       EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
@@ -308,7 +309,7 @@ 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
+      ' se configurato 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

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"

MainWindow/MainWindowVM.vb

@@ -121,7 +121,7 @@ Public Class MainWindowVM
          Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) AndAlso EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsModified() Then
          ' 91125=Salvare le modifiche correnti?
          ' 91126=Avviso
-         If MessageBox.Show(EgtMsg(91125), EgtMsg(91122), MessageBoxButton.OKCancel, MessageBoxImage.Warning) = MessageBoxResult.OK Then
+         If MessageBox.Show(EgtMsg(91125), EgtMsg(91122), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.OK Then
             EgtPHOTOLib.PhotoMap.refOptionPanelVM.Ok(Nothing)
          End If
       End If

My Project/AssemblyInfo.vb

@@ -19,7 +19,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("OmagPHOTO")>
-<Assembly: AssemblyCopyright("Copyright ©  2017-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2017-2026 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.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("3.1.3.3")>
+<Assembly: AssemblyFileVersion("3.1.3.3")>

OmagPHOTO.vbproj

@@ -219,6 +219,39 @@
   <ItemGroup>
     <Resource Include="Resources\InstrumentPanel\Matitina.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Save.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Print.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Elimina.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Cancel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Confirm.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Reset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Pencil.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Polygon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Rubber.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\ZoomAll.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Logo-Egalware.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe

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

@@ -7,6 +7,8 @@ Imports EgtPHOTOLib
 Public Class TopCommandBarVM
    Inherits VMBase
 
+   Private m_bFirstResearch As Boolean = True
+
 #Region "FIELDS & PROPERTIES"
 
    Friend m_MruFiles As New MruList
@@ -23,7 +25,16 @@ Public Class TopCommandBarVM
       End Get
       Set(value As Boolean)
          If value Then
+            If m_bFirstResearch Then
+               ' Resetto la data corrente per la prima ricerca 
+               PhotoMap.refSearchPanelVM.StartAddedDate = Nothing
+               PhotoMap.refSearchPanelVM.NotifyPropertyChanged("StartAddedDate")
+               PhotoMap.refSearchPanelVM.EndAddedDate = Nothing
+               PhotoMap.refSearchPanelVM.NotifyPropertyChanged("EndAddedDate")
+               m_bFirstResearch = False
+            End If
             PhotoMap.refSearchPanelVM.InitSearchPanel()
+
          Else
             PhotoMap.refListPageVM.InitListPage()
          End If