diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index ff1e5d7..3a8a943 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -228,8 +228,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2607, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2607, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2610, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2610, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index e5bdb7a..b0d5309 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,6 +69,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj index 4107fff..34f25f9 100644 --- a/OmagOFFICE.vbproj +++ b/OmagOFFICE.vbproj @@ -963,6 +963,19 @@ + + + + + + + + + + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe diff --git a/OptionPanel/RawPartTab/OmagPhotoV.xaml b/OptionPanel/RawPartTab/OmagPhotoV.xaml index 3baf754..68aedb7 100644 --- a/OptionPanel/RawPartTab/OmagPhotoV.xaml +++ b/OptionPanel/RawPartTab/OmagPhotoV.xaml @@ -10,12 +10,10 @@ d:DesignHeight="300" d:DesignWidth="300" Title="OmagPHOTO" ResizeMode="NoResize" ShowInTaskbar="False"> - - + + + + + diff --git a/OptionPanel/RawPartTab/OmagPhotoV.xaml.vb b/OptionPanel/RawPartTab/OmagPhotoV.xaml.vb index 83979ae..2c5bf62 100644 --- a/OptionPanel/RawPartTab/OmagPhotoV.xaml.vb +++ b/OptionPanel/RawPartTab/OmagPhotoV.xaml.vb @@ -2,13 +2,11 @@ 'Private m_OmagPhotoVM As OmagPhotoVM - 'Sub New(Owner As Window, OmagPhotoVM As OmagPhotoVM) + 'Public Sub New(Owner As Window) ' MyBase.New(Owner) - ' ' This call is required by the designer. + ' 'This call Is required by the designer. ' InitializeComponent() - ' Me.DataContext = OmagPhotoVM - ' ' Assegno al riferimento locale al VM il VM preso dal DataContext - ' m_OmagPhotoVM = OmagPhotoVM + 'End Sub End Class diff --git a/OptionPanel/RawPartTab/RawPartTabVM.vb b/OptionPanel/RawPartTab/RawPartTabVM.vb index 9f42bb8..4a2adbf 100644 --- a/OptionPanel/RawPartTab/RawPartTabVM.vb +++ b/OptionPanel/RawPartTab/RawPartTabVM.vb @@ -1091,7 +1091,7 @@ Public Class RawPartTabVM ' Creo riferimento a questa classe in OmagOFFICEMap OmagOFFICEMap.SetRefRawPartTabVM(Me) If OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB Then - 'Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow(), New OmagPhotoVM) + ' Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow()) Me.OmagPhoto = New OmagPhotoV If Not PhotoMap.ContinueApplication Then End End If @@ -2255,6 +2255,13 @@ Public Class RawPartTabVM PhotoMap.refSearchPanelVM.InitSearchPanel() ' inizializzo la ricerca a tutti le lastre di tipo "AVAILABLE" (=1) PhotoMap.refSearchPanelVM.State = 1 + + ' Resetto la data corrente per la prima ricerca + PhotoMap.refSearchPanelVM.StartAddedDate = Nothing + PhotoMap.refSearchPanelVM.NotifyPropertyChanged("StartAddedDate") + PhotoMap.refSearchPanelVM.EndAddedDate = Nothing + PhotoMap.refSearchPanelVM.NotifyPropertyChanged("EndAddedDate") + PhotoMap.refSearchPanelVM.Search() ' inserisco in elenco solo i materiali della macchina corrente AddHandler PhotoMap.refOptionPanelVM.SlabIsSelectedOFFICE, AddressOf OmagOFFICEMap.refRawPartTabVM.ClosePhotoWnd @@ -2264,9 +2271,9 @@ Public Class RawPartTabVM m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000) m_RefreshTimer.Start() - ' apro la finestra per accedere al DB delle lastre - Me.OmagPhoto = New OmagPhotoV - OmagPhoto.ShowDialog() + '' apro la finestra per accedere al DB delle lastre + 'Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow) + Me.OmagPhoto.ShowDialog() m_RefreshTimer.Stop() diff --git a/Resources/DetailPage/Cancel.png b/Resources/DetailPage/Cancel.png new file mode 100644 index 0000000..153110a Binary files /dev/null and b/Resources/DetailPage/Cancel.png differ diff --git a/Resources/DetailPage/Confirm.png b/Resources/DetailPage/Confirm.png new file mode 100644 index 0000000..55bee09 Binary files /dev/null and b/Resources/DetailPage/Confirm.png differ diff --git a/Resources/DetailPage/Elimina.png b/Resources/DetailPage/Elimina.png new file mode 100644 index 0000000..eefe7b7 Binary files /dev/null and b/Resources/DetailPage/Elimina.png differ diff --git a/Resources/DetailPage/Pencil.png b/Resources/DetailPage/Pencil.png new file mode 100644 index 0000000..4e1d88a Binary files /dev/null and b/Resources/DetailPage/Pencil.png differ diff --git a/Resources/DetailPage/Photo.png b/Resources/DetailPage/Photo.png new file mode 100644 index 0000000..ab8e933 Binary files /dev/null and b/Resources/DetailPage/Photo.png differ diff --git a/Resources/DetailPage/Polygon.png b/Resources/DetailPage/Polygon.png new file mode 100644 index 0000000..7a9c13b Binary files /dev/null and b/Resources/DetailPage/Polygon.png differ diff --git a/Resources/DetailPage/Print.png b/Resources/DetailPage/Print.png new file mode 100644 index 0000000..7981feb Binary files /dev/null and b/Resources/DetailPage/Print.png differ diff --git a/Resources/DetailPage/Reset.png b/Resources/DetailPage/Reset.png new file mode 100644 index 0000000..594c6d2 Binary files /dev/null and b/Resources/DetailPage/Reset.png differ diff --git a/Resources/DetailPage/Rubber.png b/Resources/DetailPage/Rubber.png new file mode 100644 index 0000000..192bdf6 Binary files /dev/null and b/Resources/DetailPage/Rubber.png differ diff --git a/Resources/DetailPage/Save.png b/Resources/DetailPage/Save.png new file mode 100644 index 0000000..0eca260 Binary files /dev/null and b/Resources/DetailPage/Save.png differ diff --git a/Resources/DetailPage/ZoomAll.png b/Resources/DetailPage/ZoomAll.png new file mode 100644 index 0000000..e1a27d1 Binary files /dev/null and b/Resources/DetailPage/ZoomAll.png differ