From 94c57f750fd544bcffbf4df2a40c09f8a155a547 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 27 May 2020 20:00:35 +0300
Subject: Added common snippets.

---
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index f63cedcdc..6417e34f8 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -64,6 +64,7 @@ namespace Tango.Scripting.Editors
         private static bool _isLoadingCachedAssemblies;
         private static bool _isCacheAssembliesLoaded;
         private static object _loadUsingsLock = new object();
+        private static List<SnippetCompletionItem> snippets;
 
         public static event EventHandler<TangoProgressChangedEventArgs<int>> LoadingSymbolsProgress;
         public static event EventHandler LoadingSymbolsStarted;
@@ -171,6 +172,8 @@ namespace Tango.Scripting.Editors
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ScriptEditor), new FrameworkPropertyMetadata(typeof(ScriptEditor)));
 
+            snippets = new List<SnippetCompletionItem>();
+
             BlockedUsingsCache = new List<string>();
 
             if (KNOWN_TYPES_CACHE_FOLDER == null)
@@ -188,6 +191,61 @@ namespace Tango.Scripting.Editors
             _knownTypesCache = new Dictionary<Type, KnownType>();
             _cachedAssemblies = new List<CachedAssembly>();
             _cachedUsings = new List<CachedUsing>();
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "for",
+                Code = @"for (int i = 0; i < 10; i++)
+        {
+            
+        }"
+            });
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "while",
+                Code = @"while (true)
+        {
+            
+        }"
+            });
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "foreach",
+                Code = @"foreach (var item in items)
+        {
+            
+        }"
+            });
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "prop",
+                Code = @"public int MyProperty { get; set; }"
+            });
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "do",
+                Code = @"do
+        {
+            
+        } while (true)"
+            });
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "try",
+                Code = @"try
+        {
+                
+        }
+        catch (Exception ex)
+        {
+            
+        }"
+            });
         }
 
         /// <summary>
@@ -746,6 +804,11 @@ namespace Tango.Scripting.Editors
                     {
                         IList<ICompletionData> data = new List<ICompletionData>();
 
+                        foreach (var snippet in snippets)
+                        {
+                            data.Add(snippet);
+                        }
+
                         foreach (var type in _declaredTypes.Where(x => x.Name.StartsWith(word)))
                         {
                             if (type.Kind == TypeKind.Struct)
-- 
cgit v1.3.1


From 93f4cb963fa4ba040809779e60e64fb1161ea50d Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 5 Jul 2020 10:37:21 +0300
Subject: Several corrections

---
 .../Views/RemoteDesktopView.xaml                   |   4 +-
 .../Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs |   9 +-
 .../Dialogs/UserInputDialogViewVM.cs               |   1 +
 .../Modules/Tango.FSE.Stubs/IProcedureContext.cs   |   3 +-
 .../Modules/Tango.FSE.Stubs/ProcedureContext.cs    |  22 +++-
 .../Tango.FSE.Stubs/Resources/lib_template.csx     |   1 +
 .../Tango.FSE.Stubs/Resources/main_template.csx    |   1 +
 .../FSE/Modules/Tango.FSE.Stubs/Result.cs          |   6 +-
 .../Tango.FSE.Stubs/Tango.FSE.Procedures.csproj    |   4 +
 .../ViewModels/ProcedureRunnerViewVM.cs            | 145 +++++++++++++++++++++
 .../Views/ProcedureDesignerView.xaml               |   2 +-
 .../Views/ProcedureRunnerExecutionView.xaml        |   1 +
 .../ApplicationUpgradeGeneratedViewVM.cs           |  17 ++-
 .../ViewModels/FirmwareUpgradeGeneratedViewVM.cs   |  17 ++-
 .../ViewModels/FirmwareUpgradeViewVM.cs            |  25 ++++
 .../Views/ApplicationUpgradeGeneratedView.xaml     |   4 +-
 .../Views/ApplicationUpgradeView.xaml              |   2 +-
 .../Views/FirmwareUpgradeGeneratedView.xaml        |   4 +-
 .../Views/FirmwareUpgradeView.xaml                 |   9 +-
 .../RemoteUpgrade/RemoteUpgradeHandler.cs          |   3 +
 .../Tango.PPC.Jobs/ViewModels/MainViewVM.cs        |  21 ++-
 .../Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs |  14 ++
 .../Tango.Scripting.Editors/ScriptEditor.cs        |   4 +
 .../Tango.Transport/TransporterBase.cs             |   2 +-
 24 files changed, 286 insertions(+), 35 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml
index 46327eeae..95e4b4a52 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml
@@ -123,7 +123,7 @@
                                                             <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter>
                                                         </DataTrigger>
                                                         <DataTrigger Binding="{Binding RemoteDesktopProvider.IsWebRtcActive}" Value="True">
-                                                            <Setter Property="Text" Value="Remote desktop session is active using a fast communication channel."></Setter>
+                                                            <Setter Property="Text" Value="Remote desktop session is active using a P2P communication channel."></Setter>
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -159,7 +159,7 @@
 
                                         <Button IsEnabled="{Binding RemoteDesktopProvider.InSession}" Width="250" Margin="5" Style="{StaticResource FSE_Button_Polygon}" Content="Open Task Manager" Command="{Binding OpenTaskManagerCommand}" />
 
-                                        <CheckBox Margin="5" HorizontalAlignment="Center" IsEnabled="{Binding RemoteDesktopProvider.InSession,Converter={StaticResource BooleanInverseConverter}}" IsChecked="{Binding RemoteDesktopProvider.EnableWebRtc}">Enable fast communication channel</CheckBox>
+                                        <CheckBox Margin="5" HorizontalAlignment="Center" IsEnabled="{Binding RemoteDesktopProvider.InSession,Converter={StaticResource BooleanInverseConverter}}" IsChecked="{Binding RemoteDesktopProvider.EnableWebRtc}">Enable P2P communication channel</CheckBox>
                                     </UniformGrid>
                                 </StackPanel>
                             </Grid>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs
index 5dc17ed66..c16086d9f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -81,18 +82,22 @@ namespace Tango.FSE.Procedures.Dialogs
                     //Generate columns
                     foreach (var prop in model.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
                     {
+                        var att = prop.GetCustomAttribute<DescriptionAttribute>();
+
                         grid.Columns.Add(new DataGridTextColumn()
                         {
-                            Header = prop.Name,
+                            Header = att != null ? att.Description : prop.Name,
                             Binding = new Binding($"V{columnCount++}"),
                         });
                     }
 
                     foreach (var field in model.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
                     {
+                        var att = field.GetCustomAttribute<DescriptionAttribute>();
+
                         grid.Columns.Add(new DataGridTextColumn()
                         {
-                            Header = field.Name,
+                            Header = att != null ? att.Description : field.Name,
                             Binding = new Binding($"V{columnCount++}"),
                         });
                     }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs
index 738c71ca9..e8fc957d9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs
@@ -40,6 +40,7 @@ namespace Tango.FSE.Procedures.Dialogs
                 if (Model.GetType().IsValueTypeOrString())
                 {
                     Parameter p = new Parameter();
+                    p.Value = Model.ToStringSafe();
                     p.Name = "Value";
                     Parameters.Add(p);
                 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
index 84301896d..a142e183c 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
@@ -294,8 +294,9 @@ namespace Tango.FSE.Procedures
         /// <summary>
         /// Gets the latest diagnostics package.
         /// </summary>
+        /// <param name="waitForNext">Waits for a fresh package.</param>
         /// <returns></returns>
-        DiagnosticsPackage GetDiagnosticsPackage();
+        DiagnosticsPackage GetDiagnosticsPackage(bool waitForNext = false);
 
         /// <summary>
         /// Pauses the script execution for the specified time in milliseconds.
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
index 2ce26daa7..8724b12a5 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reactive.Concurrency;
@@ -31,6 +32,7 @@ namespace Tango.FSE.Procedures
         private IProcedureLogger _logger;
         private ProcedureProject _project;
         private Dictionary<String, ProcedureInput> _inputs;
+        private DiagnosticsFrame _lastDiagnosticsFrame;
 
         [TangoInject]
         private IMachineProvider MachineProvider { get; set; }
@@ -471,8 +473,26 @@ namespace Tango.FSE.Procedures
             WriteLine(line);
         }
 
-        public DiagnosticsPackage GetDiagnosticsPackage()
+        public DiagnosticsPackage GetDiagnosticsPackage(bool waitForNext = false)
         {
+            if (waitForNext)
+            {
+                Stopwatch watch = new Stopwatch();
+                watch.Start();
+
+                while (_lastDiagnosticsFrame == DiagnosticsProvider.CurrentFrame)
+                {
+                    Thread.Sleep(10);
+
+                    if (watch.Elapsed.TotalSeconds > 5)
+                    {
+                        throw new TimeoutException("Diagnostics package did not arrive within the given time of 5 seconds.");
+                    }
+                }
+            }
+
+            _lastDiagnosticsFrame = DiagnosticsProvider.CurrentFrame;
+
             return DiagnosticsProvider.CurrentFrame.ToPackage();
         }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
index 3b317dbad..0fcf7da88 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
index 8c17cf72f..4f0dd0922 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
index 3cd093f7f..ef63ae108 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,8 +14,11 @@ namespace Tango.FSE.Procedures
         public ResultType Type { get; set; }
         public String Name { get; set; }
         public Object Value { get; set; }
+
+        [JsonIgnore]
         public bool IsGraph { get; set; }
 
+        [JsonIgnore]
         public bool IsValueArray
         {
             get { return Value != null && typeof(IEnumerable).IsAssignableFrom(Value.GetType()) && Value.GetType() != typeof(String); }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
index b062266b3..79a5eb152 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
@@ -224,6 +224,10 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.CSV\Tango.CSV.csproj">
+      <Project>{58e8825f-0c96-449c-b320-1e82b0aa876b}</Project>
+      <Name>Tango.CSV</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Integration\Tango.Integration.csproj">
       <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
       <Name>Tango.Integration</Name>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
index cf54087ba..1c4fc18c9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
@@ -1,11 +1,15 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.Core;
 using Tango.Core.Commands;
+using Tango.CSV;
 using Tango.FSE.Common;
 using Tango.FSE.Procedures.Dialogs;
 using Tango.FSE.Procedures.Messages;
@@ -21,6 +25,52 @@ namespace Tango.FSE.Procedures.ViewModels
             ProcedureRunnerExecutionView
         }
 
+        private class CsvRow
+        {
+            public Object V0 { get; set; }
+            public Object V1 { get; set; }
+            public Object V2 { get; set; }
+            public Object V3 { get; set; }
+            public Object V4 { get; set; }
+            public Object V5 { get; set; }
+            public Object V6 { get; set; }
+            public Object V7 { get; set; }
+            public Object V8 { get; set; }
+            public Object V9 { get; set; }
+            public Object V10 { get; set; }
+            public Object V11 { get; set; }
+            public Object V12 { get; set; }
+            public Object V13 { get; set; }
+            public Object V14 { get; set; }
+            public Object V15 { get; set; }
+            public Object V16 { get; set; }
+            public Object V17 { get; set; }
+            public Object V18 { get; set; }
+            public Object V19 { get; set; }
+            public Object V20 { get; set; }
+        }
+
+        private class CsvColumn
+        {
+            public String Name { get; set; }
+            public String Description { get; set; }
+            public bool IsProperty { get; set; }
+            public PropertyInfo PropertyInfo { get; set; }
+            public FieldInfo FieldInfo { get; set; }
+
+            public Object GetValue(Object obj)
+            {
+                if (IsProperty)
+                {
+                    return PropertyInfo.GetValue(obj);
+                }
+                else
+                {
+                    return FieldInfo.GetValue(obj);
+                }
+            }
+        }
+
         private bool _requiresReloadingOfProjects;
 
         private RunnerView _selectedView;
@@ -104,6 +154,7 @@ namespace Tango.FSE.Procedures.ViewModels
         public RelayCommand StartProjectCommand { get; set; }
         public RelayCommand StopProjectCommand { get; set; }
         public RelayCommand<Result> DisplayResultGridCommand { get; set; }
+        public RelayCommand<Result> ExportResultGridCommand { get; set; }
 
         public ProcedureRunnerViewVM()
         {
@@ -112,6 +163,7 @@ namespace Tango.FSE.Procedures.ViewModels
             StartProjectCommand = new RelayCommand(StartProject, () => ProjectRunner != null && ProjectRunner.CanRun);
             StopProjectCommand = new RelayCommand(StopProject, () => ProjectRunner != null && ProjectRunner.IsRunning);
             DisplayResultGridCommand = new RelayCommand<Result>(DisplayResultGrid);
+            ExportResultGridCommand = new RelayCommand<Result>(ExportResultGrid);
 
             _requiresReloadingOfProjects = true;
             RegisterForMessage<ProcedureProjectPublishedOrSuppressed>((x) => _requiresReloadingOfProjects = true);
@@ -251,5 +303,98 @@ namespace Tango.FSE.Procedures.ViewModels
                 NotificationProvider.ShowDialog(vm);
             }
         }
+
+        private async void ExportResultGrid(Result result)
+        {
+            if (result != null && result.IsValueArray && (result.Value as IList).Count > 0)
+            {
+                var r = await StorageProvider.SaveFile("Export procedure result", "CSV Files|*.csv", result.Name + ".csv", ".csv");
+                if (r.Confirmed)
+                {
+                    using (NotificationProvider.PushTaskItem("Exporting csv file..."))
+                    {
+                        try
+                        {
+                            await Task.Factory.StartNew(() =>
+                                  {
+                                      List<Object> values = (result.Value as IEnumerable).Cast<Object>().ToList();
+
+                                      var model = values.First();
+
+                                      if (model.GetType().IsValueTypeOrString())
+                                      {
+                                          CsvFile<CsvRow> csvFile = new CsvFile<CsvRow>(new CsvDestination(r.SelectedItem), new CsvDefinition() { Columns = new List<String>() { "Values" } });
+
+                                          foreach (var value in values)
+                                          {
+                                              csvFile.Append(new CsvRow()
+                                              {
+                                                  V0 = value
+                                              });
+                                          }
+
+                                          csvFile.Dispose();
+                                      }
+                                      else
+                                      {
+                                          List<CsvColumn> columns = new List<CsvColumn>();
+
+                                          //prop columns
+                                          foreach (var prop in model.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                                          {
+                                              var att = prop.GetCustomAttribute<DescriptionAttribute>();
+                                              columns.Add(new CsvColumn()
+                                              {
+                                                  Name = prop.Name,
+                                                  Description = att != null ? att.Description : prop.Name,
+                                                  IsProperty = true,
+                                                  PropertyInfo = prop
+                                              });
+                                          }
+
+                                          //field columns
+                                          foreach (var field in model.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
+                                          {
+                                              var att = field.GetCustomAttribute<DescriptionAttribute>();
+                                              columns.Add(new CsvColumn()
+                                              {
+                                                  Name = field.Name,
+                                                  Description = att != null ? att.Description : field.Name,
+                                                  FieldInfo = field
+                                              });
+                                          }
+
+                                          CsvFile<CsvRow> csvFile = new CsvFile<CsvRow>(new CsvDestination(r.SelectedItem), new CsvDefinition() { Columns = columns.Select(x => x.Description).ToList() });
+
+                                          List<PropertyInfo> rowProps = typeof(CsvRow).GetProperties().ToList();
+
+                                          foreach (var value in values)
+                                          {
+                                              CsvRow row = new CsvRow();
+
+                                              for (int i = 0; i < columns.Count; i++)
+                                              {
+                                                  var column = columns[i];
+                                                  rowProps[i].SetValue(row, column.GetValue(value));
+                                              }
+
+                                              csvFile.Append(row);
+                                          }
+
+                                          csvFile.Dispose();
+                                      }
+                                  });
+
+                            await NotificationProvider.ShowSuccess("File exported successfully.");
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error exporting csv file.");
+                            await NotificationProvider.ShowError($"Error occurred while exporting the csv file.\n{ex.FlattenMessage()}");
+                        }
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
index b76b3af5d..26c1e19b8 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
@@ -234,7 +234,7 @@
                                                 <TextBox Background="{StaticResource FSE_PrimaryBackgroundBrush}" Padding="5" Text="{Binding Project.Name,UpdateSourceTrigger=PropertyChanged,NotifyOnValidationError=True,ValidatesOnDataErrors=True,ValidatesOnNotifyDataErrors=True}" Margin="0 2 0 0" Style="{StaticResource FSE_Rounded_Corners_TextBox}"></TextBox>
 
                                                 <TextBlock Foreground="{StaticResource FSE_GrayBrush}" Margin="2 15 0 0" FontSize="{StaticResource FSE_SmallFontSize}">Description</TextBlock>
-                                                <TextBox Text="{Binding Project.Description,UpdateSourceTrigger=PropertyChanged}" Margin="0 2 0 0" Style="{StaticResource FSE_Rounded_Corners_TextBox_Multiline}" MinHeight="100"></TextBox>
+                                                <TextBox Text="{Binding Project.Description,UpdateSourceTrigger=PropertyChanged}" Margin="0 2 0 0" Style="{StaticResource FSE_Rounded_Corners_TextBox_Multiline}" MinHeight="100" TextWrapping="Wrap"></TextBox>
                                             </StackPanel>
 
                                             <DockPanel Margin="0 20 0 0">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
index a85a3e024..1f682c033 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
@@ -149,6 +149,7 @@
                                                                     <Run Text="Values."></Run>
                                                                     </TextBlock>
                                                                     <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DisplayResultGridCommand}" CommandParameter="{Binding}" Height="22" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" BorderBrush="Transparent" Margin="0 -4 0 0">(Grid View)</Button>
+                                                                    <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ExportResultGridCommand}" CommandParameter="{Binding}" Height="22" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" Padding="0" BorderBrush="Transparent" Margin="0 -4 0 0">(Export To CSV)</Button>
                                                                 </StackPanel>
 
                                                                 <StackPanel Visibility="{Binding IsGraph,Converter={StaticResource BooleanToVisibilityConverter}}">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/ApplicationUpgradeGeneratedViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/ApplicationUpgradeGeneratedViewVM.cs
index f1737463d..003aebab0 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/ApplicationUpgradeGeneratedViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/ApplicationUpgradeGeneratedViewVM.cs
@@ -247,14 +247,17 @@ namespace Tango.FSE.Upgrade.ViewModels
             {
                 var abort = await NotificationProvider.ShowWarningQuestion("Are you sure you want to abort the upgrade operation?");
 
-                if (Handler.CanAbort)
+                if (Handler.Status == RemoteUpgradeHandlerStatus.Started)
                 {
-                    Handler.Abort();
-                }
-                else
-                {
-                    await NotificationProvider.ShowWarning("Cannot abort the operation at this stage.");
-                    return false;
+                    if (Handler.CanAbort)
+                    {
+                        Handler.Abort();
+                    }
+                    else
+                    {
+                        await NotificationProvider.ShowWarning("Cannot abort the operation at this stage.");
+                        return false;
+                    }
                 }
 
                 return abort;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs
index ec35a9581..57cd3aa43 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs
@@ -219,14 +219,17 @@ namespace Tango.FSE.Upgrade.ViewModels
             {
                 var abort = await NotificationProvider.ShowWarningQuestion("Are you sure you want to abort the upgrade operation?");
 
-                if (Handler.CanAbort)
+                if (Handler.Status == RemoteUpgradeHandlerStatus.Started)
                 {
-                    Handler.Abort();
-                }
-                else
-                {
-                    await NotificationProvider.ShowWarning("Cannot abort the operation at this stage.");
-                    return false;
+                    if (Handler.CanAbort)
+                    {
+                        Handler.Abort();
+                    }
+                    else
+                    {
+                        await NotificationProvider.ShowWarning("Cannot abort the operation at this stage.");
+                        return false;
+                    }
                 }
 
                 return abort;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeViewVM.cs
index 6a5ba78b1..ed434d92f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeViewVM.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -40,6 +41,14 @@ namespace Tango.FSE.Upgrade.ViewModels
             set { _existingTfpFileLocation = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        private String _existingTfpFileVersion;
+        public String ExistingTfpFileVersion
+        {
+            get { return _existingTfpFileVersion; }
+            set { _existingTfpFileVersion = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private RemoteUpgradeHandler _handler;
         public RemoteUpgradeHandler Handler
         {
@@ -77,6 +86,22 @@ namespace Tango.FSE.Upgrade.ViewModels
             var result = await StorageProvider.OpenFile("Select existing firmware package file", "Tango Firmware Package|*.tfp");
             if (result)
             {
+                try
+                {
+                    LogManager.Log("Validating firmware package file...");
+                    using (FileStream s = File.OpenRead(result.SelectedItem))
+                    {
+                        var package = MachineProvider.MachineOperator.GetFirmwarePackageInfo(s).Result;
+                        package.Validate();
+                        ExistingTfpFileVersion = package.GetMcuVersion().ToString();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    await NotificationProvider.ShowError($"Error loading the selected tfp file.\n{ex.FlattenMessage()}");
+                    return;
+                }
+
                 ExistingTfpFileLocation = result.SelectedItem;
             }
         }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeGeneratedView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeGeneratedView.xaml
index 3c775f3f3..c1f60d813 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeGeneratedView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeGeneratedView.xaml
@@ -69,7 +69,7 @@
                                 <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_LargeFontSize}">UPGRADE NOW</TextBlock>
                             </StackPanel>
                         </Button>
-                        <Button material:ButtonAssist.CornerRadius="25" Command="{Binding SaveTupFileCommand}" Visibility="{Binding ElementName=chkSaveToDisk,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="250" Height="50">
+                        <Button material:ButtonAssist.CornerRadius="25" Command="{Binding SaveTupFileCommand}" Visibility="{Binding ElementName=chkSaveToDisk,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="250" Height="50" VerticalAlignment="Bottom">
                             <StackPanel Orientation="Horizontal">
                                 <material:PackIcon Width="32" Height="28" Kind="ContentSaveEdit" />
                                 <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_LargeFontSize}">SAVE PACKAGE</TextBlock>
@@ -78,7 +78,7 @@
                     </Grid>
 
                     <StackPanel VerticalAlignment="Bottom" Margin="0 0 40 0">
-                        <TextBlock Text="{Binding Handler.Progress.Message}" ToolTip="{Binding Handler.Progress.Message}" TextTrimming="CharacterEllipsis" Style="{StaticResource FSE_HandlerStatusTextBlock}"></TextBlock>
+                        <TextBlock Text="{Binding Handler.Progress.Message}" TextWrapping="NoWrap" MaxHeight="110" TextTrimming="CharacterEllipsis" ToolTip="{Binding Handler.Progress.Message}" Style="{StaticResource FSE_HandlerStatusTextBlock}"></TextBlock>
                         <ProgressBar Margin="0 5 0 0" Minimum="0" Maximum="{Binding Handler.Progress.Maximum}" Value="{Binding Handler.Progress.Value}" IsIndeterminate="{Binding Handler.Progress.IsIndeterminate}"></ProgressBar>
                     </StackPanel>
                 </DockPanel>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeView.xaml
index 046259d75..3a1ab183d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/ApplicationUpgradeView.xaml
@@ -22,7 +22,7 @@
             </Style>
         </Grid.Style>
         <StackPanel>
-            <TextBlock FontSize="{StaticResource FSE_LargeFontSize}">Application Upgrade</TextBlock>
+            <TextBlock FontSize="{StaticResource FSE_LargeFontSize}">Full Upgrade</TextBlock>
 
             <TextBlock Margin="0 10 0 0" Foreground="{StaticResource FSE_GrayBrush}" LineHeight="20" Visibility="{Binding ResolutionService.IsHighResolution,Converter={StaticResource BooleanToVisibilityConverter}}">
                 <Run>You chose to perform a machine application and firmware upgrade.</Run>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeGeneratedView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeGeneratedView.xaml
index a8739b347..a9d6034fd 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeGeneratedView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeGeneratedView.xaml
@@ -52,7 +52,7 @@
             <StackPanel VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="1000">
                 <DockPanel>
                     <Grid DockPanel.Dock="Right" >
-                        <Button material:ButtonAssist.CornerRadius="25" Visibility="{Binding ElementName=chkUpgradeNow,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" Command="{Binding StartUpgradeCommand}" HorizontalAlignment="Right" Width="250" Height="50">
+                        <Button material:ButtonAssist.CornerRadius="25" Visibility="{Binding ElementName=chkUpgradeNow,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" Command="{Binding StartUpgradeCommand}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="250" Height="50">
                             <StackPanel Orientation="Horizontal">
                                 <material:PackIcon Width="32" Height="28" Kind="ClockFast" />
                                 <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_LargeFontSize}">UPGRADE NOW</TextBlock>
@@ -67,7 +67,7 @@
                     </Grid>
 
                     <StackPanel VerticalAlignment="Bottom" Margin="0 0 40 0">
-                        <TextBlock Text="{Binding Handler.Progress.Message}" Style="{StaticResource FSE_HandlerStatusTextBlock}"></TextBlock>
+                        <TextBlock Text="{Binding Handler.Progress.Message}" TextWrapping="NoWrap" MaxHeight="110" TextTrimming="CharacterEllipsis" ToolTip="{Binding Handler.Progress.Message}" Style="{StaticResource FSE_HandlerStatusTextBlock}"></TextBlock>
                         <ProgressBar Margin="0 5 0 0" Minimum="0" Maximum="{Binding Handler.Progress.Maximum}" Value="{Binding Handler.Progress.Value}" IsIndeterminate="{Binding Handler.Progress.IsIndeterminate}"></ProgressBar>
                     </StackPanel>
                 </DockPanel>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeView.xaml
index d105c5617..6aeb0fcb1 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Views/FirmwareUpgradeView.xaml
@@ -67,12 +67,17 @@
                     </DockPanel>
                 </RadioButton>
 
-                <StackPanel IsEnabled="{Binding ElementName=chkExisting,Path=IsChecked}" Margin="80 10 0 0" Width="380" HorizontalAlignment="Left">
+                <StackPanel IsEnabled="{Binding ElementName=chkExisting,Path=IsChecked}" Margin="80 10 0 0" HorizontalAlignment="Left">
                     <TextBlock>Select an existing .tfp file on your computer</TextBlock>
 
                     <DockPanel Margin="0 0 0 0">
+                        <DockPanel DockPanel.Dock="Right" Margin="0 0 0 0" Visibility="{Binding ExistingTfpFileLocation,Converter={StaticResource IsNullToVisibilityConverter}}">
+                            <TextBlock Margin="10 0 0 0" Foreground="{StaticResource FSE_PrimaryAccentBrush}" FontSize="{StaticResource FSE_SmallFontSize}" VerticalAlignment="Center">
+                                <Run>v</Run><Run Text="{Binding ExistingTfpFileVersion}"></Run>
+                            </TextBlock>
+                        </DockPanel>
                         <controls:IconButton ToolTip="Browse for .tfp file" Margin="5 0 0 0" DockPanel.Dock="Right" Icon="FolderOpenOutline" Width="38" Height="38" Command="{Binding SelectExistingTfpFileLocationCommand}" />
-                        <TextBox FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" IsReadOnly="True" Text="{Binding ExistingTfpFileLocation,Converter={StaticResource FilePathToFileNameConverter}}" VerticalContentAlignment="Bottom"></TextBox>
+                        <TextBox Width="350" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" IsReadOnly="True" Text="{Binding ExistingTfpFileLocation,Converter={StaticResource FilePathToFileNameConverter}}" VerticalContentAlignment="Bottom"></TextBox>
                     </DockPanel>
                 </StackPanel>
             </StackPanel>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/RemoteUpgrade/RemoteUpgradeHandler.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/RemoteUpgrade/RemoteUpgradeHandler.cs
index 85e48a045..e06c2f95b 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/RemoteUpgrade/RemoteUpgradeHandler.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/RemoteUpgrade/RemoteUpgradeHandler.cs
@@ -102,18 +102,21 @@ namespace Tango.FSE.Common.RemoteUpgrade
         {
             FailedException = exception;
             Status = RemoteUpgradeHandlerStatus.Failed;
+            CanAbort = true;
             _completionSource.SetException(exception);
         }
 
         internal void RaiseCompleted()
         {
             Status = RemoteUpgradeHandlerStatus.Completed;
+            CanAbort = true;
             _completionSource.SetResult(Status);
         }
 
         internal void RaiseAborted()
         {
             Status = RemoteUpgradeHandlerStatus.Aborted;
+            CanAbort = true;
             _completionSource.SetException(new OperationCanceledException("Remote upgrade operation aborted."));
         }
     }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
index 087e30be6..7869e6990 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
@@ -24,6 +24,7 @@ namespace Tango.PPC.Jobs.ViewModels
     public class MainViewVM : PPCViewModel
     {
         private NotificationItem _last_failed_job_notification;
+        private bool resuming;
 
         /// <summary>
         /// Called when the application has been started.
@@ -33,15 +34,14 @@ namespace Tango.PPC.Jobs.ViewModels
             MachineProvider.MachineOperator.PrintingCompleted += MachineOperator_PrintingCompleted;
             MachineProvider.MachineOperator.PrintingFailed += MachineOperator_PrintingFailed;
             MachineProvider.MachineOperator.ResumingJob += MachineOperator_ResumingJob;
+            MachineProvider.MachineOperator.PrintingStarted += MachineOperator_PrintingStarted;
         }
 
-        private void MachineOperator_ResumingJob(object sender, ResumingJobEventArgs e)
+        private void MachineOperator_PrintingStarted(object sender, PrintingEventArgs e)
         {
-            LogManager.Log($"Trying to resume job '{e.JobGuid}'...");
-
-            try
+            if (resuming)
             {
-                e.Approve();
+                resuming = false;
 
                 InvokeUI(() =>
                 {
@@ -54,6 +54,17 @@ namespace Tango.PPC.Jobs.ViewModels
                     }
                 });
             }
+        }
+
+        private void MachineOperator_ResumingJob(object sender, ResumingJobEventArgs e)
+        {
+            LogManager.Log($"Job resume request '{e.JobGuid}' approving...");
+
+            try
+            {
+                e.Approve();
+                resuming = true;
+            }
             catch (Exception ex)
             {
                 LogManager.Log(ex, "An error occurred while trying to resume the job.");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index 54a92aa5c..d4d78dac6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -609,6 +609,7 @@ namespace Tango.PPC.UI.ViewModels
                 {
                     _update_result = await MachineUpdateManager.UpdateFromTUP(request.RemoteTupFilePath, request.SetupFirmware, request.SetupFPGA);
                     LogManager.Log("Machine update from package completed.");
+                    stopReporting = true;
 
                     InvokeUI(() =>
                     {
@@ -624,6 +625,8 @@ namespace Tango.PPC.UI.ViewModels
                     {
                         NavigateTo(MachineUpdateView.UpdateFailedFromPackageView);
                     });
+
+                    throw ex;
                 }
 
                 await receiver.SendGenericResponse(new StartRemoteApplicationUpgradeResponse()
@@ -646,10 +649,13 @@ namespace Tango.PPC.UI.ViewModels
             }
             catch (Exception ex)
             {
+                stopReporting = true;
                 await receiver.SendErrorResponse(ex, token);
             }
             finally
             {
+                stopReporting = true;
+
                 try
                 {
                     File.Delete(request.RemoteTupFilePath);
@@ -707,6 +713,7 @@ namespace Tango.PPC.UI.ViewModels
                 try
                 {
                     await MachineUpdateManager.UpdateFromTFP(request.RemoteTfpFilePath);
+                    stopReporting = true;
                     LogManager.Log("Firmware upgrade from package completed.");
                     _update_result = new MachineUpdateResult()
                     {
@@ -720,6 +727,8 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 catch (Exception ex)
                 {
+                    stopReporting = true;
+
                     LogManager.Log(ex, "Firmware upgrade from package failed.");
                     FailedError = ex.FlattenMessage();
 
@@ -727,6 +736,8 @@ namespace Tango.PPC.UI.ViewModels
                     {
                         NavigateTo(MachineUpdateView.UpdateFailedFromPackageView);
                     });
+
+                    throw ex;
                 }
 
                 await receiver.SendGenericResponse(new StartRemoteFirmwareUpgradeResponse()
@@ -749,10 +760,13 @@ namespace Tango.PPC.UI.ViewModels
             }
             catch (Exception ex)
             {
+                stopReporting = true;
                 await receiver.SendErrorResponse(ex, token);
             }
             finally
             {
+                stopReporting = true;
+
                 try
                 {
                     File.Delete(request.RemoteTfpFilePath);
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 6417e34f8..3ceecae4b 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -1939,6 +1939,8 @@ namespace Tango.Scripting.Editors
                 currentLine = currentLine.Split('(')[currentLine.Split('(').Length - 2];
             }
 
+            currentLine = Regex.Replace(currentLine, "(?<=\")(.*?)(?=\")", string.Empty);
+
             var words = currentLine.Split(' ');
 
             if (words.Count() > 0 && (words.First() == "private" || words.First() == "public" || words.First() == "void"))
@@ -1951,6 +1953,8 @@ namespace Tango.Scripting.Editors
             if (expression != null)
             {
                 int parameterIndex = expression.Count(x => x == ',');
+
+                
                 expression = new string(expression.TakeWhile(x => x != '(').ToArray());
 
                 var tree = expression.Split('.').Select(x => x.Remove(@"\n|\r|\s|\t|\(|\)|\[|\]|<.*>")).ToList();
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index 81166ac2e..cba768fce 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -1201,7 +1201,7 @@ namespace Tango.Transport
             {
                 ErrorCode = ErrorCode.GeneralError,
                 Completed = true,
-                ErrorMessage = exception.Message
+                ErrorMessage = exception.FlattenMessage()
             });
         }
 
-- 
cgit v1.3.1


From 8f082608ed86c6027cb88539d40d005189fa1cf6 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 22 Jul 2020 01:51:21 +0300
Subject: Improved procedure designer. Added support for static variables.
 Added full results support for designer. Added BitmapResult. Added
 System.Windows.Forms / Drawing as default usings.

---
 .../Converters/BitmapToBitmapSourceConverter.cs    |  42 ++++++
 .../Modules/Tango.FSE.Stubs/IProcedureContext.cs   |  55 +++++++-
 .../Modules/Tango.FSE.Stubs/ProcedureContext.cs    |  37 ++++++
 .../Tango.FSE.Stubs/Resources/lib_template.csx     |   2 +
 .../Tango.FSE.Stubs/Resources/main_template.csx    |   2 +
 .../FSE/Modules/Tango.FSE.Stubs/Result.cs          |   3 +
 .../Tango.FSE.Stubs/Tango.FSE.Procedures.csproj    |   9 ++
 .../ViewModels/ProcedureDesignerViewVM.cs          |  32 +----
 .../ViewModels/ProcedureRunnerViewVM.cs            | 119 +----------------
 .../Tango.FSE.Stubs/ViewModels/ResultsViewVM.cs    | 141 +++++++++++++++++++++
 .../Views/ProcedureDesignerView.xaml               |  51 +-------
 .../Views/ProcedureRunnerExecutionView.xaml        |  53 +-------
 .../Modules/Tango.FSE.Stubs/Views/ResultsView.xaml |  75 +++++++++++
 .../Tango.FSE.Stubs/Views/ResultsView.xaml.cs      |  55 ++++++++
 .../Intellisense/KnownType.cs                      |   8 +-
 .../Tango.Scripting.Editors/ScriptEditor.cs        |  10 ++
 16 files changed, 453 insertions(+), 241 deletions(-)
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Converters/BitmapToBitmapSourceConverter.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ResultsViewVM.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Converters/BitmapToBitmapSourceConverter.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Converters/BitmapToBitmapSourceConverter.cs
new file mode 100644
index 000000000..34b00d23f
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Converters/BitmapToBitmapSourceConverter.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.FSE.Procedures.Converters
+{
+    public class BitmapToBitmapSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                Bitmap bitmap = value as Bitmap;
+
+                if (bitmap != null)
+                {
+                    var source = bitmap.ToBitmapSource();
+                    source.Freeze();
+                    bitmap.Dispose();
+                    return source;
+                }
+
+                return null;
+            }
+            catch (Exception ex)
+            {
+                Logging.LogManager.Default.Log(ex, "Could not convert the specified bitmap result to bitmap source.");
+                return null;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
index a142e183c..90bbc9911 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -36,7 +37,7 @@ namespace Tango.FSE.Procedures
         Result AddResult(ResultType type, String name, object value);
 
         /// <summary>
-        /// Adds the procedure graph result.
+        /// Adds a new procedure graph result.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <param name="name">The name.</param>
@@ -44,6 +45,30 @@ namespace Tango.FSE.Procedures
         /// <returns></returns>
         Result AddGraphResult(ResultType type, String name, IEnumerable<double> values);
 
+        /// <summary>
+        /// Adds a new procedure bitmap result.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="name">The name.</param>
+        /// <param name="bitmap">The bitmap.</param>
+        /// <returns></returns>
+        Result AddBitmapResult(ResultType type, String name, Bitmap bitmap);
+
+        /// <summary>
+        /// Creates a new bitmap.
+        /// </summary>
+        /// <param name="width">The bitmap width.</param>
+        /// <param name="height">The bitmap height.</param>
+        /// <returns></returns>
+        Bitmap CreateBitmap(int width, int height);
+
+        /// <summary>
+        /// Creates a new drawing context for the specified bitmap.
+        /// </summary>
+        /// <param name="bitmap">The bitmap.</param>
+        /// <returns></returns>
+        Graphics GetDrawingContext(Bitmap bitmap);
+
         /// <summary>
         /// Adds a new procedure result.
         /// </summary>
@@ -71,6 +96,14 @@ namespace Tango.FSE.Procedures
         /// <returns></returns>
         IMessage Send(String messageName, int? timeout = null, params Object[] args);
 
+        /// <summary>
+        /// Sends a request by name with optional comma separated arguments.
+        /// </summary>
+        /// <param name="messageName">Name of the message.</param>
+        /// <param name="args">The arguments separated by commas.</param>
+        /// <returns></returns>
+        IMessage Send(String messageName, params Object[] args);
+
         /// <summary>
         /// Sends a request by name with optional comma separated arguments.
         /// </summary>
@@ -81,6 +114,15 @@ namespace Tango.FSE.Procedures
         /// <returns></returns>
         T Send<T>(String messageName, int? timeout = null, params Object[] args) where T : class, IMessage;
 
+        /// <summary>
+        /// Sends a request by name with optional comma separated arguments.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="messageName">Name of the message.</param>
+        /// <param name="args">The arguments separated by commas.</param>
+        /// <returns></returns>
+        T Send<T>(String messageName, params Object[] args) where T : class, IMessage;
+
         /// <summary>
         /// Sends the specified message.
         /// </summary>
@@ -117,6 +159,15 @@ namespace Tango.FSE.Procedures
         /// <param name="args">The arguments.</param>
         void SendContinuous<T>(String messageName, Action<T> callback, int? timeout, params Object[] args) where T : class, IMessage;
 
+        /// <summary>
+        /// Sends a continuous message with optional comma separated arguments.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="messageName">Name of the message.</param>
+        /// <param name="callback">Callback for continuous responses.</param>
+        /// <param name="args">The arguments.</param>
+        void SendContinuous<T>(String messageName, Action<T> callback, params Object[] args) where T : class, IMessage;
+
         /// <summary>
         /// Writes the specified object string representation to the output window.
         /// </summary>
@@ -280,7 +331,7 @@ namespace Tango.FSE.Procedures
         /// <param name="extension">Extension filter (default "*.*").</param>
         /// <param name="defaultFileName">Optional default file name.</param>
         /// <returns></returns>
-        String RequestFileSave(String message, String extension = "*.*",String defaultFileName = null);
+        String RequestFileSave(String message, String extension = "*.*", String defaultFileName = null);
 
         /// <summary>
         /// Updates the procedure progress.
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
index 8724b12a5..5663e0443 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reactive.Concurrency;
@@ -107,11 +108,21 @@ namespace Tango.FSE.Procedures
             return Send(request as IMessage, timeout);
         }
 
+        public IMessage Send(string messageName, params object[] args)
+        {
+            return Send(messageName, null, args);
+        }
+
         public T Send<T>(string messageName, int? timeout = null, params object[] args) where T : class, IMessage
         {
             return Send(messageName, timeout, args) as T;
         }
 
+        public T Send<T>(string messageName, params object[] args) where T : class, IMessage
+        {
+            return Send<T>(messageName, null, args);
+        }
+
         public IMessage Send(IMessage message, int? timeout = null)
         {
             TimeSpan? timespan = null;
@@ -209,6 +220,11 @@ namespace Tango.FSE.Procedures
             SendContinuous<IMessage>(request, callback as Action<IMessage>, timeout);
         }
 
+        public void SendContinuous<T>(string messageName, Action<T> callback, params object[] args) where T : class, IMessage
+        {
+            SendContinuous<T>(messageName, callback, null, args);
+        }
+
         public void WriteLine(object obj)
         {
             String line = "null";
@@ -563,5 +579,26 @@ namespace Tango.FSE.Procedures
         }
 
         public event EventHandler<TangoProgressChangedEventArgs<double>> Progress;
+
+        public Result AddBitmapResult(ResultType type, String name, Bitmap bitmap)
+        {
+            return AddResult(new Result()
+            {
+                IsBitmap = true,
+                Name = name,
+                Type = type,
+                Value = bitmap
+            });
+        }
+
+        public Bitmap CreateBitmap(int width, int height)
+        {
+            return new Bitmap(width, height);
+        }
+
+        public Graphics GetDrawingContext(Bitmap bitmap)
+        {
+            return Graphics.FromImage(bitmap);
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
index 0fcf7da88..0588f3ba3 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
@@ -6,6 +6,8 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Drawing;
 using Google.Protobuf;
 using Tango.BL.Enumerations;
 using Tango.PMR.Stubs;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
index 4f0dd0922..90b432a2f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
@@ -6,6 +6,8 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Drawing;
 using Google.Protobuf;
 using Tango.BL.Enumerations;
 using Tango.PMR.Stubs;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
index ef63ae108..8b7724eca 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
@@ -18,6 +18,9 @@ namespace Tango.FSE.Procedures
         [JsonIgnore]
         public bool IsGraph { get; set; }
 
+        [JsonIgnore]
+        public bool IsBitmap { get; set; }
+
         [JsonIgnore]
         public bool IsValueArray
         {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
index 8ff4f771e..db05d9ebd 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
@@ -101,6 +101,7 @@
   <ItemGroup>
     <Compile Include="ArrayParsingStyle.cs" />
     <Compile Include="Contracts\IProcedureDesignerView.cs" />
+    <Compile Include="Converters\BitmapToBitmapSourceConverter.cs" />
     <Compile Include="CreateGroup.cs" />
     <Compile Include="CreateItem.cs" />
     <Compile Include="CSV\CsvColumn.cs" />
@@ -148,6 +149,7 @@
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModels\ProcedureDesignerViewVM.cs" />
     <Compile Include="ViewModels\ProcedureRunnerViewVM.cs" />
+    <Compile Include="ViewModels\ResultsViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
@@ -163,6 +165,9 @@
     <Compile Include="Views\ProcedureRunnerView.xaml.cs">
       <DependentUpon>ProcedureRunnerView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ResultsView.xaml.cs">
+      <DependentUpon>ResultsView.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -316,6 +321,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ResultsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\test_designer.png" />
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
index e20582352..b5d56f638 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
@@ -91,12 +91,7 @@ namespace Tango.FSE.Procedures.ViewModels
             set { _compilationErrors = value; RaisePropertyChangedAuto(); }
         }
 
-        private List<Result> _results;
-        public List<Result> Results
-        {
-            get { return _results; }
-            set { _results = value; RaisePropertyChangedAuto(); }
-        }
+        public ResultsViewVM ResultsViewVM { get; set; }
 
         public ObservableCollection<Script> OpenScripts { get; set; }
 
@@ -180,7 +175,6 @@ namespace Tango.FSE.Procedures.ViewModels
         public RelayCommand TogglePublishPanelCommand { get; set; }
         public RelayCommand<Script> RenameLibraryCommand { get; set; }
         public RelayCommand<CreateItem> CreateItemCommand { get; set; }
-        public RelayCommand<Result> DisplayResultGridCommand { get; set; }
 
         #endregion
 
@@ -191,7 +185,7 @@ namespace Tango.FSE.Procedures.ViewModels
             Status = "Ready";
 
             LoadedAssemblies = new ObservableCollection<Assembly>();
-            Results = new List<Result>();
+            ResultsViewVM = new ResultsViewVM();
             CompilationErrors = new List<CompilationError>();
             Logger = new TextController();
             ScriptEditor.LoadingSymbolsProgress += ScriptEditor_LoadingSymbolsProgress;
@@ -228,7 +222,6 @@ namespace Tango.FSE.Procedures.ViewModels
             TogglePublishPanelCommand = new RelayCommand(() => IsPublishPanelOpened = !IsPublishPanelOpened, () => CurrentUser.HasPermission(Permissions.FSE_PublishProcedureProjects));
             RenameLibraryCommand = new RelayCommand<Script>(RenameLibrary);
             CreateItemCommand = new RelayCommand<CreateItem>(AutoCreateItem);
-            DisplayResultGridCommand = new RelayCommand<Result>(DisplayResultGrid);
         }
 
         #endregion
@@ -421,18 +414,18 @@ namespace Tango.FSE.Procedures.ViewModels
                 if (await CompileProject())
                 {
                     SelectedToolWindow = ToolWindows.Output;
-                    Results = new List<Result>();
+                    ResultsViewVM.Results = new List<Result>();
                     Logger.Clear();
                     Logger.WriteLine("Running project...");
                     var context = new ProcedureContext(Project, this);
                     await ProjectRunner.Run(context);
 
-                    Results = context.Results.ToList();
+                    ResultsViewVM.Results = context.Results.ToList();
 
-                    if (Results.Count > 0)
+                    if (ResultsViewVM.Results.Count > 0)
                     {
                         Logger.WriteLine("Project ran to completion with procedure results:");
-                        Logger.WriteLine(Results.ToJsonString());
+                        Logger.WriteLine(ResultsViewVM.Results.ToJsonString());
                         SelectedToolWindow = ToolWindows.Results;
                     }
                 }
@@ -955,19 +948,6 @@ namespace Tango.FSE.Procedures.ViewModels
 
         #endregion
 
-        #region Results
-
-        private void DisplayResultGrid(Result result)
-        {
-            if (result != null)
-            {
-                ResultGridViewVM vm = new ResultGridViewVM(result);
-                NotificationProvider.ShowDialog(vm);
-            }
-        }
-
-        #endregion
-
         #region INavigationObjectReceiver
 
         public async void OnNavigatedToWithObject(NavigationObject obj)
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
index 9d845218e..da5ecf324 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
@@ -68,12 +68,7 @@ namespace Tango.FSE.Procedures.ViewModels
             get { return RunningProcedureProject != null && RunningProcedureProject.Inputs.Count > 0; }
         }
 
-        private List<Result> _results;
-        public List<Result> Results
-        {
-            get { return _results; }
-            set { _results = value; RaisePropertyChangedAuto(); }
-        }
+        public ResultsViewVM ResultsViewVM { get; set; }
 
         private String _status;
         public String Status
@@ -108,17 +103,15 @@ namespace Tango.FSE.Procedures.ViewModels
         public RelayCommand<PublishedProcedureProject> RunProjectCommand { get; set; }
         public RelayCommand StartProjectCommand { get; set; }
         public RelayCommand StopProjectCommand { get; set; }
-        public RelayCommand<Result> DisplayResultGridCommand { get; set; }
-        public RelayCommand<Result> ExportResultGridCommand { get; set; }
 
         public ProcedureRunnerViewVM()
         {
+            ResultsViewVM = new ResultsViewVM();
+
             EditProjectCommand = new RelayCommand<PublishedProcedureProject>(EditProject);
             RunProjectCommand = new RelayCommand<PublishedProcedureProject>(RunProject);
             StartProjectCommand = new RelayCommand(StartProject, () => ProjectRunner != null && ProjectRunner.CanRun);
             StopProjectCommand = new RelayCommand(StopProject, () => ProjectRunner != null && ProjectRunner.IsRunning);
-            DisplayResultGridCommand = new RelayCommand<Result>(DisplayResultGrid);
-            ExportResultGridCommand = new RelayCommand<Result>(ExportResultGrid);
 
             _requiresReloadingOfProjects = true;
             RegisterForMessage<ProcedureProjectPublishedOrSuppressed>((x) => _requiresReloadingOfProjects = true);
@@ -130,14 +123,14 @@ namespace Tango.FSE.Procedures.ViewModels
             {
                 IsRunning = true;
                 FailedError = null;
-                Results = new List<Result>();
+                ResultsViewVM.Results = new List<Result>();
                 Status = "Running...";
                 var context = new ProcedureContext(RunningProcedureProject, this);
                 ProcedureProgress = new TangoProgress<double>(null);
                 context.Progress += Context_Progress;
                 await ProjectRunner.Run(context);
                 Status = "Completed";
-                Results = context.Results.ToList();
+                ResultsViewVM.Results = context.Results.ToList();
             }
             catch (OperationCanceledException)
             {
@@ -249,107 +242,5 @@ namespace Tango.FSE.Procedures.ViewModels
         {
             //Do nothing
         }
-
-        private void DisplayResultGrid(Result result)
-        {
-            if (result != null)
-            {
-                ResultGridViewVM vm = new ResultGridViewVM(result);
-                NotificationProvider.ShowDialog(vm);
-            }
-        }
-
-        private async void ExportResultGrid(Result result)
-        {
-            if (result != null && result.IsValueArray && (result.Value as IList).Count > 0)
-            {
-                var r = await StorageProvider.SaveFile("Export procedure result", "CSV Files|*.csv", result.Name + ".csv", ".csv");
-                if (r.Confirmed)
-                {
-                    using (NotificationProvider.PushTaskItem("Exporting csv file..."))
-                    {
-                        try
-                        {
-                            await Task.Factory.StartNew(() =>
-                            {
-                                List<Object> values = (result.Value as IEnumerable).Cast<Object>().ToList();
-
-                                var model = values.First();
-
-                                if (model.GetType().IsValueTypeOrString())
-                                {
-                                    CsvFile<CsvRow> csvFile = new CsvFile<CsvRow>(new CsvDestination(r.SelectedItem), new CsvDefinition() { Columns = new List<String>() { "Values" } });
-
-                                    foreach (var value in values)
-                                    {
-                                        csvFile.Append(new CsvRow()
-                                        {
-                                            V0 = value
-                                        });
-                                    }
-
-                                    csvFile.Dispose();
-                                }
-                                else
-                                {
-                                    List<CsvColumn> columns = new List<CsvColumn>();
-
-                                    //prop columns
-                                    foreach (var prop in model.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
-                                    {
-                                        var att = prop.GetCustomAttribute<DescriptionAttribute>();
-                                        columns.Add(new CsvColumn()
-                                        {
-                                            Name = prop.Name,
-                                            Description = att != null ? att.Description : prop.Name,
-                                            IsProperty = true,
-                                            PropertyInfo = prop
-                                        });
-                                    }
-
-                                    //field columns
-                                    foreach (var field in model.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
-                                    {
-                                        var att = field.GetCustomAttribute<DescriptionAttribute>();
-                                        columns.Add(new CsvColumn()
-                                        {
-                                            Name = field.Name,
-                                            Description = att != null ? att.Description : field.Name,
-                                            FieldInfo = field
-                                        });
-                                    }
-
-                                    CsvFile<CsvRow> csvFile = new CsvFile<CsvRow>(new CsvDestination(r.SelectedItem), new CsvDefinition() { Columns = columns.Select(x => x.Description).ToList() });
-
-                                    List<PropertyInfo> rowProps = typeof(CsvRow).GetProperties().ToList();
-
-                                    foreach (var value in values)
-                                    {
-                                        CsvRow row = new CsvRow();
-
-                                        for (int i = 0; i < columns.Count; i++)
-                                        {
-                                            var column = columns[i];
-                                            rowProps[i].SetValue(row, column.GetValue(value));
-                                        }
-
-                                        csvFile.Append(row);
-                                    }
-
-                                    csvFile.Dispose();
-                                }
-                            });
-
-                            await NotificationProvider.ShowSuccess("File exported successfully.");
-                        }
-                        catch (Exception ex)
-                        {
-                            LogManager.Log(ex, "Error exporting csv file.");
-                            await NotificationProvider.ShowError($"Error occurred while exporting the csv file.\n{ex.FlattenMessage()}");
-                        }
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ResultsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ResultsViewVM.cs
new file mode 100644
index 000000000..2fa496fb7
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ResultsViewVM.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.Commands;
+using Tango.Core.DI;
+using Tango.CSV;
+using Tango.FSE.Common;
+using Tango.FSE.Procedures.CSV;
+using Tango.FSE.Procedures.Dialogs;
+
+namespace Tango.FSE.Procedures.ViewModels
+{
+    public class ResultsViewVM : FSEViewModel
+    {
+        private List<Result> _results;
+        public List<Result> Results
+        {
+            get { return _results; }
+            set { _results = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand<Result> DisplayResultGridCommand { get; set; }
+        public RelayCommand<Result> ExportResultGridCommand { get; set; }
+
+        public ResultsViewVM()
+        {
+            TangoIOC.Default.Inject(this);
+
+            Results = new List<Result>();
+            DisplayResultGridCommand = new RelayCommand<Result>(DisplayResultGrid);
+            ExportResultGridCommand = new RelayCommand<Result>(ExportResultGrid);
+        }
+
+        private void DisplayResultGrid(Result result)
+        {
+            if (result != null)
+            {
+                ResultGridViewVM vm = new ResultGridViewVM(result);
+                NotificationProvider.ShowDialog(vm);
+            }
+        }
+
+        private async void ExportResultGrid(Result result)
+        {
+            if (result != null && result.IsValueArray && (result.Value as IList).Count > 0)
+            {
+                var r = await StorageProvider.SaveFile("Export procedure result", "CSV Files|*.csv", result.Name + ".csv", ".csv");
+                if (r.Confirmed)
+                {
+                    using (NotificationProvider.PushTaskItem("Exporting csv file..."))
+                    {
+                        try
+                        {
+                            await Task.Factory.StartNew(() =>
+                            {
+                                List<Object> values = (result.Value as IEnumerable).Cast<Object>().ToList();
+
+                                var model = values.First();
+
+                                if (model.GetType().IsValueTypeOrString())
+                                {
+                                    CsvFile<CsvRow> csvFile = new CsvFile<CsvRow>(new CsvDestination(r.SelectedItem), new CsvDefinition() { Columns = new List<String>() { "Values" } });
+
+                                    foreach (var value in values)
+                                    {
+                                        csvFile.Append(new CsvRow()
+                                        {
+                                            V0 = value
+                                        });
+                                    }
+
+                                    csvFile.Dispose();
+                                }
+                                else
+                                {
+                                    List<CsvColumn> columns = new List<CsvColumn>();
+
+                                    //prop columns
+                                    foreach (var prop in model.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                                    {
+                                        var att = prop.GetCustomAttribute<DescriptionAttribute>();
+                                        columns.Add(new CsvColumn()
+                                        {
+                                            Name = prop.Name,
+                                            Description = att != null ? att.Description : prop.Name,
+                                            IsProperty = true,
+                                            PropertyInfo = prop
+                                        });
+                                    }
+
+                                    //field columns
+                                    foreach (var field in model.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
+                                    {
+                                        var att = field.GetCustomAttribute<DescriptionAttribute>();
+                                        columns.Add(new CsvColumn()
+                                        {
+                                            Name = field.Name,
+                                            Description = att != null ? att.Description : field.Name,
+                                            FieldInfo = field
+                                        });
+                                    }
+
+                                    CsvFile<CsvRow> csvFile = new CsvFile<CsvRow>(new CsvDestination(r.SelectedItem), new CsvDefinition() { Columns = columns.Select(x => x.Description).ToList() });
+
+                                    List<PropertyInfo> rowProps = typeof(CsvRow).GetProperties().ToList();
+
+                                    foreach (var value in values)
+                                    {
+                                        CsvRow row = new CsvRow();
+
+                                        for (int i = 0; i < columns.Count; i++)
+                                        {
+                                            var column = columns[i];
+                                            rowProps[i].SetValue(row, column.GetValue(value));
+                                        }
+
+                                        csvFile.Append(row);
+                                    }
+
+                                    csvFile.Dispose();
+                                }
+                            });
+
+                            await NotificationProvider.ShowSuccess("File exported successfully.");
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error exporting csv file.");
+                            await NotificationProvider.ShowError($"Error occurred while exporting the csv file.\n{ex.FlattenMessage()}");
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
index 26c1e19b8..51e966c9f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
@@ -549,7 +549,7 @@
                                     <TabItem.Header>
                                         <TextBlock>
                                             <Run>RESULTS</Run>
-                                            <Run>(</Run><Run Text="{Binding Results.Count,Mode=OneWay}"></Run><Run>)</Run>
+                                            <Run>(</Run><Run Text="{Binding ResultsViewVM.Results.Count,Mode=OneWay}"></Run><Run>)</Run>
                                         </TextBlock>
                                     </TabItem.Header>
                                     <DockPanel>
@@ -558,52 +558,9 @@
 
                                             <Rectangle VerticalAlignment="Bottom" Stroke="Black" StrokeThickness="2" />
                                         </Grid>
-                                        <DataGrid ItemsSource="{Binding Results}" Style="{StaticResource FSE_LogsGridStyle}" CellStyle="{StaticResource FSE_LogsGridCellStyle}" HorizontalGridLinesBrush="{StaticResource FSE_PrimaryBackgroundBrush}" AutoGenerateColumns="False">
-                                            <DataGrid.Columns>
-                                                <DataGridTemplateColumn Width="40">
-                                                    <DataGridTemplateColumn.CellTemplate>
-                                                        <DataTemplate>
-                                                            <material:PackIcon HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                                <material:PackIcon.Style>
-                                                                    <Style TargetType="material:PackIcon">
-                                                                        <Setter Property="Kind" Value="Check"></Setter>
-                                                                        <Setter Property="Foreground" Value="{StaticResource FSE_SuccessBrush}"></Setter>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding Type}" Value="Warning">
-                                                                                <Setter Property="Kind" Value="Alert"></Setter>
-                                                                                <Setter Property="Foreground" Value="{StaticResource FSE_WarningBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding Type}" Value="Failed">
-                                                                                <Setter Property="Kind" Value="Alert"></Setter>
-                                                                                <Setter Property="Foreground" Value="{StaticResource FSE_ErrorBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </material:PackIcon.Style>
-                                                            </material:PackIcon>
-                                                        </DataTemplate>
-                                                    </DataGridTemplateColumn.CellTemplate>
-                                                </DataGridTemplateColumn>
-                                                <DataGridTextColumn Header="NAME" Binding="{Binding Name}" />
-                                                <DataGridTemplateColumn Header="VALUE" Width="1*">
-                                                    <DataGridTemplateColumn.CellTemplate>
-                                                        <DataTemplate>
-                                                            <Grid>
-                                                                <TextBlock Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityInverseConverter}}" Text="{Binding Value}"></TextBlock>
-                                                                <StackPanel Orientation="Horizontal" Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                                    <TextBlock Foreground="{StaticResource FSE_GrayBrush}">
-                                                                    <Run>This procedure result contains</Run>
-                                                                    <Run Text="{Binding Value.Count,Mode=OneWay}"></Run>
-                                                                    <Run Text="Values."></Run>
-                                                                    </TextBlock>
-                                                                    <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DisplayResultGridCommand}" CommandParameter="{Binding}" Height="22" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" BorderBrush="Transparent" Margin="0 -4 0 0">(Grid View)</Button>
-                                                                </StackPanel>
-                                                            </Grid>
-                                                        </DataTemplate>
-                                                    </DataGridTemplateColumn.CellTemplate>
-                                                </DataGridTemplateColumn>
-                                            </DataGrid.Columns>
-                                        </DataGrid>
+                                        <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                                            <local:ResultsView HorizontalAlignment="Left" DataContext="{Binding ResultsViewVM}" />
+                                        </ScrollViewer>
                                     </DockPanel>
                                 </TabItem>
                             </TabControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
index 1f682c033..c47a2ac01 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
@@ -113,57 +113,8 @@
                                     <TextBlock FontSize="{StaticResource FSE_LargeFontSize}" FontWeight="SemiBold" Foreground="{StaticResource FSE_PrimaryAccentBrush}">Results</TextBlock>
                                     <!--<Rectangle Margin="0 2 0 0" Stroke="{StaticResource FSE_BorderBrush}" StrokeDashArray="5" />-->
                                 </StackPanel>
-                                <Grid>
-                                    <ItemsControl ItemsSource="{Binding Results}" HorizontalAlignment="Left" Margin="0 20 0 0">
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate>
-                                                <DockPanel Margin="10">
-                                                    <material:PackIcon HorizontalAlignment="Center" VerticalAlignment="Center" Width="42" Height="42">
-                                                        <material:PackIcon.Style>
-                                                            <Style TargetType="material:PackIcon">
-                                                                <Setter Property="Kind" Value="Check"></Setter>
-                                                                <Setter Property="Foreground" Value="{StaticResource FSE_SuccessBrush}"></Setter>
-                                                                <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding Type}" Value="Warning">
-                                                                        <Setter Property="Kind" Value="Alert"></Setter>
-                                                                        <Setter Property="Foreground" Value="{StaticResource FSE_WarningBrush}"></Setter>
-                                                                    </DataTrigger>
-                                                                    <DataTrigger Binding="{Binding Type}" Value="Failed">
-                                                                        <Setter Property="Kind" Value="Alert"></Setter>
-                                                                        <Setter Property="Foreground" Value="{StaticResource FSE_ErrorBrush}"></Setter>
-                                                                    </DataTrigger>
-                                                                </Style.Triggers>
-                                                            </Style>
-                                                        </material:PackIcon.Style>
-                                                    </material:PackIcon>
-                                                    <StackPanel Margin="15 0 0 0" VerticalAlignment="Center">
-                                                        <TextBlock Text="{Binding Name}" ></TextBlock>
-                                                        <Grid Margin="0 2 0 0">
-                                                            <TextBlock Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityInverseConverter}}" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}" Text="{Binding Value}"></TextBlock>
-
-                                                            <StackPanel Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                                <StackPanel Orientation="Horizontal">
-                                                                    <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}">
-                                                                    <Run>This procedure result contains</Run>
-                                                                    <Run Text="{Binding Value.Count,Mode=OneWay}"></Run>
-                                                                    <Run Text="Values."></Run>
-                                                                    </TextBlock>
-                                                                    <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DisplayResultGridCommand}" CommandParameter="{Binding}" Height="22" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" BorderBrush="Transparent" Margin="0 -4 0 0">(Grid View)</Button>
-                                                                    <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ExportResultGridCommand}" CommandParameter="{Binding}" Height="22" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" Padding="0" BorderBrush="Transparent" Margin="0 -4 0 0">(Export To CSV)</Button>
-                                                                </StackPanel>
-
-                                                                <StackPanel Visibility="{Binding IsGraph,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                                    <Border Margin="0 10 0 0"  Padding="10" Background="#303030" CornerRadius="5">
-                                                                        <graphs:RealTimeGraph Foreground="{StaticResource FSE_PrimaryForegroundBrush}" GridLinesBrush="#383838" BorderBrush="Transparent" Width="750" Height="250" Loaded="RealTimeGraph_Loaded" Style="{StaticResource FSE_RealTimeGraph_Result}" />
-                                                                    </Border>
-                                                                </StackPanel>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </StackPanel>
-                                                </DockPanel>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
+                                <Grid HorizontalAlignment="Left" Margin="0 20 0 0">
+                                    <local:ResultsView DataContext="{Binding ResultsViewVM}" />
                                 </Grid>
                             </StackPanel>
                         </StackPanel>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml
new file mode 100644
index 000000000..569b77820
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml
@@ -0,0 +1,75 @@
+<UserControl x:Class="Tango.FSE.Procedures.Views.ResultsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:global="clr-namespace:Tango.FSE.Procedures"
+             xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
+             xmlns:graphs="clr-namespace:Tango.FSE.Common.Graphs;assembly=Tango.FSE.Common"
+             xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:Tango.FSE.Procedures.Converters"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" d:DesignStyle="{StaticResource FSE_User_Control_Designer}" d:DataContext="{d:DesignInstance Type=vm:ResultsViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+
+    <UserControl.Resources>
+        <converters:BitmapToBitmapSourceConverter x:Key="BitmapToBitmapSourceConverter" />
+    </UserControl.Resources>
+
+    <Grid>
+        <ItemsControl ItemsSource="{Binding Results}">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <DockPanel Margin="10">
+                        <material:PackIcon HorizontalAlignment="Center" VerticalAlignment="Center" Width="42" Height="42">
+                            <material:PackIcon.Style>
+                                <Style TargetType="material:PackIcon">
+                                    <Setter Property="Kind" Value="Check"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource FSE_SuccessBrush}"></Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Type}" Value="Warning">
+                                            <Setter Property="Kind" Value="Alert"></Setter>
+                                            <Setter Property="Foreground" Value="{StaticResource FSE_WarningBrush}"></Setter>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding Type}" Value="Failed">
+                                            <Setter Property="Kind" Value="Alert"></Setter>
+                                            <Setter Property="Foreground" Value="{StaticResource FSE_ErrorBrush}"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </material:PackIcon.Style>
+                        </material:PackIcon>
+                        <StackPanel Margin="15 0 0 0" VerticalAlignment="Center">
+                            <TextBlock Text="{Binding Name}" ></TextBlock>
+                            <Grid Margin="0 2 0 0" Visibility="{Binding IsBitmap,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <TextBlock Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityInverseConverter}}" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}" Text="{Binding Value}"></TextBlock>
+
+                                <StackPanel Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}">
+                                                                    <Run>This procedure result contains</Run>
+                                                                    <Run Text="{Binding Value.Count,Mode=OneWay}"></Run>
+                                                                    <Run Text="Values."></Run>
+                                        </TextBlock>
+                                        <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DisplayResultGridCommand}" CommandParameter="{Binding}" Height="22" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" BorderBrush="Transparent" Margin="0 -4 0 0">(Grid View)</Button>
+                                        <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ExportResultGridCommand}" CommandParameter="{Binding}" Height="22" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Background="Transparent" Padding="0" BorderBrush="Transparent" Margin="0 -4 0 0">(Export To CSV)</Button>
+                                    </StackPanel>
+
+                                    <StackPanel Visibility="{Binding IsGraph,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <Border Margin="0 10 0 0"  Padding="10" Background="#303030" CornerRadius="5">
+                                            <graphs:RealTimeGraph Foreground="{StaticResource FSE_PrimaryForegroundBrush}" GridLinesBrush="#383838" BorderBrush="Transparent" Width="750" Height="250" Loaded="RealTimeGraph_Loaded" Style="{StaticResource FSE_RealTimeGraph_Result}" />
+                                        </Border>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+
+                            <Grid Margin="0 2 0 0" Visibility="{Binding IsBitmap,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <Image HorizontalAlignment="Left" Source="{Binding Value,Converter={StaticResource BitmapToBitmapSourceConverter}}" Stretch="None" />
+                            </Grid>
+                        </StackPanel>
+                    </DockPanel>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml.cs
new file mode 100644
index 000000000..d85b0eca8
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ResultsView.xaml.cs
@@ -0,0 +1,55 @@
+using RealTimeGraphX.DataPoints;
+using RealTimeGraphX.WPF;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.FSE.Common.Graphs;
+
+namespace Tango.FSE.Procedures.Views
+{
+    /// <summary>
+    /// Interaction logic for ResultsView.xaml
+    /// </summary>
+    public partial class ResultsView : UserControl
+    {
+        public ResultsView()
+        {
+            InitializeComponent();
+        }
+
+        private void RealTimeGraph_Loaded(object sender, RoutedEventArgs e)
+        {
+            RealTimeGraph graph = sender as RealTimeGraph;
+            Result result = graph.DataContext as Result;
+
+            if (result != null && result.IsGraph)
+            {
+                var values = (result.Value as IEnumerable<double>).ToList();
+
+                WpfGraphController<Int32DataPoint, DoubleDataPoint> controller = new WpfGraphController<Int32DataPoint, DoubleDataPoint>();
+                controller.Range.AutoY = false;
+                controller.Range.MinimumY = values.Min();
+                controller.Range.MaximumY = values.Max();
+                controller.Range.MaximumX = values.Count;
+
+                controller.DataSeriesCollection.Add(new WpfGraphDataSeries() { Stroke = Colors.DodgerBlue });
+                graph.Controller = controller;
+
+                controller.PushData(
+                    Enumerable.Range(0, values.Count).Select(x => new Int32DataPoint(x)),
+                    values.Select(x => new DoubleDataPoint(x)));
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
index 3dc465541..3dc796152 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -182,7 +183,12 @@ namespace Tango.Scripting.Editors.Intellisense
 
                 //Load Properties
                 {
-                    var properties = Type.GetProperties(BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.Instance).ToList();
+                    if (Type == typeof(Color))
+                    {
+
+                    }
+
+                    var properties = Type.GetProperties(BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static).ToList();
 
                     for (int i = 0; i < properties.Count; i++)
                     {
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 3ceecae4b..71a455f86 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -1114,6 +1114,11 @@ namespace Tango.Scripting.Editors
                             return knownType;
                         }
                     }
+                    else
+                    {
+                        //Maybe static...
+                        return _knownTypes.FirstOrDefault(x => x.Name == variableName);
+                    }
                 }
             }
 
@@ -1165,6 +1170,11 @@ namespace Tango.Scripting.Editors
                             return declaredType;
                         }
                     }
+                    else
+                    {
+                        //Maybe static...
+                        return _declaredTypes.FirstOrDefault(x => x.Name == variableName);
+                    }
                 }
             }
 
-- 
cgit v1.3.1


From 84b3861addbb2f60c8b45e74d2748d4de5c39d86 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 23 Jul 2020 22:07:44 +0300
Subject: Implemented find & replace. Improved symbols loading and
 highlighting. Implemented font +/-.

---
 .../Contracts/IProcedureDesignerView.cs            |   6 +
 .../Tango.FSE.Stubs/Resources/lib_template.csx     |   1 -
 .../Tango.FSE.Stubs/Resources/main_template.csx    |   1 -
 .../Tango.FSE.Procedures_wgi5baya_wpftmp.csproj    | 403 +++++++++++++++++++++
 .../ViewModels/ProcedureDesignerViewVM.cs          |  92 ++++-
 .../Views/ProcedureDesignerView.xaml               | 187 ++++++----
 .../Views/ProcedureDesignerView.xaml.cs            |  53 +++
 .../Highlighting/OffsetColorizer.cs                |   2 +-
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 218 ++++++++++-
 .../ExtensionMethods/StringExtensions.cs           |  10 +
 10 files changed, 901 insertions(+), 72 deletions(-)
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures_wgi5baya_wpftmp.csproj

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/IProcedureDesignerView.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/IProcedureDesignerView.cs
index eaa8562f8..4dfb62cb7 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/IProcedureDesignerView.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/IProcedureDesignerView.cs
@@ -13,5 +13,11 @@ namespace Tango.FSE.Procedures.Contracts
         void HighlightCode(int position, int length, int line);
         void InsertCode(String code);
         void InvalidateHighlighting();
+        void Find(String text);
+        void ReplaceNext(String text, String replace);
+        int ReplaceAll(String text, String replace);
+        void FocusCurrentEditor();
+        void ColorizeKeyword(String text);
+        void ResetColrization();
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
index 0588f3ba3..8690a23b4 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using System.Drawing;
 using Google.Protobuf;
 using Tango.BL.Enumerations;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
index 90b432a2f..6f564682f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using System.Drawing;
 using Google.Protobuf;
 using Tango.BL.Enumerations;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures_wgi5baya_wpftmp.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures_wgi5baya_wpftmp.csproj
new file mode 100644
index 000000000..5503559aa
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures_wgi5baya_wpftmp.csproj
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1754F846-4763-4000-807F-C7BFAA145DB2}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <RootNamespace>Tango.FSE.Procedures</RootNamespace>
+    <AssemblyName>Tango.FSE.Procedures</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\FSE\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\Build\FSE\Debug\Tango.FSE.Procedures.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\FSE\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\Build\FSE\Release\Tango.FSE.Procedures.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayParsingStyle.cs" />
+    <Compile Include="Contracts\IProcedureDesignerView.cs" />
+    <Compile Include="Converters\BitmapToBitmapSourceConverter.cs" />
+    <Compile Include="CreateGroup.cs" />
+    <Compile Include="CreateItem.cs" />
+    <Compile Include="CSV\CsvColumn.cs" />
+    <Compile Include="CSV\CsvRow.cs" />
+    <Compile Include="Designer\ProjectModel.cs" />
+    <Compile Include="Designer\ScriptTabModel.cs" />
+    <Compile Include="Dialogs\AddReferenceAssemblyView.xaml.cs">
+      <DependentUpon>AddReferenceAssemblyView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\AddReferenceAssemblyViewVM.cs" />
+    <Compile Include="Dialogs\LoadPublishedProjectView.xaml.cs">
+      <DependentUpon>LoadPublishedProjectView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\LoadPublishedProjectViewVM.cs" />
+    <Compile Include="Dialogs\ResultGridView.xaml.cs">
+      <DependentUpon>ResultGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\ResultGridViewVM.cs" />
+    <Compile Include="Dialogs\SaveFileDialogView.xaml.cs">
+      <DependentUpon>SaveFileDialogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\OpenFileDialogView.xaml.cs">
+      <DependentUpon>OpenFileDialogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\SaveFileDialogViewVM.cs" />
+    <Compile Include="Dialogs\OpenFileDialogViewVM.cs" />
+    <Compile Include="Dialogs\UserInputDialogView.xaml.cs">
+      <DependentUpon>UserInputDialogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\UserInputDialogViewVM.cs" />
+    <Compile Include="IProcedureContext.cs" />
+    <Compile Include="IProcedureLogger.cs" />
+    <Compile Include="Messages\ProcedureProjectPublishedOrSuppressed.cs" />
+    <Compile Include="ProjectRunner.cs" />
+    <Compile Include="ProjectRunnerState.cs" />
+    <Compile Include="Result.cs" />
+    <Compile Include="ResultType.cs" />
+    <Compile Include="ProcedureContext.cs" />
+    <Compile Include="ProcedureFailedException.cs" />
+    <Compile Include="ProcedureInput.cs" />
+    <Compile Include="ProcedureProject.cs" />
+    <Compile Include="UserInput.cs" />
+    <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ProceduresModule.cs" />
+    <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\ProcedureDesignerViewVM.cs" />
+    <Compile Include="ViewModels\ProcedureRunnerViewVM.cs" />
+    <Compile Include="ViewModels\ResultsViewVM.cs" />
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProcedureDesignerView.xaml.cs">
+      <DependentUpon>ProcedureDesignerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProcedureRunnerCatalogView.xaml.cs">
+      <DependentUpon>ProcedureRunnerCatalogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProcedureRunnerExecutionView.xaml.cs">
+      <DependentUpon>ProcedureRunnerExecutionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProcedureRunnerView.xaml.cs">
+      <DependentUpon>ProcedureRunnerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ResultsView.xaml.cs">
+      <DependentUpon>ResultsView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <None Include="Resources\lib_template.csx" />
+    <None Include="Resources\main_template.csx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Scripting\Tango.Scripting.Basic\Tango.Scripting.Basic.csproj">
+      <Project>{2b29a699-1d65-463a-8250-a2ce81d019c9}</Project>
+      <Name>Tango.Scripting.Basic</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripting\Tango.Scripting.Core\Tango.Scripting.Core.csproj">
+      <Project>{5812e1c6-abaa-4066-94ac-971c27b4f46a}</Project>
+      <Name>Tango.Scripting.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripting\Tango.Scripting.Editors\Tango.Scripting.Editors.csproj">
+      <Project>{da62fa39-668b-47a6-b0f2-d2c1daf777b0}</Project>
+      <Name>Tango.Scripting.Editors</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
+      <Project>{6b9774f7-960d-438e-ad81-c6b9be328d50}</Project>
+      <Name>RealTimeGraphX.WPF</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX\RealTimeGraphX.csproj">
+      <Project>{f13a489c-80ee-4cd0-bdd4-92d959215646}</Project>
+      <Name>RealTimeGraphX</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
+      <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
+      <Name>Tango.AutoComplete</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.CSV\Tango.CSV.csproj">
+      <Project>{58e8825f-0c96-449c-b320-1e82b0aa876b}</Project>
+      <Name>Tango.CSV</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Integration\Tango.Integration.csproj">
+      <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
+      <Name>Tango.Integration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.PMR\Tango.PMR.csproj">
+      <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
+      <Name>Tango.PMR</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
+      <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
+      <Name>Tango.SharedUI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj">
+      <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
+      <Name>Tango.Transport</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.FSE.BL\Tango.FSE.BL.csproj">
+      <Project>{834c81c3-09b5-45d7-be12-e7d1e6655a7c}</Project>
+      <Name>Tango.FSE.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.FSE.Common\Tango.FSE.Common.csproj">
+      <Project>{bc37cccb-7392-4f78-8d1c-e9629e6e046e}</Project>
+      <Name>Tango.FSE.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets'))" />
+  </Target>
+  <ItemGroup>
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\Microsoft.Win32.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netfx.force.conflicts.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationFramework.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\SideChains\RealTimeGraphX-master\RealTimeGraphX\bin\Debug\netstandard2.0\RealTimeGraphX.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\bin\Debug\RealTimeGraphX.WPF.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.AppContext.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.NonGeneric.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.Specialized.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.ComponentModel.DataAnnotations.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.TypeConverter.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Data.Common.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Process.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.TextWriterTraceListener.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.TraceSource.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Drawing.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Globalization.Calendars.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Globalization.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.Compression.ZipFile.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.DriveInfo.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.Watcher.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.IsolatedStorage.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.MemoryMappedFiles.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.Pipes.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.UnmanagedMemoryStream.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.NameResolution.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Ping.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Security.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Sockets.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.WebSockets.Client.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.WebSockets.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Resources.Reader.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Resources.Writer.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.CompilerServices.VisualC.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Formatters.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Claims.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Csp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.SecureString.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Overlapped.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.ThreadPool.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Windows.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XmlSerializer.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\SideChains\Tango.AutoComplete\bin\Debug\Tango.AutoComplete.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.BL.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.Core.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.CSV.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\FSE\Debug\Tango.FSE.BL.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\FSE\Debug\Tango.FSE.Common.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.Integration.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.Logging.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.PMR.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Scripting\Tango.Scripting.Basic\bin\Debug\Tango.Scripting.Basic.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Scripting\Tango.Scripting.Core\bin\Debug\Tango.Scripting.Core.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Scripting\Debug\Tango.Scripting.Editors.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.Settings.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.SharedUI.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.Transport.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.InteropServices.WindowsRuntime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Duplex.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Http.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.NetTcp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Security.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\App.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Dialogs\AddReferenceAssemblyView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Dialogs\LoadPublishedProjectView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Dialogs\ResultGridView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Dialogs\SaveFileDialogView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Dialogs\OpenFileDialogView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Dialogs\UserInputDialogView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Views\MainView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Views\ProcedureDesignerView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Views\ProcedureRunnerCatalogView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Views\ProcedureRunnerExecutionView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Views\ProcedureRunnerView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\Views\ResultsView.g.cs" />
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\FSE\Modules\Tango.FSE.Stubs\obj\Debug\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
index b5d56f638..96c554a07 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
@@ -99,7 +99,13 @@ namespace Tango.FSE.Procedures.ViewModels
         public Script SelectedScript
         {
             get { return _selectedScript; }
-            set { _selectedScript = value; RaisePropertyChangedAuto(); }
+            set
+            {
+                _selectedScript = value;
+                View?.ResetColrization();
+                DisplayFindAndReplace = false;
+                RaisePropertyChangedAuto();
+            }
         }
 
         public TextController Logger { get; set; }
@@ -146,6 +152,48 @@ namespace Tango.FSE.Procedures.ViewModels
             set { _createGroups = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _displayFindAndReplace;
+        public bool DisplayFindAndReplace
+        {
+            get { return _displayFindAndReplace; }
+            set { _displayFindAndReplace = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _findText;
+        public String FindText
+        {
+            get { return _findText; }
+            set
+            {
+                _findText = value;
+                RaisePropertyChangedAuto();
+                FindNextCommand?.RaiseCanExecuteChanged();
+                ReplaceCommand?.RaiseCanExecuteChanged();
+                ReplaceAllCommand?.RaiseCanExecuteChanged();
+                View?.ColorizeKeyword(value);
+            }
+        }
+
+        private String _replaceText;
+        public String ReplaceText
+        {
+            get { return _replaceText; }
+            set { _replaceText = value; RaisePropertyChangedAuto(); ReplaceCommand?.RaiseCanExecuteChanged(); ReplaceAllCommand?.RaiseCanExecuteChanged(); }
+        }
+
+        private double _fontSize;
+        public double FontSize
+        {
+            get { return _fontSize; }
+            set
+            {
+                if (value > 5 && value < 41)
+                {
+                    _fontSize = value;
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
 
         #endregion
 
@@ -175,6 +223,14 @@ namespace Tango.FSE.Procedures.ViewModels
         public RelayCommand TogglePublishPanelCommand { get; set; }
         public RelayCommand<Script> RenameLibraryCommand { get; set; }
         public RelayCommand<CreateItem> CreateItemCommand { get; set; }
+        public RelayCommand ShowFindAndReplaceCommand { get; set; }
+        public RelayCommand HideFindAndReplaceCommand { get; set; }
+        public RelayCommand FindNextCommand { get; set; }
+        public RelayCommand ReplaceCommand { get; set; }
+        public RelayCommand ReplaceAllCommand { get; set; }
+        public RelayCommand IncreaseFontSizeCommand { get; set; }
+        public RelayCommand DecreaseFontSizeCommand { get; set; }
+
 
         #endregion
 
@@ -184,6 +240,9 @@ namespace Tango.FSE.Procedures.ViewModels
         {
             Status = "Ready";
 
+            FontSize = 13;
+            ReplaceText = String.Empty;
+
             LoadedAssemblies = new ObservableCollection<Assembly>();
             ResultsViewVM = new ResultsViewVM();
             CompilationErrors = new List<CompilationError>();
@@ -222,6 +281,13 @@ namespace Tango.FSE.Procedures.ViewModels
             TogglePublishPanelCommand = new RelayCommand(() => IsPublishPanelOpened = !IsPublishPanelOpened, () => CurrentUser.HasPermission(Permissions.FSE_PublishProcedureProjects));
             RenameLibraryCommand = new RelayCommand<Script>(RenameLibrary);
             CreateItemCommand = new RelayCommand<CreateItem>(AutoCreateItem);
+            ShowFindAndReplaceCommand = new RelayCommand(() => { DisplayFindAndReplace = true; this.SetFocus(() => FindText); View.ColorizeKeyword(FindText); });
+            HideFindAndReplaceCommand = new RelayCommand(() => { DisplayFindAndReplace = false; View.FocusCurrentEditor(); View.ResetColrization(); });
+            FindNextCommand = new RelayCommand(FindNext,() => !String.IsNullOrEmpty(FindText));
+            ReplaceCommand = new RelayCommand(ReplaceNext, () => !String.IsNullOrEmpty(FindText));
+            ReplaceAllCommand = new RelayCommand(ReplaceAll, () => !String.IsNullOrEmpty(FindText));
+            IncreaseFontSizeCommand = new RelayCommand(() => FontSize++);
+            DecreaseFontSizeCommand = new RelayCommand(() => FontSize--);
         }
 
         #endregion
@@ -957,5 +1023,29 @@ namespace Tango.FSE.Procedures.ViewModels
         }
 
         #endregion
+
+        #region Find & Replace
+
+        private void FindNext()
+        {
+            View.Find(FindText);
+        }
+
+        private void ReplaceAll()
+        {
+            var count = View.ReplaceAll(FindText, ReplaceText);
+
+            if (count > 0)
+            {
+                NotificationProvider.ShowInfo($"{count} instances of the keyword were replaced.");
+            }
+        }
+
+        private void ReplaceNext()
+        {
+            View.ReplaceNext(FindText, ReplaceText);
+        }
+
+        #endregion
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
index 51e966c9f..44bd113ed 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
@@ -27,6 +27,10 @@
         <KeyBinding Modifiers="Ctrl" Key="N" Command="{Binding NewProjectCommand}" />
         <KeyBinding Modifiers="Ctrl" Key="O" Command="{Binding OpenProjectCommand}" />
         <KeyBinding Modifiers="Ctrl" Key="P" Command="{Binding TogglePublishPanelCommand}" />
+        <KeyBinding Modifiers="Ctrl" Key="F" Command="{Binding ShowFindAndReplaceCommand}" />
+        <KeyBinding Key="F3" Command="{Binding FindNextCommand}" />
+        <KeyBinding Modifiers="Ctrl" Key="OemPlus" Command="{Binding IncreaseFontSizeCommand}" />
+        <KeyBinding Modifiers="Ctrl" Key="OemMinus" Command="{Binding DecreaseFontSizeCommand}" />
     </UserControl.InputBindings>
 
     <Grid>
@@ -96,11 +100,32 @@
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
+                        <MenuItem Header="_Find &amp; Replace" InputGestureText="Ctrl+F" Command="{Binding ShowFindAndReplaceCommand}">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="FindReplace" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <Separator/>
                         <MenuItem Header="_Format Code" InputGestureText="Ctrl+K+D" Command="{Binding FormatCodeCommand}">
                             <MenuItem.Icon>
                                 <material:PackIcon Kind="FormatColumns" />
                             </MenuItem.Icon>
                         </MenuItem>
+                        <Separator/>
+                        <MenuItem>
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="FormatFont" />
+                            </MenuItem.Icon>
+                            <MenuItem.Header>
+                                <DockPanel>
+                                    <TextBlock VerticalAlignment="Center" Text="{Binding RelativeSource={RelativeSource AncestorType=Menu},Path=DataContext.FontSize}"/>
+                                    <UniformGrid VerticalAlignment="Center" HorizontalAlignment="Right" Columns="2" Margin="70 0 0 0">
+                                        <controls:IconButton Command="{Binding RelativeSource={RelativeSource AncestorType=Menu},Path=DataContext.DecreaseFontSizeCommand}" Cursor="Hand" ToolTip="Decrease Font Size (Ctrl-)" Width="24" Height="24" Icon="FormatFontSizeDecrease" Padding="0" />
+                                        <controls:IconButton Command="{Binding RelativeSource={RelativeSource AncestorType=Menu},Path=DataContext.IncreaseFontSizeCommand}" Cursor="Hand" ToolTip="Increase Font Size (Ctrl+)" Margin="10 0 0 0" Width="24" Height="24" Icon="FormatFontSizeIncrease" Padding="0" />
+                                    </UniformGrid>
+                                </DockPanel>
+                            </MenuItem.Header>
+                        </MenuItem>
                     </MenuItem>
                     <MenuItem Header="Debug">
                         <MenuItem Header="_Build" MinWidth="250" Command="{Binding CompileProjectCommand}" InputGestureText="F6" IsEnabled="{Binding ProjectRunner.CanCompile}">
@@ -368,76 +393,106 @@
                                     <Rectangle Grid.Column="2" VerticalAlignment="Bottom" StrokeThickness="2" Stroke="{StaticResource FSE_PrimaryAccentDarkBrush}" />
                                 </Grid>
 
-                                <ItemsControl x:Name="tabControl" Margin="0 0 0 0" ItemsSource="{Binding Project.Scripts}" BorderThickness="0" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <Grid/>
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                    <ItemsControl.ItemContainerStyle>
-                                        <Style TargetType="FrameworkElement">
-                                            <Setter Property="Visibility" Value="Hidden"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsSelected}" Value="True">
-                                                    <Setter Property="Visibility" Value="Visible"></Setter>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </ItemsControl.ItemContainerStyle>
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <editors:ScriptEditor 
+                                <Grid>
+                                    <ItemsControl x:Name="tabControl" Margin="0 0 0 0" ItemsSource="{Binding Project.Scripts}" BorderThickness="0" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <Grid/>
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                        <ItemsControl.ItemContainerStyle>
+                                            <Style TargetType="FrameworkElement">
+                                                <Setter Property="Visibility" Value="Hidden"></Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding IsSelected}" Value="True">
+                                                        <Setter Property="Visibility" Value="Visible"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ItemsControl.ItemContainerStyle>
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <editors:ScriptEditor 
                                             ReferenceAssemblies="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.LoadedAssemblies}" 
                                             AdditionalScripts="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Project.AdditionalScripts}"
+                                            FontSize="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.FontSize}"
                                             Code="{Binding Code,Mode=TwoWay}">
 
-                                                <editors:ScriptEditor.ContextMenu>
-                                                    <ContextMenu>
-                                                        <MenuItem Header="_Cut" Command="Cut">
-                                                            <MenuItem.Icon>
-                                                                <material:PackIcon Kind="ContentCut" />
-                                                            </MenuItem.Icon>
-                                                        </MenuItem>
-                                                        <MenuItem Header="_Copy" Command="Copy">
-                                                            <MenuItem.Icon>
-                                                                <material:PackIcon Kind="ContentCopy" />
-                                                            </MenuItem.Icon>
-                                                        </MenuItem>
-                                                        <MenuItem Header="_Paste" Command="Paste">
-                                                            <MenuItem.Icon>
-                                                                <material:PackIcon Kind="ContentPaste" />
-                                                            </MenuItem.Icon>
-                                                        </MenuItem>
-                                                        <Separator/>
-                                                        <MenuItem Header="_Format Code" InputGestureText="Ctrl+K+D" Command="{Binding Source={StaticResource proxy},Path=Data.FormatCodeCommand}">
-                                                            <MenuItem.Icon>
-                                                                <material:PackIcon Kind="FormatColumns" />
-                                                            </MenuItem.Icon>
-                                                        </MenuItem>
-                                                        <Separator/>
-                                                        <MenuItem Header="_Wizard" ItemsSource="{Binding Source={StaticResource proxy},Path=Data.CreateGroups}">
-                                                            <MenuItem.Icon>
-                                                                <material:PackIcon Kind="Wand" />
-                                                            </MenuItem.Icon>
-                                                            <MenuItem.ItemContainerStyle>
-                                                                <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
-                                                                    <Setter Property="Command" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CreateItemCommand}" />
-                                                                    <Setter Property="CommandParameter" Value="{Binding}"></Setter>
-                                                                </Style>
-                                                            </MenuItem.ItemContainerStyle>
-                                                            <MenuItem.ItemTemplate>
-                                                                <HierarchicalDataTemplate DataType="{x:Type global:CreateItem}" ItemsSource="{Binding Path=Items}">
-                                                                    <TextBlock Text="{Binding Name}"/>
-                                                                </HierarchicalDataTemplate>
-                                                            </MenuItem.ItemTemplate>
-                                                        </MenuItem>
-                                                    </ContextMenu>
-                                                </editors:ScriptEditor.ContextMenu>
-                                                
-                                            </editors:ScriptEditor>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                                    <editors:ScriptEditor.ContextMenu>
+                                                        <ContextMenu>
+                                                            <MenuItem Header="_Cut" Command="Cut">
+                                                                <MenuItem.Icon>
+                                                                    <material:PackIcon Kind="ContentCut" />
+                                                                </MenuItem.Icon>
+                                                            </MenuItem>
+                                                            <MenuItem Header="_Copy" Command="Copy">
+                                                                <MenuItem.Icon>
+                                                                    <material:PackIcon Kind="ContentCopy" />
+                                                                </MenuItem.Icon>
+                                                            </MenuItem>
+                                                            <MenuItem Header="_Paste" Command="Paste">
+                                                                <MenuItem.Icon>
+                                                                    <material:PackIcon Kind="ContentPaste" />
+                                                                </MenuItem.Icon>
+                                                            </MenuItem>
+                                                            <Separator/>
+                                                            <MenuItem Header="_Format Code" InputGestureText="Ctrl+K+D" Command="{Binding Source={StaticResource proxy},Path=Data.FormatCodeCommand}">
+                                                                <MenuItem.Icon>
+                                                                    <material:PackIcon Kind="FormatColumns" />
+                                                                </MenuItem.Icon>
+                                                            </MenuItem>
+                                                            <Separator/>
+                                                            <MenuItem Header="_Wizard" ItemsSource="{Binding Source={StaticResource proxy},Path=Data.CreateGroups}">
+                                                                <MenuItem.Icon>
+                                                                    <material:PackIcon Kind="Wand" />
+                                                                </MenuItem.Icon>
+                                                                <MenuItem.ItemContainerStyle>
+                                                                    <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
+                                                                        <Setter Property="Command" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CreateItemCommand}" />
+                                                                        <Setter Property="CommandParameter" Value="{Binding}"></Setter>
+                                                                    </Style>
+                                                                </MenuItem.ItemContainerStyle>
+                                                                <MenuItem.ItemTemplate>
+                                                                    <HierarchicalDataTemplate DataType="{x:Type global:CreateItem}" ItemsSource="{Binding Path=Items}">
+                                                                        <TextBlock Text="{Binding Name}"/>
+                                                                    </HierarchicalDataTemplate>
+                                                                </MenuItem.ItemTemplate>
+                                                            </MenuItem>
+                                                        </ContextMenu>
+                                                    </editors:ScriptEditor.ContextMenu>
+
+                                                </editors:ScriptEditor>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+
+                                    <Grid Visibility="{Binding DisplayFindAndReplace,Converter={StaticResource BooleanToVisibilityConverter}}" HorizontalAlignment="Right" VerticalAlignment="Top" MinWidth="400" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}">
+                                        <Border BorderBrush="{StaticResource FSE_BorderBrush}" BorderThickness="1 1 1 0">
+                                            <Border BorderThickness="0 0 0 2" Margin="-1 0 -1 0" BorderBrush="{StaticResource FSE_PrimaryAccentBrush}" Padding="5 5 5 10">
+                                                <StackPanel>
+                                                    <DockPanel VerticalAlignment="Top">
+                                                        <controls:ToggleIconButton x:Name="toggleReplace" Cursor="Hand" DockPanel.Dock="Left" Width="20" Height="20" CheckedIcon="ChevronUp" UncheckedIcon="ChevronDown" />
+                                                        <controls:IconButton Cursor="Hand" Icon="Close" ToolTip="Close" Command="{Binding HideFindAndReplaceCommand}" DockPanel.Dock="Right" Width="24" Height="24" Padding="2"  />
+                                                        <controls:IconButton Cursor="Hand" Margin="5 0 0 0" Icon="ArrowRight" ToolTip="Find Next" Command="{Binding FindNextCommand}" DockPanel.Dock="Right" Width="24" Height="24" Padding="2"  />
+                                                        <TextBox FontSize="{StaticResource FSE_SmallFontSize}" Margin="5 0 0 0" Style="{StaticResource FSE_Rounded_Corners_TextBox}" Text="{Binding FindText,UpdateSourceTrigger=PropertyChanged}">
+                                                            <TextBox.InputBindings>
+                                                                <KeyBinding Key="Return" Command="{Binding FindNextCommand}" />
+                                                                <KeyBinding Key="F3" Command="{Binding FindNextCommand}" />
+                                                                <KeyBinding Key="Esc" Command="{Binding HideFindAndReplaceCommand}" />
+                                                            </TextBox.InputBindings>
+                                                        </TextBox>
+                                                    </DockPanel>
+
+                                                    <DockPanel Margin="21 10 0 0" VerticalAlignment="Top" Visibility="{Binding ElementName=toggleReplace,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                        <controls:IconButton Cursor="Hand" Icon="FileReplace" ToolTip="Replace All" Command="{Binding ReplaceAllCommand}" DockPanel.Dock="Right" Width="24" Height="24" Padding="2"  />
+                                                        <controls:IconButton Cursor="Hand" Margin="5 0 0 0" Icon="FindReplace" ToolTip="Replace" Command="{Binding ReplaceCommand}" DockPanel.Dock="Right" Width="24" Height="24" Padding="2"  />
+                                                        <TextBox FontSize="{StaticResource FSE_SmallFontSize}" Margin="5 0 0 0" Style="{StaticResource FSE_Rounded_Corners_TextBox}" Text="{Binding ReplaceText,UpdateSourceTrigger=PropertyChanged}"/>
+                                                    </DockPanel>
+                                                </StackPanel>
+                                            </Border>
+                                        </Border>
+                                    </Grid>
+                                </Grid>
                             </DockPanel>
                         </Grid>
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml.cs
index a8c37cc10..d00413b25 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml.cs
@@ -44,6 +44,11 @@ namespace Tango.FSE.Procedures.Views
             return editor;
         }
 
+        private List<ScriptEditor> GetAllEditors()
+        {
+            return tabControl.FindVisualChildren<ScriptEditor>().ToList();
+        }
+
         public void FormatCode()
         {
             GetCurrentEditor()?.FormatCode();
@@ -69,5 +74,53 @@ namespace Tango.FSE.Procedures.Views
                 }
             }));
         }
+
+        public void Find(string text)
+        {
+            GetCurrentEditor()?.Find(text);
+        }
+
+        public void ReplaceNext(string text, string replace)
+        {
+            GetCurrentEditor()?.ReplaceNext(text, replace);
+            ColorizeKeyword(text);
+        }
+
+        public int ReplaceAll(string text, string replace)
+        {
+            var editor = GetCurrentEditor();
+
+            if (editor != null)
+            {
+                int count =  editor.ReplaceAll(text, replace);
+                ColorizeKeyword(text);
+                return count;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        public void FocusCurrentEditor()
+        {
+            var editor = GetCurrentEditor();
+
+            if (editor != null)
+            {
+                editor.Focus();
+                Keyboard.Focus(editor);
+            }
+        }
+
+        public void ColorizeKeyword(string text)
+        {
+            GetCurrentEditor()?.ColorizeByKeyword(text);
+        }
+
+        public void ResetColrization()
+        {
+            GetAllEditors().ForEach(x => x.ResetColorizationByKeyword());
+        }
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs
index a05d1fc75..72c27f9a9 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs
@@ -30,7 +30,7 @@ namespace Tango.Scripting.Editors.Highlighting
             {
                 try
                 {
-                    ChangeLinePart(StartOffset, EndOffset, element => element.TextRunProperties.SetForegroundBrush(Brush));
+                    ChangeLinePart(StartOffset, EndOffset, element => element.TextRunProperties.SetBackgroundBrush(Brush));
                 }
                 catch { }
             }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 71a455f86..7b5c38a2b 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -69,6 +69,7 @@ namespace Tango.Scripting.Editors
         public static event EventHandler<TangoProgressChangedEventArgs<int>> LoadingSymbolsProgress;
         public static event EventHandler LoadingSymbolsStarted;
         public static event EventHandler LoadingSymbolsCompleted;
+        private static event EventHandler KnownTypesAvailable;
 
         #region Mini Classes
 
@@ -161,6 +162,14 @@ namespace Tango.Scripting.Editors
         public static readonly DependencyProperty AdditionalScriptsProperty =
             DependencyProperty.Register("AdditionalScripts", typeof(ObservableCollection<IScriptSource>), typeof(ScriptEditor), new PropertyMetadata(null));
 
+        public Brush ColorizeBrush
+        {
+            get { return (Brush)GetValue(ColorizeBrushProperty); }
+            set { SetValue(ColorizeBrushProperty, value); }
+        }
+        public static readonly DependencyProperty ColorizeBrushProperty =
+            DependencyProperty.Register("ColorizeBrush", typeof(Brush), typeof(ScriptEditor), new PropertyMetadata(new SolidColorBrush(Colors.YellowGreen) { Opacity = 0.5 }));
+
         #endregion
 
         #region Constructors
@@ -266,6 +275,8 @@ namespace Tango.Scripting.Editors
             _knownTypes = new List<KnownType>();
             _parser = new ScriptParser();
 
+            KnownTypesAvailable += ScriptEditor_KnownTypesAvailable;
+
             TextArea.IndentationStrategy = new Indentation.CSharp.CSharpIndentationStrategy(Options);
             foldingStrategy = new BraceFoldingStrategy();
 
@@ -287,6 +298,14 @@ namespace Tango.Scripting.Editors
             TextChanged += ScriptEditor_TextChanged;
         }
 
+        private void ScriptEditor_KnownTypesAvailable(object sender, EventArgs e)
+        {
+            if (sender != this)
+            {
+                InvalidateHighlightingPartial();
+            }
+        }
+
         private bool preventCodeUpdate;
         private void ScriptEditor_TextChanged(object sender, EventArgs e)
         {
@@ -1357,7 +1376,7 @@ namespace Tango.Scripting.Editors
             return popup;
         }
 
-        public static void LoadUsingsSymbols(List<Assembly> assemblies, List<String> usings)
+        public void LoadUsingsSymbols(List<Assembly> assemblies, List<String> usings)
         {
             lock (_loadUsingsLock)
             {
@@ -1390,6 +1409,9 @@ namespace Tango.Scripting.Editors
                                 _knownTypesCache.Add(knownType.Type, knownType);
                             }
 
+                            KnownTypesAvailable?.Invoke(this, new EventArgs());
+                            InvalidateHighlightingPartial();
+
                             continue;
                         }
 
@@ -1575,6 +1597,100 @@ namespace Tango.Scripting.Editors
         //    _isLoadingCachedAssemblies = false;
         //}
 
+        private void InvalidateHighlightingPartial()
+        {
+            List<Assembly> assemblies = new List<Assembly>();
+            Dispatcher.Invoke(() =>
+            {
+                assemblies = ReferenceAssemblies.ToList();
+            });
+
+            var usings = _current_usings.ToList();
+
+            _knownTypes.Clear();
+
+            foreach (var knownType in _knownTypesCache.ToList().Select(x => x.Value).ToList())
+            {
+                if (usings.Exists(x => knownType.Type.Namespace == x) && assemblies.Exists(x => x == knownType.Type.Assembly))
+                {
+                    lock (_knownTypes)
+                    {
+                        _knownTypes.Add(knownType);
+                    }
+                }
+            }
+
+            if (_knownTypes.Count > 0 || _declaredTypes.Count > 0)
+            {
+                String text = String.Empty;
+
+                Stream xshd_stream = typeof(ScriptEditor).Assembly.GetManifestResourceStream("Tango.Scripting.Editors.Highlighting.Resources.CSharp-Mode.xshd");
+
+                using (StreamReader reader = new StreamReader(xshd_stream))
+                {
+                    text = reader.ReadToEnd();
+                }
+
+                List<String> referenceTypes = new List<string>();
+                List<String> interfaceTypes = new List<string>();
+
+                lock (_knownTypes)
+                {
+                    foreach (var type in _knownTypes.ToList().Where(x => x != null))
+                    {
+                        String name = type.Name;
+
+                        if (type.Type.ContainsGenericParameters)
+                        {
+                            name = new String(name.TakeWhile(x => x != '`').ToArray());
+                        }
+
+                        if (type.Type.IsInterface || type.Type.IsEnum)
+                        {
+                            interfaceTypes.Add(String.Format("<Word>{0}</Word>", name));
+                        }
+                        else if (type.Type.IsClass || (type.Type.IsValueType))
+                        {
+                            referenceTypes.Add(String.Format("<Word>{0}</Word>", name));
+                        }
+                    }
+                }
+
+                foreach (var type in _declaredTypes)
+                {
+                    if (type.Kind == TypeKind.Interface || type.Kind == TypeKind.Enum)
+                    {
+                        interfaceTypes.Add(String.Format("<Word>{0}</Word>", type.Name));
+                    }
+                    else if (type.Kind == TypeKind.Class)
+                    {
+                        referenceTypes.Add(String.Format("<Word>{0}</Word>", type.Name));
+                    }
+                }
+
+                if (referenceTypes.Count > 0)
+                {
+                    text = text.Replace("<Word>@ReferenceTypes@</Word>", String.Join(Environment.NewLine, referenceTypes.Distinct()));
+                }
+
+                if (interfaceTypes.Count > 0)
+                {
+                    text = text.Replace("<Word>@InterfaceTypes@</Word>", String.Join(Environment.NewLine, interfaceTypes.Distinct()));
+                }
+
+                MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(text));
+
+                XmlTextReader xshd_reader = new XmlTextReader(ms);
+
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    SyntaxHighlighting = HighlightingLoader.Load(xshd_reader, HighlightingManager.Instance);
+                    xshd_reader.Close();
+                    ms.Dispose();
+                }));
+            }
+        }
+
         public void InvalidateHighlighting(bool loadKnownTypes = true)
         {
             if (!_isLoadingTypes)
@@ -1964,7 +2080,7 @@ namespace Tango.Scripting.Editors
             {
                 int parameterIndex = expression.Count(x => x == ',');
 
-                
+
                 expression = new string(expression.TakeWhile(x => x != '(').ToArray());
 
                 var tree = expression.Split('.').Select(x => x.Remove(@"\n|\r|\s|\t|\(|\)|\[|\]|<.*>")).ToList();
@@ -2209,6 +2325,104 @@ namespace Tango.Scripting.Editors
             Document.Insert(TextArea.Caret.Offset, code);
         }
 
+        public int Find(String text)
+        {
+            if (String.IsNullOrEmpty(text)) return -1;
+
+            string txt = Document.Text;
+            int index = txt.IndexOf(text, TextArea.Caret.Offset);
+
+            if (index > -1)
+            {
+                Select(index, text.Length);
+                ScrollToLine(TextArea.Selection.StartPosition.Line);
+            }
+            else
+            {
+                index = txt.IndexOf(text, 0);
+
+                if (index > -1)
+                {
+                    Select(index, text.Length);
+                    ScrollToLine(TextArea.Selection.StartPosition.Line);
+                }
+                else
+                {
+                    Select(0, 0);
+                    System.Media.SystemSounds.Beep.Play();
+                }
+            }
+
+            return index;
+        }
+
+        public int ReplaceNext(String text, String replace)
+        {
+            if (String.IsNullOrEmpty(text)) return -1;
+
+            String selectedText = TextArea.Selection.GetText();
+
+            if (selectedText == text)
+            {
+                TextArea.Selection.ReplaceSelectionWithText(replace);
+            }
+
+            return Find(text);
+        }
+
+        public int ReplaceAll(String text, String replace)
+        {
+            int counter = 0;
+
+            Select(0, 0);
+
+            while (ReplaceNext(text, replace) > -1)
+            {
+                counter++;
+            };
+
+            return counter;
+        }
+
+        public void ColorizeByKeyword(String text)
+        {
+            ResetColorizationByKeyword();
+
+            if (String.IsNullOrEmpty(text)) return;
+
+            var txt = Document.Text;
+
+            var indexes = txt.AllIndexesOf(text).ToList();
+
+            foreach (var index in indexes)
+            {
+                Document.BeginUpdate();
+
+                var line = Document.GetLineByOffset(index);
+
+                OffsetColorizer colorizer = new OffsetColorizer(line, index, index + text.Length, ColorizeBrush);
+                TextArea.TextView.LineTransformers.Add(colorizer);
+
+                Document.EndUpdate();
+            }
+        }
+
+        public void ResetColorizationByKeyword()
+        {
+            Document.BeginUpdate();
+
+            for (int i = 0; i < TextArea.TextView.LineTransformers.Count; i++)
+            {
+                if (TextArea.TextView.LineTransformers[i] is OffsetColorizer)
+                {
+                    TextArea.TextView.LineTransformers.RemoveAt(i);
+                    i--;
+                }
+            }
+
+            Document.EndUpdate();
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs
index 4984c84db..ef17f0279 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs
@@ -250,4 +250,14 @@ public static class StringExtensions
             return new List<T>();
         }
     }
+
+    public static IEnumerable<int> AllIndexesOf(this string str, string searchstring)
+    {
+        int minIndex = str.IndexOf(searchstring);
+        while (minIndex != -1)
+        {
+            yield return minIndex;
+            minIndex = str.IndexOf(searchstring, minIndex + searchstring.Length);
+        }
+    }
 }
-- 
cgit v1.3.1


From 925bf377913f1003324d746b9e28e053186bfa29 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 27 Jul 2020 15:25:20 +0300
Subject: Procedures: Fixed issue with TextBox on DialogWindow. Fixed issue
 with multiple library linking. Implemented error checking. Many improvements.

---
 .../Contracts/IProcedureDesignerView.cs            |   2 +
 .../Tango.FSE.Procedures/DialogController.cs       |  31 +-
 .../Dialogs/ProcedureDialogEditorViewVM.cs         |  59 +++-
 .../Tango.FSE.Procedures/IProcedureContext.cs      |  22 +-
 .../Tango.FSE.Procedures/ProcedureContext.cs       |  16 +-
 .../Tango.FSE.Procedures/ProceduresSettings.cs     |  14 +
 .../Tango.FSE.Procedures.csproj                    |   8 +
 .../Tango.FSE.Procedures/Themes/Generic.xaml       |  14 +
 .../ViewModels/ProcedureDesignerViewVM.cs          |  63 +++-
 .../ViewModels/ResultsViewVM.cs                    |   6 +-
 .../Views/ProcedureDesignerView.xaml.cs            |  10 +
 .../Tango.FSE.Procedures/WindowController.cs       |  58 +++-
 .../Windows/ProcedureDialogWindow.xaml             |  61 ++++
 .../Windows/ProcedureDialogWindow.xaml.cs          |  98 ++++++
 .../FSE/Tango.FSE.Common/FSEViewModel.cs           |  16 +
 .../Scripting/Tango.Scripting.Basic/Project.cs     |   5 +-
 .../Tango.Scripting.Editors/Errors/ITextMarker.cs  | 169 ++++++++++
 .../Errors/TextMarkerService.cs                    | 365 +++++++++++++++++++++
 .../Tango.Scripting.Editors/ScriptEditor.cs        |  18 +
 .../Tango.Scripting.Editors.csproj                 |   2 +
 20 files changed, 989 insertions(+), 48 deletions(-)
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProceduresSettings.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/ITextMarker.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/TextMarkerService.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
index 4dfb62cb7..5797d622a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
@@ -19,5 +19,7 @@ namespace Tango.FSE.Procedures.Contracts
         void FocusCurrentEditor();
         void ColorizeKeyword(String text);
         void ResetColrization();
+        void HighlightError(int position, int length);
+        void ClearErrors();
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogController.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogController.cs
index 8d32f93c2..551b0d942 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogController.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogController.cs
@@ -75,21 +75,28 @@ namespace Tango.FSE.Procedures
 
         public T FindControl<T>(String name) where T : DependencyObject
         {
-            bool completed = false;
-            T child = null;
-
-            DispatcherProvider.Invoke(() => 
-            {
-                child = _rootElement.FindChild<T>(name) as T;
-                completed = true;
-            });
-
-            while (!completed)
+            if (Thread.CurrentThread == Application.Current.Dispatcher.Thread)
             {
-                Thread.Sleep(10);
+                return _rootElement.FindChild<T>(name) as T;
             }
+            else
+            {
+                bool completed = false;
+                T child = null;
+
+                DispatcherProvider.Invoke(() =>
+                {
+                    child = _rootElement.FindChild<T>(name) as T;
+                    completed = true;
+                });
 
-            return child;
+                while (!completed)
+                {
+                    Thread.Sleep(10);
+                }
+
+                return child;
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/ProcedureDialogEditorViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/ProcedureDialogEditorViewVM.cs
index 8c95df985..264f52127 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/ProcedureDialogEditorViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/ProcedureDialogEditorViewVM.cs
@@ -11,7 +11,11 @@ using System.Windows.Markup;
 using System.Xml;
 using System.Xml.Linq;
 using Tango.Core.Commands;
+using Tango.Core.DI;
 using Tango.FSE.Common;
+using Tango.FSE.Common.Notifications;
+using Tango.FSE.Common.Storage;
+using Tango.Settings;
 
 namespace Tango.FSE.Procedures.Dialogs
 {
@@ -19,6 +23,12 @@ namespace Tango.FSE.Procedures.Dialogs
     {
         private FileSystemWatcher _watcher;
 
+        [TangoInject]
+        private INotificationProvider NotificationProvider { get; set; }
+
+        [TangoInject]
+        private IStorageProvider StorageProvider { get; set; }
+
         private String _name;
         public String Name
         {
@@ -79,26 +89,49 @@ namespace Tango.FSE.Procedures.Dialogs
 
         public ProcedureDialogEditorViewVM()
         {
+            TangoIOC.Default.Inject(this);
             OpenInBlendCommand = new RelayCommand(OpenInBlend);
         }
 
-        private void OpenInBlend()
+        private async void OpenInBlend()
         {
-            if (this._watcher != null)
+            if (_watcher != null)
             {
                 return;
             }
 
-            String blendPath = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\Blend.exe";
+            var settings = SettingsManager.Default.GetOrCreate<ProceduresSettings>();
 
-            if (!File.Exists(blendPath))
+            String blendPath = settings.BlendPath;
+
+            if (String.IsNullOrWhiteSpace(blendPath) || !File.Exists(blendPath))
             {
-                blendPath = @"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\Blend.exe";
+                blendPath = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\Blend.exe";
+
+                if (!File.Exists(blendPath))
+                {
+                    blendPath = @"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\Blend.exe";
+                }
             }
 
             if (!File.Exists(blendPath))
             {
-                throw new FileNotFoundException("Could not locate Blend for Visual Studio location.");
+                if (await NotificationProvider.ShowWarningQuestion("Could not locate Blend for Visual Studio on your computer.\nDo you wish to manually browse for it on your hard drive?", "BROWSE", "CANCEL"))
+                {
+                    var r = await StorageProvider.OpenFile("Browse for Blend for Visual Studio", "Executables|*.exe");
+                    if (!r.Confirmed)
+                    {
+                        return;
+                    }
+
+                    settings.BlendPath = r.SelectedItem;
+                    settings.Save();
+                    blendPath = settings.BlendPath;
+                }
+                else
+                {
+                    return;
+                }
             }
 
             var tempFolder = TemporaryManager.CreateFolder();
@@ -154,24 +187,30 @@ namespace Tango.FSE.Procedures.Dialogs
 
             _watcher.EnableRaisingEvents = true;
 
-            Task.Factory.StartNew(() =>
+            await Task.Factory.StartNew(() =>
             {
                 var p = Process.Start(blendPath, Path.Combine(tempFolder, "ProcedureDialog.csproj"));
                 p.WaitForExit();
-                _watcher.Dispose();
+                ClearWatcher();
             });
         }
 
         protected override void Accept()
         {
-            _watcher?.Dispose();
+            ClearWatcher();
             base.Accept();
         }
 
         protected override void Cancel()
         {
-            _watcher?.Dispose();
+            ClearWatcher();
             base.Cancel();
         }
+
+        private void ClearWatcher()
+        {
+            _watcher?.Dispose();
+            _watcher = null;
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
index 4469ff9da..c304c05d0 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
@@ -91,7 +91,7 @@ namespace Tango.FSE.Procedures
         /// Sends a request by name with optional comma separated arguments.
         /// </summary>
         /// <param name="messageName">Name of the message.</param>
-        /// <param name="timeout">The timeout.</param>
+        /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
         IMessage Send(String messageName, int? timeout = null, params Object[] args);
@@ -109,7 +109,7 @@ namespace Tango.FSE.Procedures
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="messageName">Name of the message.</param>
-        /// <param name="timeout">The timeout.</param>
+        /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
         T Send<T>(String messageName, int? timeout = null, params Object[] args) where T : class, IMessage;
@@ -127,7 +127,7 @@ namespace Tango.FSE.Procedures
         /// Sends the specified message.
         /// </summary>
         /// <param name="message">The message.</param>
-        /// <param name="timeout">The timeout.</param>
+        /// <param name="timeout">The timeout in seconds.</param>
         /// <returns></returns>
         IMessage Send(IMessage message, int? timeout = null);
 
@@ -136,7 +136,7 @@ namespace Tango.FSE.Procedures
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="message">The message.</param>
-        /// <param name="timeout">The timeout.</param>
+        /// <param name="timeout">The timeout in seconds.</param>
         /// <returns></returns>
         T Send<T>(IMessage message, int? timeout = null) where T : class, IMessage;
 
@@ -146,7 +146,7 @@ namespace Tango.FSE.Procedures
         /// <typeparam name="T"></typeparam>
         /// <param name="message">The message.</param>
         /// <param name="callback">Callback for continuous responses.</param>
-        /// <param name="timeout">The timeout.</param>
+        /// <param name="timeout">The timeout in seconds.</param>
         void SendContinuous<T>(IMessage message, Action<T> callback, int? timeout) where T : class, IMessage;
 
         /// <summary>
@@ -155,7 +155,7 @@ namespace Tango.FSE.Procedures
         /// <typeparam name="T"></typeparam>
         /// <param name="messageName">Name of the message.</param>
         /// <param name="callback">Callback for continuous responses.</param>
-        /// <param name="timeout">The timeout.</param>
+        /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments.</param>
         void SendContinuous<T>(String messageName, Action<T> callback, int? timeout, params Object[] args) where T : class, IMessage;
 
@@ -363,12 +363,18 @@ namespace Tango.FSE.Procedures
         Thread RunAsync(Action action);
 
         /// <summary>
-        /// Loads the specified procedure dialog.
+        /// Loads the specified procedure dialog on the main UI thread.
         /// </summary>
         /// <param name="name">The name of the dialog file.</param>
         /// <returns></returns>
         IDialogController LoadDialog(String name);
 
-        IDialogController LoadDialogAsWindow(String name);
+        /// <summary>
+        /// Loads the specified procedure dialog as a window on the current thread.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="windowTitle">The window title</param>
+        /// <returns></returns>
+        IDialogController LoadDialogAsWindow(String name, String windowTitle);
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
index df314425c..f67749a92 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
@@ -564,7 +564,7 @@ namespace Tango.FSE.Procedures
 
         public IDialogController LoadDialog(string name)
         {
-            var dialog = _project.Dialogs.SingleOrDefault(x => x.Name == name);
+            var dialog = GetDialog(name);
             if (dialog == null)
             {
                 throw new FileNotFoundException($"The specified dialog '{name}' could not be found in the project.");
@@ -575,19 +575,25 @@ namespace Tango.FSE.Procedures
             return controller;
         }
 
-        public IDialogController LoadDialogAsWindow(string name)
+        public IDialogController LoadDialogAsWindow(string name, String windowTitle)
         {
-            var dialog = _project.Dialogs.SingleOrDefault(x => x.Name == name);
+            var dialog = GetDialog(name);
             if (dialog == null)
             {
                 throw new FileNotFoundException($"The specified dialog '{name}' could not be found in the project.");
             }
 
-            WindowController controller = new WindowController(dialog.Xaml);
+            WindowController controller = new WindowController(dialog.Xaml, windowTitle);
             controller.Init();
             return controller;
         }
 
+        private ProcedureDialog GetDialog(String name)
+        {
+            name = Path.GetFileNameWithoutExtension(name);
+            return _project.Dialogs.SingleOrDefault(x => x.Name.ToLower() == name.ToLower() + ".xaml");
+        }
+
         private void AutoInvoke(Task task)
         {
             bool completed = false;
@@ -599,7 +605,7 @@ namespace Tango.FSE.Procedures
                     completed = true;
                 });
 
-                DispatcherProvider.Invoke((Action)(async () => 
+                DispatcherProvider.Invoke((Action)(async () =>
                 {
                     await task;
                 }));
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProceduresSettings.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProceduresSettings.cs
new file mode 100644
index 000000000..0c885081f
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProceduresSettings.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Settings;
+
+namespace Tango.FSE.Procedures
+{
+    public class ProceduresSettings : SettingsBase
+    {
+        public String BlendPath { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
index 446ca7bde..f98771187 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
@@ -143,6 +143,7 @@
     <Compile Include="IProcedureLogger.cs" />
     <Compile Include="Messages\ProcedureProjectPublishedOrSuppressed.cs" />
     <Compile Include="ProcedureDialog.cs" />
+    <Compile Include="ProceduresSettings.cs" />
     <Compile Include="ProjectRunner.cs" />
     <Compile Include="ProjectRunnerState.cs" />
     <Compile Include="Result.cs" />
@@ -177,6 +178,9 @@
       <DependentUpon>ResultsView.xaml</DependentUpon>
     </Compile>
     <Compile Include="WindowController.cs" />
+    <Compile Include="Windows\ProcedureDialogWindow.xaml.cs">
+      <DependentUpon>ProcedureDialogWindow.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -339,6 +343,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Windows\ProcedureDialogWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\test_designer.png" />
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml
index 0aa4727c5..06e60997d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml
@@ -453,4 +453,18 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ProcedureWindowTextBoxStyle" TargetType="TextBox">
+        <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter>
+        <Setter Property="CaretBrush" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter>
+        <Setter Property="Background" Value="Transparent"></Setter>
+        <Setter Property="BorderBrush" Value="{StaticResource FSE_BorderBrush}"></Setter>
+        <Setter Property="BorderThickness" Value="0 0 0 1"></Setter>
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderBrush" Value="{StaticResource FSE_PrimaryAccentBrush}"></Setter>
+                <Setter Property="BorderThickness" Value="0 0 0 2"></Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
index 30e10fca5..859570b64 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
@@ -19,6 +19,7 @@ using Tango.Core.Commands;
 using Tango.Core.ExtensionMethods;
 using Tango.FSE.Common;
 using Tango.FSE.Common.Navigation;
+using Tango.FSE.Common.Notifications;
 using Tango.FSE.Procedures.Contracts;
 using Tango.FSE.Procedures.Dialogs;
 using Tango.FSE.Procedures.Messages;
@@ -293,6 +294,7 @@ namespace Tango.FSE.Procedures.ViewModels
             DecreaseFontSizeCommand = new RelayCommand(() => FontSize--);
             AddDialogCommand = new RelayCommand(AddProcedureDialog);
             EditDialogCommand = new RelayCommand<ProcedureDialog>(EditProcedureDialog);
+            RemoveDialogCommand = new RelayCommand<ProcedureDialog>(RemoveProcedureDialog);
         }
 
         #endregion
@@ -449,11 +451,22 @@ namespace Tango.FSE.Procedures.ViewModels
                 var result = await ProjectRunner.Compile();
                 CompilationErrors = result.Errors;
 
+                View.ClearErrors();
+
                 if (CompilationErrors.Count > 0)
                 {
                     Logger.WriteLine("Project compiled with errors.");
                     Status = "Project compiled with errors.";
                     SelectedToolWindow = ToolWindows.Errors;
+
+                    foreach (var error in CompilationErrors)
+                    {
+                        if (error.File == SelectedScript.Name)
+                        {
+                            View.HighlightError(error.Position, error.Length);
+                        }
+                    }
+
                     return false;
                 }
                 else
@@ -563,6 +576,19 @@ namespace Tango.FSE.Procedures.ViewModels
                 {
                     SelectedToolWindow = ToolWindows.Errors;
                 }
+
+                InvokeUI(() =>
+                {
+                    View.ClearErrors();
+
+                    foreach (var error in CompilationErrors)
+                    {
+                        if (error.File == SelectedScript.Name)
+                        {
+                            View.HighlightError(error.Position, error.Length);
+                        }
+                    }
+                });
             }
 
             _compileTimer.Start();
@@ -644,6 +670,8 @@ namespace Tango.FSE.Procedures.ViewModels
 
                     Status = "Project saved.";
 
+                    NotificationProvider.PushSnackbarItem(MessageType.Success, "Procedure project saved", false, $"Project '{Project.Name}' saved successfully.", TimeSpan.FromSeconds(1.5));
+
                     Project.Scripts.ToList().ForEach(x => x.IsChanged = false);
                     _isProjectChanged = false;
                 }
@@ -808,6 +836,12 @@ namespace Tango.FSE.Procedures.ViewModels
 
             if (result.Confirmed)
             {
+                if (Project.Scripts.Any(x => x != script && x.Name.ToLower() == result.Input.ToLower() + ".csx"))
+                {
+                    await NotificationProvider.ShowError($"The project already contains a file named '{result.Input}'.");
+                    return;
+                }
+
                 script.Name = result.Input + ".csx";
                 script.IsChanged = true;
             }
@@ -1060,13 +1094,19 @@ namespace Tango.FSE.Procedures.ViewModels
 
         private async void AddProcedureDialog()
         {
-            var result = await NotificationProvider.ShowInputBox("New Procedure Dialog", "Please specify the dialog name", PackIconKind.WindowRestore, "MyDialog.xaml", "Dialog Name", 30);
+            var result = await NotificationProvider.ShowInputBox("New Procedure Dialog", "Please specify the dialog name", PackIconKind.WindowRestore, $"Dialog{Project.Dialogs.Count + 1}", "Dialog Name", 30);
 
             if (result.Confirmed)
             {
+                if (Project.Dialogs.Any(x => x.Name.ToLower() == result.Input.ToLower() + ".xaml"))
+                {
+                    await NotificationProvider.ShowError($"The project already contains a dialog named '{result.Input}'.");
+                    return;
+                }
+
                 Project.Dialogs.Add(new ProcedureDialog()
                 {
-                    Name = result.Input,
+                    Name = result.Input + ".xaml",
                     Xaml = Properties.Resources.dialog_template
                 });
             }
@@ -1076,17 +1116,32 @@ namespace Tango.FSE.Procedures.ViewModels
         {
             var vm = await NotificationProvider.ShowDialog(new ProcedureDialogEditorViewVM()
             {
-                Name = dialog.Name,
+                Name = Path.GetFileNameWithoutExtension(dialog.Name),
                 Xaml = dialog.Xaml,
             });
 
             if (vm.DialogResult)
             {
-                dialog.Name = vm.Name;
+                if (Project.Dialogs.Any(x => x != dialog && x.Name.ToLower() == vm.Name.ToLower() + ".xaml"))
+                {
+                    await NotificationProvider.ShowError($"The project already contains a dialog named '{vm.Name}'.");
+                    return;
+                }
+
+                dialog.Name = vm.Name + ".xaml";
                 dialog.Xaml = vm.Xaml;
             }
         }
 
+        private async void RemoveProcedureDialog(ProcedureDialog dialog)
+        {
+            if (await NotificationProvider.ShowWarningQuestion($"Are you sure you want to delete '{dialog.Name}'?"))
+            {
+                Project.Dialogs.Remove(dialog);
+                _isProjectChanged = true;
+            }
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ResultsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ResultsViewVM.cs
index 2fa496fb7..dfad0017d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ResultsViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ResultsViewVM.cs
@@ -10,6 +10,7 @@ using Tango.Core.Commands;
 using Tango.Core.DI;
 using Tango.CSV;
 using Tango.FSE.Common;
+using Tango.FSE.Common.Notifications;
 using Tango.FSE.Procedures.CSV;
 using Tango.FSE.Procedures.Dialogs;
 
@@ -126,7 +127,10 @@ namespace Tango.FSE.Procedures.ViewModels
                                 }
                             });
 
-                            await NotificationProvider.ShowSuccess("File exported successfully.");
+                            NotificationProvider.PushSnackbarItem(MessageType.Success, "CSV file exported", true, "Procedure result was exported to file.\nTap to browse the file location.", TimeSpan.FromSeconds(5), null, () => 
+                            {
+                                StorageProvider.ShowInExplorer(r.SelectedItem);
+                            });
                         }
                         catch (Exception ex)
                         {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
index 8033656c4..ee21509b2 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
@@ -127,5 +127,15 @@ namespace Tango.FSE.Procedures.Views
         {
             _vm.EditProcedureDialog((sender as FrameworkElement).DataContext as ProcedureDialog);
         }
+
+        public void HighlightError(int position, int length)
+        {
+            GetCurrentEditor()?.HighlighError(position, length);
+        }
+
+        public void ClearErrors()
+        {
+            GetAllEditors().ForEach(x => x.ClearErrors());
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs
index f70ce3cfd..f0efc9b83 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs
@@ -10,9 +10,12 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
 using System.Windows.Markup;
+using System.Xml.Linq;
 using Tango.Core.DI;
 using Tango.FSE.Common.Notifications;
 using Tango.FSE.Common.Threading;
+using Tango.FSE.Common.WindowsManager;
+using Tango.FSE.Procedures.Windows;
 
 namespace Tango.FSE.Procedures
 {
@@ -24,7 +27,9 @@ namespace Tango.FSE.Procedures
 
         private String _xaml;
         private FrameworkElement _rootElement;
-        private Window _dialogWindow;
+        private ProcedureDialogWindow _dialogWindow;
+        private Thread _windowThread;
+        private String _title;
 
         [TangoInject]
         private IDispatcherProvider DispatcherProvider { get; set; }
@@ -37,30 +42,50 @@ namespace Tango.FSE.Procedures
             }
         }
 
-        internal WindowController(String xaml)
+        internal WindowController(String xaml, String title)
         {
             _xaml = xaml;
+            _title = title;
             TangoIOC.Default.Inject(this);
         }
 
         internal void Init()
         {
+            String xaml = _xaml;
+
+            XDocument doc = XDocument.Parse(xaml);
+            var textBoxes = doc.Descendants().Where(x => x.Name.LocalName == "TextBox").ToList();
+            textBoxes.ForEach(x => x.SetAttributeValue("Style", "{StaticResource ProcedureWindowTextBoxStyle}"));
+            xaml = doc.ToString();
+
             FrameworkElement rootElement;
             var stream = new MemoryStream();
             var writer = new StreamWriter(stream);
-            writer.Write(_xaml);
+            writer.Write(xaml);
             writer.Flush();
             stream.Position = 0;
             rootElement = (FrameworkElement)XamlReader.Load(stream);
             _rootElement = rootElement;
             stream.Dispose();
 
-            _dialogWindow = new Window();
-            _dialogWindow.Content = rootElement;
+            _dialogWindow = new ProcedureDialogWindow();
+            _dialogWindow.Width = _rootElement.Width;
+            _dialogWindow.Height = _rootElement.Height;
+            _dialogWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            _dialogWindow.Title = _title;
+            _dialogWindow.SetContent(rootElement);
+
+            //var textBoxesToRestore = rootElement.FindVisualChildren<TextBox>().ToList();
+            //textBoxesToRestore.ForEach(x => x.Style = null);
+
 
             var helper = new WindowInteropHelper(_dialogWindow);
             helper.EnsureHandle();
 
+            _windowThread = _dialogWindow.Dispatcher.Thread;
+
+            //System.Windows.Threading.Dispatcher.Run();
+
             //Make the main window as owner ? could be risky..
 
             //IntPtr mainWindowHanle = IntPtr.Zero;
@@ -80,7 +105,28 @@ namespace Tango.FSE.Procedures
 
         public T FindControl<T>(String name) where T : DependencyObject
         {
-            return _rootElement.FindChild<T>(name) as T;
+            if (Thread.CurrentThread == _windowThread)
+            {
+                return _rootElement.FindChild<T>(name) as T;
+            }
+            else
+            {
+                bool completed = false;
+                T child = null;
+
+                DispatcherProvider.Invoke(() =>
+                {
+                    child = _rootElement.FindChild<T>(name) as T;
+                    completed = true;
+                });
+
+                while (!completed)
+                {
+                    Thread.Sleep(10);
+                }
+
+                return child;
+            }
         }
 
         public void Close()
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml
new file mode 100644
index 000000000..58e29d055
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml
@@ -0,0 +1,61 @@
+<mahapps:MetroWindow x:Class="Tango.FSE.Procedures.Windows.ProcedureDialogWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+        xmlns:commonControls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common"
+        xmlns:local="clr-namespace:Tango.FSE.Procedures.Windows"
+        mc:Ignorable="d"
+        Title="Tango FSE" 
+        TextElement.Foreground="{StaticResource FSE_PrimaryForegroundBrush}"
+        Background="{StaticResource FSE_PrimaryBackgroundBrush}"
+        TextElement.FontSize="{StaticResource FSE_DefaultFontSize}"
+        TitleCharacterCasing="Normal"
+        UseNoneWindowStyle="True" 
+        EnableDWMDropShadow="True" 
+        BorderThickness="1" 
+        BorderBrush="Gray" 
+        FontFamily="{StaticResource flexo}" 
+        WindowTitleBrush="{StaticResource FSE_PrimaryBackgroundBrush}"
+        TitleForeground="{StaticResource FSE_PrimaryForegroundBrush}"
+        WindowTransitionsEnabled="False" d:DesignWidth="1000" d:DesignHeight="600">
+
+    <Grid>
+        <DockPanel>
+            <Grid Height="40" DockPanel.Dock="Top" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}">
+
+                <StackPanel Margin="5 0 0 0" HorizontalAlignment="Left"  Orientation="Horizontal">
+                    <Image Source="{StaticResource FSE_Machine_Full}" RenderOptions.BitmapScalingMode="Fant" Margin="8" />
+                    <TextBlock FontWeight="SemiBold" Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Title,FallbackValue='Tango FSE'}"></TextBlock>
+                </StackPanel>
+
+                <Image Source="{StaticResource FSE_Twine_Logo_Colored}" RenderOptions.BitmapScalingMode="Fant" HorizontalAlignment="Center" Margin="5"></Image>
+
+                <Polygon HorizontalAlignment="Right" Points="200,0 300,0 300,100 0,100" Width="250" Stretch="Fill">
+                    <Polygon.Fill>
+                        <ImageBrush Viewport="0 0 800 300" ViewportUnits="Absolute" ImageSource="{StaticResource FSE_Abstract}" Stretch="None" Opacity="0.6" />
+                    </Polygon.Fill>
+                </Polygon>
+            </Grid>
+            <Grid Margin="0,-2,0,2">
+                <Border x:Name="contentBorder" x:FieldModifier="public" BorderBrush="{StaticResource FSE_PrimaryBackgroundBrush}" BorderThickness="2">
+                    
+                </Border>
+
+                <Image IsHitTestVisible="False" Source="{StaticResource FSE_Shadow_Top}" VerticalAlignment="Top" Stretch="Fill" Height="10" Opacity="0.6" />
+            </Grid>
+        </DockPanel>
+
+        <Grid VerticalAlignment="Top" Height="40">
+            <DockPanel>
+                <UniformGrid DockPanel.Dock="Right" Columns="3" HorizontalAlignment="Right" Width="130">
+                    <commonControls:IconButton Padding="8" x:Name="btnMinimize" Icon="WindowMinimize" />
+                    <commonControls:IconButton Padding="8" x:Name="btnMaximize" Icon="WindowMaximize" />
+                    <commonControls:IconButton Padding="8" x:Name="btnClose" Icon="WindowClose" ToolTip="Close and attach to main application" />
+                </UniformGrid>
+                <Grid Background="Transparent" x:Name="gridTitle" Margin="0 0 0 0" Height="50" VerticalAlignment="Top"></Grid>
+            </DockPanel>
+        </Grid>
+    </Grid>
+</mahapps:MetroWindow>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml.cs
new file mode 100644
index 000000000..e3abad343
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Windows/ProcedureDialogWindow.xaml.cs
@@ -0,0 +1,98 @@
+using MahApps.Metro.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Tango.FSE.Procedures.Windows
+{
+    /// <summary>
+    /// Interaction logic for ChildWindow.xaml
+    /// </summary>
+    public partial class ProcedureDialogWindow : MetroWindow
+    {
+        private Point _startPoint;
+        private bool _isMouseDown;
+
+        public ProcedureDialogWindow()
+        {
+            InitializeComponent();
+
+            btnMinimize.Click += (_, __) => WindowState = WindowState.Minimized;
+            btnMaximize.Click += (_, __) => WindowState = WindowState == WindowState.Maximized ? WindowState = WindowState.Normal : WindowState = WindowState.Maximized;
+            btnClose.Click += (_, __) => Close();
+            gridTitle.MouseLeftButtonDown += (x, e) =>
+            {
+                Mouse.Capture(gridTitle);
+
+                _startPoint = e.GetPosition(this);
+
+                if (e.ClickCount > 1 && btnMaximize.IsEnabled)
+                {
+                    WindowState = WindowState == WindowState.Normal ? WindowState.Maximized : WindowState.Normal;
+                    return;
+                }
+
+                _isMouseDown = true;
+            };
+            gridTitle.MouseLeftButtonUp += (x, e) =>
+            {
+                _isMouseDown = false;
+                gridTitle.ReleaseMouseCapture();
+            };
+
+            gridTitle.MouseMove += GridTitle_MouseMove;
+            StateChanged += MainWindow_StateChanged;
+        }
+
+        private void MainWindow_StateChanged(object sender, EventArgs e)
+        {
+            if (WindowState == WindowState.Maximized)
+            {
+                btnMaximize.Icon = MaterialDesignThemes.Wpf.PackIconKind.WindowRestore;
+            }
+            else if (WindowState == WindowState.Normal)
+            {
+                btnMaximize.Icon = MaterialDesignThemes.Wpf.PackIconKind.WindowMaximize;
+            }
+        }
+
+        private void GridTitle_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (_isMouseDown)
+            {
+                if (WindowState == WindowState.Maximized)
+                {
+                    var previousWidth = Width;
+                    WindowState = WindowState.Normal;
+                    var currentWidth = Width;
+                    var locationPrecentageBefore = _startPoint.X / previousWidth;
+                    var newLocationX = currentWidth * locationPrecentageBefore;
+                    _startPoint = new Point(newLocationX, _startPoint.Y);
+                }
+                else
+                {
+                    Point pointToWindow = Mouse.GetPosition(this);
+                    Point pointToScreen = PointToScreen(pointToWindow);
+
+                    Left = pointToScreen.X - _startPoint.X;
+                    Top = pointToScreen.Y - _startPoint.Y;
+                }
+            }
+        }
+
+        public void SetContent(FrameworkElement element)
+        {
+            contentBorder.Child = element;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs
index 7dcfcb3c8..d6e3a5b52 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs
@@ -528,4 +528,20 @@ namespace Tango.FSE.Common
 
         }
     }
+
+    public abstract class FSEViewModelWithModuleSettings<TView,TSettings> : FSEViewModel<TView> where TView : IFSEView where TSettings : SettingsBase
+    {
+        /// <summary>
+        /// Gets or sets the module settings.
+        /// </summary>
+        public TSettings ModuleSettings { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FSEViewModelWithModuleSettings{T}"/> class.
+        /// </summary>
+        public FSEViewModelWithModuleSettings()
+        {
+            ModuleSettings = SettingsManager.Default.GetOrCreate<TSettings>();
+        }
+    }
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index 13ebda6bb..8ca64ca18 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -85,11 +85,12 @@ namespace Tango.Scripting.Basic
 
                     foreach (var file in Scripts.Where(x => !x.IsEntryPoint && script != x).Select(x => Path.Combine(tempFolder, x.Name)))
                     {
-                        loadingString = $"#load \"{file}\"\n";
+                        loadingString += $"#load \"{file}\"\n";
                         script.LoadCount++;
-                        script.LoadCharCount += loadingString.Length;
                     }
 
+                    script.LoadCharCount += loadingString.Length;
+
                     code = loadingString + code;
 
                     if (!script.IsEntryPoint)
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/ITextMarker.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/ITextMarker.cs
new file mode 100644
index 000000000..dcbf8388a
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/ITextMarker.cs
@@ -0,0 +1,169 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Tango.Scripting.Editors
+{
+	/// <summary>
+	/// Represents a text marker.
+	/// </summary>
+	public interface ITextMarker
+	{
+		/// <summary>
+		/// Gets the start offset of the marked text region.
+		/// </summary>
+		int StartOffset { get; }
+		
+		/// <summary>
+		/// Gets the end offset of the marked text region.
+		/// </summary>
+		int EndOffset { get; }
+		
+		/// <summary>
+		/// Gets the length of the marked region.
+		/// </summary>
+		int Length { get; }
+		
+		/// <summary>
+		/// Deletes the text marker.
+		/// </summary>
+		void Delete();
+		
+		/// <summary>
+		/// Gets whether the text marker was deleted.
+		/// </summary>
+		bool IsDeleted { get; }
+		
+		/// <summary>
+		/// Event that occurs when the text marker is deleted.
+		/// </summary>
+		event EventHandler Deleted;
+		
+		/// <summary>
+		/// Gets/Sets the background color.
+		/// </summary>
+		Color? BackgroundColor { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the foreground color.
+		/// </summary>
+		Color? ForegroundColor { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the font weight.
+		/// </summary>
+		FontWeight? FontWeight { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the font style.
+		/// </summary>
+		FontStyle? FontStyle { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the type of the marker. Use TextMarkerType.None for normal markers.
+		/// </summary>
+		TextMarkerTypes MarkerTypes { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the color of the marker.
+		/// </summary>
+		Color MarkerColor { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets an object with additional data for this text marker.
+		/// </summary>
+		object Tag { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets an object that will be displayed as tooltip in the text editor.
+		/// </summary>
+		/// <remarks>Not supported in this sample!</remarks>
+		object ToolTip { get; set; }
+	}
+	
+	[Flags]
+	public enum TextMarkerTypes
+	{
+		/// <summary>
+		/// Use no marker
+		/// </summary>
+		None = 0x0000,
+		/// <summary>
+		/// Use squiggly underline marker
+		/// </summary>
+		SquigglyUnderline = 0x001,
+		/// <summary>
+		/// Normal underline.
+		/// </summary>
+		NormalUnderline = 0x002,
+		/// <summary>
+		/// Dotted underline.
+		/// </summary>
+		DottedUnderline = 0x004,
+		
+		/// <summary>
+		/// Horizontal line in the scroll bar.
+		/// </summary>
+		LineInScrollBar = 0x0100,
+		/// <summary>
+		/// Small triangle in the scroll bar, pointing to the right.
+		/// </summary>
+		ScrollBarRightTriangle = 0x0400,
+		/// <summary>
+		/// Small triangle in the scroll bar, pointing to the left.
+		/// </summary>
+		ScrollBarLeftTriangle = 0x0800,
+		/// <summary>
+		/// Small circle in the scroll bar.
+		/// </summary>
+		CircleInScrollBar = 0x1000
+	}
+	
+	public interface ITextMarkerService
+	{
+		/// <summary>
+		/// Creates a new text marker. The text marker will be invisible at first,
+		/// you need to set one of the Color properties to make it visible.
+		/// </summary>
+		ITextMarker Create(int startOffset, int length);
+		
+		/// <summary>
+		/// Gets the list of text markers.
+		/// </summary>
+		IEnumerable<ITextMarker> TextMarkers { get; }
+		
+		/// <summary>
+		/// Removes the specified text marker.
+		/// </summary>
+		void Remove(ITextMarker marker);
+		
+		/// <summary>
+		/// Removes all text markers that match the condition.
+		/// </summary>
+		void RemoveAll(Predicate<ITextMarker> predicate);
+		
+		/// <summary>
+		/// Finds all text markers at the specified offset.
+		/// </summary>
+		IEnumerable<ITextMarker> GetMarkersAtOffset(int offset);
+	}
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/TextMarkerService.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/TextMarkerService.cs
new file mode 100644
index 000000000..2bb3d8e03
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Errors/TextMarkerService.cs
@@ -0,0 +1,365 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Threading;
+using Tango.Scripting.Editors.Document;
+using Tango.Scripting.Editors.Rendering;
+
+namespace Tango.Scripting.Editors
+{
+	/// <summary>
+	/// Handles the text markers for a code editor.
+	/// </summary>
+	public sealed class TextMarkerService : DocumentColorizingTransformer, IBackgroundRenderer, ITextMarkerService, ITextViewConnect
+	{
+		TextSegmentCollection<TextMarker> markers;
+		TextDocument document;
+		
+		public TextMarkerService(TextDocument document)
+		{
+			if (document == null)
+				throw new ArgumentNullException("document");
+			this.document = document;
+			this.markers = new TextSegmentCollection<TextMarker>(document);
+		}
+		
+		#region ITextMarkerService
+		public ITextMarker Create(int startOffset, int length)
+		{
+			if (markers == null)
+				throw new InvalidOperationException("Cannot create a marker when not attached to a document");
+			
+			int textLength = document.TextLength;
+			if (startOffset < 0 || startOffset > textLength)
+				throw new ArgumentOutOfRangeException("startOffset", startOffset, "Value must be between 0 and " + textLength);
+			if (length < 0 || startOffset + length > textLength)
+				throw new ArgumentOutOfRangeException("length", length, "length must not be negative and startOffset+length must not be after the end of the document");
+			
+			TextMarker m = new TextMarker(this, startOffset, length);
+			markers.Add(m);
+			// no need to mark segment for redraw: the text marker is invisible until a property is set
+			return m;
+		}
+		
+		public IEnumerable<ITextMarker> GetMarkersAtOffset(int offset)
+		{
+			if (markers == null)
+				return Enumerable.Empty<ITextMarker>();
+			else
+				return markers.FindSegmentsContaining(offset);
+		}
+		
+		public IEnumerable<ITextMarker> TextMarkers {
+			get { return markers ?? Enumerable.Empty<ITextMarker>(); }
+		}
+		
+		public void RemoveAll(Predicate<ITextMarker> predicate)
+		{
+			if (predicate == null)
+				throw new ArgumentNullException("predicate");
+			if (markers != null) {
+				foreach (TextMarker m in markers.ToArray()) {
+					if (predicate(m))
+						Remove(m);
+				}
+			}
+		}
+		
+		public void Remove(ITextMarker marker)
+		{
+			if (marker == null)
+				throw new ArgumentNullException("marker");
+			TextMarker m = marker as TextMarker;
+			if (markers != null && markers.Remove(m)) {
+				Redraw(m);
+				m.OnDeleted();
+			}
+		}
+		
+		/// <summary>
+		/// Redraws the specified text segment.
+		/// </summary>
+		internal void Redraw(ISegment segment)
+		{
+			foreach (var view in textViews) {
+				view.Redraw(segment, DispatcherPriority.Normal);
+			}
+			if (RedrawRequested != null)
+				RedrawRequested(this, EventArgs.Empty);
+		}
+		
+		public event EventHandler RedrawRequested;
+		#endregion
+		
+		#region DocumentColorizingTransformer
+		protected override void ColorizeLine(DocumentLine line)
+		{
+			if (markers == null)
+				return;
+			int lineStart = line.Offset;
+			int lineEnd = lineStart + line.Length;
+			foreach (TextMarker marker in markers.FindOverlappingSegments(lineStart, line.Length)) {
+				Brush foregroundBrush = null;
+				if (marker.ForegroundColor != null) {
+					foregroundBrush = new SolidColorBrush(marker.ForegroundColor.Value);
+					foregroundBrush.Freeze();
+				}
+				ChangeLinePart(
+					Math.Max(marker.StartOffset, lineStart),
+					Math.Min(marker.EndOffset, lineEnd),
+					element => {
+						if (foregroundBrush != null) {
+							element.TextRunProperties.SetForegroundBrush(foregroundBrush);
+						}
+						Typeface tf = element.TextRunProperties.Typeface;
+						element.TextRunProperties.SetTypeface(new Typeface(
+							tf.FontFamily,
+							marker.FontStyle ?? tf.Style,
+							marker.FontWeight ?? tf.Weight,
+							tf.Stretch
+						));
+					}
+				);
+			}
+		}
+		#endregion
+		
+		#region IBackgroundRenderer
+		public KnownLayer Layer {
+			get {
+				// draw behind selection
+				return KnownLayer.Selection;
+			}
+		}
+		
+		public void Draw(TextView textView, DrawingContext drawingContext)
+		{
+			if (textView == null)
+				throw new ArgumentNullException("textView");
+			if (drawingContext == null)
+				throw new ArgumentNullException("drawingContext");
+			if (markers == null || !textView.VisualLinesValid)
+				return;
+			var visualLines = textView.VisualLines;
+			if (visualLines.Count == 0)
+				return;
+			int viewStart = visualLines.First().FirstDocumentLine.Offset;
+			int viewEnd = visualLines.Last().LastDocumentLine.EndOffset;
+			foreach (TextMarker marker in markers.FindOverlappingSegments(viewStart, viewEnd - viewStart)) {
+				if (marker.BackgroundColor != null) {
+					BackgroundGeometryBuilder geoBuilder = new BackgroundGeometryBuilder();
+					geoBuilder.AlignToWholePixels = true;
+					geoBuilder.CornerRadius = 3;
+					geoBuilder.AddSegment(textView, marker);
+					Geometry geometry = geoBuilder.CreateGeometry();
+					if (geometry != null) {
+						Color color = marker.BackgroundColor.Value;
+						SolidColorBrush brush = new SolidColorBrush(color);
+						brush.Freeze();
+						drawingContext.DrawGeometry(brush, null, geometry);
+					}
+				}
+				var underlineMarkerTypes = TextMarkerTypes.SquigglyUnderline | TextMarkerTypes.NormalUnderline | TextMarkerTypes.DottedUnderline;
+				if ((marker.MarkerTypes & underlineMarkerTypes) != 0) {
+					foreach (Rect r in BackgroundGeometryBuilder.GetRectsForSegment(textView, marker)) {
+						Point startPoint = r.BottomLeft;
+						Point endPoint = r.BottomRight;
+						
+						Brush usedBrush = new SolidColorBrush(marker.MarkerColor);
+						usedBrush.Freeze();
+						if ((marker.MarkerTypes & TextMarkerTypes.SquigglyUnderline) != 0) {
+							double offset = 2.5;
+							
+							int count = Math.Max((int)((endPoint.X - startPoint.X) / offset) + 1, 4);
+							
+							StreamGeometry geometry = new StreamGeometry();
+							
+							using (StreamGeometryContext ctx = geometry.Open()) {
+								ctx.BeginFigure(startPoint, false, false);
+								ctx.PolyLineTo(CreatePoints(startPoint, endPoint, offset, count).ToArray(), true, false);
+							}
+							
+							geometry.Freeze();
+							
+							Pen usedPen = new Pen(usedBrush, 1);
+							usedPen.Freeze();
+							drawingContext.DrawGeometry(Brushes.Transparent, usedPen, geometry);
+						}
+						if ((marker.MarkerTypes & TextMarkerTypes.NormalUnderline) != 0) {
+							Pen usedPen = new Pen(usedBrush, 1);
+							usedPen.Freeze();
+							drawingContext.DrawLine(usedPen, startPoint, endPoint);
+						}
+						if ((marker.MarkerTypes & TextMarkerTypes.DottedUnderline) != 0) {
+							Pen usedPen = new Pen(usedBrush, 1);
+							usedPen.DashStyle = DashStyles.Dot;
+							usedPen.Freeze();
+							drawingContext.DrawLine(usedPen, startPoint, endPoint);
+						}
+					}
+				}
+			}
+		}
+		
+		IEnumerable<Point> CreatePoints(Point start, Point end, double offset, int count)
+		{
+			for (int i = 0; i < count; i++)
+				yield return new Point(start.X + i * offset, start.Y - ((i + 1) % 2 == 0 ? offset : 0));
+		}
+		#endregion
+		
+		#region ITextViewConnect
+		readonly List<TextView> textViews = new List<TextView>();
+		
+		void ITextViewConnect.AddToTextView(TextView textView)
+		{
+			if (textView != null && !textViews.Contains(textView)) {
+				Debug.Assert(textView.Document == document);
+				textViews.Add(textView);
+			}
+		}
+		
+		void ITextViewConnect.RemoveFromTextView(TextView textView)
+		{
+			if (textView != null) {
+				Debug.Assert(textView.Document == document);
+				textViews.Remove(textView);
+			}
+		}
+		#endregion
+	}
+	
+	public sealed class TextMarker : TextSegment, ITextMarker
+	{
+		readonly TextMarkerService service;
+		
+		public TextMarker(TextMarkerService service, int startOffset, int length)
+		{
+			if (service == null)
+				throw new ArgumentNullException("service");
+			this.service = service;
+			this.StartOffset = startOffset;
+			this.Length = length;
+			this.markerTypes = TextMarkerTypes.None;
+		}
+		
+		public event EventHandler Deleted;
+		
+		public bool IsDeleted {
+			get { return !this.IsConnectedToCollection; }
+		}
+		
+		public void Delete()
+		{
+			service.Remove(this);
+		}
+		
+		internal void OnDeleted()
+		{
+			if (Deleted != null)
+				Deleted(this, EventArgs.Empty);
+		}
+		
+		void Redraw()
+		{
+			service.Redraw(this);
+		}
+		
+		Color? backgroundColor;
+		
+		public Color? BackgroundColor {
+			get { return backgroundColor; }
+			set {
+				if (backgroundColor != value) {
+					backgroundColor = value;
+					Redraw();
+				}
+			}
+		}
+		
+		Color? foregroundColor;
+		
+		public Color? ForegroundColor {
+			get { return foregroundColor; }
+			set {
+				if (foregroundColor != value) {
+					foregroundColor = value;
+					Redraw();
+				}
+			}
+		}
+		
+		FontWeight? fontWeight;
+		
+		public FontWeight? FontWeight {
+			get { return fontWeight; }
+			set {
+				if (fontWeight != value) {
+					fontWeight = value;
+					Redraw();
+				}
+			}
+		}
+		
+		FontStyle? fontStyle;
+		
+		public FontStyle? FontStyle {
+			get { return fontStyle; }
+			set {
+				if (fontStyle != value) {
+					fontStyle = value;
+					Redraw();
+				}
+			}
+		}
+		
+		public object Tag { get; set; }
+		
+		TextMarkerTypes markerTypes;
+		
+		public TextMarkerTypes MarkerTypes {
+			get { return markerTypes; }
+			set {
+				if (markerTypes != value) {
+					markerTypes = value;
+					Redraw();
+				}
+			}
+		}
+		
+		Color markerColor;
+		
+		public Color MarkerColor {
+			get { return markerColor; }
+			set {
+				if (markerColor != value) {
+					markerColor = value;
+					Redraw();
+				}
+			}
+		}
+		
+		public object ToolTip { get; set; }
+	}
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 7b5c38a2b..8cf615a7c 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -4,6 +4,7 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel.Design;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -56,6 +57,7 @@ namespace Tango.Scripting.Editors
         private List<KnownType> _knownTypes;
         private List<ScriptType> _declaredTypes;
         private bool _isLoadingTypes;
+        private TextMarkerService errorMarkerService;
         private static JsonSerializerSettings _jsonSettings;
         private static Dictionary<Type, KnownType> _knownTypesCache;
         private static String KNOWN_TYPES_CACHE_FOLDER;
@@ -296,6 +298,10 @@ namespace Tango.Scripting.Editors
             completionWindow.InsertionRequest += CompletionWindow_InsertionRequest;
 
             TextChanged += ScriptEditor_TextChanged;
+
+            errorMarkerService = new TextMarkerService(Document);
+            TextArea.TextView.BackgroundRenderers.Add(errorMarkerService);
+            TextArea.TextView.LineTransformers.Add(errorMarkerService);
         }
 
         private void ScriptEditor_KnownTypesAvailable(object sender, EventArgs e)
@@ -2423,6 +2429,18 @@ namespace Tango.Scripting.Editors
             Document.EndUpdate();
         }
 
+        public void HighlighError(int position, int length)
+        {
+            ITextMarker marker = errorMarkerService.Create(position, length);
+            marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
+            marker.MarkerColor = Colors.Red;
+        }
+
+        public void ClearErrors()
+        {
+            errorMarkerService.RemoveAll(m => true);
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
index 798529616..a70bbf3de 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
@@ -196,6 +196,8 @@
     <Compile Include="CodeCompletion\OverloadViewer.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityInversedConverter.cs" />
+    <Compile Include="Errors\ITextMarker.cs" />
+    <Compile Include="Errors\TextMarkerService.cs" />
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="Intellisense\ClassCompletionItemPopup.cs" />
     <Compile Include="Intellisense\CompletionItem.cs" />
-- 
cgit v1.3.1


From 9bf8c48e19a83ed6e2d2612dea8e990c3a05d4a0 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Fri, 31 Jul 2020 19:08:06 +0300
Subject: Implemented first procedure code editor loading block progress.

---
 .../Tango.FSE.Procedures/DialogControllerVM.cs     |  1 +
 .../Tango.FSE.Procedures/IProcedureContext.cs      | 33 ++++++++++++++++
 .../Tango.FSE.Procedures/ProcedureContext.cs       | 44 +++++++++++++++++++++-
 .../ViewModels/ProcedureDesignerViewVM.cs          | 19 ++++++++++
 .../Views/ProcedureDesignerView.xaml.cs            |  2 +-
 .../Controls/NotificationsControl.xaml             |  2 +-
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 21 +++++++++++
 Software/Visual_Studio/Tango.CSV/CsvFile.cs        |  2 +-
 8 files changed, 120 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogControllerVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogControllerVM.cs
index 7adf7d4c0..794a24e84 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogControllerVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DialogControllerVM.cs
@@ -13,6 +13,7 @@ namespace Tango.FSE.Procedures
         {
             AutoMode = false;
             CanClose = true;
+            CanCancel = true;
         }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
index 0187841c8..9b2436c71 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
@@ -415,6 +415,12 @@ namespace Tango.FSE.Procedures
         /// <returns></returns>
         String GetResourceString(String resourceName);
 
+        /// <summary>
+        /// Copies the specified resource to a temporary path and opens it using the default application.
+        /// </summary>
+        /// <param name="resourceName">Name of the resource.</param>
+        void OpenResource(String resourceName);
+
         /// <summary>
         /// Gets the specified procedure variable.
         /// </summary>
@@ -436,5 +442,32 @@ namespace Tango.FSE.Procedures
         /// <param name="name">The name of the variable.</param>
         /// <returns></returns>
         List<T> GetVariableArray<T>(String name);
+
+        /// <summary>
+        /// Reads the specified csv file to a list of type T.
+        /// The given type T model must contain properties not fields.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="file">The file path.</param>
+        /// <returns></returns>
+        List<T> ReadCsv<T>(String file) where T : class, new();
+
+        /// <summary>
+        /// Reads the specified csv byte array to a list of type T.
+        /// The given type T model must contain properties not fields.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="data">The data.</param>
+        /// <returns></returns>
+        List<T> ReadCsv<T>(byte[] data) where T : class, new();
+
+        /// <summary>
+        /// Writes a CSV file to the specified file.
+        /// The given type T model must contain properties not fields.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="file">The file path.</param>
+        /// <param name="items">The items to write.</param>
+        void WriteCsv<T>(String file, List<T> items);
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
index e75a080a1..fdfe6af9a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
@@ -19,6 +19,7 @@ using Tango.Core;
 using Tango.Core.DI;
 using Tango.Core.ExtensionMethods;
 using Tango.Core.Threading;
+using Tango.CSV;
 using Tango.FSE.Common.Connection;
 using Tango.FSE.Common.Diagnostics;
 using Tango.FSE.Common.Notifications;
@@ -30,7 +31,7 @@ using Tango.Scripting.Basic;
 
 namespace Tango.FSE.Procedures
 {
-    public class ProcedureContext : IProcedureContext
+    public class ProcedureContext : ExtendedObject, IProcedureContext
     {
         private IProcedureLogger _logger;
         private ProcedureProject _project;
@@ -300,6 +301,11 @@ namespace Tango.FSE.Procedures
             File.WriteAllText(filePath, content);
         }
 
+        public void WriteToFile(string filePath, byte[] data)
+        {
+            File.WriteAllBytes(filePath, data);
+        }
+
         public void AppendToFile(string filePath, string content)
         {
             File.AppendAllText(filePath, content);
@@ -722,6 +728,15 @@ namespace Tango.FSE.Procedures
             return Encoding.Default.GetString(data);
         }
 
+        public void OpenResource(string resourceName)
+        {
+            var data = GetResourceBytes(resourceName);
+            var tempFolder = TemporaryManager.CreateFolder();
+            var tempFile = Path.Combine(tempFolder, resourceName);
+            File.WriteAllBytes(tempFile, data);
+            Process.Start(tempFile);
+        }
+
         public object GetVariable(string name)
         {
             ProcedureVariable variable = _project.Variables.SingleOrDefault(x => x.Name == name);
@@ -757,5 +772,32 @@ namespace Tango.FSE.Procedures
 
             return list;
         }
+
+        public List<T> ReadCsv<T>(string file) where T : class, new()
+        {
+            var items = CsvFile.Read<T>(new CsvSource(file));
+            return items.ToList();
+        }
+
+        public List<T> ReadCsv<T>(byte[] data) where T : class, new()
+        {
+            using (MemoryStream ms = new MemoryStream(data))
+            {
+                var items = CsvFile.Read<T>(new CsvSource(ms));
+                return items.ToList();
+            }
+        }
+
+        public void WriteCsv<T>(string file, List<T> items)
+        {
+            CsvFile<T> csvFile = new CsvFile<T>(new CsvDestination(file));
+
+            foreach (var item in items)
+            {
+                csvFile.Append(item);
+            }
+
+            csvFile.Dispose();
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
index 5e2380d5c..84f677087 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
@@ -57,6 +57,7 @@ namespace Tango.FSE.Procedures.ViewModels
         private String PROJECT_FILE_EXTENSION = ".pproj";
         private String PROJECT_DIALOG_FILTER = $"Procedure Project Files|*.pproj";
         private bool _isProjectChanged;
+        private TaskItem _symbolsTaskItem;
 
         #region Properties
 
@@ -263,6 +264,8 @@ namespace Tango.FSE.Procedures.ViewModels
             ScriptEditor.LoadingSymbolsProgress += ScriptEditor_LoadingSymbolsProgress;
             ScriptEditor.LoadingSymbolsStarted += ScriptEditor_LoadingSymbolsStarted;
             ScriptEditor.LoadingSymbolsCompleted += ScriptEditor_LoadingSymbolsCompleted;
+            ScriptEditor.UsingsLoadingStarted += ScriptEditor_UsingsLoadingStarted;
+            ScriptEditor.UsingsLoadingCompleted += ScriptEditor_UsingsLoadingCompleted;
             ScriptEditor.BlockedUsingsCache.Add("Tango.FSE.Procedures");
             ScriptEditor.BlockedUsingsCache.Add("Tango.PMR.Stubs");
             ScriptEditor.BlockedUsingsCache.Add("Tango.BL.Entities");
@@ -442,6 +445,22 @@ namespace Tango.FSE.Procedures.ViewModels
         private void ScriptEditor_LoadingSymbolsProgress(object sender, Core.TangoProgressChangedEventArgs<int> e)
         {
             SymbolsLoadingProgress = e.Progress;
+
+            _symbolsTaskItem?.UpdateProgress(e.Progress.Message, e.Progress.Value, e.Progress.Maximum);
+        }
+
+        private void ScriptEditor_UsingsLoadingStarted(object sender, EventArgs e)
+        {
+            _symbolsTaskItem = NotificationProvider.PushTaskItem("Loading symbols...");
+        }
+
+        private void ScriptEditor_UsingsLoadingCompleted(object sender, EventArgs e)
+        {
+            if (_symbolsTaskItem != null)
+            {
+                NotificationProvider.PopTaskItem(_symbolsTaskItem);
+                _symbolsTaskItem = null;
+            }
         }
 
         #endregion
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
index ee21509b2..1e5deb04a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
@@ -70,7 +70,7 @@ namespace Tango.FSE.Procedures.Views
             {
                 foreach (var editor in tabControl.FindVisualChildren<ScriptEditor>())
                 {
-                    editor.InvalidateHighlighting();
+                    editor.InvalidateHighlighting(true);
                 }
             }));
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Controls/NotificationsControl.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Controls/NotificationsControl.xaml
index 2f293fd43..a0715a96f 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Controls/NotificationsControl.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Controls/NotificationsControl.xaml
@@ -177,7 +177,7 @@
                                 <ContentPresenter Margin="5" Content="{Binding}" />
                             </DockPanel>
 
-                            <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Visibility="{Binding DataContext.AutoMode,Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <Grid HorizontalAlignment="Right" VerticalAlignment="Top">
                                 <commonControls:IconButton Icon="Close" Padding="5" Cursor="Hand" Margin="0 0 5 0" Command="{Binding DataContext.CloseCommand}" Visibility="{Binding DataContext.CanClose,Converter={StaticResource BooleanToVisibilityConverter}}" Width="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight}"/>
                             </Grid>
                         </Grid>
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 8cf615a7c..3c27118e2 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -65,6 +65,7 @@ namespace Tango.Scripting.Editors
         private static List<CachedUsing> _cachedUsings;
         private static bool _isLoadingCachedAssemblies;
         private static bool _isCacheAssembliesLoaded;
+        private static bool _isUsingsLoadingStarted;
         private static object _loadUsingsLock = new object();
         private static List<SnippetCompletionItem> snippets;
 
@@ -72,6 +73,8 @@ namespace Tango.Scripting.Editors
         public static event EventHandler LoadingSymbolsStarted;
         public static event EventHandler LoadingSymbolsCompleted;
         private static event EventHandler KnownTypesAvailable;
+        public static event EventHandler UsingsLoadingStarted;
+        public static event EventHandler UsingsLoadingCompleted;
 
         #region Mini Classes
 
@@ -302,6 +305,13 @@ namespace Tango.Scripting.Editors
             errorMarkerService = new TextMarkerService(Document);
             TextArea.TextView.BackgroundRenderers.Add(errorMarkerService);
             TextArea.TextView.LineTransformers.Add(errorMarkerService);
+
+            Unloaded += ScriptEditor_Unloaded;
+        }
+
+        private void ScriptEditor_Unloaded(object sender, RoutedEventArgs e)
+        {
+            _update_timer.Stop();
         }
 
         private void ScriptEditor_KnownTypesAvailable(object sender, EventArgs e)
@@ -1394,6 +1404,12 @@ namespace Tango.Scripting.Editors
                 {
                     if (!_cachedUsings.Exists(x => x.Namespace == use))
                     {
+                        if (!_isUsingsLoadingStarted)
+                        {
+                            _isUsingsLoadingStarted = true;
+                            UsingsLoadingStarted?.Invoke(this, new EventArgs());
+                        }
+
                         var useFileName = System.IO.Path.Combine(KNOWN_TYPES_CACHE_FOLDER, use + ".json");
 
                         if (File.Exists(useFileName))
@@ -1485,6 +1501,11 @@ namespace Tango.Scripting.Editors
                                 File.WriteAllText(useFileName, json);
                             });
                         }
+
+                        if (_isUsingsLoadingStarted)
+                        {
+                            UsingsLoadingCompleted?.Invoke(this, new EventArgs());
+                        }
                     }
                 }
 
diff --git a/Software/Visual_Studio/Tango.CSV/CsvFile.cs b/Software/Visual_Studio/Tango.CSV/CsvFile.cs
index 1f21ce6e8..f925c0017 100644
--- a/Software/Visual_Studio/Tango.CSV/CsvFile.cs
+++ b/Software/Visual_Studio/Tango.CSV/CsvFile.cs
@@ -293,7 +293,7 @@ namespace Tango.CSV
             if (pi == null) //Then try get by column index,
             {
                 pi = typeof(T).GetProperties()[index];
-                pi = typeof(T).GetProperties()[index];
+                pi = typeof(T).GetProperties()[index]; //Workaround for some weired problem that makes the program not take the value.
             }
 
             if (CsvFile.UseLambdas)
-- 
cgit v1.3.1


From bd1221e36ee3e493dc25bd32559f846519fe60d0 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 3 Aug 2020 12:16:21 +0300
Subject: Refactored RemoteSQL on procedures. Fixed issue with generic types
 display on code editor. Added line wrap toggle to procedure designer output.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 .../ViewModels/ProcedureDesignerViewVM.cs          |  10 +-
 .../Views/ProcedureDesignerView.xaml               |  22 ++-
 .../Tango.FSE.Common/SQL/RemoteSqlCommandResult.cs |   9 +-
 .../Tango.FSE.UI/SQL/DefaultRemoteSqlProvider.cs   |  27 +---
 .../SQL/DefaultRemoteSqlService.cs                 |  23 +---
 .../PPC/Tango.PPC.Shared/SQL/ExecuteSqlResponse.cs |   4 +-
 .../PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs    |  24 ++++
 .../SQL/RemoteSqlColumnCollection.cs               |  47 +++++++
 .../PPC/Tango.PPC.Shared/SQL/RemoteSqlDataSet.cs   | 153 +++++++++++++++++++++
 .../PPC/Tango.PPC.Shared/SQL/RemoteSqlRow.cs       |  98 +++++++++++++
 .../PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj   |   5 +
 .../Tango.Scripting.Editors/ExtensionMethods.cs    |   2 +-
 .../Tango.Scripting.Editors/ScriptEditor.cs        |  18 ++-
 15 files changed, 377 insertions(+), 65 deletions(-)
 create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs
 create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumnCollection.cs
 create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlDataSet.cs
 create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlRow.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 944715183..07f93ca84 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 47c6923db..fd01f6cba 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
index 84f677087..68c8538b8 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
@@ -266,13 +266,7 @@ namespace Tango.FSE.Procedures.ViewModels
             ScriptEditor.LoadingSymbolsCompleted += ScriptEditor_LoadingSymbolsCompleted;
             ScriptEditor.UsingsLoadingStarted += ScriptEditor_UsingsLoadingStarted;
             ScriptEditor.UsingsLoadingCompleted += ScriptEditor_UsingsLoadingCompleted;
-            ScriptEditor.BlockedUsingsCache.Add("Tango.FSE.Procedures");
-            ScriptEditor.BlockedUsingsCache.Add("Tango.PMR.Stubs");
-            ScriptEditor.BlockedUsingsCache.Add("Tango.BL.Entities");
-            ScriptEditor.BlockedUsingsCache.Add("Tango.BL.Enumerations");
-            ScriptEditor.BlockedUsingsCache.Add("Tango.PMR.Diagnostics");
-            ScriptEditor.BlockedUsingsCache.Add("Tango.FSE.Common.Connection");
-            ScriptEditor.BlockedUsingsCache.Add("Tango.FSE.Common.Diagnostics");
+            ScriptEditor.BlockedUsingsCache.Add("Tango");
 
             OpenScripts = new ObservableCollection<Script>();
             OpenScriptCommand = new RelayCommand<Script>(OpenScript);
@@ -446,7 +440,7 @@ namespace Tango.FSE.Procedures.ViewModels
         {
             SymbolsLoadingProgress = e.Progress;
 
-            _symbolsTaskItem?.UpdateProgress(e.Progress.Message, e.Progress.Value, e.Progress.Maximum);
+            _symbolsTaskItem?.UpdateProgress(e.Progress.Message, e.Progress.Value, e.Progress.Maximum, e.Progress.IsIndeterminate);
         }
 
         private void ScriptEditor_UsingsLoadingStarted(object sender, EventArgs e)
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
index 214dc66ee..e122a1eca 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
@@ -505,11 +505,29 @@
                                     <DockPanel>
                                         <Grid DockPanel.Dock="Top" Height="28" Background="{StaticResource FSE_PrimaryBackgroundBrush}">
                                             <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontFamily="{StaticResource hand}">Output</TextBlock>
-                                            <controls:IconButton Command="{Binding ClearOutputCommand}" Height="32" Cursor="Hand" ToolTip="Clear" Width="32" Icon="DeleteEmpty" Foreground="{StaticResource FSE_GrayBrush}" HorizontalAlignment="Right" VerticalAlignment="Center" />
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                                <ToggleButton x:Name="chkWrap" IsChecked="True" VerticalAlignment="Center" Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}" Cursor="Hand" Foreground="{StaticResource FSE_GrayBrush}" ToolTip="Line Wrap" FocusVisualStyle="{x:Null}" Width="22" Height="22">
+                                                    <material:PackIcon Kind="Wrap" />
+                                                </ToggleButton>
+                                                <controls:IconButton Margin="5 0 0 0" Command="{Binding ClearOutputCommand}" Height="32" Cursor="Hand" ToolTip="Clear" Width="32" Icon="DeleteEmpty" Foreground="{StaticResource FSE_GrayBrush}" VerticalAlignment="Center" />
+                                            </StackPanel>
 
                                             <Rectangle VerticalAlignment="Bottom" Stroke="Black" StrokeThickness="2" />
                                         </Grid>
-                                        <TextBox HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5" Style="{x:Null}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}" FontFamily="Consolas" components:TextController.Controller="{Binding Logger}" FontSize="{StaticResource FSE_SmallFontSize}" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}" BorderThickness="0" AcceptsReturn="True" IsReadOnly="True" TextWrapping="Wrap" />
+                                        <TextBox VerticalScrollBarVisibility="Auto" Padding="5" Foreground="{StaticResource FSE_PrimaryForegroundBrush}" FontFamily="Consolas" components:TextController.Controller="{Binding Logger}" FontSize="{StaticResource FSE_SmallFontSize}" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}" BorderThickness="0" AcceptsReturn="True" IsReadOnly="True">
+                                            <TextBox.Style>
+                                                <Style TargetType="TextBox">
+                                                    <Setter Property="TextWrapping" Value="Wrap"></Setter>
+                                                    <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding ElementName=chkWrap,Path=IsChecked}" Value="False">
+                                                            <Setter Property="TextWrapping" Value="NoWrap"></Setter>
+                                                            <Setter Property="HorizontalScrollBarVisibility" Value="Auto"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBox.Style>
+                                        </TextBox>
                                     </DockPanel>
                                 </TabItem>
                                 <TabItem>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/SQL/RemoteSqlCommandResult.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/SQL/RemoteSqlCommandResult.cs
index b4714c1aa..34ab74a68 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/SQL/RemoteSqlCommandResult.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/SQL/RemoteSqlCommandResult.cs
@@ -3,25 +3,26 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.PPC.Shared.SQL;
 
 namespace Tango.FSE.Common.SQL
 {
     public class RemoteSqlCommandResult
     {
         public int LocalAffectedRecords { get; set; }
-        public List<Dictionary<String, Object>> LocalRows { get; set; }
+        public RemoteSqlDataSet LocalDatSet { get; set; }
         public bool HasLocalError { get; set; }
         public String LocalError { get; set; }
 
         public int GlobalAffectedRecords { get; set; }
-        public List<Dictionary<String, Object>> GlobalRows { get; set; }
+        public RemoteSqlDataSet GLobalDataSet { get; set; }
         public bool HasGlobalError { get; set; }
         public String GlobalError { get; set; }
 
         public RemoteSqlCommandResult()
         {
-            LocalRows = new List<Dictionary<string, object>>();
-            GlobalRows = new List<Dictionary<string, object>>();
+            LocalDatSet = new RemoteSqlDataSet();
+            GLobalDataSet = new RemoteSqlDataSet();
         }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/SQL/DefaultRemoteSqlProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/SQL/DefaultRemoteSqlProvider.cs
index 19750094e..7477dc7f4 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/SQL/DefaultRemoteSqlProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/SQL/DefaultRemoteSqlProvider.cs
@@ -119,14 +119,13 @@ namespace Tango.FSE.UI.SQL
                     }, new TransportRequestConfig() { Timeout = TimeSpan.FromSeconds(command.Timeout) });
 
                     result.LocalAffectedRecords = response.AffectedRecords;
-                    result.LocalRows = response.Rows.ToList();
+                    result.LocalDatSet = response.DataSet;
                 }
                 catch (Exception ex)
                 {
                     LogManager.Log(ex, "Remote SQL command local execution failed.");
                     result.HasLocalError = true;
                     result.LocalError = ex.FlattenMessage();
-                    return result;
                 }
             }
 
@@ -140,31 +139,15 @@ namespace Tango.FSE.UI.SQL
                     {
                         using (SqlConnection connection = new SqlConnection(db.Database.Connection.ConnectionString))
                         {
+                            connection.AccessToken = ObservablesContext.GetActualDataSource().AccessToken;
+                            connection.Open();
+
                             SqlCommand cmd = new SqlCommand(command.SQL, connection);
                             cmd.CommandTimeout = command.Timeout;
-                            connection.Open();
 
                             SqlDataReader reader = await cmd.ExecuteReaderAsync();
                             result.GlobalAffectedRecords = reader.RecordsAffected;
-
-                            try
-                            {
-                                while (reader.Read())
-                                {
-                                    Dictionary<String, Object> row = new Dictionary<string, object>();
-
-                                    for (int i = 0; i < reader.FieldCount; i++)
-                                    {
-                                        row[reader.GetName(i)] = reader.GetValue(i);
-                                    }
-
-                                    result.GlobalRows.Add(row);
-                                }
-                            }
-                            finally
-                            {
-                                reader.Close();
-                            }
+                            result.GLobalDataSet = await RemoteSqlDataSet.Load(reader);
                         }
                     }
                 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/SQL/DefaultRemoteSqlService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/SQL/DefaultRemoteSqlService.cs
index 986c4d062..e5ac43d3f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/SQL/DefaultRemoteSqlService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/SQL/DefaultRemoteSqlService.cs
@@ -27,7 +27,7 @@ namespace Tango.PPC.Common.SQL
         {
             this.ThrowIfDisabled();
 
-            List<Dictionary<String, Object>> rows = new List<Dictionary<string, object>>();
+            RemoteSqlDataSet dataSet = new RemoteSqlDataSet();
             int affected = 0;
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
@@ -40,30 +40,13 @@ namespace Tango.PPC.Common.SQL
                     SqlDataReader reader = command.ExecuteReader();
                     affected = reader.RecordsAffected;
 
-                    try
-                    {
-                        while (reader.Read())
-                        {
-                            Dictionary<String, Object> row = new Dictionary<string, object>();
-
-                            for (int i = 0; i < reader.FieldCount; i++)
-                            {
-                                row[reader.GetName(i)] = reader.GetValue(i);
-                            }
-
-                            rows.Add(row);
-                        }
-                    }
-                    finally
-                    {
-                        reader.Close();
-                    }
+                    dataSet = await RemoteSqlDataSet.Load(reader);
                 }
             }
 
             await receiver.SendGenericResponse(new ExecuteSqlResponse()
             {
-                Rows = rows,
+                DataSet = dataSet,
                 AffectedRecords = affected
             }, token);
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/ExecuteSqlResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/ExecuteSqlResponse.cs
index 4166d8f82..2db90a336 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/ExecuteSqlResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/ExecuteSqlResponse.cs
@@ -9,11 +9,11 @@ namespace Tango.PPC.Shared.SQL
     public class ExecuteSqlResponse
     {
         public int AffectedRecords { get; set; }
-        public List<Dictionary<String,Object>> Rows { get; set; }
+        public RemoteSqlDataSet DataSet { get; set; }
 
         public ExecuteSqlResponse()
         {
-            Rows = new List<Dictionary<string, object>>();
+            DataSet = new RemoteSqlDataSet();
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs
new file mode 100644
index 000000000..328dbb492
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Shared.SQL
+{
+    public class RemoteSqlColumn
+    {
+        public String Name { get; set; }
+        public int Index { get; set; }
+
+        public RemoteSqlColumn()
+        {
+
+        }
+
+        public RemoteSqlColumn(String name)
+        {
+            Name = name;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumnCollection.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumnCollection.cs
new file mode 100644
index 000000000..5358e047b
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumnCollection.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Shared.SQL
+{
+    public class RemoteSqlColumnCollection : Collection<RemoteSqlColumn>
+    {
+        private Dictionary<String, RemoteSqlColumn> _dictionary;
+
+        public RemoteSqlColumnCollection()
+        {
+            _dictionary = new Dictionary<string, RemoteSqlColumn>();
+        }
+
+        protected override void InsertItem(int index, RemoteSqlColumn item)
+        {
+            item.Index = Count;
+            _dictionary.Add(item.Name, item);
+            base.InsertItem(index, item);
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override void ClearItems()
+        {
+            _dictionary.Clear();
+            base.ClearItems();
+        }
+
+        protected override void SetItem(int index, RemoteSqlColumn item)
+        {
+            throw new NotSupportedException();
+        }
+
+        public int GetIndexOf(String columnName)
+        {
+            return _dictionary[columnName].Index;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlDataSet.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlDataSet.cs
new file mode 100644
index 000000000..089908e5a
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlDataSet.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Shared.SQL
+{
+    public class RemoteSqlDataSet
+    {
+        public RemoteSqlColumnCollection Columns { get; set; }
+
+        private ObservableCollection<RemoteSqlRow> _rows;
+        public ObservableCollection<RemoteSqlRow> Rows
+        {
+            get { return _rows; }
+            set { _rows = value; OnRowsChanged(); }
+        }
+
+        public RemoteSqlDataSet()
+        {
+            Columns = new RemoteSqlColumnCollection();
+            Rows = new ObservableCollection<RemoteSqlRow>();
+        }
+
+        private void OnRowsChanged()
+        {
+            if (Rows != null)
+            {
+                Rows.CollectionChanged -= Rows_CollectionChanged;
+                Rows.CollectionChanged += Rows_CollectionChanged;
+
+                InitRows();
+            }
+        }
+
+        private void Rows_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            InitRows();
+        }
+
+        private void InitRows()
+        {
+            if (Rows != null)
+            {
+                foreach (var row in Rows.ToList())
+                {
+                    row.Init(
+                        (key) =>
+                        {
+                            return row.Values[Columns.GetIndexOf(key)];
+                        },
+                        (index) =>
+                        {
+                            return row.Values[index];
+                        });
+                }
+            }
+        }
+
+        public static Task<RemoteSqlDataSet> Load(SqlDataReader reader)
+        {
+            return Task.Factory.StartNew<RemoteSqlDataSet>(() =>
+            {
+                bool columnsRead = false;
+                RemoteSqlDataSet dataSet = new RemoteSqlDataSet();
+
+                try
+                {
+                    while (reader.Read())
+                    {
+                        RemoteSqlRow row = new RemoteSqlRow();
+
+                        for (int i = 0; i < reader.FieldCount; i++)
+                        {
+                            if (!columnsRead)
+                            {
+                                dataSet.Columns.Add(new RemoteSqlColumn()
+                                {
+                                    Name = reader.GetName(i)
+                                });
+                            }
+
+                            row.Values.Add(reader.GetValue(i));
+                        }
+
+                        columnsRead = true;
+                        dataSet.Rows.Add(row);
+                    }
+                }
+                finally
+                {
+                    reader.Close();
+                }
+
+                return dataSet;
+            });
+        }
+
+        public override string ToString()
+        {
+            return String.Join(", ", Columns.Select(x => x.Name)) + "\n" + String.Join(Environment.NewLine, Rows.Select(x => x.ToString()));
+        }
+
+        public String ToTableString()
+        {
+            Dictionary<int, int> columnsMaxLength = new Dictionary<int, int>();
+
+            for (int i = 0; i < Columns.Count; i++)
+            {
+                columnsMaxLength.Add(i, Columns[i].Name.Length);
+            }
+
+            foreach (var row in Rows)
+            {
+                for (int i = 0; i < row.Values.Count; i++)
+                {
+                    int valueLength = row.Values[i].ToStringSafe().Length;
+
+                    if (valueLength > columnsMaxLength[i])
+                    {
+                        columnsMaxLength[i] = valueLength;
+                    }
+                }
+            }
+
+            String str = String.Empty;
+
+            for (int i = 0; i < Columns.Count; i++)
+            {
+                str += $"{Columns[i].Name.PadRight(columnsMaxLength[i])}{(i < Columns.Count - 1 ? " | " : "")}";
+            }
+
+            int width = str.Length;
+            str += Environment.NewLine + String.Empty.PadRight(width, '-');
+
+            foreach (var row in Rows)
+            {
+                str += Environment.NewLine;
+
+                for (int i = 0; i < row.Values.Count; i++)
+                {
+                    str += $"{row.Values[i].ToStringSafe().PadRight(columnsMaxLength[i])}{(i < Columns.Count - 1 ? " | " : "")}";
+                }
+            }
+
+            return str;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlRow.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlRow.cs
new file mode 100644
index 000000000..bf6b0ba0c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlRow.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.PPC.Shared.SQL
+{
+    public class RemoteSqlRow
+    {
+        private Func<String, Object> _getFuncKey;
+        private Func<int, Object> _getFuncIndex;
+
+        public List<Object> Values { get; set; }
+
+        public RemoteSqlRow()
+        {
+            Values = new List<object>();
+        }
+
+        public Object Get(String columnName)
+        {
+            return _getFuncKey.Invoke(columnName);
+        }
+
+        public Object Get(int columnIndex)
+        {
+            return _getFuncIndex.Invoke(columnIndex);
+        }
+
+        public T Get<T>(String columnName)
+        {
+            var value = _getFuncKey.Invoke(columnName);
+
+            if (typeof(T) != value.GetType())
+            {
+                return (T)Convert.ChangeType(value, typeof(T));
+            }
+            else
+            {
+                return (T)value;
+            }
+        }
+
+        public T Get<T>(int columnIndex)
+        {
+            var value = _getFuncIndex.Invoke(columnIndex);
+
+            if (typeof(T) != value.GetType())
+            {
+                return (T)Convert.ChangeType(value, typeof(T));
+            }
+            else
+            {
+                return (T)value;
+            }
+        }
+
+        internal void Init(Func<String, Object> getFuncKey, Func<int, Object> getFuncIndex)
+        {
+            _getFuncKey = getFuncKey;
+            _getFuncIndex = getFuncIndex;
+        }
+
+        public override string ToString()
+        {
+            return String.Join(", ", Values);
+        }
+
+        public T Map<T>() where T : class, new()
+        {
+            var obj = Activator.CreateInstance<T>();
+            Map<T>(obj);
+            return obj;
+        }
+
+        public void Map<T>(T obj) where T : class
+        {
+            foreach (var prop in typeof(T).GetPropertiesWithAttribute<ColumnAttribute>())
+            {
+                try
+                {
+                    var columnName = prop.GetCustomAttribute<ColumnAttribute>().Name;
+                    var value = Get(columnName).ToStringSafe();
+                    prop.SetValue(obj, Convert.ChangeType(value, prop.PropertyType));
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex);
+                }
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj
index c93aef159..10993399c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj
@@ -33,6 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -90,6 +91,10 @@
     <Compile Include="RemoteUpgrade\StartRemoteApplicationUpgradeRequest.cs" />
     <Compile Include="SQL\ExecuteSqlRequest.cs" />
     <Compile Include="SQL\ExecuteSqlResponse.cs" />
+    <Compile Include="SQL\RemoteSqlColumn.cs" />
+    <Compile Include="SQL\RemoteSqlColumnCollection.cs" />
+    <Compile Include="SQL\RemoteSqlDataSet.cs" />
+    <Compile Include="SQL\RemoteSqlRow.cs" />
     <Compile Include="Updates\GetUpdatesAndPackagesRequest.cs" />
     <Compile Include="Updates\GetUpdatesAndPackagesResponse.cs" />
     <Compile Include="Updates\PackageInstallation.cs" />
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs
index 1605ff281..d112c6141 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs
@@ -22,7 +22,7 @@ namespace Tango.Scripting.Editors
             {
                 List<String> args = new List<string>();
 
-                foreach (var lGenericArgument in type.GetGenericTypeDefinition().GetGenericArguments())
+                foreach (var lGenericArgument in type.GetGenericArguments())
                 {
                     args.Add(lGenericArgument.Name);
                 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 3c27118e2..0e32af6ed 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -260,6 +260,12 @@ namespace Tango.Scripting.Editors
             
         }"
             });
+
+            snippets.Add(new SnippetCompletionItem()
+            {
+                Name = "cw",
+                Code = "context.WriteLine(\"\");"
+            });
         }
 
         /// <summary>
@@ -1493,7 +1499,7 @@ namespace Tango.Scripting.Editors
                             knownType.LoadDocumentation();
                         }
 
-                        if (!BlockedUsingsCache.Exists(x => x == use))
+                        if (!BlockedUsingsCache.Exists(x => use.StartsWith(x)))
                         {
                             Task.Factory.StartNew(() =>
                             {
@@ -1501,14 +1507,14 @@ namespace Tango.Scripting.Editors
                                 File.WriteAllText(useFileName, json);
                             });
                         }
-
-                        if (_isUsingsLoadingStarted)
-                        {
-                            UsingsLoadingCompleted?.Invoke(this, new EventArgs());
-                        }
                     }
                 }
 
+                if (_isUsingsLoadingStarted)
+                {
+                    UsingsLoadingCompleted?.Invoke(this, new EventArgs());
+                }
+
                 LoadingSymbolsCompleted?.Invoke(null, new EventArgs());
             }
         }
-- 
cgit v1.3.1


From 91d5be468e28266a4ae18ee3845f0cb3433dd898 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 4 Aug 2020 14:18:28 +0300
Subject: Reset Application & Firmware "Logs" tab even when machine connection
 is the same. Fixed issue on FileSystem download. Ignored issue with procedure
 error highlighting caused application error. Fixed issue when logout/login
 with different environment did not refreshed the list of available machines
 for connection.

---
 .../Tango.FSE.Firmware/ViewModels/LogsViewVM.cs    | 11 +++----
 .../Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs  | 11 +++----
 .../FileSystem/FileSystemHandler.cs                | 27 ++++++++++++----
 .../DefaultAuthenticationProvider.cs               |  2 ++
 .../ViewModels/MainViewVM.cs                       | 14 ++++----
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 13 ++++++--
 Software/Visual_Studio/Tango.Logging/FileLogger.cs |  2 ++
 .../Visual_Studio/Tango.Logging/LogItemBase.cs     | 12 +++++++
 Software/Visual_Studio/Tango.Logging/LogManager.cs | 37 ++++++----------------
 .../Tango.Logging/SessionFileLogger.cs             |  2 ++
 10 files changed, 73 insertions(+), 58 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs
index 2860f8c63..0195d24c1 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/LogsViewVM.cs
@@ -145,14 +145,11 @@ namespace Tango.FSE.Firmware.ViewModels
 
         private void MachineProvider_MachineConnected(object sender, MachineConnectedEventArgs e)
         {
-            if (e.DifferentFromPrevious)
-            {
-                _loaded = false;
+            _loaded = false;
 
-                if (MachineProvider.IsPPCAvailable && IsVisible)
-                {
-                    LoadLogFiles();
-                }
+            if (MachineProvider.IsPPCAvailable && IsVisible)
+            {
+                LoadLogFiles();
             }
         }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs
index 30946ba0f..66270df7e 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/LogsViewVM.cs
@@ -147,14 +147,11 @@ namespace Tango.FSE.PPCConsole.ViewModels
 
         private void MachineProvider_MachineConnected(object sender, MachineConnectedEventArgs e)
         {
-            if (e.DifferentFromPrevious)
-            {
-                _loaded = false;
+            _loaded = false;
 
-                if (MachineProvider.ConnectionType.IsRemote() && IsVisible)
-                {
-                    LoadLogFiles();
-                }
+            if (MachineProvider.IsPPCAvailable && IsVisible)
+            {
+                LoadLogFiles();
             }
         }
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/FileSystem/FileSystemHandler.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/FileSystem/FileSystemHandler.cs
index b1f4446d2..ab6a788f2 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/FileSystem/FileSystemHandler.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/FileSystem/FileSystemHandler.cs
@@ -15,6 +15,7 @@ namespace Tango.FSE.Common.FileSystem
         private System.Timers.Timer _transferRateTimer;
         private double _lastPosition;
         private TaskCompletionSource<FileSystemHandlerStatus> _completionSource;
+        private bool _completed;
 
         public event EventHandler<FileSystemHandlerStatus> StatusChanged;
         public event EventHandler<TangoProgressChangedEventArgs<double>> ProgressChanged;
@@ -134,21 +135,33 @@ namespace Tango.FSE.Common.FileSystem
 
         internal void RaiseFailed(Exception exception)
         {
-            Status = FileSystemHandlerStatus.Failed;
-            FailedException = exception;
-            _completionSource.SetException(exception);
+            if (!_completed)
+            {
+                _completed = true;
+                Status = FileSystemHandlerStatus.Failed;
+                FailedException = exception;
+                _completionSource.SetException(exception);
+            }
         }
 
         internal void RaiseAborted()
         {
-            Status = FileSystemHandlerStatus.Aborted;
-            _completionSource.SetException(new OperationCanceledException("File system operation aborted."));
+            if (!_completed)
+            {
+                _completed = true;
+                Status = FileSystemHandlerStatus.Aborted;
+                _completionSource.SetException(new OperationCanceledException("File system operation aborted."));
+            }
         }
 
         internal void RaiseCompleted()
         {
-            Status = FileSystemHandlerStatus.Completed;
-            _completionSource.SetResult(Status);
+            if (!_completed)
+            {
+                _completed = true;
+                Status = FileSystemHandlerStatus.Completed;
+                _completionSource.SetResult(Status);
+            }
         }
 
         public void Abort()
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
index 14997cd32..309839831 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -237,6 +237,8 @@ namespace Tango.FSE.UI.Authentication
 
             _tokenRefreshTimer.Stop();
 
+            MemoryCacheManager.Default.ClearAll();
+
             await NavigationManager.NavigateWithObject<LoginViewVM.NavigationObject>(NavigationView.LoginView, new LoginViewVM.NavigationObject()
             {
                 IsLoggingOut = true,
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 01def8679..40710ea21 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
@@ -1709,12 +1709,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 try
                 {
-                    LogManager.Log(String.Format("Uploading process parameters table {0}...", SelectedProcessParametersTable.Name));
+                    LogManager.Log($"Uploading process parameters table {SelectedProcessParametersTable.Name}...");
                     await MachineOperator.UploadProcessParameters(SelectedProcessParametersTable);
                 }
                 catch (Exception ex)
                 {
-                    LogManager.LogFormat(ex, "Failed to upload process parameters table {0}", SelectedProcessParametersTable.Name);
+                    LogManager.Log(ex, $"Failed to upload process parameters table {SelectedProcessParametersTable.Name}");
                     _notification.ShowError("Failed to upload the selected process parameters." + Environment.NewLine + ex.Message);
                 }
             }
@@ -2189,7 +2189,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (ActiveJob != null)
             {
-                LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
+                LogManager.Log($"Adding new segment to job {ActiveJob.Name}...");
                 Segment seg = new Segment();
                 seg.Job = ActiveJob;
                 seg.Name = "SEGMENT";
@@ -2342,7 +2342,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedSegment != null)
             {
-                LogManager.LogFormat("Adding new brush stop to segment...", SelectedSegment.SegmentIndex.ToString());
+                LogManager.Log($"Adding new brush stop to segment '{SelectedSegment.SegmentIndex}'...");
 
                 var stop = new BrushStop();
 
@@ -2373,7 +2373,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private void DuplicateSelectedBrushStops()
         {
-            LogManager.LogFormat("Duplicating {0} brush stops...", SelectedBrushStops.Count);
+            LogManager.Log($"Duplicating {SelectedBrushStops.Count} brush stops...");
 
             foreach (var stop in SelectedBrushStops.OrderBy(x => x.StopIndex))
             {
@@ -2391,7 +2391,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private void DuplicateSelectedSegments()
         {
-            LogManager.LogFormat("Duplicating {0} segments...", SelectedSegments.Count);
+            LogManager.Log($"Duplicating {SelectedSegments.Count} segments...");
 
             int start_index = SelectedSegments.Max(x => x.SegmentIndex);
 
@@ -2419,7 +2419,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     CanWork = false;
 
-                    LogManager.LogFormat("Duplicating {0} jobs...", SelectedJobs.Count);
+                    LogManager.Log($"Duplicating {SelectedJobs.Count} jobs...");
 
                     int index = SelectedMachine.Jobs.Max(x => x.JobIndex);
 
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 0e32af6ed..a3a682833 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -2458,9 +2458,16 @@ namespace Tango.Scripting.Editors
 
         public void HighlighError(int position, int length)
         {
-            ITextMarker marker = errorMarkerService.Create(position, length);
-            marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
-            marker.MarkerColor = Colors.Red;
+            try
+            {
+                ITextMarker marker = errorMarkerService.Create(position, length);
+                marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
+                marker.MarkerColor = Colors.Red;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error highlighting script error.\n{ex.ToString()}");
+            }
         }
 
         public void ClearErrors()
diff --git a/Software/Visual_Studio/Tango.Logging/FileLogger.cs b/Software/Visual_Studio/Tango.Logging/FileLogger.cs
index 0839a5ee7..041b56be4 100644
--- a/Software/Visual_Studio/Tango.Logging/FileLogger.cs
+++ b/Software/Visual_Studio/Tango.Logging/FileLogger.cs
@@ -138,6 +138,8 @@ namespace Tango.Logging
         /// <param name="output">The output.</param>
         public void OnLog(LogItemBase output)
         {
+            if (output.SkipFileLogging) return;
+
             try
             {
                 if (DateTime.Now.Date > _logFileTimeDate.Date)
diff --git a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
index 01d520f6a..944f61130 100644
--- a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
+++ b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
@@ -24,10 +24,22 @@ namespace Tango.Logging
         /// </summary>
         public Object LogObject
         {
+
             get { return _logObject; }
             set { _logObject = value; }
         }
 
+        [NonSerialized]
+        private bool _skipFileLogging;
+        /// <summary>
+        /// Gets or sets a value indicating whether this log should not be written to a file.
+        /// </summary>
+        public bool SkipFileLogging
+        {
+            get { return _skipFileLogging; }
+            set { _skipFileLogging = value; }
+        }
+
         /// <summary>
         /// Gets or sets the caller method adding the exception.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.Logging/LogManager.cs b/Software/Visual_Studio/Tango.Logging/LogManager.cs
index bbc6baf57..55264164a 100644
--- a/Software/Visual_Studio/Tango.Logging/LogManager.cs
+++ b/Software/Visual_Studio/Tango.Logging/LogManager.cs
@@ -102,9 +102,9 @@ namespace Tango.Logging
         /// </summary>
         /// <param name="e">Exception.</param>
         /// <param name="description">Error description.</param>
-        public Exception Log(Exception e, String description = null, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
+        public Exception Log(Exception e, String description = null, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
         {
-            return Log(e, LogCategory.Error, description, caller, file, lineNumber);
+            return Log(e, LogCategory.Error, description, skipFileLogging, caller, file, lineNumber);
         }
 
         /// <summary>
@@ -112,7 +112,7 @@ namespace Tango.Logging
         /// </summary>
         /// <param name="e">Exception.</param>
         /// <param name="description">Error description.</param>
-        public Exception Log(Exception e, LogCategory category, String description = null, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
+        public Exception Log(Exception e, LogCategory category, String description = null, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
         {
             if (!Categories.Contains(category)) return e;
 
@@ -125,54 +125,36 @@ namespace Tango.Logging
             log.Category = category;
             log.Description = description;
             log.Message = log.Description + Environment.NewLine + log.Exception.FlattenException();
+            log.SkipFileLogging = skipFileLogging;
 
             AppendLog(log);
 
             return e;
         }
 
-        /// <summary>
-        /// Add new exception log item.
-        /// </summary>
-        /// <param name="e">Exception.</param>
-        /// <param name="description">Error description.</param>
-        public Exception LogFormat(Exception e, String description, object argument, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
-        {
-            return Log(e, LogCategory.Error, String.Format(description, argument), caller, file, lineNumber);
-        }
-
-        /// <summary>
-        /// Add new message log item.
-        /// </summary>
-        /// <param name="message">Message.</param>
-        public String LogFormat(String message, object argument, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
-        {
-            return Log(String.Format(message, argument), LogCategory.Info, null, caller, file, lineNumber);
-        }
-
         /// <summary>
         /// Add new message log item.
         /// </summary>
         /// <param name="message">Message.</param>
-        public String Log(String message, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
+        public String Log(String message, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
         {
-            return Log(message, LogCategory.Info, null, caller, file, lineNumber);
+            return Log(message, LogCategory.Info, null, skipFileLogging, caller, file, lineNumber);
         }
 
         /// <summary>
         /// Add new message log item.
         /// </summary>
         /// <param name="message">Message.</param>
-        public String Log(String message, LogCategory category, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
+        public String Log(String message, LogCategory category, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
         {
-            return Log(message, category, null, caller, file, lineNumber);
+            return Log(message, category, null, skipFileLogging, caller, file, lineNumber);
         }
 
         /// <summary>
         /// Add new message log item.
         /// </summary>
         /// <param name="message">Message.</param>
-        public String Log(String message, LogCategory category, Object logObject, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
+        public String Log(String message, LogCategory category, Object logObject, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0)
         {
             if (!Categories.Contains(category)) return message;
 
@@ -184,6 +166,7 @@ namespace Tango.Logging
             log.Category = category;
             log.Message = message;
             log.LogObject = logObject;
+            log.SkipFileLogging = skipFileLogging;
 
             AppendLog(log);
 
diff --git a/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs b/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs
index 4e378bfbf..efe74c899 100644
--- a/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs
+++ b/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs
@@ -102,6 +102,8 @@ namespace Tango.Logging
         /// <param name="output">The output.</param>
         public void OnLog(LogItemBase output)
         {
+            if (output.SkipFileLogging) return;
+
             if (_inInSession)
             {
                 try
-- 
cgit v1.3.1


From da9d6fd74eed7424836956811cff05bf4247ac40 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 4 Aug 2020 19:24:05 +0300
Subject: Fixed issue with procedure Send method "messageName" entry and
 confusion with params array. Improved intellisense for fields of declared
 libraries.

---
 .../Tango.FSE.Procedures/IProcedureContext.cs      |   4 +-
 .../Tango.FSE.Procedures/ProcedureContext.cs       |   6 +-
 .../FSE/Tango.FSE.BL/EntityRepositoryBase.cs       |  54 ++++++++--
 .../Tango.FSE.BL/Services/MachineEventsService.cs  |  33 ++++---
 .../FSE/Tango.FSE.BL/Services/MachinesService.cs   |  33 ++++---
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 109 ++++++++++++---------
 6 files changed, 155 insertions(+), 84 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
index 9b2436c71..e93311d80 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
@@ -96,7 +96,7 @@ namespace Tango.FSE.Procedures
         /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
-        IMessage Send(String messageName, int? timeout = null, params Object[] args);
+        IMessage Send(String messageName, TimeSpan? timeout = null, params Object[] args);
 
         /// <summary>
         /// Sends a request by name with optional comma separated arguments.
@@ -114,7 +114,7 @@ namespace Tango.FSE.Procedures
         /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
-        T Send<T>(String messageName, int? timeout = null, params Object[] args) where T : class, IMessage;
+        T Send<T>(String messageName, TimeSpan? timeout = null, params Object[] args) where T : class, IMessage;
 
         /// <summary>
         /// Sends a request by name with optional comma separated arguments.
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
index fdfe6af9a..ef5664772 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
@@ -82,7 +82,7 @@ namespace Tango.FSE.Procedures
             TangoIOC.Default.Inject(this);
         }
 
-        public IMessage Send(string messageName, int? timeout = null, params object[] args)
+        public IMessage Send(string messageName, TimeSpan? timeout = null, params object[] args)
         {
             var stubType = MessageFactory.GetAvailableRequestStubs().SingleOrDefault(x => x.Name.ToLower() == messageName.ToLower() || x.Name.Replace("Request", "").ToLower() == messageName.ToLower());
             if (stubType == null)
@@ -123,7 +123,7 @@ namespace Tango.FSE.Procedures
                 }
             }
 
-            return Send(request as IMessage, timeout);
+            return Send(request as IMessage, timeout != null ? (int?)timeout.Value.TotalSeconds : null);
         }
 
         public IMessage Send(string messageName, params object[] args)
@@ -131,7 +131,7 @@ namespace Tango.FSE.Procedures
             return Send(messageName, null, args);
         }
 
-        public T Send<T>(string messageName, int? timeout = null, params object[] args) where T : class, IMessage
+        public T Send<T>(string messageName, TimeSpan? timeout = null, params object[] args) where T : class, IMessage
         {
             return Send(messageName, timeout, args) as T;
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/EntityRepositoryBase.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/EntityRepositoryBase.cs
index e14b61f22..3bc183d11 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/EntityRepositoryBase.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/EntityRepositoryBase.cs
@@ -46,17 +46,38 @@ namespace Tango.FSE.BL
                     {
                         var entities = db.Set<TEntity>().Where(expression).ToList();
 
-                        using (var cache = DiskCache.CreateContext())
-                        {
-                            var collection = cache.Database.GetCollection<TCachedEntity>();
+                        List<TCachedEntity> cachedEntities = new List<TCachedEntity>();
 
+                        try
+                        {
                             foreach (var entity in entities)
                             {
                                 var cachedEntity = ConvertToCached(entity);
+                                cachedEntities.Add(cachedEntity);
                                 _memoryCache.Put(entity.Guid, cachedEntity);
-                                collection.Upsert(cachedEntity);
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error occurred while trying to cache entities of type '{typeof(TEntity).Name}' to memory.");
+                        }
+
+                        try
+                        {
+                            using (var cache = DiskCache.CreateContext())
+                            {
+                                var collection = cache.Database.GetCollection<TCachedEntity>();
+
+                                foreach (var cachedEntity in cachedEntities)
+                                {
+                                    collection.Upsert(cachedEntity);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error occurred while trying to cache entities of type '{typeof(TEntity).Name}' to disk.");
+                        }
 
                         return entities;
                     }
@@ -104,12 +125,29 @@ namespace Tango.FSE.BL
                     {
                         var entity = db.Set<TEntity>().First(expression);
 
-                        using (var cache = DiskCache.CreateContext())
+                        try
                         {
-                            var collection = cache.Database.GetCollection<TCachedEntity>();
-                            var cachedEntity = ConvertToCached(entity);
+                            TCachedEntity cachedEntity = null;
+
+                            cachedEntity = ConvertToCached(entity);
                             _memoryCache.Put(entity.Guid, cachedEntity);
-                            collection.Upsert(cachedEntity);
+
+                            try
+                            {
+                                using (var cache = DiskCache.CreateContext())
+                                {
+                                    var collection = cache.Database.GetCollection<TCachedEntity>();
+                                    collection.Upsert(cachedEntity);
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                LogManager.Log(ex, $"Error caching entity '{entity.Guid}' of type '{typeof(TEntity).Name}' to disk.");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error caching entity '{entity.Guid}' of type '{typeof(TEntity).Name}'.");
                         }
 
                         return entity;
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineEventsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineEventsService.cs
index bba9caf94..4b2609a94 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineEventsService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineEventsService.cs
@@ -43,26 +43,37 @@ namespace Tango.FSE.BL.Services
                     {
                         var eventTypes = db.EventTypes.ToList();
 
-                        using (var cache = DiskCache.CreateContext())
-                        {
-                            var collection = cache.Database.GetCollection<CachedEventType>(EVENT_TYPES_COLLECTION);
+                        List<CachedEventType> cachedEventTypes = new List<CachedEventType>();
 
+                        try
+                        {
                             foreach (var eventType in eventTypes)
                             {
-                                try
-                                {
-                                    var cachedEventType = CachedEventType.FromObservable<CachedEventType>(eventType);
+                                var cachedEventType = CachedEventType.FromObservable<CachedEventType>(eventType);
+                                _eventTypesCache.Put(cachedEventType.Guid, cachedEventType);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error caching event types on memory.");
+                        }
 
-                                    _eventTypesCache.Put(cachedEventType.Guid, cachedEventType);
+                        try
+                        {
+                            using (var cache = DiskCache.CreateContext())
+                            {
+                                var collection = cache.Database.GetCollection<CachedEventType>(EVENT_TYPES_COLLECTION);
 
-                                    collection.Upsert(cachedEventType);
-                                }
-                                catch (Exception ex)
+                                foreach (var cachedEventType in cachedEventTypes)
                                 {
-                                    LogManager.Log(ex, $"Error caching event type '{eventType.Guid}' on disk.");
+                                    collection.Upsert(cachedEventType);
                                 }
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error caching event types to disk.");
+                        }
 
                         return eventTypes;
                     }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachinesService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachinesService.cs
index 8e07551b1..c77bb79c0 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachinesService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachinesService.cs
@@ -265,26 +265,37 @@ namespace Tango.FSE.BL.Services
                     {
                         var machines = db.Machines.Where(x => allowAll || x.OrganizationGuid == CurrentUser.OrganizationGuid).Include(x => x.Organization).ToList();
 
-                        using (var cache = DiskCache.CreateContext())
-                        {
-                            var collection = cache.Database.GetCollection<CachedMachine>(MACHINES_COLLECTION);
+                        List<CachedMachine> cachedMachines = new List<CachedMachine>();
 
+                        try
+                        {
                             foreach (var machine in machines)
                             {
-                                try
-                                {
-                                    var cachedMachine = CachedMachine.FromObservable<CachedMachine>(machine);
+                                var cachedMachine = CachedMachine.FromObservable<CachedMachine>(machine);
+                                _machinesCache.Put(machine.SerialNumber, cachedMachine);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error caching machines (partial) to memory.");
+                        }
 
-                                    _machinesCache.Put(machine.SerialNumber, cachedMachine);
+                        try
+                        {
+                            using (var cache = DiskCache.CreateContext())
+                            {
+                                var collection = cache.Database.GetCollection<CachedMachine>(MACHINES_COLLECTION);
 
-                                    collection.Upsert(cachedMachine);
-                                }
-                                catch (Exception ex)
+                                foreach (var cachedMachine in cachedMachines)
                                 {
-                                    LogManager.Log(ex, $"Error caching machine '{machine.SerialNumber}' on disk.");
+                                    collection.Upsert(cachedMachine);
                                 }
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error caching machines (partial) to disk.");
+                        }
 
                         return machines;
                     }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index a3a682833..0802cf456 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -78,6 +78,22 @@ namespace Tango.Scripting.Editors
 
         #region Mini Classes
 
+        private class KnownTypeResult
+        {
+            public KnownType KnownType { get; set; }
+            public bool IsStatic { get; set; }
+
+            public KnownTypeResult()
+            {
+
+            }
+
+            public KnownTypeResult(KnownType knownType)
+            {
+                KnownType = knownType;
+            }
+        }
+
         private class ScriptClass
         {
             public String Name { get; set; }
@@ -493,19 +509,19 @@ namespace Tango.Scripting.Editors
                 if (e.Text == " " && previousWords.Count > 2 && previousWords[previousWords.Count - 2] == "=")
                 {
                     var expression = previousWords.First();
-                    var knownType = GetKnownTypeFromExpression(expression + ".");
+                    var knownTypeResult = GetKnownTypeFromExpression(expression + ".");
 
-                    if (knownType != null && knownType.Type.IsEnum)
+                    if (knownTypeResult != null && knownTypeResult.KnownType.Type.IsEnum)
                     {
                         completionWindow.HideCompletion();
                         IList<ICompletionData> data = new List<ICompletionData>();
 
-                        foreach (var field in knownType.Fields)
+                        foreach (var field in knownTypeResult.KnownType.Fields)
                         {
                             data.Add(new FieldCompletionItem()
                             {
-                                Class = knownType.FriendlyName,
-                                Name = knownType.FriendlyName + "." + field.Name,
+                                Class = knownTypeResult.KnownType.FriendlyName,
+                                Name = knownTypeResult.KnownType.FriendlyName + "." + field.Name,
                                 Type = field.ReturnTypeFriendlyName,
                                 Description = field.Summary,
                             });
@@ -540,25 +556,25 @@ namespace Tango.Scripting.Editors
                 }
                 else if (e.Text == ".")
                 {
-                    var knownType = GetCurrentKnownType();
+                    var knownTypeResult = GetCurrentKnownType();
 
                     IList<ICompletionData> data = new List<ICompletionData>();
 
-                    if (knownType != null)
+                    if (knownTypeResult != null)
                     {
                         completionWindow.HideCompletion();
 
-                        if (!knownType.Type.IsEnum)
+                        if (!knownTypeResult.KnownType.Type.IsEnum)
                         {
-                            var typeMembers = knownType.Members.ToList();
+                            var typeMembers = knownTypeResult.KnownType.Members.ToList();
 
-                            foreach (var methodGroup in typeMembers.OfType<KnownTypeMethod>().Where(x => !x.IsStatic).GroupBy(x => x.NameWithTypeArguments))
+                            foreach (var methodGroup in typeMembers.OfType<KnownTypeMethod>().Where(x => (!knownTypeResult.IsStatic && !x.IsStatic) || (knownTypeResult.IsStatic && x.IsStatic)).GroupBy(x => x.NameWithTypeArguments))
                             {
                                 var method = methodGroup.First();
 
                                 data.Add(new MethodCompletionItem()
                                 {
-                                    Class = knownType.FriendlyName,
+                                    Class = knownTypeResult.KnownType.FriendlyName,
                                     Name = method.NameWithTypeArguments,
                                     ReturnType = method.ReturnTypeFriendlyName,
                                     Description = method.Summary,
@@ -571,7 +587,7 @@ namespace Tango.Scripting.Editors
                             {
                                 data.Add(new EventCompletionItem()
                                 {
-                                    Class = knownType.FriendlyName,
+                                    Class = knownTypeResult.KnownType.FriendlyName,
                                     Name = ev.Name,
                                     Description = ev.Summary,
                                 });
@@ -583,7 +599,7 @@ namespace Tango.Scripting.Editors
 
                                 data.Add(new PropertyCompletionItem()
                                 {
-                                    Class = knownType.FriendlyName,
+                                    Class = knownTypeResult.KnownType.FriendlyName,
                                     Name = member.Name,
                                     Type = member.ReturnTypeFriendlyName,
                                     Description = member.Summary,
@@ -592,11 +608,11 @@ namespace Tango.Scripting.Editors
                         }
                         else
                         {
-                            foreach (var field in knownType.Fields)
+                            foreach (var field in knownTypeResult.KnownType.Fields)
                             {
                                 data.Add(new FieldCompletionItem()
                                 {
-                                    Class = knownType.FriendlyName,
+                                    Class = knownTypeResult.KnownType.FriendlyName,
                                     Name = field.Name,
                                     Type = field.ReturnTypeFriendlyName,
                                     Description = field.Summary,
@@ -672,34 +688,6 @@ namespace Tango.Scripting.Editors
 
                             ShowCompletionWindow(data, GetCurrentWord());
                         }
-                        else
-                        {
-                            //Maybe static ...
-                            var typeText = GetPreviousWord();
-                            knownType = _knownTypes.FirstOrDefault(x => x.FriendlyName == typeText || x.Alias == typeText);
-
-                            if (knownType != null)
-                            {
-                                var typeMembers = knownType.Members.ToList();
-
-                                foreach (var methodGroup in typeMembers.OfType<KnownTypeMethod>().Where(x => x.IsStatic).GroupBy(x => x.NameWithTypeArguments))
-                                {
-                                    var method = methodGroup.First();
-
-                                    data.Add(new MethodCompletionItem()
-                                    {
-                                        Class = knownType.FriendlyName,
-                                        Name = method.NameWithTypeArguments,
-                                        ReturnType = method.ReturnTypeFriendlyName,
-                                        Description = method.Summary,
-                                        Parameters = method.Parameters,
-                                        Overloads = methodGroup.Count() - 1,
-                                    });
-                                }
-
-                                ShowCompletionWindow(data.OrderBy(x => x.Text).ToList(), GetCurrentWord());
-                            }
-                        }
                     }
                 }
                 else if (e.Text == "(" || e.Text == ",")
@@ -1097,13 +1085,13 @@ namespace Tango.Scripting.Editors
             return list;
         }
 
-        private KnownType GetCurrentKnownType()
+        private KnownTypeResult GetCurrentKnownType()
         {
             var expression = GetPreviousWords().LastOrDefault();
             return GetKnownTypeFromExpression(expression);
         }
 
-        private KnownType GetKnownTypeFromExpression(String expression)
+        private KnownTypeResult GetKnownTypeFromExpression(String expression)
         {
             if (expression != null)
             {
@@ -1124,7 +1112,7 @@ namespace Tango.Scripting.Editors
 
                     if (enumType != null)
                     {
-                        return enumType;
+                        return new KnownTypeResult(enumType);
                     }
 
                     tree.RemoveAt(0);
@@ -1152,13 +1140,36 @@ namespace Tango.Scripting.Editors
                                 knownType = _knownTypes.FirstOrDefault(x => x.Type.Namespace + "." + x.Type.Name == member.ReturnType.Namespace + "." + member.ReturnType.Name);
                             }
 
-                            return knownType;
+                            return new KnownTypeResult(knownType);
+                        }
+                        else //Maybe a variable of a declared type...
+                        {
+                            if (tree.Count > 0)
+                            {
+                                var memberName = tree[0];
+                                var declaredType = _declaredTypes.SingleOrDefault(x => x.Name == name);
+
+                                if (declaredType != null)
+                                {
+                                    var member = declaredType.Symbols.FirstOrDefault(x => x.Name == memberName);
+                                    if (member != null)
+                                    {
+                                        knownType = _knownTypes.SingleOrDefault(x => x.Name.ToLower() == member.Type.ToLower());
+
+                                        if (knownType != null)
+                                        {
+                                            return new KnownTypeResult(knownType);
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                     else
                     {
                         //Maybe static...
-                        return _knownTypes.FirstOrDefault(x => x.Name == variableName);
+                        var type = _knownTypes.FirstOrDefault(x => x.Name == variableName);
+                        return type != null ? new KnownTypeResult(type) { IsStatic = true } : null;
                     }
                 }
             }
@@ -1305,7 +1316,7 @@ namespace Tango.Scripting.Editors
             foreach (var m in session.Type.Methods.Where(x => x.Name == session.MethodName))
             {
                 MethodDescription method = new MethodDescription();
-                method.ReturnType = session.Type.Name;
+                method.ReturnType = m.ReturnTypeFriendlyName;
                 method.Description = m.Summary;
                 method.Name = m.NameWithTypeArguments;
                 method.Class = session.Type.FriendlyName;
-- 
cgit v1.3.1


From 255a47cf96e83e8d11befa9180dc4458f6767188 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 6 Aug 2020 04:34:38 +0300
Subject: Implemented interactive runtime error handling on procedures.

---
 .../Contracts/IProcedureDesignerView.cs            |  3 ++
 .../Tango.FSE.Procedures/ProcedureContext.cs       |  2 +-
 .../ViewModels/ProcedureDesignerViewVM.cs          | 54 +++++++++++++++++++
 .../Views/ProcedureDesignerView.xaml               | 60 ++++++++++++++++++----
 .../Views/ProcedureDesignerView.xaml.cs            | 47 ++++++++++++++++-
 .../Scripting/Tango.Scripting.Basic/Project.cs     |  3 +-
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 35 +++++++++++++
 7 files changed, 192 insertions(+), 12 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
index 5797d622a..fa8a4cab6 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
@@ -21,5 +21,8 @@ namespace Tango.FSE.Procedures.Contracts
         void ResetColrization();
         void HighlightError(int position, int length);
         void ClearErrors();
+        void ScrollToLine(int lineNumber);
+        void HighlightRuntimeError(int lineNumber);
+        void CloseRunTimeError();
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
index ef5664772..88ab8dae9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
@@ -87,7 +87,7 @@ namespace Tango.FSE.Procedures
             var stubType = MessageFactory.GetAvailableRequestStubs().SingleOrDefault(x => x.Name.ToLower() == messageName.ToLower() || x.Name.Replace("Request", "").ToLower() == messageName.ToLower());
             if (stubType == null)
             {
-                throw new ArgumentException("Invalid stub '" + messageName + "'.");
+                throw new ArgumentException($"Stub '{messageName}' could not be located on the PMR.");
             }
 
             var stubProps = stubType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
index 68c8538b8..bd36350c1 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -200,6 +201,20 @@ namespace Tango.FSE.Procedures.ViewModels
             }
         }
 
+        private Exception _runtimeException;
+        public Exception RuntimeException
+        {
+            get { return _runtimeException; }
+            set { _runtimeException = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _runtimeErrorFree;
+        public bool RuntimeErrorFree
+        {
+            get { return _runtimeErrorFree; }
+            set { _runtimeErrorFree = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -244,6 +259,7 @@ namespace Tango.FSE.Procedures.ViewModels
         public RelayCommand<ProcedureResource> RemoveResourceCommand { get; set; }
         public RelayCommand<ProcedureResource> OpenResourceCommand { get; set; }
         public RelayCommand<ProcedureResource> ExportResourceCommand { get; set; }
+        public RelayCommand CloseRuntimeErrorCommand { get; set; }
 
 
         #endregion
@@ -256,6 +272,7 @@ namespace Tango.FSE.Procedures.ViewModels
 
             FontSize = 13;
             ReplaceText = String.Empty;
+            RuntimeErrorFree = true;
 
             LoadedAssemblies = new ObservableCollection<Assembly>();
             ResultsViewVM = new ResultsViewVM();
@@ -309,6 +326,7 @@ namespace Tango.FSE.Procedures.ViewModels
             RemoveResourceCommand = new RelayCommand<ProcedureResource>(RemoveProcedureResource);
             OpenResourceCommand = new RelayCommand<ProcedureResource>(OpenProcedureResource);
             ExportResourceCommand = new RelayCommand<ProcedureResource>(ExportProcedureResource);
+            CloseRuntimeErrorCommand = new RelayCommand(CloseRunTimeError);
         }
 
         #endregion
@@ -557,6 +575,32 @@ namespace Tango.FSE.Procedures.ViewModels
                 SelectedToolWindow = ToolWindows.Output;
                 Logger.WriteLine("Project terminated with error:");
                 Logger.WriteLine(ex.FlattenMessage());
+
+                try
+                {
+                    Regex regex = new Regex(@"OnExecute\(IProcedureContext context\) in :line (\d+)");
+                    var matches = regex.Matches(ex.ToString()).OfType<Match>().ToList();
+
+                    if (matches.Count > 0)
+                    {
+                        var match = matches.First();
+
+                        if (match.Groups.Count > 1)
+                        {
+                            var line = match.Groups[1].Value;
+                            int lineNumber = int.Parse(line) - Project.Scripts.Count + 1;
+                            OpenScript(Project.Scripts.FirstOrDefault(x => x.IsEntryPoint));
+                            RuntimeException = ex;
+                            View.HighlightRuntimeError(lineNumber);
+                            RuntimeErrorFree = false;
+                            Mouse.OverrideCursor = null;
+                        }
+                    }
+                }
+                catch (Exception exx)
+                {
+                    LogManager.Log(exx, "Error occurred while trying to show procedue runtime error.");
+                }
             }
         }
 
@@ -1288,5 +1332,15 @@ namespace Tango.FSE.Procedures.ViewModels
         }
 
         #endregion
+
+        #region Runtime Error
+
+        private void CloseRunTimeError()
+        {
+            View.CloseRunTimeError();
+            RuntimeErrorFree = true;
+        }
+
+        #endregion
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
index 82f799d7b..dd442348f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
@@ -36,7 +36,7 @@
     <Grid>
         <Grid>
             <DockPanel>
-                <Menu IsMainMenu="True" DockPanel.Dock="Top">
+                <Menu IsMainMenu="True" DockPanel.Dock="Top" IsHitTestVisible="{Binding RuntimeErrorFree}">
                     <MenuItem Header="_File">
                         <MenuItem Header="_New" MinWidth="250" Command="{Binding NewProjectCommand}" InputGestureText="Ctrl+N">
                             <MenuItem.Icon>
@@ -166,7 +166,7 @@
                     </MenuItem>
                 </Menu>
 
-                <Grid DockPanel.Dock="Top">
+                <Grid DockPanel.Dock="Top" IsHitTestVisible="{Binding RuntimeErrorFree}">
                     <!--Toolbar-->
                     <ToolBar ClipToBounds="False" Background="Transparent" HorizontalAlignment="Center" ToolBarTray.IsLocked="True">
                         <Button ToolTip="Save" Command="{Binding SaveProjectCommand}">
@@ -206,7 +206,7 @@
                     </ToolBar>
                 </Grid>
 
-                <Grid DockPanel.Dock="Bottom" Height="25" Background="#007BA5" TextElement.FontSize="{StaticResource FSE_SmallFontSize}">
+                <Grid DockPanel.Dock="Bottom" Height="25" Background="#007BA5" TextElement.FontSize="{StaticResource FSE_SmallFontSize}" IsHitTestVisible="{Binding RuntimeErrorFree}">
                     <!--Status Bar-->
                     <Grid>
                         <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Margin="5 0 0 0">
@@ -231,7 +231,7 @@
                         <ColumnDefinition MaxWidth="500" MinWidth="250" Width="134*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Grid Width="350" Margin="0 33 0 0" Visibility="{Binding IsPublishPanelOpened,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <Grid IsHitTestVisible="{Binding RuntimeErrorFree}" Width="350" Margin="0 33 0 0" Visibility="{Binding IsPublishPanelOpened,Converter={StaticResource BooleanToVisibilityConverter}}">
                         <Border BorderThickness="0 0 5 0" BorderBrush="{StaticResource FSE_PrimaryBackgroundBrush}">
                             <DockPanel Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
                                 <Border DockPanel.Dock="Top" Padding="5" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" BorderThickness="0 1 0 0" BorderBrush="{StaticResource FSE_BorderBrush}">
@@ -304,7 +304,7 @@
                             <RowDefinition MinHeight="30" Height="210*"/>
                         </Grid.RowDefinitions>
 
-                        <Grid Grid.Column="2">
+                        <Grid Grid.Column="2" IsHitTestVisible="{Binding RuntimeErrorFree}">
                             <!--Code Editor-->
                             <DockPanel>
                                 <Grid DockPanel.Dock="Top" Height="35">
@@ -492,13 +492,14 @@
                                             </Border>
                                         </Border>
                                     </Grid>
+
                                 </Grid>
                             </DockPanel>
                         </Grid>
 
-                        <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
+                        <GridSplitter IsHitTestVisible="{Binding RuntimeErrorFree}" Grid.Row="1" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
 
-                        <Grid Grid.Row="2">
+                        <Grid Grid.Row="2" IsHitTestVisible="{Binding RuntimeErrorFree}">
                             <!--Output & Error Tabs-->
                             <TabControl  SelectedIndex="{Binding SelectedToolWindow,Mode=TwoWay,Converter={StaticResource EnumToIntConverter}}" ItemContainerStyle="{StaticResource FSE_TabItem_VisualStudio_Output}" TabStripPlacement="Bottom" Margin="0" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}" BorderThickness="0">
                                 <TabItem Header="OUTPUT">
@@ -630,7 +631,7 @@
                                                                                                                 </Button>
                                                                                                                 <controls:FSERoundedCornersComboBox Height="25" FontSize="{StaticResource FSE_SmallFontSize}" ItemsSource="{Binding SelectionInputs}" SelectedValue="{Binding Value}" SelectedValuePath="Value" DisplayMemberPath="Name"/>
                                                                                                             </DockPanel>
-                                                                                                        </StackPanel>   
+                                                                                                        </StackPanel>
                                                                                                     </DataTemplate>
                                                                                                 </Setter.Value>
                                                                                             </Setter>
@@ -734,11 +735,52 @@
                                 </TabItem>
                             </TabControl>
                         </Grid>
+
+                        <Canvas Grid.Column="1" Grid.RowSpan="4" Background="Transparent" Margin="75 35 0 0" x:Name="runTimeErrorCanvas" IsHitTestVisible="True" Visibility="Hidden">
+                            <DockPanel x:Name="runTimeErrorDock" Canvas.Top="200" Canvas.Left="0">
+                                <Grid x:Name="runTimeErrorLineGrid" DockPanel.Dock="Bottom" Width="50" Height="50" HorizontalAlignment="Left">
+                                    <Line RenderTransformOrigin="0.5,0.5" x:Name="runTimeErrorLine" X1="0" Y1="50" X2="50" Y2="0" Stroke="{StaticResource FSE_ErrorBrush}">
+                                        <Line.RenderTransform>
+                                            <RotateTransform Angle="0" x:Name="runTimeErrorLineTransform" />
+                                        </Line.RenderTransform>
+                                    </Line>
+                                </Grid>
+                                <Border Margin="50 0 0 0" Width="500" Height="250" BorderBrush="{StaticResource FSE_BorderBrush}" BorderThickness="1" Background="{StaticResource FSE_PrimaryBackgroundMidBrush}">
+                                    <DockPanel>
+                                        <DockPanel DockPanel.Dock="Top" Height="25" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}">
+                                            <controls:IconButton Width="20" Height="20" Cursor="Hand" ToolTip="Close" Padding="0" Icon="Close" DockPanel.Dock="Right" Margin="0 0 5 0" Command="{Binding CloseRuntimeErrorCommand}" />
+                                            <material:PackIcon Margin="5 0 0 0" Kind="AlertOctagon" VerticalAlignment="Center" />
+                                            <TextBlock Margin="5 2 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_SmallFontSize}">Runtime Error</TextBlock>
+                                        </DockPanel>
+                                        <Grid>
+                                            <DockPanel>
+                                                <TextBlock Margin="10" DockPanel.Dock="Top" Text="{Binding RuntimeException.Message,Mode=OneWay}" TextWrapping="Wrap" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_ErrorBrush}"></TextBlock>
+                                                <TextBox Style="{x:Null}" Margin="5 10 10 10" 
+                                                         HorizontalScrollBarVisibility="Hidden"
+                                                         VerticalScrollBarVisibility="Auto"
+                                                         AcceptsReturn="True"
+                                                         TextWrapping="NoWrap" 
+                                                         BorderThickness="0"
+                                                         Padding="5"
+                                                         BorderBrush="{StaticResource FSE_BorderBrush}"
+                                                         Background="Transparent"
+                                                         Foreground="{StaticResource FSE_GrayBrush}"
+                                                         CaretBrush="{StaticResource FSE_PrimaryForegroundBrush}"
+                                                         FontSize="{StaticResource FSE_SmallFontSize}" Text="{Binding RuntimeException,Mode=OneWay}"
+                                                         IsReadOnly="True">
+                                                    
+                                                </TextBox>
+                                            </DockPanel>
+                                        </Grid>
+                                    </DockPanel>
+                                </Border>
+                            </DockPanel>
+                        </Canvas>
                     </Grid>
 
                     <GridSplitter Grid.Column="2" Width="5" HorizontalAlignment="Center" VerticalAlignment="Stretch" Margin="0 33 0 30" />
 
-                    <Grid Grid.Column="3">
+                    <Grid Grid.Column="3" IsHitTestVisible="{Binding RuntimeErrorFree}">
                         <Grid Margin="0 33 0 29">
                             <!--Project Explorer-->
                             <DockPanel Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
index 1e5deb04a..a85508b24 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
@@ -16,6 +16,7 @@ using Tango.FSE.Procedures.Contracts;
 using Tango.FSE.Procedures.ViewModels;
 using Tango.Scripting.Basic;
 using Tango.Scripting.Editors;
+using Tango.SharedUI.Helpers;
 
 namespace Tango.FSE.Procedures.Views
 {
@@ -92,7 +93,7 @@ namespace Tango.FSE.Procedures.Views
 
             if (editor != null)
             {
-                int count =  editor.ReplaceAll(text, replace);
+                int count = editor.ReplaceAll(text, replace);
                 ColorizeKeyword(text);
                 return count;
             }
@@ -137,5 +138,49 @@ namespace Tango.FSE.Procedures.Views
         {
             GetAllEditors().ForEach(x => x.ClearErrors());
         }
+
+        public void ScrollToLine(int lineNumber)
+        {
+            GetCurrentEditor().ScrollToLine(lineNumber);
+        }
+
+        public void HighlightRuntimeError(int lineNumber)
+        {
+            ScrollToLine(lineNumber);
+            var editor = GetCurrentEditor();
+            editor.HighlightErrorLine(lineNumber);
+            UIHelper.DoEvents();
+            Point? p = editor.GetLineVisualPosition(lineNumber);
+
+            if (p != null)
+            {
+                Point point = p.Value;
+                point = new Point(point.X, point.Y - editor.VerticalOffset);
+                double height = editor.ActualHeight;
+
+                if (point.Y > runTimeErrorDock.ActualHeight)
+                {
+                    DockPanel.SetDock(runTimeErrorLineGrid, Dock.Bottom);
+                    runTimeErrorLineTransform.Angle = 0;
+                    Canvas.SetTop(runTimeErrorDock, point.Y - runTimeErrorDock.ActualHeight);
+                }
+                else
+                {
+                    DockPanel.SetDock(runTimeErrorLineGrid, Dock.Top);
+                    runTimeErrorLineTransform.Angle = 90;
+                    Canvas.SetTop(runTimeErrorDock, point.Y);
+                }
+
+                Canvas.SetLeft(runTimeErrorDock, Math.Min(point.X, editor.ActualWidth - 110 - runTimeErrorDock.ActualWidth));
+
+                runTimeErrorCanvas.Visibility = Visibility.Visible;
+            }
+        }
+
+        public void CloseRunTimeError()
+        {
+            runTimeErrorCanvas.Visibility = Visibility.Hidden;
+            GetCurrentEditor().ResetColorizationByKeyword();
+        }
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index 8ca64ca18..2a1a7b7fc 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -121,9 +121,10 @@ namespace Tango.Scripting.Basic
                     }
                 }
 
-                var scriptOptions = ScriptOptions.Default.WithReferences(LoadReferenceAssemblies());
+                var scriptOptions = ScriptOptions.Default.WithReferences(LoadReferenceAssemblies()).WithEmitDebugInformation(true);
 
                 var s = CSharpScript.Create<object>(mainScriptCode, scriptOptions, typeof(GlobalObject<T>));
+
                 result.Script = s;
 
                 var compileResults = s.Compile();
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 0802cf456..c650ad425 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -191,6 +191,14 @@ namespace Tango.Scripting.Editors
         public static readonly DependencyProperty ColorizeBrushProperty =
             DependencyProperty.Register("ColorizeBrush", typeof(Brush), typeof(ScriptEditor), new PropertyMetadata(new SolidColorBrush(Colors.YellowGreen) { Opacity = 0.5 }));
 
+        public Brush ErrorLineBrush
+        {
+            get { return (Brush)GetValue(ErrorLineBrushProperty); }
+            set { SetValue(ErrorLineBrushProperty, value); }
+        }
+        public static readonly DependencyProperty ErrorLineBrushProperty =
+            DependencyProperty.Register("ErrorLineBrush", typeof(Brush), typeof(ScriptEditor), new PropertyMetadata(new SolidColorBrush(Colors.Red) { Opacity = 0.5 }));
+
         #endregion
 
         #region Constructors
@@ -2486,6 +2494,33 @@ namespace Tango.Scripting.Editors
             errorMarkerService.RemoveAll(m => true);
         }
 
+        public void HighlightErrorLine(int lineNumber)
+        {
+            Document.BeginUpdate();
+
+            var line = Document.GetLineByNumber(lineNumber);
+            OffsetColorizer errorLineColrizer = new OffsetColorizer(line, line.Offset, line.EndOffset, ErrorLineBrush);
+            TextArea.TextView.LineTransformers.Add(errorLineColrizer);
+
+            Document.EndUpdate();
+        }
+
+        public Point? GetLineVisualPosition(int lineNumber)
+        {
+            double top = TextArea.TextView.GetVisualTopByDocumentLine(lineNumber);
+            var visualLine = TextArea.TextView.GetVisualLine(lineNumber);
+
+            if (visualLine != null)
+            {
+                var textLine = visualLine.GetTextLine(0);
+                var x = visualLine.GetTextLineVisualXPosition(textLine, visualLine.VisualLengthWithEndOfLineMarker);
+                var left = visualLine.VisualLengthWithEndOfLineMarker;
+                return new Point(x, top);
+            }
+
+            return null;
+        }
+
         #endregion
     }
 }
-- 
cgit v1.3.1


From 92db2f2431bb58a84dc4d476b889fee1de0143e9 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 9 Aug 2020 02:26:07 +0300
Subject: Procedure runtime debugging and exceptions.

---
 .../BreakPointRequestEventArgs.cs                  |  31 +
 .../Contracts/IProcedureDesignerView.cs            |   5 +
 .../Controls/ObjectInTreeView.xaml                 |  27 +
 .../Controls/ObjectInTreeView.xaml.cs              |  50 ++
 .../Tango.FSE.Procedures/Controls/TreeNode.cs      |  98 ++++
 .../FSE/Modules/Tango.FSE.Procedures/DebugNode.cs  | 256 +++++++++
 .../Helpers/ProcedureExceptionHelper.cs            |  36 ++
 .../Tango.FSE.Procedures/IProcedureContext.cs      |  19 +
 .../Tango.FSE.Procedures/ProcedureContext.cs       |  46 +-
 .../Tango.FSE.Procedures.csproj                    |  12 +
 .../Tango.FSE.Procedures/Themes/Generic.xaml       | 219 +++++++
 .../ViewModels/ProcedureDesignerViewVM.cs          | 105 +++-
 .../Views/ProcedureDesignerView.xaml               |  37 +-
 .../Views/ProcedureDesignerView.xaml.cs            |  66 +++
 .../Sandcastle/SHFBInstaller_v2020.3.6.0.zip       | Bin 0 -> 48579276 bytes
 .../Scripting/Tango.Scripting.Basic/Project.cs     |  42 +-
 .../Scripting/Tango.Scripting.Core/BreakPoint.cs   |  14 +
 .../Tango.Scripting.Core/ScriptBreakPoint.cs       |  23 +
 .../Tango.Scripting.Core/ScriptBreakPointSymbol.cs |  16 +
 .../Tango.Scripting.Core.csproj                    |   3 +
 .../BreakPointSymbolPressedEventArgs.cs            |  16 +
 .../Editing/BreakPointMargin.cs                    | 285 ++++++++++
 .../Images/break_point_arrow.png                   | Bin 0 -> 453 bytes
 .../Intellisense/HideIntellisenseAttribute.cs      |  12 +
 .../Intellisense/KnownType.cs                      |  11 +-
 .../Tango.Scripting.Editors/ScriptEditor.cs        | 229 ++++++++
 .../Tango.Scripting.Editors.csproj                 |   6 +
 .../Tango.Scripting.Editors_di35u2uj_wpftmp.csproj | 628 +++++++++++++++++++++
 .../Tango.Scripting/Parsing/ScriptParser.cs        |  23 +
 .../Tango.Scripting/Parsing/ScriptSymbol.cs        |   4 +
 30 files changed, 2275 insertions(+), 44 deletions(-)
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/BreakPointRequestEventArgs.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/TreeNode.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DebugNode.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Helpers/ProcedureExceptionHelper.cs
 create mode 100644 Software/Visual_Studio/Installers/Sandcastle/SHFBInstaller_v2020.3.6.0.zip
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Core/BreakPoint.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPoint.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPointSymbol.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/BreakPointSymbolPressedEventArgs.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Editing/BreakPointMargin.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Images/break_point_arrow.png
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/HideIntellisenseAttribute.cs
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors_di35u2uj_wpftmp.csproj

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/BreakPointRequestEventArgs.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/BreakPointRequestEventArgs.cs
new file mode 100644
index 000000000..768f4bb0d
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/BreakPointRequestEventArgs.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Scripting.Basic;
+using Tango.Scripting.Core;
+
+namespace Tango.FSE.Procedures
+{
+    public class BreakPointRequestEventArgs : EventArgs
+    {
+        private Action _releaseAction;
+
+        public int LineNumber { get; set; }
+        public Script Script { get; set; }
+
+        public List<ScriptBreakPointSymbol> Symbols { get; set; }
+
+        public BreakPointRequestEventArgs(Action releaseAction)
+        {
+            Symbols = new List<ScriptBreakPointSymbol>();
+            _releaseAction = releaseAction;
+        }
+
+        public void Release()
+        {
+            _releaseAction?.Invoke();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
index fa8a4cab6..a16345f65 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
@@ -4,6 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.FSE.Common;
+using Tango.Scripting.Basic;
+using Tango.Scripting.Core;
 
 namespace Tango.FSE.Procedures.Contracts
 {
@@ -24,5 +26,8 @@ namespace Tango.FSE.Procedures.Contracts
         void ScrollToLine(int lineNumber);
         void HighlightRuntimeError(int lineNumber);
         void CloseRunTimeError();
+        List<ScriptBreakPoint> GetBreakPoints();
+        void HighlightBreakPointRequest(int lineNumber, List<ScriptBreakPointSymbol> symbols);
+        void ResetBreakPointRequest();
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml
new file mode 100644
index 000000000..d331935c8
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml
@@ -0,0 +1,27 @@
+<UserControl x:Class="Tango.FSE.Procedures.Controls.ObjectInTreeView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800" x:Name="ObjectInTreeViewControl">
+    <TreeView ItemsSource="{Binding TreeNodes, ElementName=ObjectInTreeViewControl}" Style="{x:Null}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}" Background="Transparent" FontSize="{StaticResource FSE_SmallFontSize}" BorderThickness="0">
+        <TreeView.Resources>
+            <Style TargetType="TreeViewItem" BasedOn="{StaticResource {x:Type TreeViewItem}}">
+                
+            </Style>
+            <HierarchicalDataTemplate DataType="{x:Type local:TreeNode}" ItemsSource="{Binding Path=Children}">
+                <TreeViewItem Style="{x:Null}">
+                    <TreeViewItem.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Path=Name}"/>
+                            <TextBlock Text=" : "/>
+                            <TextBlock Text="{Binding Path=Value}"/>
+                        </StackPanel>
+                    </TreeViewItem.Header>
+                </TreeViewItem>
+            </HierarchicalDataTemplate>
+        </TreeView.Resources>
+    </TreeView>
+</UserControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml.cs
new file mode 100644
index 000000000..b1d1ee14d
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/ObjectInTreeView.xaml.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.FSE.Procedures.Controls
+{
+    /// <summary>
+    /// Interaction logic for ObjectInTreeView.xaml
+    /// </summary>
+    public partial class ObjectInTreeView : UserControl
+    {
+        public ObjectInTreeView()
+        {
+            InitializeComponent();
+        }
+
+        public object ObjectToVisualize
+        {
+            get { return (object)GetValue(ObjectToVisualizeProperty); }
+            set { SetValue(ObjectToVisualizeProperty, value); }
+        }
+        public static readonly DependencyProperty ObjectToVisualizeProperty =
+            DependencyProperty.Register("ObjectToVisualize", typeof(object), typeof(ObjectInTreeView), new PropertyMetadata(null, OnObjectChanged));
+
+        private static void OnObjectChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            TreeNode tree = TreeNode.CreateTree(e.NewValue);
+            (d as ObjectInTreeView).TreeNodes = new List<TreeNode>() { tree };
+        }
+
+        public List<TreeNode> TreeNodes
+        {
+            get { return (List<TreeNode>)GetValue(TreeNodesProperty); }
+            set { SetValue(TreeNodesProperty, value); }
+        }
+        public static readonly DependencyProperty TreeNodesProperty =
+            DependencyProperty.Register("TreeNodes", typeof(List<TreeNode>), typeof(ObjectInTreeView), new PropertyMetadata(null));
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/TreeNode.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/TreeNode.cs
new file mode 100644
index 000000000..47407077f
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Controls/TreeNode.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Script.Serialization;
+
+namespace Tango.FSE.Procedures.Controls
+{
+    public class TreeNode
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+        public List<TreeNode> Children { get; set; } = new List<TreeNode>();
+
+        public static TreeNode CreateTree(object obj)
+        {
+            if (obj.GetType().IsValueTypeOrString())
+            {
+                return new TreeNode()
+                {
+                    Name = "Value",
+                    Value = obj.ToStringSafe()
+                };
+            }
+            else
+            {
+                JavaScriptSerializer jss = new JavaScriptSerializer();
+                var serialized = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
+                Dictionary<string, object> dic = jss.Deserialize<Dictionary<string, object>>(serialized);
+                var root = new TreeNode();
+                root.Name = "Root";
+                BuildTree(dic, root);
+                return root;
+            }
+        }
+
+        private static void BuildTree(object item, TreeNode node)
+        {
+            if (item is KeyValuePair<string, object>)
+            {
+                KeyValuePair<string, object> kv = (KeyValuePair<string, object>)item;
+                TreeNode keyValueNode = new TreeNode();
+                keyValueNode.Name = kv.Key;
+                keyValueNode.Value = GetValueAsString(kv.Value);
+                node.Children.Add(keyValueNode);
+                BuildTree(kv.Value, keyValueNode);
+            }
+            else if (item is ArrayList)
+            {
+                ArrayList list = (ArrayList)item;
+                int index = 0;
+                foreach (object value in list)
+                {
+                    TreeNode arrayItem = new TreeNode();
+                    arrayItem.Name = $"[{index}]";
+                    arrayItem.Value = "";
+                    node.Children.Add(arrayItem);
+                    BuildTree(value, arrayItem);
+                    index++;
+                }
+            }
+            else if (item is Dictionary<string, object>)
+            {
+                Dictionary<string, object> dictionary = (Dictionary<string, object>)item;
+                foreach (KeyValuePair<string, object> d in dictionary)
+                {
+                    BuildTree(d, node);
+                }
+            }
+        }
+
+        private static string GetValueAsString(object value)
+        {
+            if (value == null)
+                return "null";
+            var type = value.GetType();
+            if (type.IsArray)
+            {
+                return "[]";
+            }
+
+            if (value is ArrayList)
+            {
+                var arr = value as ArrayList;
+                return $"[{arr.Count}]";
+            }
+
+            if (type.IsGenericType)
+            {
+                return "{}";
+            }
+
+            return value.ToString();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DebugNode.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DebugNode.cs
new file mode 100644
index 000000000..81f29c96c
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/DebugNode.cs
@@ -0,0 +1,256 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Core.Commands;
+
+namespace Tango.FSE.Procedures
+{
+    public class DebugNode : ExtendedObject
+    {
+        private Object _originalValue;
+
+        public String Name { get; set; }
+        public Object ParentObject { get; set; }
+
+        private Object _value;
+        public Object Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+
+                if (_originalValue == null)
+                {
+                    _originalValue = _value;
+                }
+
+                DisplayValue = GetDisplayValue(_value);
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        public bool IsSimpleValue { get; set; }
+
+        public String Type { get; set; }
+        public PropertyInfo PropertyInfo { get; set; }
+        public FieldInfo FieldInfo { get; set; }
+
+        public Type MemberType
+        {
+            get
+            {
+                if (PropertyInfo != null)
+                {
+                    return PropertyInfo.PropertyType;
+                }
+                else if (FieldInfo != null)
+                {
+                    return FieldInfo.FieldType;
+                }
+                else
+                {
+                    return Value.GetType();
+                }
+            }
+        }
+
+        private bool _isEdited;
+        public bool IsEdited
+        {
+            get { return _isEdited; }
+            set { _isEdited = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand UpdateValueCommand { get; set; }
+
+        public bool IsEditable
+        {
+            get
+            {
+                if (IsSimpleValue)
+                {
+                    return false; //Sorry can't update simple script symbols as they are passed to me by value...
+                }
+                
+                if (MemberType != null && MemberType.IsValueTypeOrString() && ((PropertyInfo != null  && PropertyInfo.SetMethod != null) || FieldInfo != null))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
+
+        private Object _displayValue;
+        public Object DisplayValue
+        {
+            get { return _displayValue; }
+            set { _displayValue = value; RaisePropertyChangedAuto(); }
+        }
+
+        public List<DebugNode> Nodes
+        {
+            get
+            {
+                return GetChildNodes();
+            }
+        }
+
+        public DebugNode()
+        {
+            UpdateValueCommand = new RelayCommand(UpdateValue);
+        }
+
+        private void UpdateValue()
+        {
+            try
+            {
+                if (IsSimpleValue && Value != null)
+                {
+                    _value = Convert.ChangeType(DisplayValue, Value.GetType());
+                    IsEdited = _originalValue.ToStringSafe() != Value.ToStringSafe();
+                }
+                else if (IsEditable && ((PropertyInfo != null && PropertyInfo.SetMethod != null) || FieldInfo != null))
+                {
+                    if (PropertyInfo != null)
+                    {
+                        _value = Convert.ChangeType(DisplayValue, PropertyInfo.PropertyType);
+                        PropertyInfo.SetValue(ParentObject, Value);
+                        IsEdited = _originalValue.ToStringSafe() != Value.ToStringSafe();
+                    }
+                    else if (FieldInfo != null)
+                    {
+                        _value = Convert.ChangeType(DisplayValue, FieldInfo.FieldType);
+                        FieldInfo.SetValue(ParentObject, Value);
+                        IsEdited = _originalValue.ToStringSafe() != Value.ToStringSafe();
+                    }
+                }
+            }
+            catch { }
+
+            DisplayValue = GetDisplayValue(Value);
+        }
+
+        private List<DebugNode> GetChildNodes()
+        {
+            List<DebugNode> childNodes = new List<DebugNode>();
+
+            if (Value == null) return childNodes;
+
+            var type = Value.GetType();
+
+            if (type.IsValueTypeOrString())
+            {
+                return childNodes;
+            }
+
+            if (typeof(IEnumerable).IsAssignableFrom(type) && type != typeof(String))
+            {
+                List<Object> list = (Value as IEnumerable).Cast<Object>().ToList();
+
+                for (int i = 0; i < list.Count; i++)
+                {
+                    var item = list[i];
+
+                    DebugNode listNode = new DebugNode();
+                    listNode.Name = $"[{i}]";
+                    listNode.Value = item;
+                    listNode.Type = GetFriendlyName(item.GetType());
+                    childNodes.Add(listNode);
+                }
+            }
+            else
+            {
+                foreach (var prop in type.GetProperties(BindingFlags.Instance | BindingFlags.Public))
+                {
+                    DebugNode propNode = new DebugNode();
+                    propNode.Type = GetFriendlyName(prop.PropertyType);
+                    propNode.Name = prop.Name;
+                    propNode.Value = prop.GetValue(Value);
+                    propNode.PropertyInfo = prop;
+                    propNode.ParentObject = Value;
+                    childNodes.Add(propNode);
+                }
+
+                foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public))
+                {
+                    DebugNode propNode = new DebugNode();
+                    propNode.Type = GetFriendlyName(field.FieldType);
+                    propNode.Name = field.Name;
+                    propNode.Value = field.GetValue(Value);
+                    propNode.FieldInfo = field;
+                    propNode.ParentObject = Value;
+                    childNodes.Add(propNode);
+                }
+            }
+
+            return childNodes;
+        }
+
+        public static DebugNode CreateNode(String name, Object obj)
+        {
+            DebugNode node = new DebugNode();
+            node.Name = name;
+            node.Value = obj;
+            node.Type = GetFriendlyName(obj.GetType());
+
+            if (obj.GetType().IsValueTypeOrString())
+            {
+                node.IsSimpleValue = true;
+            }
+
+            return node;
+        }
+
+        private static String GetFriendlyName(Type type)
+        {
+            if (type == typeof(int))
+                return "int";
+            else if (type == typeof(short))
+                return "short";
+            else if (type == typeof(byte))
+                return "byte";
+            else if (type == typeof(bool))
+                return "bool";
+            else if (type == typeof(long))
+                return "long";
+            else if (type == typeof(float))
+                return "float";
+            else if (type == typeof(double))
+                return "double";
+            else if (type == typeof(decimal))
+                return "decimal";
+            else if (type == typeof(string))
+                return "string";
+            else if (type.IsGenericType)
+                return type.Name.Split('`')[0] + "<" + string.Join(", ", type.GetGenericArguments().Select(x => GetFriendlyName(x)).ToArray()) + ">";
+            else
+                return type.Name;
+        }
+
+        private static Object GetDisplayValue(Object value)
+        {
+            if (value == null)
+            {
+                return "null";
+            }
+            else if (value.GetType().IsValueTypeOrString())
+            {
+                return value;
+            }
+            else if (typeof(IEnumerable).IsAssignableFrom(value.GetType()))
+            {
+                List<Object> list = (value as IEnumerable).Cast<Object>().ToList();
+                return $"Count = {list.Count}";
+            }
+
+            return value.ToStringSafe();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Helpers/ProcedureExceptionHelper.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Helpers/ProcedureExceptionHelper.cs
new file mode 100644
index 000000000..7a57681e7
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Helpers/ProcedureExceptionHelper.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Tango.FSE.Procedures.Helpers
+{
+    public static class ProcedureExceptionHelper
+    {
+        public static int? GetExceptionLineNumber(Exception ex, ProcedureProject project)
+        {
+            try
+            {
+                Regex regex = new Regex(@"OnExecute\(IProcedureContext context\) in :line (\d+)");
+                var matches = regex.Matches(ex.ToString()).OfType<Match>().ToList();
+
+                if (matches.Count > 0)
+                {
+                    var match = matches.First();
+
+                    if (match.Groups.Count > 1)
+                    {
+                        var line = match.Groups[1].Value;
+                        int lineNumber = int.Parse(line) - project.Scripts.Count + 1;
+                        return lineNumber;
+                    }
+                }
+            }
+            catch { }
+
+            return null;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
index e93311d80..8dafe2291 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,6 +15,7 @@ using Tango.FSE.Common.Connection;
 using Tango.FSE.Common.Diagnostics;
 using Tango.Integration.Operation;
 using Tango.Scripting.Basic;
+using Tango.Scripting.Editors.Intellisense;
 
 namespace Tango.FSE.Procedures
 {
@@ -22,11 +24,19 @@ namespace Tango.FSE.Procedures
         /// <summary>
         /// Occurs when the procedure is reporting about some progress.
         /// </summary>
+        [HideIntellisense]
         event EventHandler<TangoProgressChangedEventArgs<double>> Progress;
 
+        /// <summary>
+        /// Occurs when a procedure object break point request occurs through the IDE break points.
+        /// </summary>
+        [HideIntellisense]
+        event EventHandler<BreakPointRequestEventArgs> BreakPointRequest;
+
         /// <summary>
         /// Gets the list of current results.
         /// </summary>
+        [HideIntellisense]
         ReadOnlyCollection<Result> Results { get; }
 
         /// <summary>
@@ -469,5 +479,14 @@ namespace Tango.FSE.Procedures
         /// <param name="file">The file path.</param>
         /// <param name="items">The items to write.</param>
         void WriteCsv<T>(String file, List<T> items);
+
+        /// <summary>
+        /// Request a breakpoint operation from the host IDE (internal use only).
+        /// </summary>
+        /// <param name="file">The file.</param>
+        /// <param name="lineNumber">The line number.</param>
+        /// <param name="symbolsMap">The symbols map.</param>
+        [HideIntellisense]
+        void BreakPoint(String file, int lineNumber, params Object[] symbolsMap);
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
index 88ab8dae9..0f422c5f5 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -25,9 +26,11 @@ using Tango.FSE.Common.Diagnostics;
 using Tango.FSE.Common.Notifications;
 using Tango.FSE.Common.Threading;
 using Tango.FSE.Procedures.Dialogs;
+using Tango.FSE.Procedures.Helpers;
 using Tango.Integration.Operation;
 using Tango.PMR;
 using Tango.Scripting.Basic;
+using Tango.Scripting.Core;
 
 namespace Tango.FSE.Procedures
 {
@@ -38,6 +41,10 @@ namespace Tango.FSE.Procedures
         private Dictionary<String, ProcedureInput> _inputs;
         private DiagnosticsFrame _lastDiagnosticsFrame;
 
+        public event EventHandler<TangoProgressChangedEventArgs<double>> Progress;
+
+        public event EventHandler<BreakPointRequestEventArgs> BreakPointRequest;
+
         [TangoInject]
         private IMachineProvider MachineProvider { get; set; }
 
@@ -561,8 +568,6 @@ namespace Tango.FSE.Procedures
             });
         }
 
-        public event EventHandler<TangoProgressChangedEventArgs<double>> Progress;
-
         public Result AddBitmapResult(ResultType type, String name, Bitmap bitmap)
         {
             return AddResult(new Result()
@@ -799,5 +804,42 @@ namespace Tango.FSE.Procedures
 
             csvFile.Dispose();
         }
+
+        public void BreakPoint(string file, int lineNumber, params object[] symbolsMap)
+        {
+            if (BreakPointRequest != null && symbolsMap.Length > 0)
+            {
+                bool released = false;
+
+                BreakPointRequestEventArgs args = new BreakPointRequestEventArgs(() =>
+                {
+                    released = true;
+                });
+
+                args.LineNumber = lineNumber;
+                args.Script = _project.Scripts.SingleOrDefault(x => x.Name == file);
+
+                for (int i = 0; i < symbolsMap.Length; i += 4)
+                {
+                    args.Symbols.Add(new ScriptBreakPointSymbol()
+                    {
+                        Name = symbolsMap[i].ToString(),
+                        Offset = (int)symbolsMap[i + 1],
+                        Length = (int)symbolsMap[i + 2],
+                        SymbolObject = symbolsMap[i + 3],
+                    });
+                }
+
+                DispatcherProvider.Invoke(() =>
+                {
+                    BreakPointRequest?.Invoke(this, args);
+                });
+
+                while (!released)
+                {
+                    Thread.Sleep(100);
+                }
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
index fcd5c7603..03ae31168 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
@@ -80,6 +80,7 @@
     <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -100,12 +101,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ArrayParsingStyle.cs" />
+    <Compile Include="BreakPointRequestEventArgs.cs" />
     <Compile Include="Contracts\IProcedureDesignerView.cs" />
+    <Compile Include="Controls\ObjectInTreeView.xaml.cs">
+      <DependentUpon>ObjectInTreeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\TreeNode.cs" />
     <Compile Include="Converters\BitmapToBitmapSourceConverter.cs" />
     <Compile Include="CreateGroup.cs" />
     <Compile Include="CreateItem.cs" />
     <Compile Include="CSV\CsvColumn.cs" />
     <Compile Include="CSV\CsvRow.cs" />
+    <Compile Include="DebugNode.cs" />
     <Compile Include="Designer\ProjectModel.cs" />
     <Compile Include="Designer\ScriptTabModel.cs" />
     <Compile Include="DialogController.cs" />
@@ -142,6 +149,7 @@
       <DependentUpon>UserInputDialogView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Dialogs\UserInputDialogViewVM.cs" />
+    <Compile Include="Helpers\ProcedureExceptionHelper.cs" />
     <Compile Include="IDialogController.cs" />
     <Compile Include="IProcedureContext.cs" />
     <Compile Include="IProcedureLogger.cs" />
@@ -300,6 +308,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Controls\ObjectInTreeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\AddReferenceAssemblyView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml
index 06e60997d..661eb5405 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Themes/Generic.xaml
@@ -2,6 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:realTimeGraphX="clr-namespace:RealTimeGraphX.WPF;assembly=RealTimeGraphX.WPF"
                     xmlns:commonGraph="clr-namespace:Tango.FSE.Common.Graphs;assembly=Tango.FSE.Common"
+                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
                     xmlns:local="clr-namespace:Tango.FSE.Procedures.Themes">
 
     <Style x:Key="FocusVisual">
@@ -467,4 +469,221 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="FSE_Debug_TreeViewItemFocusVisualStyle">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
+
+    <Style x:Key="FSE_Debug_ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Width" Value="20"/>
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Background="Transparent" Height="20" Padding="5,5,5,5" Width="20">
+                        <Path x:Name="ExpandPath" Data="{StaticResource TreeArrow}" Fill="Transparent" Stroke="{StaticResource FSE_PrimaryForegroundBrush}">
+                            <Path.RenderTransform>
+                                <RotateTransform Angle="135" CenterY="3" CenterX="3"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="RenderTransform" TargetName="ExpandPath">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180" CenterY="3" CenterX="3"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource FSE_PrimaryForegroundBrush}"/>
+                            <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource FSE_PrimaryForegroundBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource FSE_PrimaryAccentBrush}"/>
+                            <Setter Property="Fill" TargetName="ExpandPath" Value="Transparent"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource FSE_PrimaryAccentBrush}"/>
+                            <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource FSE_PrimaryAccentBrush}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="FSE_Debug_TreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FSE_Debug_TreeViewItemFocusVisualStyle}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="19" Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource FSE_Debug_ExpandCollapseToggleStyle}"/>
+                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                            <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="false">
+                            <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="true"/>
+                                <Condition Property="IsSelectionActive" Value="false"/>
+                            </MultiTrigger.Conditions>
+
+                        </MultiTrigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{StaticResource FSE_GrayBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel/>
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="FSE_Debug_TreeViewStyle" TargetType="{x:Type TreeView}">
+        <Style.Resources>
+            <Style TargetType="TreeViewItem" BasedOn="{StaticResource FSE_Debug_TreeViewItemStyle}">
+
+            </Style>
+        </Style.Resources>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TreeView}">
+                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                        <ScrollViewer x:Name="_tv_scrollviewer_" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                            <ItemsPresenter/>
+                        </ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
+                        </Trigger>
+                        <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+                            <Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel/>
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+    <Style x:Key="FSE_Debug_TextBoxStyle" TargetType="TextBox">
+        <Setter Property="Background" Value="Transparent"></Setter>
+        <Setter Property="BorderBrush" Value="{StaticResource FSE_BorderBrush}"></Setter>
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter>
+        <Setter Property="CaretBrush" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter>
+    </Style>
+
+    <DataTemplate x:Key="TreeViewDataTemplate">
+        <DockPanel>
+            <material:PackIcon Kind="Cube" VerticalAlignment="Center" Width="12" Height="12" Foreground="{StaticResource FSE_PrimaryForegroundBrush}" />
+            <DockPanel Margin="2 0 0 0">
+                <Border BorderThickness="0.5" BorderBrush="{StaticResource FSE_BorderBrush}" Padding="2">
+                    <TextBlock Margin="0 0 0 0" Width="100" Text="{Binding Name}" ToolTip="{Binding Name}"></TextBlock>
+                </Border>
+                <DockPanel>
+                    <TextBlock DockPanel.Dock="Right" Margin="10 -1 10 0" Foreground="{StaticResource FSE_GrayBrush}" VerticalAlignment="Center">
+                        <Run>[</Run>
+                        <Run Text="{Binding Type}"></Run>
+                        <Run>]</Run>
+                    </TextBlock>
+                    <Border Margin="0 0 0 0" BorderThickness="0.5" BorderBrush="{StaticResource FSE_BorderBrush}" Padding="2">
+                        <DockPanel ToolTip="{Binding DisplayValue}">
+                            <material:PackIcon Kind="Search" Width="12" Height="12" VerticalAlignment="Center" />
+                            <TextBox IsEnabled="{Binding IsEditable}" MinWidth="100" MaxWidth="100" Margin="2 0 0 0" Text="{Binding DisplayValue,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBox.Style>
+                                    <Style TargetType="TextBox" BasedOn="{StaticResource FSE_Debug_TextBoxStyle}">
+                                        <Setter Property="FontWeight" Value="Normal"></Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsEdited}" Value="True">
+                                                <Setter Property="FontWeight" Value="SemiBold"></Setter>
+                                                <Setter Property="Foreground" Value="Red"></Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Style>
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="LostFocus">
+                                        <i:InvokeCommandAction Command="{Binding UpdateValueCommand}" />
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                                <TextBox.InputBindings>
+                                    <KeyBinding Key="Return" Command="{Binding UpdateValueCommand}" />
+                                </TextBox.InputBindings>
+                            </TextBox>
+                        </DockPanel>
+                    </Border>
+                </DockPanel>
+            </DockPanel>
+        </DockPanel>
+    </DataTemplate>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
index bd36350c1..8b3912c32 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
@@ -59,6 +59,7 @@ namespace Tango.FSE.Procedures.ViewModels
         private String PROJECT_DIALOG_FILTER = $"Procedure Project Files|*.pproj";
         private bool _isProjectChanged;
         private TaskItem _symbolsTaskItem;
+        private BreakPointRequestEventArgs _lastBreakPointRequestArgs;
 
         #region Properties
 
@@ -215,6 +216,20 @@ namespace Tango.FSE.Procedures.ViewModels
             set { _runtimeErrorFree = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isBreakPoint;
+        public bool IsBreakPoint
+        {
+            get { return _isBreakPoint; }
+            set { _isBreakPoint = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private bool _isReadOnly;
+        public bool IsReadOnly
+        {
+            get { return _isReadOnly; }
+            set { _isReadOnly = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -260,6 +275,7 @@ namespace Tango.FSE.Procedures.ViewModels
         public RelayCommand<ProcedureResource> OpenResourceCommand { get; set; }
         public RelayCommand<ProcedureResource> ExportResourceCommand { get; set; }
         public RelayCommand CloseRuntimeErrorCommand { get; set; }
+        public RelayCommand ContinueProjectCommand { get; set; }
 
 
         #endregion
@@ -288,7 +304,7 @@ namespace Tango.FSE.Procedures.ViewModels
             OpenScripts = new ObservableCollection<Script>();
             OpenScriptCommand = new RelayCommand<Script>(OpenScript);
             CloseScriptCommand = new RelayCommand<Script>(CloseScript);
-            RunProjectCommand = new RelayCommand(RunProject, () => ProjectRunner != null && ProjectRunner.CanRun);
+            RunProjectCommand = new RelayCommand(RunProject, () => ProjectRunner != null && (ProjectRunner.CanRun || IsBreakPoint));
             StopProjectCommand = new RelayCommand(StopProject, () => ProjectRunner != null && ProjectRunner.IsRunning);
             CompileProjectCommand = new RelayCommand(async () => await CompileProject(), () => ProjectRunner != null && ProjectRunner.CanCompile);
             AddReferenceAssemblyCommand = new RelayCommand(AddReferenceAssembly);
@@ -327,6 +343,7 @@ namespace Tango.FSE.Procedures.ViewModels
             OpenResourceCommand = new RelayCommand<ProcedureResource>(OpenProcedureResource);
             ExportResourceCommand = new RelayCommand<ProcedureResource>(ExportProcedureResource);
             CloseRuntimeErrorCommand = new RelayCommand(CloseRunTimeError);
+            ContinueProjectCommand = new RelayCommand(ContinueProject);
         }
 
         #endregion
@@ -482,6 +499,8 @@ namespace Tango.FSE.Procedures.ViewModels
         private void StopProject()
         {
             ProjectRunner.Stop();
+            ContinueProject();
+            IsReadOnly = false;
         }
 
         private async Task<bool> CompileProject()
@@ -541,15 +560,35 @@ namespace Tango.FSE.Procedures.ViewModels
 
         private async void RunProject()
         {
+            if (IsBreakPoint)
+            {
+                ContinueProject();
+                return;
+            }
+
             try
             {
                 if (await CompileProject())
                 {
+                    IsReadOnly = true;
                     SelectedToolWindow = ToolWindows.Output;
                     ResultsViewVM.Results = new List<Result>();
                     Logger.Clear();
                     Logger.WriteLine("Running project...");
+
                     var context = new ProcedureContext(Project, this);
+
+                    context.BreakPointRequest += Context_BreakPointRequest;
+
+                    try
+                    {
+                        Project.BreakPoints = View.GetBreakPoints();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error initializing break points for project.");
+                    }
+
                     await ProjectRunner.Run(context);
 
                     ResultsViewVM.Results = context.Results.ToList();
@@ -564,44 +603,44 @@ namespace Tango.FSE.Procedures.ViewModels
                     {
                         Logger.WriteLine("Project ran to completion with zero results.");
                     }
+
+                    IsReadOnly = false;
                 }
             }
             catch (OperationCanceledException)
             {
+                IsReadOnly = false;
                 Logger.WriteLine("Project terminated by user.");
             }
             catch (Exception ex)
             {
+                IsReadOnly = false;
                 SelectedToolWindow = ToolWindows.Output;
                 Logger.WriteLine("Project terminated with error:");
                 Logger.WriteLine(ex.FlattenMessage());
 
                 try
                 {
-                    Regex regex = new Regex(@"OnExecute\(IProcedureContext context\) in :line (\d+)");
-                    var matches = regex.Matches(ex.ToString()).OfType<Match>().ToList();
+                    int? lineNumber = Helpers.ProcedureExceptionHelper.GetExceptionLineNumber(ex, Project);
 
-                    if (matches.Count > 0)
+                    if (lineNumber != null)
                     {
-                        var match = matches.First();
-
-                        if (match.Groups.Count > 1)
-                        {
-                            var line = match.Groups[1].Value;
-                            int lineNumber = int.Parse(line) - Project.Scripts.Count + 1;
-                            OpenScript(Project.Scripts.FirstOrDefault(x => x.IsEntryPoint));
-                            RuntimeException = ex;
-                            View.HighlightRuntimeError(lineNumber);
-                            RuntimeErrorFree = false;
-                            Mouse.OverrideCursor = null;
-                        }
+                        OpenScript(Project.Scripts.FirstOrDefault(x => x.IsEntryPoint));
+                        RuntimeException = ex;
+                        View.HighlightRuntimeError(lineNumber.Value);
+                        RuntimeErrorFree = false;
+                        IsReadOnly = true;
                     }
                 }
                 catch (Exception exx)
                 {
-                    LogManager.Log(exx, "Error occurred while trying to show procedue runtime error.");
+                    LogManager.Log(exx, "Error occurred while trying to show procedure runtime error.");
                 }
             }
+            finally
+            {
+                Project.BreakPoints.Clear();
+            }
         }
 
         #endregion
@@ -1339,6 +1378,38 @@ namespace Tango.FSE.Procedures.ViewModels
         {
             View.CloseRunTimeError();
             RuntimeErrorFree = true;
+            IsReadOnly = false;
+        }
+
+        #endregion
+
+        #region BreakPoint Request
+
+        private void Context_BreakPointRequest(object sender, BreakPointRequestEventArgs e)
+        {
+            try
+            {
+                _lastBreakPointRequestArgs = e;
+                OpenScript(e.Script);
+                View.HighlightBreakPointRequest(e.LineNumber, e.Symbols);
+                IsBreakPoint = true;
+            }
+            catch (Exception ex)
+            {
+                e.Release();
+                LogManager.Log(ex, "Error initializing runtime debug request.");
+            }
+        }
+
+        private void ContinueProject()
+        {
+            if (_lastBreakPointRequestArgs != null)
+            {
+                View.ResetBreakPointRequest();
+                IsBreakPoint = false;
+                _lastBreakPointRequestArgs.Release();
+                _lastBreakPointRequestArgs = null;
+            }
         }
 
         #endregion
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
index dd442348f..5329c13dc 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml
@@ -8,6 +8,7 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:components="clr-namespace:Tango.SharedUI.Components;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
+             xmlns:localControls="clr-namespace:Tango.FSE.Procedures.Controls"
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:editors="clr-namespace:Tango.Scripting.Editors;assembly=Tango.Scripting.Editors"
              xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common"
@@ -191,6 +192,12 @@
                             <material:PackIcon Kind="ContentPaste" />
                         </Button>
                         <Separator/>
+                        <Button Width="125" ToolTip="Continue (F5)" ToolBar.OverflowMode="AsNeeded" Command="{Binding ContinueProjectCommand}" Visibility="{Binding IsBreakPoint,Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <DockPanel>
+                                <material:PackIcon Kind="Play" Foreground="{StaticResource FSE_GreenBrush}" />
+                                <TextBlock Margin="10 2 0 0" VerticalAlignment="Center">Continue</TextBlock>
+                            </DockPanel>
+                        </Button>
                         <Button Width="120" ToolTip="Run (F5)" ToolBar.OverflowMode="AsNeeded" Command="{Binding RunProjectCommand}" Visibility="{Binding ProjectRunner.IsRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}" IsEnabled="{Binding ProjectRunner.CanRun}">
                             <DockPanel>
                                 <material:PackIcon Kind="Play" Foreground="{StaticResource FSE_GreenBrush}" />
@@ -413,10 +420,13 @@
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate>
                                                 <editors:ScriptEditor 
+                                            IsReadOnly="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.IsReadOnly}"
+                                            ScriptSource="{Binding}"
                                             ReferenceAssemblies="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.LoadedAssemblies}" 
                                             AdditionalScripts="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Project.AdditionalScripts}"
                                             FontSize="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.FontSize}"
-                                            Code="{Binding Code,Mode=TwoWay}">
+                                            Code="{Binding Code,Mode=TwoWay}"
+                                            BreakPointSymbolPressed="ScriptEditor_BreakPointSymbolPressed">
 
                                                     <editors:ScriptEditor.ContextMenu>
                                                         <ContextMenu>
@@ -736,7 +746,7 @@
                             </TabControl>
                         </Grid>
 
-                        <Canvas Grid.Column="1" Grid.RowSpan="4" Background="Transparent" Margin="75 35 0 0" x:Name="runTimeErrorCanvas" IsHitTestVisible="True" Visibility="Hidden">
+                        <Canvas Grid.Column="1" Grid.RowSpan="4" Background="Transparent" Margin="95 35 0 0" x:Name="runTimeErrorCanvas" IsHitTestVisible="True" Visibility="Hidden">
                             <DockPanel x:Name="runTimeErrorDock" Canvas.Top="200" Canvas.Left="0">
                                 <Grid x:Name="runTimeErrorLineGrid" DockPanel.Dock="Bottom" Width="50" Height="50" HorizontalAlignment="Left">
                                     <Line RenderTransformOrigin="0.5,0.5" x:Name="runTimeErrorLine" X1="0" Y1="50" X2="50" Y2="0" Stroke="{StaticResource FSE_ErrorBrush}">
@@ -768,7 +778,7 @@
                                                          CaretBrush="{StaticResource FSE_PrimaryForegroundBrush}"
                                                          FontSize="{StaticResource FSE_SmallFontSize}" Text="{Binding RuntimeException,Mode=OneWay}"
                                                          IsReadOnly="True">
-                                                    
+
                                                 </TextBox>
                                             </DockPanel>
                                         </Grid>
@@ -776,6 +786,27 @@
                                 </Border>
                             </DockPanel>
                         </Canvas>
+
+                        <Canvas Grid.Column="1" Grid.RowSpan="4" Background="Transparent" Margin="95 35 0 0" x:Name="runTimeBreakPointCanvas" IsHitTestVisible="True" Visibility="Hidden" MouseUp="RunTimeBreakPointCanvas_MouseUp">
+                            <DockPanel x:Name="runTimeBreakPointDock" Canvas.Top="200" Canvas.Left="0">
+                                <Border BorderBrush="{StaticResource FSE_BorderBrush}" MaxHeight="300" MaxWidth="700" BorderThickness="1" Background="{StaticResource FSE_PrimaryBackgroundMidBrush}" Padding="2" TextElement.FontSize="{StaticResource FSE_SmallFontSize}">
+                                    <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                                        <TreeView Style="{StaticResource FSE_Debug_TreeViewStyle}" x:Name="runTimeBreakPointTreeView">
+                                            <TreeView.Resources>
+                                                <HierarchicalDataTemplate ItemsSource="{Binding Nodes}" DataType="{x:Type global:DebugNode}">
+                                                    <ContentControl Content="{Binding}" ContentTemplate="{StaticResource TreeViewDataTemplate}" />
+                                                </HierarchicalDataTemplate>
+                                            </TreeView.Resources>
+                                            <TreeViewItem ItemsSource="{Binding Nodes}">
+                                                <TreeViewItem.Header>
+                                                    <ContentControl Content="{Binding}" ContentTemplate="{StaticResource TreeViewDataTemplate}" />
+                                                </TreeViewItem.Header>
+                                            </TreeViewItem>
+                                        </TreeView>
+                                    </ScrollViewer>
+                                </Border>
+                            </DockPanel>
+                        </Canvas>
                     </Grid>
 
                     <GridSplitter Grid.Column="2" Width="5" HorizontalAlignment="Center" VerticalAlignment="Stretch" Margin="0 33 0 30" />
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
index a85508b24..0ee25b64d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
@@ -14,7 +14,9 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Tango.FSE.Procedures.Contracts;
 using Tango.FSE.Procedures.ViewModels;
+using Tango.Logging;
 using Tango.Scripting.Basic;
+using Tango.Scripting.Core;
 using Tango.Scripting.Editors;
 using Tango.SharedUI.Helpers;
 
@@ -182,5 +184,69 @@ namespace Tango.FSE.Procedures.Views
             runTimeErrorCanvas.Visibility = Visibility.Hidden;
             GetCurrentEditor().ResetColorizationByKeyword();
         }
+
+        public void HighlightDebugRequest(Object toDebug, int lineNumber)
+        {
+            ScrollToLine(lineNumber);
+            var editor = GetCurrentEditor();
+            editor.HighlightDebugLine(lineNumber);
+            UIHelper.DoEvents();
+            Point? p = editor.GetLineVisualPosition(lineNumber);
+
+            if (p != null)
+            {
+                Point point = p.Value;
+
+            }
+        }
+
+        public List<ScriptBreakPoint> GetBreakPoints()
+        {
+            List<ScriptBreakPoint> breakPoints = new List<ScriptBreakPoint>();
+
+            foreach (var editor in GetAllEditors())
+            {
+                breakPoints.AddRange(editor.GetBreakPoints());
+            }
+
+            return breakPoints;
+        }
+
+        public void HighlightBreakPointRequest(int lineNumber, List<ScriptBreakPointSymbol> symbols)
+        {
+            UIHelper.DoEvents();
+            ScrollToLine(lineNumber);
+            var editor = GetCurrentEditor();
+            editor.HighlightBreakPoint(lineNumber, symbols);
+            UIHelper.DoEvents();
+        }
+
+        public void ResetBreakPointRequest()
+        {
+            GetCurrentEditor().ResetBreakPointLine();
+        }
+
+        private void ScriptEditor_BreakPointSymbolPressed(object sender, BreakPointSymbolPressedEventArgs e)
+        {
+            try
+            {
+                var editor = GetCurrentEditor();
+                var point = new Point(e.Position.X, e.Position.Y - editor.VerticalOffset);
+                Canvas.SetTop(runTimeBreakPointDock, point.Y);
+                Canvas.SetLeft(runTimeBreakPointDock, Math.Min(point.X, editor.ActualWidth - 110 - runTimeBreakPointDock.ActualWidth));
+
+                runTimeBreakPointTreeView.DataContext = DebugNode.CreateNode(e.BreakPointSymbol.Name, e.BreakPointSymbol.SymbolObject);
+                runTimeBreakPointCanvas.Visibility = Visibility.Visible;
+            }
+            catch (Exception ex)
+            {
+                LogManager.Default.Log(ex, "Error initializing break point debug window.");
+            }
+        }
+
+        private void RunTimeBreakPointCanvas_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            runTimeBreakPointCanvas.Visibility = Visibility.Hidden;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Installers/Sandcastle/SHFBInstaller_v2020.3.6.0.zip b/Software/Visual_Studio/Installers/Sandcastle/SHFBInstaller_v2020.3.6.0.zip
new file mode 100644
index 000000000..c8f91b5e1
Binary files /dev/null and b/Software/Visual_Studio/Installers/Sandcastle/SHFBInstaller_v2020.3.6.0.zip differ
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index 2a1a7b7fc..2bd438ff8 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -52,6 +52,8 @@ namespace Tango.Scripting.Basic
             }
         }
 
+        public List<ScriptBreakPoint> BreakPoints { get; set; }
+
         public Project()
         {
             ID = Guid.NewGuid().ToString();
@@ -62,6 +64,8 @@ namespace Tango.Scripting.Basic
 
             Scripts = new ObservableCollection<Script>();
             Scripts.CollectionChanged += (x, e) => { RaisePropertyChanged(nameof(AdditionalScripts)); };
+
+            BreakPoints = new List<ScriptBreakPoint>();
         }
 
         public Task<CompilationResult> Compile()
@@ -93,25 +97,28 @@ namespace Tango.Scripting.Basic
 
                     code = loadingString + code;
 
+                    int debugLinesLength = 0;
+
+                    foreach (var breakPoint in BreakPoints.Where(x => x.Script == script).OrderBy(x => x.LineNumber))
+                    {
+                        var debugLine = $"context.BreakPoint(\"{script.Name}\",{breakPoint.LineNumber}";
+
+                        foreach (var symbol in breakPoint.ContextSymbols)
+                        {
+                            debugLine += $",\"{symbol.Name}\",{symbol.Offset},{symbol.Length},{symbol.Name}";
+                        }
+
+                        debugLine += ");";
+
+                        StringBuilder builder = new StringBuilder(code);
+                        builder.Insert(breakPoint.LineStartOffset + loadingString.Length + debugLinesLength, debugLine);
+                        code = builder.ToString();
+
+                        debugLinesLength += debugLine.Length;
+                    }
+
                     if (!script.IsEntryPoint)
                     {
-                        //In case we use #load
-                        //foreach (var match in Regex.Matches(code, "#load \".+\"").OfType<Match>())
-                        //{
-                        //    String line = match.ToString();
-                        //    var pathMatch = Regex.Match(line, "(?<=\")(.*?)(?=\")");
-                        //    if (pathMatch.Success)
-                        //    {
-                        //        String path = pathMatch.ToString();
-
-                        //        if (!System.IO.Path.IsPathRooted(path))
-                        //        {
-                        //            StringBuilder builder = new StringBuilder(code);
-                        //            builder.Insert(match.Index + pathMatch.Index, System.IO.Path.GetFullPath(tempFolder + "\\"));
-                        //            code = builder.ToString();
-                        //        }
-                        //    }
-                        //}
                         File.WriteAllText(codeFile, code);
                     }
                     else
@@ -188,6 +195,7 @@ namespace Tango.Scripting.Basic
                 }
                 finally
                 {
+                    BreakPoints.Clear();
                     GC.Collect();
                 }
             });
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Core/BreakPoint.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/BreakPoint.cs
new file mode 100644
index 000000000..e847ea03e
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/BreakPoint.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Scripting.Core
+{
+    public class BreakPoint
+    {
+        public int LineNumber { get; set; }
+        public bool IsActive { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPoint.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPoint.cs
new file mode 100644
index 000000000..626c1abc6
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPoint.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Scripting.Core;
+
+namespace Tango.Scripting.Core
+{
+    public class ScriptBreakPoint
+    {
+        public IScriptSource Script { get; set; }
+        public int LineNumber { get; set; }
+        public int LineStartOffset { get; set; }
+        public int LineEndOffset { get; set; }
+        public List<ScriptBreakPointSymbol> ContextSymbols { get; set; }
+
+        public ScriptBreakPoint()
+        {
+            ContextSymbols = new List<ScriptBreakPointSymbol>();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPointSymbol.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPointSymbol.cs
new file mode 100644
index 000000000..8da35fe55
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/ScriptBreakPointSymbol.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Scripting.Core
+{
+    public class ScriptBreakPointSymbol
+    {
+        public String Name { get; set; }
+        public int Offset { get; set; }
+        public int Length { get; set; }
+        public Object SymbolObject { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Core/Tango.Scripting.Core.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/Tango.Scripting.Core.csproj
index aa4bbb240..bb623a4fe 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Core/Tango.Scripting.Core.csproj
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Core/Tango.Scripting.Core.csproj
@@ -41,8 +41,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BreakPoint.cs" />
     <Compile Include="IScriptSource.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScriptBreakPoint.cs" />
+    <Compile Include="ScriptBreakPointSymbol.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/BreakPointSymbolPressedEventArgs.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/BreakPointSymbolPressedEventArgs.cs
new file mode 100644
index 000000000..1728bb565
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/BreakPointSymbolPressedEventArgs.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using Tango.Scripting.Core;
+
+namespace Tango.Scripting.Editors
+{
+    public class BreakPointSymbolPressedEventArgs : EventArgs
+    {
+        public ScriptBreakPointSymbol BreakPointSymbol { get; set; }
+        public Point Position { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Editing/BreakPointMargin.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Editing/BreakPointMargin.cs
new file mode 100644
index 000000000..e566e6aa9
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Editing/BreakPointMargin.cs
@@ -0,0 +1,285 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.TextFormatting;
+using Tango.Scripting.Core;
+using Tango.Scripting.Editors.Document;
+using Tango.Scripting.Editors.Rendering;
+using Tango.Scripting.Editors.Utils;
+
+namespace Tango.Scripting.Editors.Editing
+{
+    public class BreakPointMargin : AbstractMargin, IWeakEventListener
+    {
+        private TextArea textArea;
+        private int maxLineNumberLength = 1;
+        private BitmapSource _arrowBitmap;
+        private ScriptEditor _editor;
+
+        public ObservableCollection<BreakPoint> BreakPoints { get; set; }
+
+        public Brush Background
+        {
+            get { return (Brush)GetValue(BackgroundProperty); }
+            set { SetValue(BackgroundProperty, value); }
+        }
+        public static readonly DependencyProperty BackgroundProperty =
+            DependencyProperty.Register("Background", typeof(Brush), typeof(BreakPointMargin), new PropertyMetadata(new SolidColorBrush(Color.FromRgb(50, 50, 50))));
+
+        public Brush Foreground
+        {
+            get { return (Brush)GetValue(ForegroundProperty); }
+            set { SetValue(ForegroundProperty, value); }
+        }
+        public static readonly DependencyProperty ForegroundProperty =
+            DependencyProperty.Register("Foreground", typeof(Brush), typeof(BreakPointMargin), new PropertyMetadata(Brushes.Red));
+
+        static BreakPointMargin()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(BreakPointMargin),
+                                                     new FrameworkPropertyMetadata(typeof(BreakPointMargin)));
+        }
+
+        public BreakPointMargin(ScriptEditor editor)
+        {
+            _editor = editor;
+            BreakPoints = new ObservableCollection<BreakPoint>();
+            BreakPoints.CollectionChanged += BreakPoints_CollectionChanged;
+            RenderOptions.SetEdgeMode(this, EdgeMode.Unspecified);
+
+            _arrowBitmap = new BitmapImage(new Uri($"pack://application:,,,/Tango.Scripting.Editors;component/Images/break_point_arrow.png", UriKind.Absolute));
+        }
+
+        private void BreakPoints_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            InvalidateVisual();
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            return new Size(20, 0);
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            TextView textView = this.TextView;
+            Size renderSize = this.RenderSize;
+            if (textView != null && textView.VisualLinesValid)
+            {
+                drawingContext.DrawRectangle(Background, new Pen(Background, 1), new Rect(0, 0, ActualWidth, ActualHeight));
+
+                var foreground = Foreground;
+                foreach (VisualLine line in textView.VisualLines)
+                {
+                    int lineNumber = line.FirstDocumentLine.LineNumber;
+
+                    BreakPoint b = BreakPoints.FirstOrDefault(x => x.LineNumber == lineNumber);
+
+                    if (b != null)
+                    {
+                        double y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop);
+                        drawingContext.DrawEllipse(Foreground, new Pen(Brushes.Gainsboro, 1), new Point(10, y - textView.VerticalOffset + 8), 6, 6);
+
+                        if (b.IsActive)
+                        {
+                            drawingContext.DrawImage(_arrowBitmap, new Rect(6, y - textView.VerticalOffset + 2.5, 8.5, 10));
+                        }
+                    }
+                }
+            }
+        }
+
+        protected override void OnTextViewChanged(TextView oldTextView, TextView newTextView)
+        {
+            if (oldTextView != null)
+            {
+                oldTextView.VisualLinesChanged -= TextViewVisualLinesChanged;
+            }
+            base.OnTextViewChanged(oldTextView, newTextView);
+            if (newTextView != null)
+            {
+                newTextView.VisualLinesChanged += TextViewVisualLinesChanged;
+
+                // find the text area belonging to the new text view
+                textArea = newTextView.Services.GetService(typeof(TextArea)) as TextArea;
+            }
+            else
+            {
+                textArea = null;
+            }
+            InvalidateVisual();
+        }
+
+        protected override void OnDocumentChanged(TextDocument oldDocument, TextDocument newDocument)
+        {
+            if (oldDocument != null)
+            {
+                PropertyChangedEventManager.RemoveListener(oldDocument, this, "LineCount");
+            }
+            base.OnDocumentChanged(oldDocument, newDocument);
+            if (newDocument != null)
+            {
+                PropertyChangedEventManager.AddListener(newDocument, this, "LineCount");
+            }
+            OnDocumentLineCountChanged();
+        }
+
+        protected virtual bool ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
+        {
+            if (managerType == typeof(PropertyChangedEventManager))
+            {
+                OnDocumentLineCountChanged();
+                return true;
+            }
+            return false;
+        }
+
+        bool IWeakEventListener.ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
+        {
+            return ReceiveWeakEvent(managerType, sender, e);
+        }
+
+        private void OnDocumentLineCountChanged()
+        {
+            int documentLineCount = Document != null ? Document.LineCount : 1;
+            int newLength = documentLineCount.ToString(CultureInfo.CurrentCulture).Length;
+
+            foreach (var breakPoint in BreakPoints.ToList())
+            {
+                if (breakPoint.LineNumber > documentLineCount)
+                {
+                    BreakPoints.Remove(breakPoint);
+                }
+                else
+                {
+                    try
+                    {
+                        var line = Document.GetLineByNumber(breakPoint.LineNumber);
+                        if (line != null)
+                        {
+                            String lineText = Document.GetText(line.Offset, line.Length);
+                            if (!IsBreakPointValid(lineText))
+                            {
+                                BreakPoints.Remove(breakPoint);
+                            }
+                        }
+                    }
+                    catch { }
+                }
+            }
+
+            // The margin looks too small when there is only one digit, so always reserve space for
+            // at least two digits
+            if (newLength < 2)
+                newLength = 2;
+
+            if (newLength != maxLineNumberLength)
+            {
+                maxLineNumberLength = newLength;
+                InvalidateMeasure();
+            }
+        }
+
+        private void TextViewVisualLinesChanged(object sender, EventArgs e)
+        {
+            InvalidateVisual();
+        }
+
+        protected override HitTestResult HitTestCore(PointHitTestParameters hitTestParameters)
+        {
+            // accept clicks even when clicking on the background
+            return new PointHitTestResult(this, hitTestParameters.HitPoint);
+        }
+
+        private VisualLine GetLineNumberByMousePosition(MouseEventArgs e)
+        {
+            Point pos = e.GetPosition(TextView);
+            pos.X = 0;
+            pos.Y += TextView.VerticalOffset;
+            VisualLine vl = TextView.GetVisualLineFromVisualTop(pos.Y);
+            return vl;
+        }
+
+        private bool IsBreakPointValid(String lineText)
+        {
+            if (lineText.EndsWith(";") && !lineText.StartsWith("using"))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        protected override void OnPreviewMouseMove(MouseEventArgs e)
+        {
+            base.OnPreviewMouseMove(e);
+
+            if (_editor.DisableBreakPoints)
+            {
+                Cursor = Cursors.No;
+            }
+            else
+            {
+                Cursor = Cursors.Arrow;
+            }
+        }
+
+        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            if (_editor.DisableBreakPoints)
+            {
+                return;
+            }
+
+            try
+            {
+                if (!e.Handled && TextView != null && textArea != null)
+                {
+                    e.Handled = true;
+                    textArea.Focus();
+
+                    var visualLine = GetLineNumberByMousePosition(e);
+
+                    int? lineNumber = visualLine != null ? (int?)visualLine.FirstDocumentLine.LineNumber : null;
+
+                    if (lineNumber != null)
+                    {
+                        var breakPoint = BreakPoints.FirstOrDefault(x => x.LineNumber == lineNumber.Value);
+                        if (breakPoint != null)
+                        {
+                            BreakPoints.Remove(breakPoint);
+                        }
+                        else
+                        {
+                            var lineText = Document.GetText(visualLine.FirstDocumentLine.Offset, visualLine.FirstDocumentLine.Length).Trim();
+
+                            if (IsBreakPointValid(lineText))
+                            {
+                                BreakPoint newBreakPoint = new BreakPoint();
+                                newBreakPoint.LineNumber = lineNumber.Value;
+                                BreakPoints.Add(newBreakPoint);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Images/break_point_arrow.png b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Images/break_point_arrow.png
new file mode 100644
index 000000000..e8d367028
Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Images/break_point_arrow.png differ
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/HideIntellisenseAttribute.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/HideIntellisenseAttribute.cs
new file mode 100644
index 000000000..548bd909e
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/HideIntellisenseAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Scripting.Editors.Intellisense
+{
+    public class HideIntellisenseAttribute : Attribute
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
index 3dc796152..c2e7ac422 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
@@ -137,6 +137,8 @@ namespace Tango.Scripting.Editors.Intellisense
                     {
                         var method = methods[i];
 
+                        if (method.GetCustomAttribute<HideIntellisenseAttribute>() != null) continue;
+
                         KnownTypeMethod m = new KnownTypeMethod(this);
                         m.Name = method.Name;
                         m.ReturnType = method.ReturnType;
@@ -183,17 +185,14 @@ namespace Tango.Scripting.Editors.Intellisense
 
                 //Load Properties
                 {
-                    if (Type == typeof(Color))
-                    {
-
-                    }
-
                     var properties = Type.GetProperties(BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static).ToList();
 
                     for (int i = 0; i < properties.Count; i++)
                     {
                         var property = properties[i];
 
+                        if (property.GetCustomAttribute<HideIntellisenseAttribute>() != null) continue;
+
                         KnownTypeProperty p = new KnownTypeProperty(this);
                         p.Name = property.Name;
                         p.ReturnType = property.PropertyType;
@@ -211,6 +210,8 @@ namespace Tango.Scripting.Editors.Intellisense
                     {
                         var ev = events[i];
 
+                        if (ev.GetCustomAttribute<HideIntellisenseAttribute>() != null) continue;
+
                         KnownTypeEvent p = new KnownTypeEvent(this);
                         p.Name = ev.Name;
 
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index c650ad425..b355ba818 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -47,7 +47,10 @@ namespace Tango.Scripting.Editors
         private char[] word_separators = { ' ', '\t', '\n', '.', '(', ',', '-', '*', '/', '+', '$', '=', '<', '>' };
         private string[] _blocking_type_words = { "class", "void" };
 
+        public event EventHandler<BreakPointSymbolPressedEventArgs> BreakPointSymbolPressed;
+
         private DispatcherTimer _update_timer;
+        private BreakPointMargin breakPointMargin;
         private Popup _popup;
         private FoldingManager foldingManager;
         private BraceFoldingStrategy foldingStrategy;
@@ -58,6 +61,11 @@ namespace Tango.Scripting.Editors
         private List<ScriptType> _declaredTypes;
         private bool _isLoadingTypes;
         private TextMarkerService errorMarkerService;
+        private List<ScriptBreakPointSymbol> _breakPointSymbols;
+        private int _breakPointLineNumber;
+        private ScriptBreakPointSymbol _currentBreakPointSymbol;
+        private Point _currentBreakPointSymbolPosition;
+
         private static JsonSerializerSettings _jsonSettings;
         private static Dictionary<Type, KnownType> _knownTypesCache;
         private static String KNOWN_TYPES_CACHE_FOLDER;
@@ -199,6 +207,39 @@ namespace Tango.Scripting.Editors
         public static readonly DependencyProperty ErrorLineBrushProperty =
             DependencyProperty.Register("ErrorLineBrush", typeof(Brush), typeof(ScriptEditor), new PropertyMetadata(new SolidColorBrush(Colors.Red) { Opacity = 0.5 }));
 
+        public Brush DebugLineBrush
+        {
+            get { return (Brush)GetValue(DebugLineBrushProperty); }
+            set { SetValue(DebugLineBrushProperty, value); }
+        }
+        public static readonly DependencyProperty DebugLineBrushProperty =
+            DependencyProperty.Register("DebugLineBrush", typeof(Brush), typeof(ScriptEditor), new PropertyMetadata(new SolidColorBrush(Colors.Gray) { Opacity = 0.5 }));
+
+        public Brush BreakPointLineBrush
+        {
+            get { return (Brush)GetValue(BreakPointLineBrushProperty); }
+            set { SetValue(BreakPointLineBrushProperty, value); }
+        }
+        public static readonly DependencyProperty BreakPointLineBrushProperty =
+            DependencyProperty.Register("BreakPointLineBrush", typeof(Brush), typeof(ScriptEditor), new PropertyMetadata(new SolidColorBrush(Colors.Yellow) { Opacity = 0.5 }));
+
+        public IScriptSource ScriptSource
+        {
+            get { return (IScriptSource)GetValue(ScriptSourceProperty); }
+            set { SetValue(ScriptSourceProperty, value); }
+        }
+        public static readonly DependencyProperty ScriptSourceProperty =
+            DependencyProperty.Register("ScriptSource", typeof(IScriptSource), typeof(ScriptEditor), new PropertyMetadata(null));
+
+        public bool DisableBreakPoints
+        {
+            get { return (bool)GetValue(DisableBreakPointsProperty); }
+            set { SetValue(DisableBreakPointsProperty, value); }
+        }
+        public static readonly DependencyProperty DisableBreakPointsProperty =
+            DependencyProperty.Register("DisableBreakPoints", typeof(bool), typeof(ScriptEditor), new PropertyMetadata(false));
+
+
         #endregion
 
         #region Constructors
@@ -337,6 +378,17 @@ namespace Tango.Scripting.Editors
             TextArea.TextView.LineTransformers.Add(errorMarkerService);
 
             Unloaded += ScriptEditor_Unloaded;
+
+            breakPointMargin = new BreakPointMargin(this);
+            _breakPointSymbols = new List<ScriptBreakPointSymbol>();
+            Loaded += ScriptEditor_Loaded;
+
+            MouseMove += ScriptEditor_MouseMove;
+        }
+
+        private void ScriptEditor_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextArea.LeftMargins.Insert(0, breakPointMargin);
         }
 
         private void ScriptEditor_Unloaded(object sender, RoutedEventArgs e)
@@ -500,6 +552,8 @@ namespace Tango.Scripting.Editors
 
         private void TextArea_TextEntered(object sender, TextCompositionEventArgs e)
         {
+            if (IsReadOnly) return;
+
             try
             {
                 List<Object> items = new List<object>();
@@ -2505,6 +2559,47 @@ namespace Tango.Scripting.Editors
             Document.EndUpdate();
         }
 
+        public void HighlightDebugLine(int lineNumber)
+        {
+            Document.BeginUpdate();
+
+            var line = Document.GetLineByNumber(lineNumber);
+            OffsetColorizer errorLineColrizer = new OffsetColorizer(line, line.Offset, line.EndOffset, DebugLineBrush);
+            TextArea.TextView.LineTransformers.Add(errorLineColrizer);
+
+            Document.EndUpdate();
+        }
+
+        public void HighlightBreakPoint(int lineNumber, List<ScriptBreakPointSymbol> symbols)
+        {
+            _breakPointLineNumber = lineNumber;
+            _breakPointSymbols = symbols.ToList();
+            _currentBreakPointSymbol = null;
+
+            Document.BeginUpdate();
+
+            var line = Document.GetLineByNumber(lineNumber);
+            OffsetColorizer errorLineColrizer = new OffsetColorizer(line, line.Offset, line.EndOffset, BreakPointLineBrush);
+            TextArea.TextView.LineTransformers.Add(errorLineColrizer);
+
+            var breakPoint = breakPointMargin.BreakPoints.FirstOrDefault(x => x.LineNumber == lineNumber);
+            breakPoint.IsActive = true;
+            breakPointMargin.InvalidateVisual();
+
+            Document.EndUpdate();
+        }
+
+        public void ResetBreakPointLine()
+        {
+            _breakPointSymbols = new List<ScriptBreakPointSymbol>();
+            _currentBreakPointSymbol = null;
+            ResetColorizationByKeyword();
+            breakPointMargin.BreakPoints.ToList().ForEach(x => x.IsActive = false);
+            Mouse.OverrideCursor = null;
+            ClearErrors();
+            breakPointMargin.InvalidateVisual();
+        }
+
         public Point? GetLineVisualPosition(int lineNumber)
         {
             double top = TextArea.TextView.GetVisualTopByDocumentLine(lineNumber);
@@ -2521,6 +2616,140 @@ namespace Tango.Scripting.Editors
             return null;
         }
 
+        public List<ScriptBreakPoint> GetBreakPoints()
+        {
+            List<ScriptBreakPoint> breakPoints = new List<ScriptBreakPoint>();
+
+            foreach (var b in breakPointMargin.BreakPoints)
+            {
+                ScriptBreakPoint breakPoint = new ScriptBreakPoint();
+                breakPoint.Script = ScriptSource;
+                breakPoint.LineNumber = b.LineNumber;
+
+                var line = Document.GetLineByNumber(b.LineNumber);
+                breakPoint.LineStartOffset = line.Offset;
+                breakPoint.LineEndOffset = line.EndOffset;
+
+                var symbols = _parser.GetContextSymbols(Document.Text, line.Offset);
+
+                foreach (var symbol in symbols.Where(x => (x.Kind == SymbolKind.Property || x.Kind == SymbolKind.Field || x.Kind == SymbolKind.Local || x.Kind == SymbolKind.Parameter) && !x.IsUnassigned))
+                {
+                    if (symbol.Offset < line.Offset)
+                    {
+                        breakPoint.ContextSymbols.Add(new ScriptBreakPointSymbol()
+                        {
+                            Name = symbol.Name,
+                            Offset = symbol.Offset,
+                            Length = symbol.Length,
+                        });
+                    }
+                }
+
+                breakPoints.Add(breakPoint);
+            }
+
+            return breakPoints;
+        }
+
+        #endregion
+
+        #region BreakPoint Symbols Search
+
+        private void ScriptEditor_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (IsReadOnly && _breakPointSymbols.Count > 0)
+            {
+                try
+                {
+                    var word_separators_plus = word_separators.ToList();
+                    word_separators_plus.Add(')');
+                    word_separators_plus.Add(';');
+
+                    var textView = TextArea.TextView;
+                    Point position = e.GetPosition(textView);
+                    position.Y += textView.VerticalOffset;
+                    VisualLine visualLine = textView.GetVisualLineFromVisualTop(position.Y);
+                    int columnIndex = visualLine.GetVisualColumnFloor(position, false);
+                    String line = Document.GetText(visualLine.FirstDocumentLine.Offset, visualLine.FirstDocumentLine.Length);
+                    if (columnIndex < line.Length)
+                    {
+                        int wordStartIndex = columnIndex;
+                        int wordEndIndex = columnIndex;
+
+                        while (wordStartIndex > 0)
+                        {
+                            if (word_separators_plus.Contains(line[wordStartIndex])) break;
+                            wordStartIndex--;
+                        }
+
+                        while (wordEndIndex < line.Length)
+                        {
+                            if (word_separators_plus.Contains(line[wordEndIndex])) break;
+                            wordEndIndex++;
+                        }
+
+                        if (wordStartIndex > 0)
+                        {
+                            wordStartIndex++;
+                        }
+
+                        String word = line.Substring(wordStartIndex, wordEndIndex - wordStartIndex);
+
+                        var breakPointSymbol = _breakPointSymbols.FirstOrDefault(x => x.Name == word);
+
+                        if (breakPointSymbol != null)
+                        {
+                            int wordStartOffset = visualLine.FirstDocumentLine.Offset + wordStartIndex;
+
+                            ClearErrors();
+                            ITextMarker marker = errorMarkerService.Create(wordStartOffset, word.Length);
+                            marker.MarkerTypes = TextMarkerTypes.NormalUnderline;
+                            marker.MarkerColor = Colors.Yellow;
+                            Mouse.OverrideCursor = Cursors.Hand;
+
+                            _currentBreakPointSymbol = breakPointSymbol;
+                            _currentBreakPointSymbolPosition = visualLine.GetVisualPosition(wordEndIndex, VisualYPosition.LineTop);
+                        }
+                        else
+                        {
+                            _currentBreakPointSymbol = null;
+                            Mouse.OverrideCursor = null;
+                            ClearErrors();
+                        }
+                    }
+                    else
+                    {
+                        _currentBreakPointSymbol = null;
+                        Mouse.OverrideCursor = null;
+                        ClearErrors();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _currentBreakPointSymbol = null;
+                    Mouse.OverrideCursor = null;
+                    ClearErrors();
+                    Debug.WriteLine(ex.Message);
+                }
+            }
+        }
+
+        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseLeftButtonUp(e);
+
+            if (_currentBreakPointSymbol != null)
+            {
+                Mouse.OverrideCursor = null;
+                Debug.WriteLine($"Pressed on break point symbol: {_currentBreakPointSymbol.Name}");
+                BreakPointSymbolPressed?.Invoke(this, new BreakPointSymbolPressedEventArgs()
+                {
+                    BreakPointSymbol = _currentBreakPointSymbol,
+                    Position = _currentBreakPointSymbolPosition
+                });
+            }
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
index a70bbf3de..11e023f86 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
@@ -180,6 +180,7 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AvalonEditCommands.cs" />
+    <Compile Include="BreakPointSymbolPressedEventArgs.cs" />
     <Compile Include="CachedAssembly.cs" />
     <Compile Include="CachedUsing.cs" />
     <Compile Include="CodeCompletion\CompletionListBox.cs" />
@@ -196,6 +197,7 @@
     <Compile Include="CodeCompletion\OverloadViewer.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityInversedConverter.cs" />
+    <Compile Include="Editing\BreakPointMargin.cs" />
     <Compile Include="Errors\ITextMarker.cs" />
     <Compile Include="Errors\TextMarkerService.cs" />
     <Compile Include="ExtensionMethods.cs" />
@@ -207,6 +209,7 @@
     <Compile Include="Intellisense\EventCompletionItem.cs" />
     <Compile Include="Intellisense\FieldCompletionItem.cs" />
     <Compile Include="Intellisense\FieldCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\HideIntellisenseAttribute.cs" />
     <Compile Include="Intellisense\ICompletionItem.cs" />
     <Compile Include="Intellisense\ICompletionProvider.cs" />
     <Compile Include="Intellisense\InterfaceCompletionItem.cs" />
@@ -651,6 +654,9 @@
   <ItemGroup>
     <Resource Include="Images\snippet.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\break_point_arrow.png" />
+  </ItemGroup>
   <ProjectExtensions>
     <VisualStudio>
       <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UseGlobalSettings="True" />
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors_di35u2uj_wpftmp.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors_di35u2uj_wpftmp.csproj
new file mode 100644
index 000000000..70a4840c4
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors_di35u2uj_wpftmp.csproj
@@ -0,0 +1,628 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{DA62FA39-668B-47A6-B0F2-D2C1DAF777B0}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Tango.Scripting.Editors</RootNamespace>
+    <AssemblyName>Tango.Scripting.Editors</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SourceAnalysisOverrideSettingsFile>"C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"</SourceAnalysisOverrideSettingsFile>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>ICSharpCode.AvalonEdit.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <RunCodeAnalysis>False</RunCodeAnalysis>
+    <CodeAnalysisRules>-Microsoft.Design#CA1020;-Microsoft.Design#CA1033;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810</CodeAnalysisRules>
+    <OutputPath>..\bin\$(Configuration)</OutputPath>
+    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.AvalonEdit.xml</DocumentationFile>
+    <NoWarn>1607</NoWarn>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;DOTNET4</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;DOTNET4</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <OutputPath>..\..\Build\Scripting\Debug\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <Prefer32Bit>false</Prefer32Bit>
+    <OutputPath>..\..\Build\Scripting\Release\</OutputPath>
+    <DocumentationFile />
+  </PropertyGroup>
+  <PropertyGroup>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="AvalonEditCommands.cs" />
+    <Compile Include="CachedAssembly.cs" />
+    <Compile Include="CachedUsing.cs" />
+    <Compile Include="CodeCompletion\CompletionListBox.cs" />
+    <Compile Include="CodeCompletion\CompletionListBoxItem.cs" />
+    <Compile Include="CodeCompletion\CompletionWindowBase.cs" />
+    <Compile Include="CodeCompletion\CompletionList.cs" />
+    <Compile Include="CodeCompletion\CompletionWindow.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CodeCompletion\ICompletionData.cs" />
+    <Compile Include="CodeCompletion\InsightWindow.cs" />
+    <Compile Include="CodeCompletion\IOverloadProvider.cs" />
+    <Compile Include="CodeCompletion\OverloadInsightWindow.cs" />
+    <Compile Include="CodeCompletion\OverloadViewer.cs" />
+    <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
+    <Compile Include="Converters\BooleanToVisibilityInversedConverter.cs" />
+    <Compile Include="Editing\BreakPoint.cs" />
+    <Compile Include="Editing\BreakPointMargin.cs" />
+    <Compile Include="Errors\ITextMarker.cs" />
+    <Compile Include="Errors\TextMarkerService.cs" />
+    <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="Intellisense\ClassCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\CompletionItem.cs" />
+    <Compile Include="Intellisense\CompletionItemPopupControl.cs" />
+    <Compile Include="Intellisense\EnumCompletionItem.cs" />
+    <Compile Include="Intellisense\EnumCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\EventCompletionItem.cs" />
+    <Compile Include="Intellisense\FieldCompletionItem.cs" />
+    <Compile Include="Intellisense\FieldCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\ICompletionItem.cs" />
+    <Compile Include="Intellisense\ICompletionProvider.cs" />
+    <Compile Include="Intellisense\InterfaceCompletionItem.cs" />
+    <Compile Include="Intellisense\InterfaceCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\KnownType.cs" />
+    <Compile Include="Document\ChangeTrackingCheckpoint.cs" />
+    <Compile Include="Document\DocumentChangeOperation.cs">
+      <DependentUpon>UndoStack.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\ILineTracker.cs" />
+    <Compile Include="Document\ISegment.cs" />
+    <Compile Include="Document\ITextSource.cs" />
+    <Compile Include="Document\IUndoableOperation.cs">
+      <DependentUpon>UndoStack.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\LineNode.cs">
+      <DependentUpon>DocumentLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\NewLineFinder.cs" />
+    <Compile Include="Document\OffsetChangeMap.cs" />
+    <Compile Include="Document\TextDocumentWeakEventManager.cs">
+      <DependentUpon>TextDocument.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\TextSegmentCollection.cs" />
+    <Compile Include="Document\TextAnchor.cs" />
+    <Compile Include="Document\TextAnchorNode.cs">
+      <DependentUpon>TextAnchor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\TextAnchorTree.cs">
+      <DependentUpon>TextAnchor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\TextLocation.cs" />
+    <Compile Include="Document\TextSegment.cs" />
+    <Compile Include="Document\TextUtilities.cs" />
+    <Compile Include="Document\UndoOperationGroup.cs">
+      <DependentUpon>UndoStack.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\UndoStack.cs">
+    </Compile>
+    <Compile Include="Document\WeakLineTracker.cs">
+      <DependentUpon>ILineTracker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\AbstractMargin.cs" />
+    <Compile Include="Editing\Caret.cs" />
+    <Compile Include="Editing\CaretLayer.cs">
+    </Compile>
+    <Compile Include="Editing\CaretNavigationCommandHandler.cs">
+    </Compile>
+    <Compile Include="Editing\CaretWeakEventHandler.cs" />
+    <Compile Include="Editing\DottedLineMargin.cs" />
+    <Compile Include="Editing\DragDropException.cs" />
+    <Compile Include="Editing\EditingCommandHandler.cs" />
+    <Compile Include="Editing\EmptySelection.cs">
+      <DependentUpon>Selection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\ImeNativeWrapper.cs" />
+    <Compile Include="Editing\SelectionSegment.cs" />
+    <Compile Include="Editing\ImeSupport.cs" />
+    <Compile Include="Folding\AbstractFoldingStrategy.cs" />
+    <Compile Include="Folding\BraceFoldingStrategy.cs" />
+    <Compile Include="Folding\FoldingElementGenerator.cs" />
+    <Compile Include="Folding\FoldingManager.cs" />
+    <Compile Include="Folding\FoldingMargin.cs" />
+    <Compile Include="Folding\FoldingMarginMarker.cs" />
+    <Compile Include="Folding\FoldingSection.cs" />
+    <Compile Include="Editing\IReadOnlySectionProvider.cs" />
+    <Compile Include="Editing\LineNumberMargin.cs" />
+    <Compile Include="Editing\NoReadOnlySections.cs">
+      <DependentUpon>IReadOnlySectionProvider.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\RectangleSelection.cs">
+      <DependentUpon>Selection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\Selection.cs" />
+    <Compile Include="Editing\SelectionColorizer.cs">
+      <DependentUpon>Selection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\SelectionLayer.cs">
+      <DependentUpon>Selection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\SelectionMouseHandler.cs">
+      <DependentUpon>Selection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\SimpleSelection.cs">
+      <DependentUpon>Selection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editing\TextArea.cs" />
+    <Compile Include="Editing\TextAreaDefaultInputHandlers.cs" />
+    <Compile Include="Editing\TextAreaInputHandler.cs" />
+    <Compile Include="Editing\TextSegmentReadOnlySectionProvider.cs">
+      <DependentUpon>IReadOnlySectionProvider.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Folding\NewFolding.cs" />
+    <Compile Include="Folding\XmlFoldingStrategy.cs" />
+    <Compile Include="Highlighting\DocumentHighlighter.cs" />
+    <Compile Include="Highlighting\HighlightedInlineBuilder.cs" />
+    <Compile Include="Highlighting\HighlightedLine.cs" />
+    <Compile Include="Highlighting\HighlightedSection.cs" />
+    <Compile Include="Highlighting\HighlightingBrush.cs" />
+    <Compile Include="Highlighting\HighlightingColor.cs" />
+    <Compile Include="Highlighting\HighlightingColorizer.cs" />
+    <Compile Include="Highlighting\HighlightingDefinitionInvalidException.cs" />
+    <Compile Include="Highlighting\HighlightingDefinitionTypeConverter.cs" />
+    <Compile Include="Highlighting\HighlightingManager.cs" />
+    <Compile Include="Highlighting\HtmlClipboard.cs" />
+    <Compile Include="Highlighting\IHighlighter.cs" />
+    <Compile Include="Highlighting\IHighlightingDefinition.cs" />
+    <Compile Include="Highlighting\HighlightingRule.cs" />
+    <Compile Include="Highlighting\OffsetColorizer.cs" />
+    <Compile Include="Highlighting\Resources\Resources.cs" />
+    <Compile Include="Highlighting\HighlightingRuleSet.cs" />
+    <Compile Include="Highlighting\HighlightingSpan.cs" />
+    <Compile Include="Highlighting\IHighlightingDefinitionReferenceResolver.cs">
+    </Compile>
+    <Compile Include="Highlighting\Xshd\HighlightingLoader.cs" />
+    <Compile Include="Highlighting\Xshd\IXshdVisitor.cs" />
+    <Compile Include="Highlighting\Xshd\SaveXshdVisitor.cs" />
+    <Compile Include="Highlighting\Xshd\V1Loader.cs" />
+    <Compile Include="Highlighting\Xshd\V2Loader.cs" />
+    <Compile Include="Highlighting\Xshd\XmlHighlightingDefinition.cs" />
+    <Compile Include="Highlighting\Xshd\XshdColor.cs" />
+    <Compile Include="Highlighting\Xshd\XshdImport.cs" />
+    <Compile Include="Highlighting\Xshd\XshdProperty.cs" />
+    <Compile Include="Highlighting\Xshd\XshdReference.cs" />
+    <Compile Include="Highlighting\Xshd\XshdElement.cs" />
+    <Compile Include="Highlighting\Xshd\XshdKeywords.cs" />
+    <Compile Include="Highlighting\Xshd\XshdRule.cs" />
+    <Compile Include="Highlighting\Xshd\XshdRuleSet.cs" />
+    <Compile Include="Highlighting\Xshd\XshdSpan.cs" />
+    <Compile Include="Highlighting\Xshd\XshdSyntaxDefinition.cs" />
+    <Compile Include="Indentation\CSharp\CSharpIndentationHelper.cs" />
+    <Compile Include="Indentation\CSharp\IndentationReformatter.cs" />
+    <Compile Include="Indentation\CSharp\CSharpIndentationStrategy.cs" />
+    <Compile Include="Indentation\CSharp\DocumentAccessor.cs" />
+    <Compile Include="Indentation\DefaultIndentationStrategy.cs" />
+    <Compile Include="Indentation\IIndentationStrategy.cs" />
+    <Compile Include="Intellisense\KnownTypeConstructor.cs" />
+    <Compile Include="Intellisense\KnownTypeEvent.cs" />
+    <Compile Include="Intellisense\KnownTypeField.cs" />
+    <Compile Include="Intellisense\KnownTypeMember.cs" />
+    <Compile Include="Intellisense\KnownTypeMethodParameter.cs" />
+    <Compile Include="Intellisense\KnownTypeMethod.cs" />
+    <Compile Include="Intellisense\KnownTypeProperty.cs" />
+    <Compile Include="Intellisense\ClassCompletionItem.cs" />
+    <Compile Include="Intellisense\MethodCompletionItem.cs" />
+    <Compile Include="Intellisense\MethodCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\NamespaceCompletionItem.cs" />
+    <Compile Include="Intellisense\NamespaceCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\PropertyCompletionItem.cs" />
+    <Compile Include="Intellisense\PropertyCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\SnippetCompletionItem.cs" />
+    <Compile Include="Intellisense\StructCompletionItem.cs" />
+    <Compile Include="Intellisense\StructCompletionItemPopup.cs" />
+    <Compile Include="Intellisense\Utils.cs" />
+    <Compile Include="Popups\MethodDescription.cs" />
+    <Compile Include="Popups\MethodPopup.cs" />
+    <Compile Include="Popups\ParameterDescription.cs" />
+    <Compile Include="Rendering\BackgroundGeometryBuilder.cs">
+      <DependentUpon>IBackgroundRenderer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\CollapsedLineSection.cs">
+      <DependentUpon>HeightTree.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ColorizingTransformer.cs">
+      <DependentUpon>IVisualLineTransformer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ColumnRulerRenderer.cs" />
+    <Compile Include="Rendering\DefaultTextRunTypographyProperties.cs" />
+    <Compile Include="Rendering\DocumentColorizingTransformer.cs">
+      <DependentUpon>IVisualLineTransformer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\FormattedTextElement.cs" />
+    <Compile Include="Rendering\GlobalTextRunProperties.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\HeightTree.cs" />
+    <Compile Include="Rendering\HeightTreeLineNode.cs">
+      <DependentUpon>HeightTree.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\HeightTreeNode.cs">
+      <DependentUpon>HeightTree.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\IBackgroundRenderer.cs" />
+    <Compile Include="Rendering\InlineObjectRun.cs" />
+    <Compile Include="Rendering\ITextRunConstructionContext.cs">
+      <DependentUpon>VisualLineElementGenerator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ITextViewConnect.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\IVisualLineTransformer.cs" />
+    <Compile Include="Rendering\Layer.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\LayerPosition.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\LinkElementGenerator.cs" />
+    <Compile Include="Rendering\MouseHoverLogic.cs" />
+    <Compile Include="Rendering\SimpleTextSource.cs">
+      <DependentUpon>FormattedTextElement.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\SingleCharacterElementGenerator.cs" />
+    <Compile Include="Rendering\TextLayer.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\TextView.cs" />
+    <Compile Include="Rendering\TextViewCachedElements.cs" />
+    <Compile Include="Rendering\TextViewWeakEventManager.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualLine.cs" />
+    <Compile Include="Rendering\VisualLineConstructionStartEventArgs.cs" />
+    <Compile Include="Rendering\VisualLineElement.cs" />
+    <Compile Include="Rendering\VisualLineElementGenerator.cs" />
+    <Compile Include="Rendering\VisualLineElementTextRunProperties.cs">
+      <DependentUpon>VisualLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualLineLinkText.cs" />
+    <Compile Include="Rendering\VisualLinesInvalidException.cs" />
+    <Compile Include="Rendering\VisualLineText.cs" />
+    <Compile Include="Rendering\VisualLineTextParagraphProperties.cs">
+      <DependentUpon>VisualLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualLineTextSource.cs">
+      <DependentUpon>VisualLineElementGenerator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualYPosition.cs">
+      <DependentUpon>VisualLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ScriptEditor.cs" />
+    <Compile Include="Search\Localization.cs" />
+    <Compile Include="Search\RegexSearchStrategy.cs" />
+    <Compile Include="Search\DropDownButton.cs" />
+    <Compile Include="Search\ISearchStrategy.cs" />
+    <Compile Include="Search\SearchCommands.cs" />
+    <Compile Include="Search\SearchResultBackgroundRenderer.cs" />
+    <Compile Include="Search\SearchPanel.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Search\SearchStrategyFactory.cs" />
+    <Compile Include="Snippets\IActiveElement.cs" />
+    <Compile Include="Snippets\SnippetAnchorElement.cs" />
+    <Compile Include="Snippets\SnippetEventArgs.cs" />
+    <Compile Include="Snippets\SnippetInputHandler.cs" />
+    <Compile Include="Snippets\Snippet.cs" />
+    <Compile Include="Snippets\SnippetBoundElement.cs" />
+    <Compile Include="Snippets\SnippetCaretElement.cs" />
+    <Compile Include="Snippets\SnippetContainerElement.cs" />
+    <Compile Include="Snippets\SnippetElement.cs" />
+    <Compile Include="Snippets\InsertionContext.cs" />
+    <Compile Include="Snippets\SnippetReplaceableTextElement.cs" />
+    <Compile Include="Snippets\SnippetSelectionElement.cs" />
+    <Compile Include="Snippets\SnippetTextElement.cs" />
+    <Compile Include="TextEditor.cs" />
+    <Compile Include="TextEditorAutomationPeer.cs" />
+    <Compile Include="TextEditorComponent.cs">
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Document\DocumentChangeEventArgs.cs" />
+    <Compile Include="Document\GapTextBuffer.cs">
+      <DependentUpon>TextDocument.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\LineManager.cs">
+      <DependentUpon>TextDocument.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\DocumentLine.cs" />
+    <Compile Include="Document\DocumentLineTree.cs">
+      <DependentUpon>DocumentLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Document\TextDocument.cs" />
+    <Compile Include="TextEditorOptions.cs" />
+    <Compile Include="TextEditorWeakEventManager.cs">
+      <DependentUpon>TextEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="TextViewPosition.cs" />
+    <Compile Include="Utils\Boxes.cs" />
+    <Compile Include="Utils\BusyManager.cs">
+      <DependentUpon>ObserveAddRemoveCollection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Utils\CharRope.cs" />
+    <Compile Include="Utils\CompressingTreeList.cs" />
+    <Compile Include="Utils\Constants.cs" />
+    <Compile Include="Utils\DelayedEvents.cs" />
+    <Compile Include="Utils\CallbackOnDispose.cs" />
+    <Compile Include="Utils\Deque.cs" />
+    <Compile Include="Utils\Empty.cs" />
+    <Compile Include="Utils\ExtensionMethods.cs" />
+    <Compile Include="Utils\FileReader.cs" />
+    <Compile Include="Utils\ImmutableStack.cs" />
+    <Compile Include="Utils\NullSafeCollection.cs" />
+    <Compile Include="Utils\ObserveAddRemoveCollection.cs" />
+    <Compile Include="Utils\PropertyChangedWeakEventManager.cs" />
+    <Compile Include="Utils\Rope.cs" />
+    <Compile Include="Utils\RopeNode.cs" />
+    <Compile Include="Utils\RopeTextReader.cs" />
+    <Compile Include="Utils\StringSegment.cs" />
+    <Compile Include="Utils\TextFormatterFactory.cs" />
+    <Compile Include="Utils\WeakEventManagerBase.cs" />
+    <Compile Include="Utils\PixelSnapHelpers.cs" />
+    <Compile Include="Utils\ThrowUtil.cs" />
+    <Compile Include="Utils\Win32.cs" />
+    <CodeAnalysisDictionary Include="Properties\CodeAnalysisDictionary.xml" />
+    <Compile Include="XamlEditor.cs" />
+    <Compile Include="Xml\AbstractAXmlVisitor.cs" />
+    <Compile Include="Xml\AXmlAttribute.cs" />
+    <Compile Include="Xml\AXmlAttributeCollection.cs" />
+    <Compile Include="Xml\AXmlContainer.cs" />
+    <Compile Include="Xml\AXmlDocument.cs" />
+    <Compile Include="Xml\AXmlElement.cs" />
+    <Compile Include="Xml\AXmlObject.cs" />
+    <Compile Include="Xml\AXmlObjectCollection.cs" />
+    <Compile Include="Xml\AXmlObjectEventArgs.cs" />
+    <Compile Include="Xml\AXmlParser.cs" />
+    <Compile Include="Xml\AXmlTag.cs" />
+    <Compile Include="Xml\AXmlText.cs" />
+    <Compile Include="Xml\CanonicalPrintAXmlVisitor.cs" />
+    <Compile Include="Xml\InternalException.cs" />
+    <Compile Include="Xml\TrackedSegmentCollection.cs">
+      <DependentUpon>AXmlParser.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Xml\ExtensionMethods.cs" />
+    <Compile Include="Xml\FilteredCollection.cs" />
+    <Compile Include="Xml\IAXmlVisitor.cs" />
+    <Compile Include="Xml\MergedCollection.cs" />
+    <Compile Include="Xml\PrettyPrintAXmlVisitor.cs" />
+    <Compile Include="Xml\SyntaxError.cs" />
+    <Compile Include="Xml\TagMatchingHeuristics.cs">
+      <DependentUpon>AXmlParser.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Xml\TagReader.cs">
+      <DependentUpon>AXmlParser.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Xml\TextType.cs">
+      <DependentUpon>AXmlText.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Xml\TokenReader.cs">
+      <DependentUpon>AXmlParser.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="Highlighting\Resources\ASPX.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\Boo.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\Coco-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\CPP-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\HTML-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\Java-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\JavaScript-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\Patch-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\PHP-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\Tex-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\VBNET-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\XML-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\ModeV1.xsd" />
+    <EmbeddedResource Include="Highlighting\Resources\ModeV2.xsd" />
+    <EmbeddedResource Include="Highlighting\Resources\CSharp-Mode.xshd" />
+    <EmbeddedResource Include="Highlighting\Resources\XmlDoc.xshd" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Highlighting\Resources\CSS-Mode.xshd" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.Scripting.Core\Tango.Scripting.Core.csproj">
+      <Project>{5812E1C6-ABAA-4066-94AC-971C27B4F46A}</Project>
+      <Name>Tango.Scripting.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.Scripting.Formatting\Tango.Scripting.Formatting.csproj">
+      <Project>{8d8f06ed-7f75-4933-b0c5-829b0ff654d0}</Project>
+      <Name>Tango.Scripting.Formatting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.Scripting\Tango.Scripting.csproj">
+      <Project>{1e938fd2-c669-4738-98c9-77f96ce4d451}</Project>
+      <Name>Tango.Scripting</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Highlighting\Resources\PowerShell.xshd" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Highlighting\Resources\MarkDown-Mode.xshd" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
+  <ItemGroup>
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\mscorlib.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationFramework.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.ComponentModel.Composition.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Console.4.3.0\lib\net46\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Drawing.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Numerics.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Core\Debug\Tango.Core.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Scripting\Tango.Scripting.Core\bin\Debug\Tango.Scripting.Core.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Build\Scripting\Debug\Tango.Scripting.dll" />
+    <ReferencePath Include="C:\DATA\Development\Tango\Software\Visual_Studio\Scripting\Tango.Scripting.Formatting\bin\Debug\Tango.Scripting.Formatting.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.InteropServices.WindowsRuntime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Duplex.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Http.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.NetTcp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Security.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Xml.XmlSerializer.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="C:\DATA\Development\Tango\Software\Visual_Studio\Scripting\Tango.Scripting.Editors\obj\Debug\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
index e9cb8fc4c..2e7086ce0 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
@@ -138,9 +138,32 @@ namespace Tango.Scripting.Parsing
                         varSymbol.Type = type;
                         varSymbol.Class = ReplaceFakeScript(symbol.ContainingType?.Name);
                         varSymbol.Kind = symbol.Kind;
+                        varSymbol.RealSymbol = symbol;
                         varSymbol.Accessibility = symbol.DeclaredAccessibility;
                         varSymbol.ContainingNamespace = ReplaceFakeScript(symbol.ContainingNamespace?.Name);
                         varSymbol.Summary = GetSymbolDocumentation(symbol);
+
+                        try
+                        {
+                            if (symbol.Kind == SymbolKind.Local && symbol.DeclaringSyntaxReferences.Count() > 0)
+                            {
+                                var node = symbol.DeclaringSyntaxReferences.First().GetSyntax() as VariableDeclaratorSyntax;
+
+                                if (node != null)
+                                {
+                                    varSymbol.IsUnassigned = node.Initializer == null;
+                                }
+                            }
+                        }
+                        catch { }
+
+                        try
+                        {
+                            varSymbol.Offset = symbol.Locations[0].SourceSpan.Start;
+                            varSymbol.Length = symbol.Locations[0].SourceSpan.Length;
+                        }
+                        catch { }
+
                         vars.Add(varSymbol);
 
                         if (type == "?")
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptSymbol.cs b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptSymbol.cs
index d6fdaeebf..4b34837af 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptSymbol.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptSymbol.cs
@@ -17,6 +17,10 @@ namespace Tango.Scripting.Parsing
         public String ContainingNamespace { get; set; }
         public List<KeyValuePair<String,String>> Parameters { get; set; }
         public String Summary { get; set; }
+        public int Offset { get; set; }
+        public int Length { get; set; }
+        public bool IsUnassigned { get; set; }
+        public ISymbol RealSymbol { get; set; }
 
         public ScriptSymbol()
         {
-- 
cgit v1.3.1


From bd48c80d788ea5e2f602236ad10ceb13dd3ba65f Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 10 Aug 2020 16:47:01 +0300
Subject: Some more work on proc_doc. Added auto member navigation for
 procedures help. Optimized compilation frequency thus memory accumulation.

---
 .../Help/proc-doc.chm                              | Bin 191415 -> 165989 bytes
 .../Help/proc-doc.chw                              | Bin 29459 -> 40891 bytes
 .../Tango.FSE.Procedures.Documentation.shfbproj    |  12 +++-
 .../Contracts/IProcedureDesignerView.cs            |   1 +
 .../Tango.FSE.Procedures/Examples/Send/Program.cs  |  47 ++++++++++++++
 .../Examples/SendContinuous/Program.cs             |  66 +++++++++++++++++++
 .../Tango.FSE.Procedures/IProcedureContext.cs      |  72 ++++++++++++++++++---
 .../Tango.FSE.Procedures/ProcedureContext.cs       |   8 +--
 .../Resources/main_template.csx                    |   1 -
 .../Tango.FSE.Procedures.csproj                    |   3 +
 .../ViewModels/ProcedureDesignerViewVM.cs          |  52 +++++++++++++++
 .../Views/ProcedureDesignerView.xaml.cs            |   5 ++
 .../Tango FSE Procedure Example.zip                | Bin 0 -> 6123 bytes
 .../Tango.Scripting.Editors/ScriptEditor.cs        |  38 +++++++++++
 14 files changed, 289 insertions(+), 16 deletions(-)
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/Send/Program.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/SendContinuous/Program.cs
 create mode 100644 Software/Visual_Studio/Project Templates/Tango FSE Procedure Example.zip

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
index a153e1469..24e7db2e2 100644
Binary files a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm differ
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chw b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chw
index f981812da..b5d8170cd 100644
Binary files a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chw and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chw differ
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj
index 9d86f76d3..78ae89b52 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj
@@ -45,7 +45,7 @@
     <SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
     <HelpTitle>Tango FSE Procedures API</HelpTitle>
     <HelpFileVersion>1.0.0.0</HelpFileVersion>
-    <NamingMethod>Guid</NamingMethod>
+    <NamingMethod>MemberName</NamingMethod>
     <ContentPlacement>AboveNamespaces</ContentPlacement>
     <RootNamespaceContainer>False</RootNamespaceContainer>
     <NamespaceGrouping>False</NamespaceGrouping>
@@ -71,7 +71,10 @@
 <Filter entryType="Namespace" fullName="Tango.FSE.Common.Core" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Common.DemoMode" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Common.Diagnostics" isExposed="False">
-  <Filter entryType="Class" fullName="Tango.FSE.Common.Diagnostics.DiagnosticsPackage" filterName="DiagnosticsPackage" isExposed="True" />
+  <Filter entryType="Class" fullName="Tango.FSE.Common.Diagnostics.DiagnosticsPackage" filterName="DiagnosticsPackage" isExposed="True">
+    <Filter entryType="Property" fullName="Tango.FSE.Common.Diagnostics.DiagnosticsPackage.Frame" filterName="Frame" isExposed="False" />
+    <Filter entryType="Property" fullName="Tango.FSE.Common.Diagnostics.DiagnosticsPackage.MonitorsProperties" filterName="MonitorsProperties" isExposed="False" />
+  </Filter>
 </Filter>
 <Filter entryType="Namespace" fullName="Tango.FSE.Common.Dialogs" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Common.Events" isExposed="False" />
@@ -121,6 +124,8 @@
 <Filter entryType="Namespace" fullName="Tango.FSE.Procedures.CSV" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Procedures.Designer" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Procedures.Dialogs" isExposed="False" />
+<Filter entryType="Namespace" fullName="Tango.FSE.Procedures.Examples.Another" isExposed="False" />
+<Filter entryType="Namespace" fullName="Tango.FSE.Procedures.Examples.Send" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Procedures.Helpers" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Procedures.Messages" isExposed="False" />
 <Filter entryType="Namespace" fullName="Tango.FSE.Procedures.ViewModels" isExposed="False" />
@@ -130,7 +135,8 @@
     <ProjectSummary>This is the global summery for the help file.</ProjectSummary>
     <NamespaceSummaries>
       <NamespaceSummaryItem name="(global)" isDocumented="True">This is the global summery for the help file.</NamespaceSummaryItem>
-<NamespaceSummaryItem name="Tango.FSE.Procedures" isDocumented="True">Contains a collection of interfaces and classes for the main procedures API.</NamespaceSummaryItem></NamespaceSummaries>
+      <NamespaceSummaryItem name="Tango.FSE.Procedures" isDocumented="True">Contains a collection of interfaces and classes for the main procedures API.</NamespaceSummaryItem>
+    </NamespaceSummaries>
     <ComponentConfigurations />
     <MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, TypeParameter, AutoDocumentDispose</MissingTags>
   </PropertyGroup>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
index a16345f65..07899056c 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Contracts/IProcedureDesignerView.cs
@@ -29,5 +29,6 @@ namespace Tango.FSE.Procedures.Contracts
         List<ScriptBreakPoint> GetBreakPoints();
         void HighlightBreakPointRequest(int lineNumber, List<ScriptBreakPointSymbol> symbols);
         void ResetBreakPointRequest();
+        String GetCaretWord();
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/Send/Program.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/Send/Program.cs
new file mode 100644
index 000000000..bf7c38e13
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/Send/Program.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Drawing;
+using Google.Protobuf;
+using Tango.BL.Entities;
+using Tango.BL.Enumerations;
+using Tango.PMR.Stubs;
+using Tango.PMR.Diagnostics;
+using Tango.FSE.Common.Connection;
+using Tango.FSE.Common.Diagnostics;
+using Tango.FSE.Procedures;
+
+namespace Tango.FSE.Procedures.Examples.Send
+{
+    #region Example
+    public class Program
+    {
+        public void OnExecute(IProcedureContext context)
+        {
+            //Sends a request by providing the request name and comma separated arguments.
+            CalculateResponse response1 = context.Send<CalculateResponse>("CalculateRequest", 10, 5);
+
+            //Sends a request by providing the request short name and comma separated arguments.
+            CalculateResponse response2 = context.Send<CalculateResponse>("calculate", 10, 5);
+
+            //Sends a request by providing the request short name, a timeout and comma separated arguments.
+            CalculateResponse response3 = context.Send<CalculateResponse>("calculate", TimeSpan.FromSeconds(5), 10, 5);
+
+            //Sends a request by providing a request object.
+            CalculateRequest request = new CalculateRequest();
+            request.A = 10;
+            request.B = 5;
+
+            CalculateResponse response4 = context.Send<CalculateResponse>(request);
+
+            //Sends a request by providing a request object and 5 seconds timeout.
+            CalculateResponse response5 = context.Send<CalculateResponse>(request, 5);
+        }
+    }
+    #endregion
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/SendContinuous/Program.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/SendContinuous/Program.cs
new file mode 100644
index 000000000..2f8115642
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Examples/SendContinuous/Program.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Drawing;
+using Google.Protobuf;
+using Tango.BL.Entities;
+using Tango.BL.Enumerations;
+using Tango.PMR.Stubs;
+using Tango.PMR.Diagnostics;
+using Tango.FSE.Common.Connection;
+using Tango.FSE.Common.Diagnostics;
+using Tango.FSE.Procedures;
+
+namespace Tango.FSE.Procedures.Examples.SendContinuous
+{
+    #region Example
+    public class Program
+    {
+        private IProcedureContext _context;
+
+        public void OnExecute(IProcedureContext context)
+        {
+            //Sends a continuous request by providing the request name, a callback method and comma separated arguments.
+            context.SendContinuous<ProgressResponse>("ProgressRequest", (response) =>
+            {
+                //Each response will be provided here...
+                context.WriteLine(response);
+            }, 100, 10);
+
+
+            //Sends a continuous request by providing the request name, a callback method, a timeout, and comma separated arguments.
+            context.SendContinuous<ProgressResponse>("progress", (response) =>
+            {
+                context.WriteLine(response);
+            }, TimeSpan.FromSeconds(5), 100, 10);
+
+
+            //Sends a continuous request by providing the request object, a callback method and a 5 seconds timeout.
+            ProgressRequest request = new ProgressRequest();
+            request.Amount = 100;
+            request.Delay = 10;
+
+            context.SendContinuous<ProgressResponse>(request, (response) =>
+            {
+                context.WriteLine(response);
+            }, 5);
+
+
+            //Sends a continuous request by providing the request object, a defined callback method and a 5 seconds timeout.
+            //We need to store the context globally so the callback method will have access to it.
+            _context = context;
+            context.SendContinuous<ProgressResponse>(request, OnProgressResponse, 5);
+        }
+
+        private void OnProgressResponse(ProgressResponse response)
+        {
+            _context.WriteLine(response);
+        }
+    }
+    #endregion
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
index 4c6f5cc6b..a72d26495 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/IProcedureContext.cs
@@ -22,9 +22,6 @@ namespace Tango.FSE.Procedures
     /// <summary>
     /// Represents the main procedures API.
     /// </summary>
-    /// <example>
-    /// <code lang="C#" source="../Tango.FSE.Procedures/Resources/main_template.csx" title="Simple procedure" />
-    /// </example>
     /// <seealso cref="Tango.Scripting.Basic.IContext" />
     public interface IProcedureContext : IContext
     {
@@ -107,12 +104,23 @@ namespace Tango.FSE.Procedures
         void ClearResults();
 
         /// <summary>
-        /// Sends a request by name with optional comma separated arguments.
+        /// Sends a stub request by name, with optional comma separated arguments.
         /// </summary>
+        /// <remarks>
+        /// This Send override accepts only stub requests.
+        /// </remarks>
         /// <param name="messageName">Name of the message.</param>
-        /// <param name="timeout">The timeout in seconds.</param>
-        /// <param name="args">The arguments separated by commas.</param>
-        /// <returns></returns>
+        /// <param name="timeout">Request timeout in seconds. (leave null to get the default timeout)</param>
+        /// <param name="args">Request arguments separated by commas.</param>
+        /// <returns>Returns the response message.</returns>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a request to the machine and get a response using the various different Send method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/Send/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         IMessage Send(String messageName, TimeSpan? timeout = null, params Object[] args);
 
         /// <summary>
@@ -121,6 +129,14 @@ namespace Tango.FSE.Procedures
         /// <param name="messageName">Name of the message.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a request to the machine and get a response using the various different Send method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/Send/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         IMessage Send(String messageName, params Object[] args);
 
         /// <summary>
@@ -131,6 +147,14 @@ namespace Tango.FSE.Procedures
         /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a request to the machine and get a response using the various different Send method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/Send/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         T Send<T>(String messageName, TimeSpan? timeout = null, params Object[] args) where T : class, IMessage;
 
         /// <summary>
@@ -140,6 +164,14 @@ namespace Tango.FSE.Procedures
         /// <param name="messageName">Name of the message.</param>
         /// <param name="args">The arguments separated by commas.</param>
         /// <returns></returns>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a request to the machine and get a response using the various different Send method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/Send/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         T Send<T>(String messageName, params Object[] args) where T : class, IMessage;
 
         /// <summary>
@@ -148,6 +180,14 @@ namespace Tango.FSE.Procedures
         /// <param name="message">The message.</param>
         /// <param name="timeout">The timeout in seconds.</param>
         /// <returns></returns>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a request to the machine and get a response using the various different Send method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/Send/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         IMessage Send(IMessage message, int? timeout = null);
 
         /// <summary>
@@ -157,6 +197,14 @@ namespace Tango.FSE.Procedures
         /// <param name="message">The message.</param>
         /// <param name="timeout">The timeout in seconds.</param>
         /// <returns></returns>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a request to the machine and get a response using the various different Send method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/Send/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         T Send<T>(IMessage message, int? timeout = null) where T : class, IMessage;
 
         /// <summary>
@@ -166,6 +214,14 @@ namespace Tango.FSE.Procedures
         /// <param name="message">The message.</param>
         /// <param name="callback">Callback for continuous responses.</param>
         /// <param name="timeout">The timeout in seconds.</param>
+        /// <example>
+        /// <para>
+        /// <i>
+        /// The following example demonstrates how to send a continuous request to the machine and get a continuous response using the various different SendContinuous method overrides.
+        /// </i>
+        /// </para>
+        /// <code lang="C#" source="../Tango.FSE.Procedures/Examples/SendContinuous/Program.cs" title="Send a request" region="Example" />
+        /// </example>
         void SendContinuous<T>(IMessage message, Action<T> callback, int? timeout) where T : class, IMessage;
 
         /// <summary>
@@ -176,7 +232,7 @@ namespace Tango.FSE.Procedures
         /// <param name="callback">Callback for continuous responses.</param>
         /// <param name="timeout">The timeout in seconds.</param>
         /// <param name="args">The arguments.</param>
-        void SendContinuous<T>(String messageName, Action<T> callback, int? timeout, params Object[] args) where T : class, IMessage;
+        void SendContinuous<T>(String messageName, Action<T> callback, TimeSpan? timeout, params Object[] args) where T : class, IMessage;
 
         /// <summary>
         /// Sends a continuous message with optional comma separated arguments.
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
index 0f422c5f5..1676fb2ed 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs
@@ -168,7 +168,7 @@ namespace Tango.FSE.Procedures
             return Send(messageName, timeout) as T;
         }
 
-        public void SendContinuous<T>(IMessage messageName, Action<T> callback, int? timeout = null) where T : class, IMessage
+        public void SendContinuous<T>(IMessage message, Action<T> callback, int? timeout = null) where T : class, IMessage
         {
             TaskCompletionSource<object> completion = new TaskCompletionSource<object>();
 
@@ -179,7 +179,7 @@ namespace Tango.FSE.Procedures
                 timespan = TimeSpan.FromMilliseconds(timeout.Value);
             }
 
-            MachineProvider.MachineOperator.SendContinuousRequest(messageName, new Transport.TransportContinuousRequestConfig()
+            MachineProvider.MachineOperator.SendContinuousRequest(message, new Transport.TransportContinuousRequestConfig()
             {
                 Timeout = timespan,
                 ContinuousTimeout = timespan
@@ -201,7 +201,7 @@ namespace Tango.FSE.Procedures
             completion.Task.GetAwaiter().GetResult();
         }
 
-        public void SendContinuous<T>(string messageName, Action<T> callback, int? timeout = null, params object[] args) where T : class, IMessage
+        public void SendContinuous<T>(string messageName, Action<T> callback, TimeSpan? timeout = null, params object[] args) where T : class, IMessage
         {
             var stubType = MessageFactory.GetAvailableRequestStubs().SingleOrDefault(x => x.Name.ToLower() == messageName.ToLower() || x.Name.Replace("Request", "").ToLower() == messageName.ToLower());
             if (stubType == null)
@@ -242,7 +242,7 @@ namespace Tango.FSE.Procedures
                 }
             }
 
-            SendContinuous<IMessage>(request, callback as Action<IMessage>, timeout);
+            SendContinuous<IMessage>(request, callback as Action<IMessage>, timeout != null ? (int?)timeout.Value.TotalSeconds : null);
         }
 
         public void SendContinuous<T>(string messageName, Action<T> callback, params object[] args) where T : class, IMessage
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Resources/main_template.csx
index 8a2516cac..26e4fcb1c 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Resources/main_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Resources/main_template.csx
@@ -20,7 +20,6 @@ public class Program
 {
     public void OnExecute(IProcedureContext context)
     {
-
         context.AddResult(ResultType.Passed, "My Value Name", "Test for this value has passed.");
 
     }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
index a928bba75..266fc55aa 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
@@ -150,6 +150,8 @@
       <DependentUpon>UserInputDialogView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Dialogs\UserInputDialogViewVM.cs" />
+    <Compile Include="Examples\SendContinuous\Program.cs" />
+    <Compile Include="Examples\Send\Program.cs" />
     <Compile Include="Helpers\ProcedureExceptionHelper.cs" />
     <Compile Include="IDialogController.cs" />
     <Compile Include="IProcedureContext.cs" />
@@ -399,6 +401,7 @@
   <ItemGroup>
     <Resource Include="Images\blend.png" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
index 3023d974b..fa649d1e0 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureDesignerViewVM.cs
@@ -1433,6 +1433,58 @@ namespace Tango.FSE.Procedures.ViewModels
 
         private void OpenHelpFile()
         {
+            String word = View.GetCaretWord();
+
+            if (word != null)
+            {
+                String memberSign = null;
+                String typeFullName = null;
+
+                if (typeof(IProcedureContext).GetProperties(BindingFlags.Instance | BindingFlags.Public).Any(x => x.Name == word))
+                {
+                    memberSign = "P";
+                }
+
+                if (memberSign == null)
+                {
+                    if (typeof(IProcedureContext).GetMethods(BindingFlags.Instance | BindingFlags.Public).Any(x => x.Name == word))
+                    {
+                        memberSign = "M";
+                    }
+                }
+
+                if (memberSign == null)
+                {
+                    var type =  typeof(IProcedureContext).Assembly.GetTypes().FirstOrDefault(x => x.Name == word);
+                    if (type != null)
+                    {
+                        memberSign = "T";
+                        typeFullName = type.FullName.Replace(".", "_");
+                    }
+                }
+
+                if (memberSign != null)
+                {
+                    String url = String.Empty;
+
+                    if (memberSign == "T")
+                    {
+                        url = $"{typeFullName}.htm";
+                    }
+                    else
+                    {
+                        url = $"Tango_FSE_Procedures_IProcedureContext_{word}.htm";
+                    }
+
+                    Process pp = new Process();
+                    pp.StartInfo.FileName = "hh.exe";
+                    pp.StartInfo.Arguments = $"ms-its:{Path.Combine(AssemblyHelper.GetCurrentAssemblyFolder(), "proc-doc.chm")}::/html/{memberSign}_{url}";
+                    pp.StartInfo.WindowStyle = ProcessWindowStyle.Maximized;
+                    pp.Start();
+                    return;
+                }
+            }
+
             Process p = new Process();
             p.StartInfo.FileName = Path.Combine(AssemblyHelper.GetCurrentAssemblyFolder(), "proc-doc.chm");
             p.StartInfo.WindowStyle = ProcessWindowStyle.Maximized;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
index 0ee25b64d..e6857a87b 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Views/ProcedureDesignerView.xaml.cs
@@ -248,5 +248,10 @@ namespace Tango.FSE.Procedures.Views
         {
             runTimeBreakPointCanvas.Visibility = Visibility.Hidden;
         }
+
+        public string GetCaretWord()
+        {
+            return GetCurrentEditor()?.GetCaretWord();
+        }
     }
 }
diff --git a/Software/Visual_Studio/Project Templates/Tango FSE Procedure Example.zip b/Software/Visual_Studio/Project Templates/Tango FSE Procedure Example.zip
new file mode 100644
index 000000000..e220c4f8c
Binary files /dev/null and b/Software/Visual_Studio/Project Templates/Tango FSE Procedure Example.zip differ
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index b355ba818..6c248b63d 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -2750,6 +2750,44 @@ namespace Tango.Scripting.Editors
             }
         }
 
+        public String GetCaretWord()
+        {
+            try
+            {
+                var word_separators_plus = word_separators.ToList();
+                word_separators_plus.Add(')');
+                word_separators_plus.Add(';');
+
+                int wordStartOffset = CaretOffset;
+                int wordEndOffset = CaretOffset;
+
+                while (wordStartOffset > 0)
+                {
+                    if (word_separators_plus.Contains(Document.Text[wordStartOffset])) break;
+                    wordStartOffset--;
+                }
+
+                while (wordEndOffset < Document.Text.Length)
+                {
+                    if (word_separators_plus.Contains(Document.Text[wordEndOffset])) break;
+                    wordEndOffset++;
+                }
+
+                if (wordStartOffset > 0)
+                {
+                    wordStartOffset++;
+                }
+
+                String word = Document.Text.Substring(wordStartOffset, wordEndOffset - wordStartOffset);
+
+                return word;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         #endregion
     }
 }
-- 
cgit v1.3.1


From ddcd370da70d9e2212450368df1499c3a1f1b71c Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 25 Aug 2020 16:03:24 +0300
Subject: Fixed issue with script editor not recognizing string => String
 alias. Fixed issue with script FillVariables recursion hangs.

---
 .../Scripting/Tango.Scripting.Editors/ScriptEditor.cs  |  6 +++++-
 .../Scripting/Tango.Scripting/Parsing/ScriptParser.cs  | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 6c248b63d..9ff78912f 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -1230,7 +1230,7 @@ namespace Tango.Scripting.Editors
                     else
                     {
                         //Maybe static...
-                        var type = _knownTypes.FirstOrDefault(x => x.Name == variableName);
+                        var type = _knownTypes.FirstOrDefault(x => x.Name == variableName || x.Alias == variableName);
                         return type != null ? new KnownTypeResult(type) { IsStatic = true } : null;
                     }
                 }
@@ -1566,6 +1566,10 @@ namespace Tango.Scripting.Editors
                                     knownType.Alias = "uint";
                                 }
                             }
+                            else if (type == typeof(String))
+                            {
+                                knownType.Alias = "string";
+                            }
 
                             _knownTypesCache.Add(type, knownType);
                             cachedUsing.KnownTypes.Add(knownType);
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
index 2e7086ce0..63d2cca5d 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
@@ -440,7 +440,7 @@ namespace Tango.Scripting.Parsing
             var root = (CompilationUnitSyntax)tree.GetRoot();
 
             List<VariableDeclaratorSyntax> variables = new List<VariableDeclaratorSyntax>();
-            FillVariables(variables, root.Members[0]);
+            FillVariables(variables, new List<SyntaxNode>(), root.Members[0]);
             variables = variables.Distinct().ToList();
 
             foreach (var item in variables)
@@ -463,17 +463,27 @@ namespace Tango.Scripting.Parsing
             return vars;
         }
 
-        private void FillVariables(List<VariableDeclaratorSyntax> variables, SyntaxNode node)
+        private void FillVariables(List<VariableDeclaratorSyntax> variables, List<SyntaxNode> existingNodes, SyntaxNode node)
         {
-            foreach (var item in node.DescendantNodes(x => true))
+            var nodes = node.ChildNodes().ToList();
+
+            nodes.RemoveAll(x => existingNodes.Contains(x));
+
+            foreach (var item in nodes)
             {
+                existingNodes.Add(item);
+
                 if (item.GetType() == typeof(VariableDeclaratorSyntax))
                 {
                     variables.Add(item as VariableDeclaratorSyntax);
                 }
+                else if (item == node)
+                {
+                    continue;
+                }
                 else
                 {
-                    FillVariables(variables, item);
+                    FillVariables(variables, existingNodes, item);
                 }
             }
         }
-- 
cgit v1.3.1


From d530d39d7ed9b05e3e233adc62dceba2fd17e1fe Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 25 Oct 2020 16:58:42 +0200
Subject: Improved extension methods support on procedures. Drastically reduces
 procedure designer loading time. DataStore proto support fully working and
 tested.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../DataStore/RemoteDataStoreCollection.cs         |   5 ++
 .../DataStore/DefaultDataStoreService.cs           |  11 +++
 .../Intellisense/KnownType.cs                      |  25 ++++++-
 .../Tango.Scripting.Editors/ScriptEditor.cs        |   1 +
 .../Tango.Core/ExtensionMethods/TypeExtensions.cs  |  76 ++++++++++++++++++---
 .../Visual_Studio/Tango.Core/Tango.Core.csproj     |   4 +-
 .../Tango.DataStore.Remote.csproj                  |   1 -
 .../Tango.DataStore/DataStoreHelper.cs             |  35 ++--------
 .../Tango.DataStore/DataStoreProtoObject.cs        |   6 ++
 .../Tango.DataStore/ExtensionMethods.cs            |  16 +++++
 .../Tango.DataStore/Tango.DataStore.csproj         |   2 +-
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |  53 ++++++++++++++
 .../ExtensionMethods/IMessageExtensions.cs         |  27 ++++++++
 Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj  |   3 +-
 18 files changed, 220 insertions(+), 45 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.DataStore/ExtensionMethods.cs
 create mode 100644 Software/Visual_Studio/Tango.PMR/ExtensionMethods/IMessageExtensions.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 7e41561c2..82f79b115 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 9d05c6dbf..3e094bf75 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index dd6d320e3..f51d1ef53 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index ee59bb247..efb7ce79e 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/DataStore/RemoteDataStoreCollection.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/DataStore/RemoteDataStoreCollection.cs
index 4cf64a688..78e2bcfb1 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/DataStore/RemoteDataStoreCollection.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/DataStore/RemoteDataStoreCollection.cs
@@ -136,6 +136,11 @@ namespace Tango.FSE.UI.DataStore
 
         public IDataStoreItem GetItem(string key, object defaultValue)
         {
+            if (defaultValue is IMessage defaultValueMessage)
+            {
+                defaultValue = DataStoreProtoObject.FromMessage(defaultValueMessage);
+            }
+
             var result = _machineProvider.MachineOperator.SendGenericRequest<RemoteDataStoreGetItemRequest, RemoteDataStoreGetItemResponse>(new RemoteDataStoreGetItemRequest()
             {
                 Collection = Name,
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs
index bf0eadae1..ddc0f6cdb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs
@@ -16,6 +16,7 @@ using Tango.PPC.Common.Connection;
 using Tango.PPC.Common.ExternalBridge;
 using Tango.Transport;
 using Tango.Core.ExtensionMethods;
+using Newtonsoft.Json.Linq;
 
 namespace Tango.PPC.Common.DataStore
 {
@@ -59,6 +60,11 @@ namespace Tango.PPC.Common.DataStore
         [ExternalBridgeRequestHandlerMethod(typeof(RemoteDataStoreGetRequest), RequestHandlerLoggingMode.LogRequestName)]
         public async Task OnRemoteDataStoreGetRequest(RemoteDataStoreGetRequest request, String token, ExternalBridgeReceiver receiver)
         {
+            if (request.DefaultValue is JObject obj)
+            {
+                request.DefaultValue = DataStoreProtoObject.FromJObject(obj);
+            }
+
             var item = GetManager().GetCollection(request.Collection).GetItem(request.Key, request.DefaultValue);
             await receiver.SendGenericResponse(new RemoteDataStoreGetResponse()
             {
@@ -70,6 +76,11 @@ namespace Tango.PPC.Common.DataStore
         [ExternalBridgeRequestHandlerMethod(typeof(RemoteDataStoreGetItemRequest), RequestHandlerLoggingMode.LogRequestName)]
         public async Task OnRemoteDataStoreGetItemRequest(RemoteDataStoreGetItemRequest request, String token, ExternalBridgeReceiver receiver)
         {
+            if (request.DefaultValue is JObject obj)
+            {
+                request.DefaultValue = DataStoreProtoObject.FromJObject(obj);
+            }
+
             var item = GetManager().GetCollection(request.Collection).GetItem(request.Key, request.DefaultValue);
             await receiver.SendGenericResponse(new RemoteDataStoreGetItemResponse()
             {
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
index f55838db3..8010dc689 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
@@ -43,6 +44,13 @@ namespace Tango.Scripting.Editors.Intellisense
         }
         public List<KnownTypeField> Fields { get; set; }
 
+        public static List<Assembly> ExtensionMethodsAssemblies { get; set; }
+
+        static KnownType()
+        {
+            ExtensionMethodsAssemblies = new List<Assembly>();
+        }
+
         public KnownType(Type type)
         {
             Summary = "Loading documentation...";
@@ -131,11 +139,24 @@ namespace Tango.Scripting.Editors.Intellisense
                             methods.AddRange(inter.GetRuntimeMethods().Where(x => x.IsPublic && !x.IsSpecialName).ToList());
                         }
                         methods = methods.Distinct().ToList();
+
+                        if (!methods.Exists(x => x.Name == "ToString"))
+                        {
+                            methods.Add(typeof(Object).GetMethod("ToString"));
+                        }
                     }
 
                     //TODO: Separate extension methods!
                     methods.AddRange(Type.GetExtensionMethods(Type.Assembly).ToList());
 
+                    if (Type.Namespace.StartsWith("Tango"))
+                    {
+                        foreach (var asm in ExtensionMethodsAssemblies.Where(x => x != Type.Assembly))
+                        {
+                            methods.AddRange(Type.GetExtensionMethods(asm).ToList());
+                        }
+                    }
+
                     if (typeof(IEnumerable).IsAssignableFrom(Type))
                     {
                         var linqMethods = typeof(System.Linq.Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public).ToList();
@@ -152,7 +173,7 @@ namespace Tango.Scripting.Editors.Intellisense
                         m.Name = method.Name;
                         m.ReturnType = method.ReturnType;
                         m.ReturnTypeFriendlyName = method.ReturnType.GetFriendlyName();
-                        m.IsStatic = method.IsStatic;
+                        m.IsStatic = method.IsStatic && !method.IsDefined(typeof(System.Runtime.CompilerServices.ExtensionAttribute), false);
 
                         if (method.IsGenericMethod)
                         {
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 9ff78912f..e65ff671d 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -1808,6 +1808,7 @@ namespace Tango.Scripting.Editors
                 _isLoadingTypes = true;
 
                 var assemblies = ReferenceAssemblies.ToList();
+                KnownType.ExtensionMethodsAssemblies = assemblies.ToList();
                 var usings = _current_usings.ToList();
 
                 Thread t = new Thread(() =>
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/TypeExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/TypeExtensions.cs
index 66978ec19..44297b277 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/TypeExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/TypeExtensions.cs
@@ -10,6 +10,19 @@ using System.Threading.Tasks;
 /// </summary>
 public static class TypeExtensions
 {
+    private class AssemblyExtensionMethods
+    {
+        public Assembly Assembly { get; set; }
+        public List<MethodInfo> Methods { get; set; }
+
+        public AssemblyExtensionMethods()
+        {
+            Methods = new List<MethodInfo>();
+        }
+    }
+
+    private static List<AssemblyExtensionMethods> _extensionMethodsCache = new List<AssemblyExtensionMethods>();
+
     /// <summary>
     /// Gets all the extension methods registered in the specified assembly.
     /// </summary>
@@ -18,14 +31,61 @@ public static class TypeExtensions
     /// <returns></returns>
     public static IEnumerable<MethodInfo> GetExtensionMethods(this Type type, Assembly extensionsAssembly)
     {
-        var query = from t in extensionsAssembly.GetTypes()
-                    where !t.IsGenericType && !t.IsNested
-                    from m in t.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
-                    where m.IsDefined(typeof(System.Runtime.CompilerServices.ExtensionAttribute), false)
-                    where m.GetParameters()[0].ParameterType == type
-                    select m;
-
-        return query;
+        if (type.Name == "CalculateRequest")
+        {
+
+        }
+
+        var asmMethods = _extensionMethodsCache.FirstOrDefault(x => x.Assembly == extensionsAssembly);
+
+        if (asmMethods == null)
+        {
+            var query = from t in extensionsAssembly.GetTypes()
+                        where !t.IsGenericType && !t.IsNested
+                        from m in t.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
+                        where m.IsDefined(typeof(System.Runtime.CompilerServices.ExtensionAttribute), false)
+                        select m;
+
+            asmMethods = new AssemblyExtensionMethods();
+            asmMethods.Assembly = extensionsAssembly;
+            asmMethods.Methods = query.ToList();
+            _extensionMethodsCache.Add(asmMethods);
+        }
+
+        List<MethodInfo> methods = new List<MethodInfo>();
+
+        asmMethods.Methods.Where(x => x.GetParameters()[0].ParameterType.IsAssignableFrom(type));
+
+        foreach (var method in asmMethods.Methods)
+        {
+            var parameter = method.GetParameters()[0];
+
+            if (parameter.ParameterType.IsGenericParameter)
+            {
+                var constraints = parameter.ParameterType.GetGenericParameterConstraints().ToList();
+
+                if (constraints.Count > 0)
+                {
+                    if (constraints[0].IsAssignableFrom(type))
+                    {
+                        methods.Add(method);
+                    }
+                    else if (constraints[0].GetInterfaces().Any(x => x.IsAssignableFrom(type)))
+                    {
+                        methods.Add(method);
+                    }
+                }
+            }
+            else
+            {
+                if (parameter.ParameterType.IsAssignableFrom(type))
+                {
+                    methods.Add(method);
+                }
+            }
+        }
+
+        return methods;
     }
 
     /// <summary>
diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index 582fa9712..813a31443 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -155,7 +155,7 @@
     <Compile Include="ExtensionMethods\INotifyPropertyChangedExtensions.cs" />
     <Compile Include="ExtensionMethods\ObservableCollectionExtensions.cs" />
     <Compile Include="ExtensionMethods\IEnumerableExtensions.cs" />
-    <Compile Include="ExtensionMethods\IMessageExtensions.cs" />
+    <None Include="ExtensionMethods\IMessageExtensions.cs" />
     <Compile Include="ExtensionMethods\IParameterizedExtensions.cs" />
     <Compile Include="ExtensionMethods\ObjectExtensions.cs" />
     <Compile Include="ExtensionMethods\ProcessExtensions.cs" />
@@ -220,7 +220,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
diff --git a/Software/Visual_Studio/Tango.DataStore.Remote/Tango.DataStore.Remote.csproj b/Software/Visual_Studio/Tango.DataStore.Remote/Tango.DataStore.Remote.csproj
index 2b05d6af3..4d0d04054 100644
--- a/Software/Visual_Studio/Tango.DataStore.Remote/Tango.DataStore.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DataStore.Remote/Tango.DataStore.Remote.csproj
@@ -76,7 +76,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Software/Visual_Studio/Tango.DataStore/DataStoreHelper.cs b/Software/Visual_Studio/Tango.DataStore/DataStoreHelper.cs
index 3cf24bdd0..96a905120 100644
--- a/Software/Visual_Studio/Tango.DataStore/DataStoreHelper.cs
+++ b/Software/Visual_Studio/Tango.DataStore/DataStoreHelper.cs
@@ -35,7 +35,11 @@ namespace Tango.DataStore
         /// <exception cref="System.NotSupportedException"></exception>
         public static DataType GetDataType(Type type)
         {
-            if (type == typeof(Int32))
+            if (type == typeof(int))
+            {
+                return DataType.Int32;
+            }
+            else if (type == typeof(Int64))
             {
                 return DataType.Int32;
             }
@@ -71,35 +75,6 @@ namespace Tango.DataStore
             throw new NotSupportedException($"The specified type '{type.Name}' is not supported by the data store.");
         }
 
-        /// <summary>
-        /// Gets the CLR type by specified data store data type.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns></returns>
-        /// <exception cref="System.NotSupportedException">The specified data type is not supported.</exception>
-        //public static Type GetType(DataType type)
-        //{
-        //    switch (type)
-        //    {
-        //        case DataType.Boolean:
-        //            return typeof(bool);
-        //        case DataType.Bytes:
-        //            return typeof(byte[]);
-        //        case DataType.Double:
-        //            return typeof(double);
-        //        case DataType.Float:
-        //            return typeof(float);
-        //        case DataType.Int32:
-        //            return typeof(Int32);
-        //        case DataType.String:
-        //            return typeof(String);
-        //        case DataType.Proto:
-        //            return typeof(DataStoreProtoObject);
-        //    }
-
-        //    throw new NotSupportedException("The specified data type is not supported.");
-        //}
-
         /// <summary>
         /// Formats the data store item as a string.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs b/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs
index ec4cf1057..6661c2017 100644
--- a/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs
+++ b/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs
@@ -1,5 +1,6 @@
 using Google.Protobuf;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -59,6 +60,11 @@ namespace Tango.DataStore
             return proto;
         }
 
+        public static DataStoreProtoObject FromJObject(JObject obj)
+        {
+            return (obj.ToObject<DataStoreProtoObject>());
+        }
+
         public static DataStoreProtoObject FromPMRDataStoreItem(DataStoreItem item)
         {
             DataStoreProtoObject proto = new DataStoreProtoObject();
diff --git a/Software/Visual_Studio/Tango.DataStore/ExtensionMethods.cs b/Software/Visual_Studio/Tango.DataStore/ExtensionMethods.cs
new file mode 100644
index 000000000..acc381a61
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DataStore/ExtensionMethods.cs
@@ -0,0 +1,16 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DataStore;
+
+public static class ExtensionMethods
+{
+    public static DataStoreProtoObject ToDataStoreProtoObject(IMessage message)
+    {
+        return DataStoreProtoObject.FromMessage(message);
+    }
+}
+
diff --git a/Software/Visual_Studio/Tango.DataStore/Tango.DataStore.csproj b/Software/Visual_Studio/Tango.DataStore/Tango.DataStore.csproj
index 8035af7b4..c12abe9e8 100644
--- a/Software/Visual_Studio/Tango.DataStore/Tango.DataStore.csproj
+++ b/Software/Visual_Studio/Tango.DataStore/Tango.DataStore.csproj
@@ -54,6 +54,7 @@
     </Compile>
     <Compile Include="DataStoreHelper.cs" />
     <Compile Include="DataStoreProtoObject.cs" />
+    <Compile Include="ExtensionMethods.cs" />
     <Compile Include="IDataStoreItem.cs" />
     <Compile Include="DataType.cs" />
     <Compile Include="IDataStoreCollection.cs" />
@@ -61,7 +62,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index e5296ab4c..6b49ca4eb 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -2060,6 +2060,59 @@ namespace Tango.Emulations.Emulators
                     LogManager.Log(ex, "Failed.");
                 }
             }
+
+            {
+                try
+                {
+                    LogManager.Log("Testing int default...");
+
+                    var res = await Transporter.SendRequest<GetDataStoreItemRequest, GetDataStoreItemResponse>(new GetDataStoreItemRequest()
+                    {
+                        Collection = "TEST",
+                        Key = "intDefault",
+                        DefaultItem = new PMR.DataStore.DataStoreItem()
+                        {
+                            DataType = DataType.Int32,
+                            Int32Value = 10,
+                        },
+                    });
+
+                    LogManager.Log(res.Container.Error != ErrorCode.None ? "Get Failed." : "Passed.");
+                    LogManager.Log(res.ToJsonString());
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Failed.");
+                }
+            }
+
+            {
+                try
+                {
+                    LogManager.Log("Testing proto default...");
+
+                    var res = await Transporter.SendRequest<GetDataStoreItemRequest, GetDataStoreItemResponse>(new GetDataStoreItemRequest()
+                    {
+                        Collection = "TEST",
+                        Key = "protoDefault",
+                        DefaultItem = new PMR.DataStore.DataStoreItem()
+                        {
+                            DataType = DataType.Proto,
+                            BytesValue = (new CalculateRequest() { A = 10, B = 15 }).ToByteString(),
+                            ProtoType = MessageType.CalculateRequest,
+                        },
+                    });
+
+                    LogManager.Log(res.Container.Error != ErrorCode.None ? "Get Failed." : "Passed.");
+
+                    LogManager.Log(CalculateRequest.Parser.ParseFrom(res.Message.Item.BytesValue).ToJsonString());
+                    LogManager.Log(res.ToJsonString());
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Failed.");
+                }
+            }
         }
 
         #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/ExtensionMethods/IMessageExtensions.cs b/Software/Visual_Studio/Tango.PMR/ExtensionMethods/IMessageExtensions.cs
new file mode 100644
index 000000000..84acb51d2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ExtensionMethods/IMessageExtensions.cs
@@ -0,0 +1,27 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+public static class IMessageExtensions
+{
+    /// <summary>
+    /// Serializes this PMR message to byte array.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="message">The message.</param>
+    /// <returns></returns>
+    public static byte[] ToBytes<T>(this T message) where T : IMessage<T>
+    {
+        using (MemoryStream ms = new MemoryStream())
+        {
+            message.WriteTo(ms);
+            return ms.ToArray();
+        }
+    }
+}
+
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 7b3a7c397..bb44ef591 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -189,6 +189,7 @@
     <Compile Include="Exports\JobFileLiquidVolume.cs" />
     <Compile Include="Exports\JobFileSegment.cs" />
     <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="ExtensionMethods\IMessageExtensions.cs" />
     <Compile Include="ExtensionMethods\VersionPackageDescriptorExtensions.cs" />
     <Compile Include="FirmwareUpgrade\ActivateVersionRequest.cs" />
     <Compile Include="FirmwareUpgrade\ActivateVersionResponse.cs" />
@@ -482,7 +483,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
-- 
cgit v1.3.1