diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb index dd2a072..95f0a8c 100644 --- a/OptionsWindow/OptionWindowVM.vb +++ b/OptionsWindow/OptionWindowVM.vb @@ -353,6 +353,8 @@ Public Class OptionWindowVM Map.refTopPanelVM.UpdateMessagesTopPanel() Map.refProjManagerVM.UpdateMessageProjManager() Map.refSecondaryWindowVM.UpdateTitle() + Map.refViewPanelVM.UpdateMessageViewPanel() + Map.refViewPanelProspectiveVM.UpdateMessageViewProspectivePanel() End Sub #End Region ' Methods diff --git a/TopPanel/TopPanelVM.vb b/TopPanel/TopPanelVM.vb index bd2d96a..0a32087 100644 --- a/TopPanel/TopPanelVM.vb +++ b/TopPanel/TopPanelVM.vb @@ -56,13 +56,10 @@ Public Class TopPanelVM End Sub Private m_View_Msg As String = "▼" & EgtMsg(110019) ' Vista - Public Property View_Msg As String + Public ReadOnly Property View_Msg As String Get Return m_View_Msg End Get - Set(value As String) - m_View_Msg = value - End Set End Property Friend Sub SetView_Msg(sView_Msg As String) m_View_Msg = sView_Msg @@ -70,13 +67,10 @@ Public Class TopPanelVM End Sub Private m_ProspectiveView_Msg As String = "▼" & EgtMsg(110027) ' Vista Prospettica - Public Property ProspectiveView_Msg As String + Public ReadOnly Property ProspectiveView_Msg As String Get Return m_ProspectiveView_Msg End Get - Set(value As String) - m_ProspectiveView_Msg = value - End Set End Property Friend Sub SetProspectiveView_Msg(sProspectiveView_Msg As String) m_ProspectiveView_Msg = sProspectiveView_Msg @@ -225,7 +219,8 @@ Public Class TopPanelVM NotifyPropertyChanged(NameOf(Save_Msg)) NotifyPropertyChanged(NameOf(SaveAs_Msg)) NotifyPropertyChanged(NameOf(Open_Msg)) - NotifyPropertyChanged(NameOf(Options_Msg)) + SetView_Msg("▼" & EgtMsg(110019)) + SetProspectiveView_Msg("▼" & EgtMsg(110027)) End Sub #End Region ' Methods diff --git a/Utility/Map.vb b/Utility/Map.vb index 5326643..7fa979d 100644 --- a/Utility/Map.vb +++ b/Utility/Map.vb @@ -9,6 +9,8 @@ Module Map Private m_refTopPanelVM As TopPanelVM Private m_refSecondaryWindowVM As SecondaryWindowVM Private m_refProjManagerVM As ProjManagerVM + Private m_refViewPanelVM As ViewPanelVM + Private m_refViewPanelProspectiveVM As ViewPanelProspectiveVM Private m_refMainWindowV As MainWindowV Private m_refSecondaryWindowV As SecondaryWindowV @@ -50,6 +52,18 @@ Module Map End Get End Property + Public ReadOnly Property refViewPanelVM As ViewPanelVM + Get + Return m_refViewPanelVM + End Get + End Property + + Public ReadOnly Property refViewPanelProspectiveVM As ViewPanelProspectiveVM + Get + Return m_refViewPanelProspectiveVM + End Get + End Property + Public ReadOnly Property refSceneHostV As SceneHostV Get Return m_refSceneHostV @@ -115,6 +129,16 @@ Module Map Return Not IsNothing(m_refProjManagerVM) End Function + Friend Function SetRefViewPanelVM(ViewPanelVM As ViewPanelVM) As Boolean + m_refViewPanelVM = ViewPanelVM + Return Not IsNothing(m_refViewPanelVM) + End Function + + Friend Function SetRefViewPanelProspectiveVM(ViewPanelProspectiveVM As ViewPanelProspectiveVM) As Boolean + m_refViewPanelProspectiveVM = ViewPanelProspectiveVM + Return Not IsNothing(m_refViewPanelProspectiveVM) + End Function + Friend Function SetRefSceneHostV(SceneHostV As SceneHostV) As Boolean m_refSceneHostV = SceneHostV Return Not IsNothing(m_refSceneHostV) diff --git a/ViewPanel/ViewPanelVM.vb b/ViewPanel/ViewPanelVM.vb index d85dd23..d0f8aa5 100644 --- a/ViewPanel/ViewPanelVM.vb +++ b/ViewPanel/ViewPanelVM.vb @@ -56,6 +56,30 @@ Public Class ViewPanelVM #End Region ' Fields & Properties +#Region "CONSTRUCTOR" + + Sub New() + Map.SetRefViewPanelVM(Me) + End Sub + +#End Region ' Constructor + +#Region "METHODS" + + ''' + ''' Funzione che aggiorna i messaggi del Manager + ''' + Friend Sub UpdateMessageViewPanel() + NotifyPropertyChanged(NameOf(LookFromTop_Msg)) + NotifyPropertyChanged(NameOf(LookFromBottom_Msg)) + NotifyPropertyChanged(NameOf(LookFromFront_Msg)) + NotifyPropertyChanged(NameOf(LookFromBack_Msg)) + NotifyPropertyChanged(NameOf(LookFromLeft_Msg)) + NotifyPropertyChanged(NameOf(LookFromRight_Msg)) + End Sub + +#End Region ' Methods + #Region "COMMANDS" #Region "TopViewCommand" diff --git a/ViewPanelProspective/ViewPanelProspectiveVM.vb b/ViewPanelProspective/ViewPanelProspectiveVM.vb index 29ec504..9fecc28 100644 --- a/ViewPanelProspective/ViewPanelProspectiveVM.vb +++ b/ViewPanelProspective/ViewPanelProspectiveVM.vb @@ -28,6 +28,26 @@ Public Class ViewPanelProspectiveVM #End Region ' Fields & Properties +#Region "CONSTRUCTOR" + + Sub New() + Map.SetRefViewPanelProspectiveVM(Me) + End Sub + +#End Region ' Constructor + +#Region "METHODS" + + ''' + ''' Funzione che aggiorna i messaggi del Manager + ''' + Friend Sub UpdateMessageViewProspectivePanel() + NotifyPropertyChanged(NameOf(Orthographic_Msg)) + NotifyPropertyChanged(NameOf(Prospective_Msg)) + End Sub + +#End Region ' Methods + #Region "COMMANDS" #Region "OrthographicViewCommand"