merge

1 files changed, 40 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 94c1ed802..28e488aae 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -159,6 +159,46 @@ namespace Tango.MachineStudio.Developer.Views
             e.Handled = true;
         }
 
+        private void ParameterizedEditor_GeneratingItems(object sender, SharedUI.Editors.ParameterizedEditor.GeneratingItemsEventArgs e)
+        {
+            var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+
+            List<ParameterItem> items = e.Result.ToList();
+
+            if (settings.ProcessParametersIndices.Count > 0)
+            {
+                items.Clear();
+
+                foreach (var item in settings.ProcessParametersIndices.OrderBy(x => x.Index))
+                {
+                    var p = e.Source.SingleOrDefault(x => x.Name == item.Name);
+
+                    if (p != null)
+                    {
+                        items.Add(p);
+                    }
+                }
+            }
+            else
+            {
+                ProcessParametersTable p = new ProcessParametersTable();
+                var pp = p.CreateParametersCollection(Core.ParameterItemMode.Binding);
+
+                foreach (var item in pp)
+                {
+                    settings.ProcessParametersIndices.Add(new ParameterIndex()
+                    {
+                        Index = pp.IndexOf(item),
+                        Name = item.Name
+                    });
+                }
+
+                settings.Save();
+            }
+
+            e.Result = items;
+        }
+
         private void OnProcessParameterDropped(object sender, DropEventArgs e)
         {
             ParameterItem draggedItem = e.Draggable.DataContext as ParameterItem;
@@ -281,10 +321,5 @@ namespace Tango.MachineStudio.Developer.Views
         {
             listStops.SelectedItem = (sender as ListBoxItem).DataContext;
         }
-
-        private void OnBrushStopColorSpace_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            _vm.OnBrushStopColorSpaceChanged((sender as ComboBox).DataContext as BrushStop);
-        }
     }
 }