From a0e25846735104f09a18647220db59804977e73a Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 8 Apr 2018 17:48:58 +0300
Subject: Fixed issue with "Application Started" event.

Fixed issue with segment indexing after emb import.
---
 .../ViewModels/MainViewVM.cs                       |  2 +-
 .../EventLogging/DefaultEventLogger.cs             | 29 ++++++++++++++--------
 .../Tango.MachineStudio.UI/App.xaml.cs             |  6 -----
 .../ViewModels/LoadingViewVM.cs                    |  4 +++
 4 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

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 63994f592..7891f96b7 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
@@ -1752,7 +1752,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 segment.Length = totalLength;
                 segment.Name = "Embroidery Segment";
-                segment.SegmentIndex = vm.Paths.IndexOf(path) + 2;
+                segment.SegmentIndex = vm.Paths.IndexOf(path);
 
                 if (path.Brush is SolidColorBrush)
                 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
index 91aa049e9..f3ae1002b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
@@ -78,21 +78,28 @@ namespace Tango.MachineStudio.Common.EventLogging
         {
             if (!_isInitialized)
             {
-                _db = ObservablesContext.CreateDefault();
-                _db.Configuration.LazyLoadingEnabled = false;
+                try
+                {
+                    _db = ObservablesContext.CreateDefault();
+                    _db.Configuration.LazyLoadingEnabled = false;
 
-                _db.ActionTypes.ToList();
-                _db.EventTypesActions.ToList();
-                _db.EventTypesCategories.ToList();
-                _db.EventTypesGroups.ToList();
-                _db.EventTypes.ToList();
+                    _db.ActionTypes.ToList();
+                    _db.EventTypesActions.ToList();
+                    _db.EventTypesCategories.ToList();
+                    _db.EventTypesGroups.ToList();
+                    _db.EventTypes.ToList();
 
-                foreach (var type in _db.EventTypes)
+                    foreach (var type in _db.EventTypes)
+                    {
+                        _eventTypesGuids.Add((EventTypes)type.Code, type);
+                    }
+
+                    _isInitialized = true;
+                }
+                catch
                 {
-                    _eventTypesGuids.Add((EventTypes)type.Code, type);
+                    _isInitialized = false;
                 }
-
-                _isInitialized = true;
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 8b3233ab1..76c7b3e58 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -50,12 +50,6 @@ namespace Tango.MachineStudio.UI
             exceptionTrapper = new WpfGlobalExceptionTrapper();
             exceptionTrapper.Initialize(this);
             exceptionTrapper.ApplicationCrashed += ExceptionTrapper_ApplicationCrashed;
-
-            var eventLogger = ServiceLocator.Current.GetInstance<IEventLogger>();
-            if (eventLogger != null)
-            {
-                eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
-            }
         }
 
         #region Global Exception Trapping
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 5776cadc2..512341f7e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -14,6 +14,7 @@ using Tango.MachineStudio.Common.StudioApplication;
 using Tango.SharedUI;
 using Tango.BL;
 using Tango.MachineStudio.Common.EventLogging;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -66,6 +67,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                 try
                 {
                     ObservablesEntitiesAdapter.Instance.Initialize();
+
+                    _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
+
                     InvokeUI(() =>
                     {
                         _studioModuleLoader.LoadModules();
-- 
cgit v1.3.1