merge conflict

1 files changed, 63 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/RMLModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/RMLModule.cs
new file mode 100644
index 000000000..fdd8cb124
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/RMLModule.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media.Imaging;
+using Tango.BL.Enumerations;
+using Tango.MachineStudio.RML.Views;
+using Tango.MachineStudio.Common;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.ColorLab
+{
+    [StudioModule(7)]
+    public class RMLModule : StudioModuleBase
+    {
+        public override string Name
+        {
+            get
+            {
+                return "RML";
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                return "Create and manage twine's recommended media list (RML). Configure RML's default calibration data and process parameters";
+            }
+        }
+
+        public override BitmapSource Image
+        {
+            get
+            {
+                return ResourceHelper.GetImageFromResources("Images/rml-module.jpg");
+            }
+        }
+
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
+
+        public override Permissions Permission
+        {
+            get
+            {
+                return Permissions.RunColorLabModule;
+            }
+        }
+
+        public override void Dispose()
+        {
+            
+        }
+    }
+}