From 0dec8a74239cff769836cae577fbd84824070e83 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 21 Apr 2018 19:49:05 +0300
Subject: Implemented NavigationControl for better performance!!! Redesign of
 machine studio module initialization.

---
 .../Tango.MachineStudio.Logging/LoggingModule.cs   |  7 ++++--
 .../Navigation/LoggingNavigationManager.cs         |  2 +-
 .../ViewModels/ApplicationLogsViewVM.cs            |  9 +++++---
 .../ViewModels/EmbeddedLogsViewVM.cs               |  9 +++++---
 .../Views/MainView.xaml                            | 26 ++++++----------------
 5 files changed, 25 insertions(+), 28 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs
index 91a9f51b0..b389c121e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs
@@ -38,11 +38,14 @@ namespace Tango.MachineStudio.Logging
             }
         }
 
-        public override FrameworkElement MainView
+        /// <summary>
+        /// Gets the module entry point view type.
+        /// </summary>
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs
index b86df7b0f..496baf4c4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs
@@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Logging.Navigation
         public void NavigateTo(LoggingNavigationView view)
         {
             LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
-            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainView.Instance.TransitionControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index d51607004..ffb16fed4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -103,10 +103,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             IsRealTime = true;
             RealTimePaused = true;
 
-            SelectedDate = Dates.Last();
+            SelectedDate = Dates.LastOrDefault();
 
-            MinDate = Dates.Min();
-            MaxDate = Dates.Max();
+            if (Dates.Count > 0)
+            {
+                MinDate = Dates.Min();
+                MaxDate = Dates.Max();
+            }
 
             LogManager.NewLog += LogManager_NewLog;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
index 126f61402..959d294c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
@@ -105,10 +105,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             IsRealTime = true;
             RealTimePaused = true;
 
-            SelectedDate = Dates.Last();
+            SelectedDate = Dates.LastOrDefault();
 
-            MinDate = Dates.Min();
-            MaxDate = Dates.Max();
+            if (Dates.Count > 0)
+            {
+                MinDate = Dates.Min();
+                MaxDate = Dates.Max();
+            }
 
             MachineOperator.EmbeddedLogManager.NewLog += EmbeddedLogManager_NewLog;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml
index bf1bc8778..29a563c72 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml
@@ -16,24 +16,12 @@
              d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:EventsViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.EventsViewVM}">
 
     <Grid>
-        <controls:MultiTransitionControl x:Name="TransitionControl" x:FieldModifier="internal" TransitionType="Slide">
-            <controls:MultiTransitionControl.Controls>
-                <ContentControl Tag="HomeView">
-                    <local:HomeView/>
-                </ContentControl>
-                <ContentControl Tag="ApplicationLogsView">
-                    <local:ApplicationLogsView/>
-                </ContentControl>
-                <ContentControl Tag="EmbeddedLogsView">
-                    <local:EmbeddedLogsView/>
-                </ContentControl>
-                <ContentControl Tag="EventsView">
-                    <local:EventsView/>
-                </ContentControl>
-                <ContentControl Tag="TimelineView">
-                    <local:TimelineWrapperView />
-                </ContentControl>
-            </controls:MultiTransitionControl.Controls>
-        </controls:MultiTransitionControl>
+        <controls:NavigationControl x:Name="TransitionControl" x:FieldModifier="internal" TransitionType="Slide">
+            <local:HomeView controls:NavigationControl.NavigationName="HomeView" />
+            <local:ApplicationLogsView controls:NavigationControl.NavigationName="ApplicationLogsView" />
+            <local:EmbeddedLogsView controls:NavigationControl.NavigationName="EmbeddedLogsView" />
+            <local:EventsView controls:NavigationControl.NavigationName="EventsView" />
+            <local:TimelineWrapperView controls:NavigationControl.NavigationName="TimelineWrapperView" />
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
-- 
cgit v1.3.1