Merge branch 'feature/IntegrityCheckField' into develop

# Conflicts: # Libs/CMS_CORE_Library.dll # Step.NC/SiemensToolTableAdapter.cs
2019-12-11 15:06:11 +01:00
parent 665c8cfa54 024d32e5c9
commit ea8e2683cf
10 changed files with 42 additions and 22 deletions
@@ -607,7 +607,8 @@ namespace Step.Config
                    MultidimensionalShankOpt = Convert.ToBoolean(x.Element("multidimensionalShankOpt").Value),
                    SelfAdaptivePathOpt = Convert.ToBoolean(x.Element("selfAdaptivePathOpt").Value),
                    DynamicCompensationOpt = Convert.ToBoolean(x.Element("dynamicCompensationOpt").Value),
-                    BallufOpt = Convert.ToBoolean(x.Element("ballufOpt").Value)                   
+                    BallufOpt = Convert.ToBoolean(x.Element("ballufOpt").Value),
+                    IntegrityCheckOpt = Convert.ToBoolean(x.Element("integrityCheckOpt").Value)  
                })
                .FirstOrDefault();