Implemented In-Memory Transport Adapter.

Implemented Embedded In-Memory Emulator.

3 files changed, 8 insertions, 8 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 55dd370d1..0a9bba69e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -461,7 +461,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set
             {
                 _segmentsCollectionView = value;
-                BindingOperations.EnableCollectionSynchronization(_segmentsCollectionView, _syncLock);
                 RaisePropertyChangedAuto();
             }
         }
@@ -1230,7 +1229,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                         if (status.Message != null)
                         {
-                            _eventLogger.Log(BL.Enumerations.EventTypes.JobStatus, status.Message);
+                            // TODO: Write to db when shlomo is not sending test messages anymore.
+                            _eventLogger.Log(BL.Enumerations.EventTypes.JobStatus, status.Message, false);
                         }
                     }
                 };
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
index 68094d91f..1f93a96dc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
@@ -145,7 +145,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
                         DateTime now = DateTime.UtcNow.AddMonths(-1);
 
-                        _history_events = _db.MachinesEvents.Where(x => x.MachineGuid == SelectedMachine.Guid && x.DateTime > now).ToList();
+                        _history_events = _db.MachinesEvents.Where(x => x.MachineGuid == SelectedMachine.Guid && x.DateTime > now).Include(x => x.User).Include(x => x.User.Contact).Include(x => x.Machine).ToList();
 
                         Dates = new ObservableCollection<DateTime>();
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index a186d3039..9dd6c4b79 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1571,13 +1571,13 @@ namespace Tango.MachineStudio.Technician.ViewModels
         public override void OnNavigatedTo()
         {
             base.OnNavigatedTo();
-            _singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(true));
+            //_singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(true));
         }
 
         public override void OnNavigatedFrom()
         {
             base.OnNavigatedFrom();
-            _singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(false));
+            //_singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(false));
         }
 
         public override void OnShuttingDown()
@@ -1698,8 +1698,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             using (ObservablesContext db = ObservablesContext.CreateDefault())
                             {
-                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone();
-                                hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone();
+                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.Machine.ConfigurationGuid).Clone();
+                                hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid).Clone();
                             }
                         });
 
@@ -1795,7 +1795,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                 await Task.Factory.StartNew(() =>
                 {
-                    hw = adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
+                    hw = adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid);
                 });
 
                 foreach (var motorConfig in hw.HardwareMotors)