From 9b7875d904456c34c3698d7fc569078f99ed5187 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 19 Apr 2020 23:12:56 +0300 Subject: Scripting refactoring. --- .../Scripting/Tango.Scripting.Basic/GlobalObject.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs new file mode 100644 index 000000000..fc48bb2a2 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Scripting.Basic +{ + public class GlobalObject + { + public IContext GlobalContext { get; set; } + } +} -- cgit v1.3.1 From 499e0a03bb41e2330a47ccca83e6e6dfe7c5a634 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 22 Apr 2020 02:08:25 +0300 Subject: Scripting. --- .../FSE/Modules/Tango.FSE.Stubs/ITestContext.cs | 6 + .../FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs | 15 + .../FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs | 111 ++++--- .../Tango.FSE.Stubs/Resources/main_template.csx | 11 +- .../FSE/Modules/Tango.FSE.Stubs/Result.cs | 33 ++ .../FSE/Modules/Tango.FSE.Stubs/ResultType.cs | 15 + .../Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj | 4 + .../FSE/Modules/Tango.FSE.Stubs/TestContext.cs | 69 ++++- .../ViewModels/TestDesignerViewVM.cs | 162 +++++++++- .../Tango.FSE.Stubs/Views/TestDesignerView.xaml | 111 ++++--- .../FSE/Tango.FSE.Common/FSEViewModel.cs | 7 + .../FSE/Tango.FSE.Common/Resources/Converters.xaml | 1 + .../Tango.Scripting.Basic/GlobalObject.cs | 4 +- .../Scripting/Tango.Scripting.Basic/Project.cs | 23 +- .../Tango.Scripting.Basic/ProjectManager.cs | 18 -- .../Tango.Scripting.Basic/ProjectSession.cs | 6 +- .../Tango.Scripting.Basic.csproj | 1 - .../Tango.Scripting.Editors/CachedUsing.cs | 20 ++ .../Tango.Scripting.Editors/Images/event.png | Bin 0 -> 210 bytes .../Intellisense/EventCompletionItem.cs | 22 ++ .../Intellisense/KnownType.cs | 24 +- .../Intellisense/KnownTypeEvent.cs | 21 ++ .../Tango.Scripting.Editors/ScriptEditor.cs | 334 ++++++++++++++++----- .../Tango.Scripting.Editors.csproj | 8 +- .../Tango.Scripting.Editors/Themes/Generic.xaml | 3 + .../Tango.Scripting.Test/MainWindow.xaml.cs | 9 +- .../Scripting/Tango.Scripting.Test/MainWindowVM.cs | 13 +- .../Converters/EnumToIntConverter.cs | 23 ++ .../Tango.SharedUI/Tango.SharedUI.csproj | 3 +- 29 files changed, 855 insertions(+), 222 deletions(-) create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectManager.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/CachedUsing.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Images/event.png create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/EventCompletionItem.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownTypeEvent.cs create mode 100644 Software/Visual_Studio/Tango.SharedUI/Converters/EnumToIntConverter.cs (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs') diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs index 671b2174a..41b13f2d2 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs @@ -1,6 +1,7 @@ using Google.Protobuf; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -11,6 +12,11 @@ namespace Tango.FSE.Stubs { public interface ITestContext : IContext { + ReadOnlyCollection Results { get; } + Result AddResult(ResultType type, String name, object value); + Result AddResult(Result result); + void RemoveResult(Result result); + void ClearResults(); IMessage Run(String stubName, params Object[] args); IMessage Run(IMessage stub); void RunContinuous(T stub, Action callback) where T : class, IMessage; diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs new file mode 100644 index 000000000..286bc07ea --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.FSE.Stubs +{ + public interface ITestLogger + { + void WriteLine(String text); + void Write(String text); + void Clear(); + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs index 00ab0caca..de93305d8 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs @@ -10,63 +10,104 @@ namespace Tango.FSE.Stubs { public class ProjectRunner : ExtendedObject { - private ProjectSession _currentSession; + private ProjectSession _currentSession; private ProjectRunnerState _state; public ProjectRunnerState State { get { return _state; } - private set { _state = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(IsRunning)); } + private set + { + _state = value; + RaisePropertyChangedAuto(); + RaisePropertyChanged(nameof(IsRunning)); + RaisePropertyChanged(nameof(IsCompiling)); + RaisePropertyChanged(nameof(CanRun)); + RaisePropertyChanged(nameof(CanCompile)); + } } public bool IsRunning { - get { return State == ProjectRunnerState.Compiling || State == ProjectRunnerState.Running; } + get { return State == ProjectRunnerState.Running; } + } + + public bool IsCompiling + { + get { return State == ProjectRunnerState.Compiling; } } - public Project Project { get; private set; } + public bool CanCompile + { + get { return State != ProjectRunnerState.Running && State != ProjectRunnerState.Compiling; } + } - public ProjectRunner(Project project) + public bool CanRun + { + get { return State != ProjectRunnerState.Running && State != ProjectRunnerState.Compiling; } + } + + public Project Project { get; private set; } + + public ProjectRunner(Project project) { Project = project; } - public async Task Run() + public async Task Compile() { - if (State != ProjectRunnerState.Compiling && State != ProjectRunnerState.Running) + try + { + State = ProjectRunnerState.Compiling; + var result = await Project.Compile(); + State = ProjectRunnerState.None; + return result; + } + catch (Exception) + { + throw; + } + finally { - try - { - State = ProjectRunnerState.Compiling; - _currentSession = await Project.Run(null); - } - catch (Exception ex) - { - State = ProjectRunnerState.None; - throw ex; - } + State = ProjectRunnerState.None; + } + } - State = ProjectRunnerState.Running; + public async Task Run(TestContext context) + { + if (!CanRun) + { + throw new InvalidOperationException("Project is already running."); + } - try - { - var result = await _currentSession.WaitForCompletion(); - State = ProjectRunnerState.Completed; - return result; - } - catch (OperationCanceledException) - { - State = ProjectRunnerState.Aborted; - throw; - } - catch (Exception) - { - State = ProjectRunnerState.Failed; - throw; - } + try + { + State = ProjectRunnerState.Compiling; + _currentSession = await Project.Run(context); + } + catch (Exception ex) + { + State = ProjectRunnerState.None; + throw ex; } - throw new InvalidOperationException("Project is already running."); + State = ProjectRunnerState.Running; + + try + { + var result = await _currentSession.WaitForCompletion(); + State = ProjectRunnerState.Completed; + } + catch (OperationCanceledException) + { + State = ProjectRunnerState.Aborted; + throw; + } + catch (Exception) + { + State = ProjectRunnerState.Failed; + throw; + } } public void Stop() 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 34604c6d3..c50f70c5f 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,19 +1,18 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using Tango.FSE.Stubs; public class Program { - public Object OnExecute(ITestContext context) + public void OnExecute(ITestContext context) { - return new - { - Item1 = "Item 1", - Item2 = "Item 2" - }; + context.AddResult(ResultType.Passed, "My Value Name", "Test for this value has passed."); + } } \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs new file mode 100644 index 000000000..74f95a437 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.ExtensionMethods; + +namespace Tango.FSE.Stubs +{ + public class Result + { + public ResultType Type { get; set; } + public String Name { get; set; } + public Object Value { get; set; } + + public Result() + { + + } + + public Result(ResultType type, String name, Object value) : this() + { + Type = type; + Name = name; + Value = value; + } + + public override string ToString() + { + return this.ToJsonString(); + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs new file mode 100644 index 000000000..e19f58b4f --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.FSE.Stubs +{ + public enum ResultType + { + Passed, + Failed, + Warning, + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj index 9058bf074..faf3615be 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj @@ -61,6 +61,7 @@ + ..\..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll @@ -97,8 +98,11 @@ + + + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs index e40ccebfc..83823a27c 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; using System.Linq; using System.Reflection; using System.Text; @@ -7,6 +9,7 @@ using System.Threading; using System.Threading.Tasks; using Google.Protobuf; using Tango.Core.DI; +using Tango.FSE.Common.Connection; using Tango.FSE.Common.Notifications; using Tango.FSE.Common.Threading; using Tango.Integration.Operation; @@ -17,15 +20,23 @@ namespace Tango.FSE.Stubs { public class TestContext : ITestContext { - private IMachineOperator _machineOperator; - private INotificationProvider _notificationProvider; - private IDispatcherProvider _dispatcherProvider; + private ITestLogger _logger; - public TestContext(IMachineOperator machineOperator, INotificationProvider notificationProvider, IDispatcherProvider dispatcherProvider) + [TangoInject] + private IMachineProvider MachineProvider; + + [TangoInject] + private INotificationProvider NotificationProvider { get; set; } + + [TangoInject] + private IDispatcherProvider DispatcherProvider { get; set; } + + public ReadOnlyCollection Results { get; private set; } + + public TestContext(ITestLogger logger) { - _machineOperator = machineOperator; - _notificationProvider = notificationProvider; - _dispatcherProvider = dispatcherProvider; + _logger = logger; + Results = new ReadOnlyCollection(new List()); } public IMessage Run(string stubName, params object[] args) @@ -74,14 +85,14 @@ namespace Tango.FSE.Stubs public IMessage Run(IMessage stub) { - return _machineOperator.SendRequest(stub, new Transport.TransportRequestConfig()).Result; + return MachineProvider.MachineOperator.SendRequest(stub, new Transport.TransportRequestConfig()).Result; } public void RunContinuous(T stub, Action callback) where T : class, IMessage { Type stubType = stub.GetType(); - _machineOperator.SendContinuousRequest(stub, new Transport.TransportContinuousRequestConfig()).Subscribe((msg) => + MachineProvider.MachineOperator.SendContinuousRequest(stub, new Transport.TransportContinuousRequestConfig()).Subscribe((msg) => { callback?.Invoke(msg as T); @@ -143,37 +154,63 @@ namespace Tango.FSE.Stubs public void WriteLine(object obj) { - throw new NotImplementedException(); + _logger?.WriteLine(obj != null ? obj.ToString() : "null"); } public void Write(object obj) { - throw new NotImplementedException(); + _logger?.Write(obj != null ? obj.ToString() : "null"); } public void WriteLineHex(object number, int digits) { - throw new NotImplementedException(); + _logger?.WriteLine("#" + Convert.ToInt32(number).ToString("X" + digits.ToString())); } public void WriteHex(object number, int digits) { - throw new NotImplementedException(); + _logger?.Write("#" + Convert.ToInt32(number).ToString("X" + digits.ToString())); } public void Clear() { - throw new NotImplementedException(); + _logger?.Clear(); } public void WriteToFile(string filePath, string content) { - throw new NotImplementedException(); + File.WriteAllText(filePath, content); } public void AppendToFile(string filePath, string content) { - throw new NotImplementedException(); + File.AppendAllText(filePath, content); + } + + public Result AddResult(ResultType type, string name, object value) + { + var result = new Result(type, name, value); + return AddResult(result); + } + + public Result AddResult(Result result) + { + List results = new List(Results); + results.Add(result); + Results = new ReadOnlyCollection(results); + return result; + } + + public void RemoveResult(Result result) + { + List results = new List(Results); + results.Remove(result); + Results = new ReadOnlyCollection(results); + } + + public void ClearResults() + { + Results = new ReadOnlyCollection(new List()); } } } diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs index 6e6873c9a..d87fe0ff3 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs @@ -5,18 +5,38 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Input; +using Tango.Core; using Tango.Core.Commands; +using Tango.Core.ExtensionMethods; using Tango.FSE.Common; using Tango.Integration.Operation; using Tango.Scripting.Basic; +using Tango.Scripting.Editors; +using Tango.SharedUI.Components; +using Tango.SharedUI.Helpers; using Tango.Transport; namespace Tango.FSE.Stubs.ViewModels { - public class TestDesignerViewVM : FSEViewModel + public class TestDesignerViewVM : FSEViewModel, ITestLogger { - private Project _project; - public Project Project + public enum ToolWindows + { + Output, + Errors, + Results + } + + private ToolWindows _selectedToolWindow; + public ToolWindows SelectedToolWindow + { + get { return _selectedToolWindow; } + set { _selectedToolWindow = value; RaisePropertyChangedAuto(); } + } + + private Project _project; + public Project Project { get { return _project; } set { _project = value; RaisePropertyChangedAuto(); OnProjectChanged(); } @@ -29,6 +49,13 @@ namespace Tango.FSE.Stubs.ViewModels set { _projectRunner = value; RaisePropertyChangedAuto(); } } + private List _compilationErrors; + public List CompilationErrors + { + get { return _compilationErrors; } + set { _compilationErrors = value; RaisePropertyChangedAuto(); } + } + public ObservableCollection