merge conflict

1 files changed, 62 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechTabVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechTabVM.cs
new file mode 100644
index 000000000..4e04a078c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechTabVM.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Editors;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.Technician.ViewModels
+{
+    public class MachineTechTabVM : ViewModel
+    {
+        private ElementsEditor _editor;
+
+        public ElementsEditor Editor
+        {
+            get { return _editor; }
+            set { _editor = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public String Name
+        {
+            get { return _name; }
+            set { _name = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isSelected;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is selected.
+        /// </summary>
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set { _isSelected = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        private ObservableCollection<IElementEditor> _elements;
+        /// <summary>
+        /// Gets or sets the visual elements.
+        /// </summary>
+        public ObservableCollection<IElementEditor> Elements
+        {
+            get { return _elements; }
+            set { _elements = value; RaisePropertyChangedAuto(); }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineTechTabVM"/> class.
+        /// </summary>
+        public MachineTechTabVM()
+        {
+            Name = "untitled";
+            Elements = new ObservableCollection<IElementEditor>();
+        }
+    }
+}