MERGE

5 files changed, 181 insertions, 39 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
index 3f8772f0e..070beefa6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
@@ -1,4 +1,5 @@
 using Google.Protobuf;
+using Microsoft.Practices.ServiceLocation;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -10,7 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
 using Tango.Core.Helpers;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.Integration.Services;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
@@ -23,6 +24,10 @@ using Tango.Synchronization.Remote;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
+    /// <summary>
+    /// Represents the 'Direct Synchronization' view model.
+    /// </summary>
+    /// <seealso cref="Tango.SharedUI.ViewModel" />
     public class DirectSynchronizationViewVM : ViewModel
     {
         private SyncNavigationManager _navigation;
@@ -31,9 +36,16 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         private LocalDBComparer _comparer;
         private INotificationProvider _notification;
         private String _comparedSerialNumber;
+        private MainViewVM _mainView;
 
-        public IStudioApplicationManager ApplicationManager { get; set; }
+        #region Constructors
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectSynchronizationViewVM"/> class.
+        /// </summary>
+        /// <param name="applicationManager">The application manager.</param>
+        /// <param name="navigation">The navigation.</param>
+        /// <param name="notification">The notification.</param>
         public DirectSynchronizationViewVM(IStudioApplicationManager applicationManager, SyncNavigationManager navigation, INotificationProvider notification)
         {
             ApplicationManager = applicationManager;
@@ -49,6 +61,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             CommitAllCommand = new RelayCommand(Synchronize, (x) => Differences.Count > 0 && !IsWorking && SelectedMachine != null);
         }
 
+        #endregion
+
         #region Commands
 
         /// <summary>
@@ -90,6 +104,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #region Properties
 
+        public IStudioApplicationManager ApplicationManager { get; set; }
+
         private bool _isWorking;
         /// <summary>
         /// Gets or sets a value indicating whether this instance is working.
@@ -146,11 +162,29 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #endregion
 
+        #region Event Handlers
+
+        private void Comparer_Progress(object sender, string e)
+        {
+            if (_mainView == null)
+            {
+                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView.Log = String.Empty;
+            }
+
+            _mainView.Log += ("[" + DateTime.Now.ToTimeString() + "]  " + e + Environment.NewLine);
+        }
+
+        #endregion
+
         #region Private Methods
 
+        /// <summary>
+        /// Compares the selected machine against the remote database.
+        /// </summary>
         private void Compare()
         {
-            if (SelectedMachine.SerialNumber != ApplicationManager.ConnectedMachine.SerialNumber)
+            if (SelectedMachine.SerialNumber != ApplicationManager.ConnectedMachine.As<ExternalBridgeTcpClient>().SerialNumber)
             {
                 if (!_notification.ShowQuestion("The selected machine serial number does not match the connected machine. Are you sure you want to continue?"))
                 {
@@ -195,6 +229,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                             using (_notification.PushTaskItem("Comparing database..."))
                             {
                                 _comparer = new LocalDBComparer(new SQLiteDataBase(_masterDBFile), new SQLiteDataBase(_slaveDBFile));
+                                _comparer.Progress += Comparer_Progress;
 
                                 var diffs = _comparer.Compare();
                                 Differences = new ObservableCollection<Diff>(diffs);
@@ -236,6 +271,10 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+
+        /// <summary>
+        /// Synchronizes the selected machine with the remote database.
+        /// </summary>
         private void Synchronize()
         {
             if (IsClearMachine)
@@ -313,11 +352,19 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Displays an error message.
+        /// </summary>
+        /// <param name="message">The message.</param>
         private void ShowError(String message)
         {
             InvokeUINow(() => _notification.ShowError(message));
         }
 
+        /// <summary>
+        /// Displays an information message.
+        /// </summary>
+        /// <param name="message">The message.</param>
         private void ShowInfo(String message)
         {
             InvokeUINow(() => _notification.ShowInfo(message));
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
index 9c805cca4..2621f622a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
@@ -1,4 +1,5 @@
-using Microsoft.Win32;
+using Microsoft.Practices.ServiceLocation;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -19,6 +20,10 @@ using Tango.Synchronization.Local;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
+    /// <summary>
+    /// Represents the 'Local Synchronization' view model.
+    /// </summary>
+    /// <seealso cref="Tango.SharedUI.ViewModel" />
     public class LocalSynchronizationViewVM : ViewModel
     {
         private SyncNavigationManager _navigation;
@@ -27,6 +32,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         private LocalDBComparer _comparer;
         private INotificationProvider _notification;
         private bool _isWorking;
+        private MainViewVM _mainView;
 
         #region Constructors
 
@@ -166,8 +172,26 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #endregion
 
+        #region Event Handlers
+
+        private void Comparer_Progress(object sender, string e)
+        {
+            if (_mainView == null)
+            {
+                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView.Log = String.Empty;
+            }
+
+            _mainView.Log += ("[" + DateTime.Now.ToTimeString() + "]  " + e + Environment.NewLine);
+        }
+
+        #endregion
+
         #region Private Methods
 
+        /// <summary>
+        /// Cleans the slave database.
+        /// </summary>
         private async void CleanSlave()
         {
             if (_notification.ShowQuestion("Are you sure you want to erase all data on slave database?"))
@@ -205,9 +229,13 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             }
         }
 
+        /// <summary>
+        /// Compares the master and slave database files.
+        /// </summary>
         private void Compare()
         {
             _comparer = new LocalDBComparer(new SQLiteDataBase(MasterDBFile), new SQLiteDataBase(SlaveDBFile));
+            _comparer.Progress += Comparer_Progress;
 
             Task.Factory.StartNew(() =>
             {
@@ -248,6 +276,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Commits the selected difference.
+        /// </summary>
         private void Commit()
         {
             Task.Factory.StartNew(() =>
@@ -277,6 +308,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Commits all the differences.
+        /// </summary>
         private void CommitAll()
         {
             Task.Factory.StartNew(() =>
@@ -314,6 +348,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Browse for slave database file.
+        /// </summary>
         private void BrowseSlaveDB()
         {
             String file = BrowseForFilePath();
@@ -325,6 +362,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             }
         }
 
+        /// <summary>
+        /// Browse for master database file.
+        /// </summary>
         private void BrowseMasterDB()
         {
             String file = BrowseForFilePath();
@@ -336,6 +376,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             }
         }
 
+        /// <summary>
+        /// Browse for database file.
+        /// </summary>
         private String BrowseForFilePath()
         {
             OpenFileDialog dlg = new OpenFileDialog();
@@ -348,11 +391,19 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             return null;
         }
 
+        /// <summary>
+        /// Displays an error message.
+        /// </summary>
+        /// <param name="message">The message.</param>
         private void ShowError(String message)
         {
             InvokeUINow(() => _notification.ShowError(message));
         }
 
+        /// <summary>
+        /// Displays an information message.
+        /// </summary>
+        /// <param name="message">The message.</param>
         private void ShowInfo(String message)
         {
             InvokeUINow(() => _notification.ShowInfo(message));
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MainViewVM.cs
index c392aee1a..987b9ac4d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MainViewVM.cs
@@ -8,17 +8,18 @@ using Tango.SharedUI;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
+    /// <summary>
+    /// Represents the synchronization module main view, view model.
+    /// </summary>
+    /// <seealso cref="Tango.SharedUI.ViewModel" />
     public class MainViewVM : ViewModel
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewVM"/> class.
+        /// </summary>
         public MainViewVM()
         {
-            MainViewLogger logger = new MainViewLogger();
-            logger.NewLog += (output) =>
-            {
-                Log += output + Environment.NewLine;
-            };
-
-            LogManager.RegisterLogger(logger);
+            Log = "Synchronization module started...";
         }
 
         private String _log;
@@ -30,32 +31,5 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             get { return _log; }
             set { _log = value; RaisePropertyChanged(nameof(Log)); }
         }
-
-        #region Custom Logger
-
-        public class MainViewLogger : ILogger
-        {
-            public bool Enabled { get; set; }
-            public bool Immediate { get; set; }
-            public event Action<String> NewLog;
-
-            public MainViewLogger()
-            {
-                Enabled = true;
-                Immediate = true;
-            }
-
-            public void OnError(LogItemBase output)
-            {
-                NewLog?.Invoke(output.TimeStamp.ToTimeString() + ": " + output.GetMessage());
-            }
-
-            public void OnTrace(LogItemBase output)
-            {
-                NewLog?.Invoke(output.TimeStamp.ToTimeString() + ": " + output.GetMessage());
-            }
-        }
-
-        #endregion
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MenuViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MenuViewVM.cs
index 0fe510f36..efc6ec900 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MenuViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/MenuViewVM.cs
@@ -9,10 +9,18 @@ using Tango.SharedUI;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
+    /// <summary>
+    /// Represents the synchronization module main menu view, view model.
+    /// </summary>
+    /// <seealso cref="Tango.SharedUI.ViewModel" />
     public class MenuViewVM : ViewModel
     {
         private SyncNavigationManager _navigation;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenuViewVM"/> class.
+        /// </summary>
+        /// <param name="navigation">The navigation.</param>
         public MenuViewVM(SyncNavigationManager navigation)
         {
             _navigation = navigation;
@@ -22,10 +30,19 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             StartDirectRemoteSyncCommand = new RelayCommand(() => { _navigation.NavigateTo(NavigationView.DirectSynchronizationView); });
         }
 
+        /// <summary>
+        /// Gets or sets the start local synchronize command.
+        /// </summary>
         public RelayCommand StartLocalSyncCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the start remote synchronize command.
+        /// </summary>
         public RelayCommand StartRemoteSyncCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the start direct remote synchronize command.
+        /// </summary>
         public RelayCommand StartDirectRemoteSyncCommand { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
index e14b0ffb9..0f427643f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
@@ -10,7 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
 using Tango.DAL.Local.DB;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.DAL.Remote.DB;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Notifications;
@@ -21,9 +21,15 @@ using Tango.SharedUI;
 using Tango.Synchronization;
 using Tango.Synchronization.Local;
 using Tango.Synchronization.Remote;
+using Microsoft.Practices.ServiceLocation;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
+    /// <summary>
+    /// Represents the 'Semi Remote Synchronization' view model.
+    /// </summary>
+    /// <seealso cref="Tango.SharedUI.ViewModel" />
+    /// <seealso cref="Tango.MachineStudio.Common.StudioApplication.IShutdownRequestBlocker" />
     public class RemoteSynchronizationViewVM : ViewModel, IShutdownRequestBlocker
     {
         private SyncNavigationManager _navigation;
@@ -33,6 +39,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         private RemoteDBComparer _comparer;
         private RemoteDB _remoteDB;
         private LocalDB _localDB;
+        private MainViewVM _mainView;
 
         #region Constructors
 
@@ -104,6 +111,21 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #endregion
 
+        #region Event Handlers
+
+        private void Comparer_Progress(object sender, string e)
+        {
+            if (_mainView == null)
+            {
+                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView.Log = String.Empty;
+            }
+
+            _mainView.Log += ("[" + DateTime.Now.ToTimeString() + "]  " + e + Environment.NewLine);
+        }
+
+        #endregion
+
         #region Properties
 
         private ObservableCollection<Diff> _differences;
@@ -158,6 +180,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #region Private Methods
 
+        /// <summary>
+        /// Cleans the slave database file.
+        /// </summary>
         private async void CleanSlave()
         {
             if (_notification.ShowQuestion("Are you sure you want to erase all data on slave database?"))
@@ -195,6 +220,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             }
         }
 
+        /// <summary>
+        /// Compares the remote database with the selected database file.
+        /// </summary>
         private void Compare()
         {
             Task.Factory.StartNew(() =>
@@ -211,6 +239,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         _remoteDB = RemoteDB.CreateDefault();
                         _localDB = new LocalDB(SlaveDBFile);
                         _comparer = new RemoteDBComparer(_remoteDB, _localDB, SelectedMachine.SerialNumber);
+                        _comparer.Progress += Comparer_Progress;
                         _isWorking = true;
                         InvalidateRelayCommands();
                         Thread.Sleep(1500);
@@ -243,6 +272,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Commits the selected difference.
+        /// </summary>
         private void Commit()
         {
             Task.Factory.StartNew(() =>
@@ -274,6 +306,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Commits all the differences.
+        /// </summary>
         private void CommitAll()
         {
             Task.Factory.StartNew(() =>
@@ -325,6 +360,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+        /// <summary>
+        /// Browse for slave database file.
+        /// </summary>
         private void BrowseSlaveDB()
         {
             String file = BrowseForFilePath();
@@ -336,6 +374,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             }
         }
 
+        /// <summary>
+        /// Browse for database file.
+        /// </summary>
         private String BrowseForFilePath()
         {
             OpenFileDialog dlg = new OpenFileDialog();
@@ -348,16 +389,28 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             return null;
         }
 
+        /// <summary>
+        /// Displays an error message.
+        /// </summary>
+        /// <param name="message">The message.</param>
         private void ShowError(String message)
         {
             InvokeUINow(() => _notification.ShowError(message));
         }
 
+        /// <summary>
+        /// Displays an information message.
+        /// </summary>
+        /// <param name="message">The message.</param>
         private void ShowInfo(String message)
         {
             InvokeUINow(() => _notification.ShowInfo(message));
         }
 
+        /// <summary>
+        /// Called when the application is shutting down.
+        /// </summary>
+        /// <returns></returns>
         public Task<bool> OnShutdownRequest()
         {
             if (_comparer != null)