Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

2 files changed, 11 insertions, 17 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs
index 7d05897d5..7d913299e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs
@@ -346,7 +346,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                 if(!String.IsNullOrEmpty(result.ErrorMessage))
                 {
-                    LogManager.Log(result.ErrorMessage, "Error occurred while trying to call GetLinearizationMeasurements.");
+                    //LogManager.Log(result.ErrorMessage, "Error occurred while trying to call GetLinearizationMeasurements.");
                 }
                 return result.InkPercentage.ToList();
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index c31c95800..229d62df7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -34,7 +34,6 @@ namespace Tango.MachineStudio.RML.ViewModels
         private IAuthenticationProvider _authentication;
         private IActionLogManager _actionLogManager;
         private RmlDTO _rmlBeforeSave;
-        private static object _syncLock = new object();
 
         private ObservablesContext _rmls_context;
         private ObservablesContext _active_context;
@@ -56,8 +55,6 @@ namespace Tango.MachineStudio.RML.ViewModels
             set
             {
                 _rmlssCollectionView = value;
-                BindingOperations.EnableCollectionSynchronization(_rmlssCollectionView, _syncLock);
-
                 RaisePropertyChangedAuto();
             }
         }
@@ -311,6 +308,15 @@ namespace Tango.MachineStudio.RML.ViewModels
             }
             RmlsCollectionView = CollectionViewSource.GetDefaultView(Rmls);
             RmlsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Rml.LastUpdated), ListSortDirection.Descending));
+            //RmlsCollectionView.Filter = new Predicate<object>(FilterCollection);
+           
+            RmlsCollectionView.Filter = (rml) =>
+            {
+                Rml r = rml as Rml;
+                return String.IsNullOrWhiteSpace(RMLFilter)
+                || r.Name.ToLower().Contains(RMLFilter.ToLower()) //Rml name
+                || (r.MediaMaterial != null && r.MediaMaterial.Name.ToLower().Contains(RMLFilter.ToLower()));
+            };
         }
 
         private async void LoadActiveRML(String guid)
@@ -683,19 +689,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         private void OnRMLFilterChanged()
         {
-            String filter = RMLFilter.ToLower();
-
-            RmlsCollectionView.Filter = (rml) =>
-            {
-                Rml r = rml as Rml;
-                return String.IsNullOrWhiteSpace(filter)
-                ||
-                r.Name.ToLower().Contains(filter) //Rml name
-                ||
-                (r.MediaMaterial != null && r.MediaMaterial.Name.ToLower().Contains(filter)) // Material name
-                ||
-                (r.Cct != null && r.Cct.FileName != null && r.Cct.FileName.ToString().Contains(filter)); //Cct.FileName
-            };
+            RmlsCollectionView.Refresh();
         }
 
         private void RemoveLiquidFactor(LiquidTypesRml liquidFactor)