Egalware/OmagPHOTO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OmagPHOTO 2.2h3 :

Browse Source 
- modifiche per EgtPHOTOLib.
This commit is contained in:
Dario Sassi
2020-08-19 15:38:49 +00:00
parent f5dfbc8482
commit 020ddb8210
10 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AboutBoxWindow/AboutBoxV.xaml.vb
+1 -1
View File
@@ -1,5 +1,5 @@
Imports EgtUILib
Imports EgtSTONELib
Imports EgtPHOTOLib
Public Class AboutBoxV
MainWindow/MainWindowM.vb
+7 -7
View File
@@ -3,7 +3,7 @@ Imports System.Math
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtSTONELib
Imports EgtPHOTOLib
Public Class MainWindowM
@@ -203,12 +203,12 @@ Public Class MainWindowM
End If
' Info su opzioni chiave
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
' Imposto parametri EgtSTONELib
EgtSTONELib.MainData.SetConfigDir(m_sConfigDir)
EgtSTONELib.MainData.SetKeyLevel(m_nKeyLevel)
EgtSTONELib.MainData.SetKeyOptions(m_nKeyOptions)
EgtSTONELib.MainData.SetPhotoDir(m_sPhotoDir)
EgtSTONELib.MainData.SetBackUpDir(m_sBackUpDir)
' Imposto parametri EgtPHOTOLib
EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)
EgtPHOTOLib.MainData.SetBackUpDir(m_sBackUpDir)
End Sub
Private Sub ManageInstance()
MainWindow/MainWindowV.xaml
+3 -3
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OmagPHOTO="clr-namespace:OmagPHOTO"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtSTONELib="clr-namespace:EgtSTONELib;assembly=EgtSTONELib"
xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
DataContext="{StaticResource MainWindowVM}"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Title="{Binding Title}" Icon="/Resources/OmagPHOTO.ico"
@@ -20,8 +20,8 @@
<!--StatusBar-->
<OmagPHOTO:StatusBarV DataContext="{StaticResource StatusBarVM}"
DockPanel.Dock="Bottom"/>
<!--Progetto corrente-->
<EgtSTONELib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>
<!--Progetto corrente-->
<EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>
</DockPanel>
</EgtWPFLib5:EgtCustomWindow>
MainWindow/MainWindowVM.vb
+3 -3
View File
@@ -1,6 +1,6 @@
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtSTONELib
Imports EgtPHOTOLib
Imports System.IO
Public Class MainWindowVM
@@ -63,11 +63,11 @@ Public Class MainWindowVM
' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine altrimenti chiudo
If Not Map.EndInit() Then End
' mi preparo a gestire l'evento definito dal cambio pagina
AddHandler StoneMap.refProjectVM.SlabIsSelected, AddressOf Map.refTopCommandBarVM.SetSearch_IsEnable
AddHandler PhotoMap.refProjectVM.SlabIsSelected, AddressOf Map.refTopCommandBarVM.SetSearch_IsEnable
' Aggiorno visualizzazione unità di misura
Map.refStatusBarVM.SetMeasureUnit(If(EgtUiUnitsAreMM(), MeasureUnitOpt.MM, MeasureUnitOpt.INCH))
' Apro in modalità lista
StoneMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST
PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST
' Se macchina fotografica abilitata, ne inizializzo il gestore
If m_MainWindowM.GetKeyOption(KEY_OPT.MAN_PHOTO) Then
m_Camera.Init()
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -59,5 +59,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.2.7.2")>
<Assembly: AssemblyFileVersion("2.2.7.2")>
<Assembly: AssemblyVersion("2.2.8.3")>
<Assembly: AssemblyFileVersion("2.2.8.3")>
OmagPHOTO.vbproj
+2 -2
View File
@@ -55,8 +55,8 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="EgtSTONELib">
<HintPath>..\..\EgtProg\DllD32\EgtSTONELib.dll</HintPath>
<Reference Include="EgtPHOTOLib">
<HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
</Reference>
<Reference Include="EgtUILib">
<HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
OptionWindow/OptionWindowVM.vb
+1 -1
View File
@@ -1,7 +1,7 @@
Imports System.Collections.ObjectModel
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtSTONELib
Imports EgtPHOTOLib
Public Class OptionWindowVM
Inherits VMBase
TopCommandBar/TopCommandBarVM.vb
+8 -8
View File
@@ -2,7 +2,7 @@
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtSTONELib
Imports EgtPHOTOLib
Public Class TopCommandBarVM
Inherits VMBase
@@ -23,19 +23,19 @@ Public Class TopCommandBarVM
End Get
Set(value As Boolean)
If value Then
StoneMap.refSearchPanelVM.InitSearchPanel()
PhotoMap.refSearchPanelVM.InitSearchPanel()
Else
StoneMap.refListPageVM.InitListPage()
PhotoMap.refListPageVM.InitListPage()
End If
m_Search_IsChecked = value
StoneMap.refSearchPanelVM.SetSearchPanel_Visibility(m_Search_IsChecked)
PhotoMap.refSearchPanelVM.SetSearchPanel_Visibility(m_Search_IsChecked)
NotifyPropertyChanged("Search_IsChecked")
End Set
End Property
Friend Sub SetSearch_IsChecked(value As Boolean)
m_Search_IsChecked = value
Map.refSearchPanelVM.SetSearchPanel_Visibility(m_Search_IsChecked)
StoneMap.refSearchPanelVM.SetSearch_IsChecked(value)
PhotoMap.refSearchPanelVM.SetSearch_IsChecked(value)
NotifyPropertyChanged("Search_IsChecked")
End Sub
@@ -46,12 +46,12 @@ Public Class TopCommandBarVM
End Get
Set(value As Boolean)
m_Search_IsEnabled = value
StoneMap.refSearchPanelVM.Search_IsEnabled = m_Search_IsEnabled
PhotoMap.refSearchPanelVM.Search_IsEnabled = m_Search_IsEnabled
NotifyPropertyChanged("Search_IsEnabled")
End Set
End Property
Public Sub SetSearch_IsEnable()
m_Search_IsEnabled = EgtSTONELib.StoneMap.refSearchPanelVM.Search_IsEnabled
m_Search_IsEnabled = EgtPHOTOLib.PhotoMap.refSearchPanelVM.Search_IsEnabled
NotifyPropertyChanged("Search_IsEnabled")
End Sub
@@ -155,7 +155,7 @@ Public Class TopCommandBarVM
''' </summary>
Friend Sub NewCmd(Optional bUseDefaults As Boolean = False)
' passo alla libreria l'oggetto Camera che è stato inizializzato nel Omag-PHOTO
EgtSTONELib.MainData.SetCamera(Map.refMainWindowVM.m_Camera)
EgtPHOTOLib.MainData.SetCamera(Map.refMainWindowVM.m_Camera)
Map.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.NEWSLAB
End Sub
Utility/Dictionary.xaml
+7 -7
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OmagPHOTO="clr-namespace:OmagPHOTO"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtSTONELib="clr-namespace:EgtSTONELib;assembly=EgtSTONELib"
xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
<!--
@@ -14,12 +14,12 @@
<!--<OmagPHOTO:MySceneHostVM x:Key="MySceneHostVM"/>-->
<OmagPHOTO:TopCommandBarVM x:Key="TopCommandBarVM"/>
<EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
<EgtSTONELib:ProjectSlabVM x:Key="ProjectSlabVM"/>
<EgtSTONELib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
<EgtSTONELib:ListPageSlabVM x:Key="ListPageSlabVM"/>
<EgtSTONELib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
<EgtSTONELib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
<EgtSTONELib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
<EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
<EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
<EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
<EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
<EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
<EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
<EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
<EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
Utility/Map.vb
+10 -10
View File
@@ -1,5 +1,5 @@
Imports EgtWPFLib5
Imports EgtSTONELib
Imports EgtPHOTOLib
Module Map
@@ -45,31 +45,31 @@ Module Map
Public ReadOnly Property refProjectVM As ProjectSlabVM
Get
Return StoneMap.refProjectVM
Return PhotoMap.refProjectVM
End Get
End Property
Public ReadOnly Property refOptionPanelVM As OptionPanelSlabVM
Get
Return StoneMap.refOptionPanelVM
Return PhotoMap.refOptionPanelVM
End Get
End Property
Public ReadOnly Property refListPageVM As ListPageSlabVM
Get
Return StoneMap.refListPageVM
Return PhotoMap.refListPageVM
End Get
End Property
Public ReadOnly Property refDetailPageVM As DetailPageSlabVM
Get
Return StoneMap.refDetailPageVM
Return PhotoMap.refDetailPageVM
End Get
End Property
Public ReadOnly Property refSearchPanelVM As SearchPanelSlabVM
Get
Return StoneMap.refSearchPanelVM
Return PhotoMap.refSearchPanelVM
End Get
End Property
@@ -134,12 +134,12 @@ Module Map
Friend Function EndInit() As Boolean
' LibMap.EndInit AndAlso -> ho eliminato questo controllo perchè altrimenti fallisce
' Verifico se tutti i pezzi necessari sono stati caricati
Return Not IsNothing(m_refMainWindowVM) AndAlso Not IsNothing(StoneMap.refProjectVM) AndAlso
Return Not IsNothing(m_refMainWindowVM) AndAlso Not IsNothing(PhotoMap.refProjectVM) AndAlso
Not IsNothing(LibMap.refStatusBarVM) AndAlso Not IsNothing(m_refTopCommandBarVM) AndAlso
Not IsNothing(LibMap.refSceneHostVM) AndAlso
Not IsNothing(StoneMap.refOptionPanelVM) AndAlso Not IsNothing(StoneMap.refListPageVM) AndAlso
Not IsNothing(StoneMap.refDetailPageVM) AndAlso Not IsNothing(StoneMap.refSearchPanelVM) AndAlso
StoneMap.ContninueApplication
Not IsNothing(PhotoMap.refOptionPanelVM) AndAlso Not IsNothing(PhotoMap.refListPageVM) AndAlso
Not IsNothing(PhotoMap.refDetailPageVM) AndAlso Not IsNothing(PhotoMap.refSearchPanelVM) AndAlso
PhotoMap.ContninueApplication
End Function
#End Region ' Init