Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 43 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
index 029580a10..072720c4b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.MachineStudio.Technician.Editors;
 using Tango.MachineStudio.Technician.Helpers;
 using Tango.SharedUI.Helpers;
@@ -81,6 +82,36 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _useMinMax = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _useAutoRange;
+        /// <summary>
+        /// Gets or sets a value indicating whether [use automatic range].
+        /// </summary>
+        public bool UseAutoRange
+        {
+            get { return _useAutoRange; }
+            set { _useAutoRange = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isPaused;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is paused.
+        /// </summary>
+        public bool IsPaused
+        {
+            get { return _isPaused; }
+            set
+            {
+                _isPaused = value; RaisePropertyChangedAuto();
+
+                if (Editor != null)
+                {
+                    Editor.InnerGraph.Controller.IsPaused = _isPaused;
+                }
+            }
+        }
+
+        public RelayCommand ClearCommand { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MultiGraphItem"/> class.
         /// </summary>
@@ -90,6 +121,14 @@ namespace Tango.MachineStudio.Technician.TechItems
             Name = "Multi Channel Graph";
             Description = "Multi channel real-time graph";
             Image = ResourceHelper.GetImageFromResources("Images/multi-graph.png");
+
+            ClearCommand = new RelayCommand(() => 
+            {
+                if (Editor != null)
+                {
+                    Editor.InnerGraph.Controller.Clear();
+                }
+            });
         }
 
         /// <summary>
@@ -109,6 +148,10 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             MultiGraphItem cloned = base.Clone() as MultiGraphItem;
             cloned.TechMonitor = TechMonitor;
+            cloned.Min = Min;
+            cloned.Max = Max;
+            cloned.UseMinMax = UseMinMax;
+            cloned.UseAutoRange = UseAutoRange;
             return cloned;
         }
     }