Merge branch 'feature/Osai_ToolTable' into develop

# Conflicts: # Libs/CMS_CORE_Library.dll # Step.Core/ThreadsFunctions.cs # Step.Core/ThreadsHandler.cs # Step.Database/DatabaseContext.cs # Step.Database/Migrations/201806220920193_InitMigration.Designer.cs # Step.Database/Migrations/201806220920193_InitMigration.cs # Step.Database/Migrations/201807120908403_InitMigration.Designer.cs # Step.Database/Migrations/201807120908403_InitMigration.cs # Step.Database/Migrations/201807120908403_InitMigration.resx # Step.Database/Migrations/201807251330036_InitMigration.Designer.cs # Step.Database/Migrations/201807251330036_InitMigration.cs # Step.Database/Step.Database.csproj # Step.Model/Constants.cs # Step.NC/NcHandler.cs # Step/Listeners/ListenersHandler.cs # Step/Step.csproj
2018-08-03 12:59:14 +02:00
parent 15f8e0e834 10610c481a
commit bbd4535dbf
46 changed files with 3431 additions and 787 deletions
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Step.Model.ConfigModels
+{
+    public class ToolManagerConfigModel
+    {
+        public bool FamilyOptIsActive { get; set; }
+        public bool ShankOptIsActive { get; set; }
+        public bool MagPositionIsActive { get; set; }
+        public bool OffsetOptIsActive { get; set; }
+        public bool ReviveOptIsActive { get; set; }
+        public bool GammaOptIsActive { get; set; }
+        public bool LifeOptIsActive { get; set; }
+        public bool TcpOptIsActive { get; set; }
+        public bool CoolingOptIsActive { get; set; }
+        public bool MultidimensionalShankOptIsActive { get; set; }
+        public bool SelfAdaptivePathOptIsActive { get; set; }
+        public bool DynamicCompensationOptIsActive { get; set; }
+    }
+}
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Step.Model.ConfigModels
-{
-    public class ToolTableConfigModel
-    {
-        public bool FamilyOption;
-        public bool MultiToolOption;
-        public bool MagazinePosition;
-    }
-}