MS. RML Extensions. Add RMLExtension object with import/export RML.

3 files changed, 17 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 686d95ccc..321d4af04 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -237,7 +237,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             set { _RMLFilter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
         }
 
-        private async void OnFilterChanged()
+        public async void OnFilterChanged()
         {
             await LoadRmlExtentions();
         }
@@ -940,7 +940,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                             _allUsers.Add(model);
                         }
                     }
-                        
+                    
                     var q = (from c in db.Rmls.Where(x => x.Name.ToLower().Contains(filter))
                              join p in db.RmlsExtensions on c.Guid equals p.RmlsGuid into ps
                              from p in ps.DefaultIfEmpty()
@@ -953,7 +953,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                                  Manufacturer = x.RML.Manufacturer,
                                  Brand = x.RMLExtesion == null ? "" : (Brands.Where(y => y.Guid == x.RMLExtesion.YarnBrandGuid).Select(z => z.Name).FirstOrDefault()),
                                  LinearDensity = (int)x.RML.FiberSize,
-                                 CreatedBy = x.RMLExtesion == null ? "" : _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid).Name,
+                                 CreatedBy = (x.RMLExtesion == null || x.RMLExtesion.UsersGuid == null || null == _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid)) ? "" : _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid).Name,
                                  Created = x.RMLExtesion == null ? DateTime.Now : x.RMLExtesion.Created,
                                  LastUpdated = x.RMLExtesion == null ? DateTime.Now : x.RMLExtesion.LastUpdated,
                                  Status = x.RMLExtesion == null ? RMLExtensionStatus.New : x.RMLExtesion.RMLStatus,
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml
index 255fd80d1..14b2f737f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml
@@ -21,7 +21,7 @@
         <localconverters:BoolToDisplayStatusConverter x:Key="BoolToDisplayStatusConverter"/>
     </UserControl.Resources>
     
-    <Grid IsEnabled="{Binding IsFree}">
+    <Grid IsEnabled="{Binding IsFree}" IsVisibleChanged="RMLExtensionsView_IsVisibleChanged">
         <DockPanel Margin="100 100 100 50" MaxWidth="1500">
             <Grid DockPanel.Dock="Top">
                 <Image Source="../Images/threads.png" Width="300" Margin="10" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs
index 03bac4bbe..1b5a5872d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs
@@ -19,9 +19,22 @@ namespace Tango.MachineStudio.ThreadExtensions.Views
     /// </summary>
     public partial class RMLExtensionsView : UserControl
     {
+        private ViewModels.MainViewVM _vm {  get;set; }
         public RMLExtensionsView()
         {
             InitializeComponent();
+            _vm = (ViewModels.MainViewVM)this.DataContext;
+        }
+
+        private void RMLExtensionsView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((bool)e.NewValue)
+            {
+                if(_vm != null)
+                {
+                    _vm.OnFilterChanged();
+                }
+            }
         }
     }
 }