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
This commit is contained in:
Lucio Maranta
2018-08-03 12:59:14 +02:00
46 changed files with 3431 additions and 787 deletions
+26
View File
@@ -24,6 +24,7 @@ namespace Step.Config
ReadUserSoftKeysConfig();
ReadAlarmsConfig();
ReadHeadsConfig();
ReadToolManagerConfig();
}
catch (System.Xml.XmlException ex)
{
@@ -308,6 +309,31 @@ namespace Step.Config
.ToList();
}
private static void ReadToolManagerConfig()
{
XDocument xmlConfigFile = GetXmlHandlerWithValidator(TOOL_MANAGER_CONFIG_SCHEMA_PATH, TOOL_MANAGER_CONFIG_PATH);
// Read config from XML file
ToolManagerConfig = xmlConfigFile
.Elements()
.Select(x => new ToolManagerConfigModel()
{
FamilyOptIsActive = Convert.ToBoolean(x.Element("familyOptIsActive").Value),
ShankOptIsActive = Convert.ToBoolean(x.Element("shankOptIsActive").Value),
MagPositionIsActive = Convert.ToBoolean(x.Element("magPositionOptIsActive").Value),
OffsetOptIsActive = Convert.ToBoolean(x.Element("offsetOptIsActive").Value),
ReviveOptIsActive = Convert.ToBoolean(x.Element("reviveOptIsActive").Value),
GammaOptIsActive = Convert.ToBoolean(x.Element("gammaOptIsActive").Value),
LifeOptIsActive = Convert.ToBoolean(x.Element("lifeOptIsActive").Value),
TcpOptIsActive = Convert.ToBoolean(x.Element("tcpOptIsActive").Value),
CoolingOptIsActive = Convert.ToBoolean(x.Element("coolingOptIsActive").Value),
MultidimensionalShankOptIsActive = Convert.ToBoolean(x.Element("multidimensionalShankOptIsActive").Value),
SelfAdaptivePathOptIsActive = Convert.ToBoolean(x.Element("selfAdaptivePathOptIsActive").Value),
DynamicCompensationOptIsActive = Convert.ToBoolean(x.Element("dynamicCompensationOptIsActive").Value),
})
.FirstOrDefault();
}
#endregion Read config from file from configuration
}
}