Added new colorized static text widget to tech board.

Added option to go back to job/jobs from running job view.
Fixed issue with bug reporting.
Fixed other bugs.

1 files changed, 7 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
index a19a2066a..605e168cb 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -113,13 +114,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the machineversion machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -133,13 +134,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<TangoVersion> _tangoversions;
+        protected SynchronizedObservableCollection<TangoVersion> _tangoversions;
 
         /// <summary>
         /// Gets or sets the machineversion tango versions.
         /// </summary>
 
-        public virtual ObservableCollection<TangoVersion> TangoVersions
+        public virtual SynchronizedObservableCollection<TangoVersion> TangoVersions
         {
             get 
             {
@@ -159,11 +160,9 @@ namespace Tango.BL.Entities
         public MachineVersion() : base()
         {
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
-            TangoVersions = new ObservableCollection<TangoVersion>();
-            TangoVersions.EnableCrossThreadOperations();
+            TangoVersions = new SynchronizedObservableCollection<TangoVersion>();
 
         }
     }