From 338edba081dba2a2aefb634811be1cc84ec93d64 Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Tue, 25 Aug 2020 10:08:01 +0300 Subject: merge --- .../Scripting/Tango.Scripting.Basic/Project.cs | 194 +++++++++++++-------- 1 file changed, 120 insertions(+), 74 deletions(-) (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs index 8ca64ca18..7500e404f 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs @@ -21,6 +21,8 @@ namespace Tango.Scripting.Basic { public class Project : ExtendedObject where T : IContext { + private object _compileLock = new object(); + public String ID { get; set; } private String _name; @@ -37,6 +39,22 @@ namespace Tango.Scripting.Basic set { _description = value; RaisePropertyChangedAuto(); } } + private bool _isRunning; + [JsonIgnore] + public bool IsRunning + { + get { return _isRunning; } + set { _isRunning = value; RaisePropertyChangedAuto(); } + } + + private bool _isCompiling; + [JsonIgnore] + public bool IsCompiling + { + get { return _isCompiling; } + set { _isCompiling = value; RaisePropertyChangedAuto(); } + } + public ApartmentState ApartmentState { get; set; } public ObservableCollection ReferenceAssemblies { get; set; } @@ -52,6 +70,9 @@ namespace Tango.Scripting.Basic } } + [JsonIgnore] + public List BreakPoints { get; set; } + public Project() { ID = Guid.NewGuid().ToString(); @@ -62,99 +83,121 @@ namespace Tango.Scripting.Basic Scripts = new ObservableCollection