Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix siemens tool-table

Browse Source
This commit is contained in:
Lucio Maranta
2019-10-07 15:02:37 +00:00
parent 63a60ec94c
commit 0eaa0a2bb5
5 changed files with 136 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/Demo/Nc_Demo.cs
-1
View File
@@ -2582,7 +2582,6 @@ namespace CMS_CORE_Library.Demo
Cooling1 = demoTool.Cooling1,
Cooling2 = demoTool.Cooling2,
MaxSpeed = demoTool.MaxSpeed,
MaxAcceleration = demoTool.MaxAcceleration,
IsEnabled = demoTool.IsEnabled,
IsActive = demoTool.IsActive,
InFixedPlace = demoTool.InFixedPlace,
CMS_CORE_Library/Models/SiemensToolModels.cs
-1
View File
@@ -25,7 +25,6 @@ namespace CMS_CORE_Library.Models
public bool IsInUse;
public bool PreAlarm;
public double MaxSpeed;
public double MaxAcceleration;
public int MagazineId;
public int PositionId;
public int MultitoolId;
CMS_CORE_Library/Siemens/Nc_Siemens.cs
+96 -37
View File
@@ -193,15 +193,27 @@ namespace CMS_CORE_Library.Siemens
SiemensAlmSvc.Subscribe(AlarmsChanged);
Infrastructure.SubscribeLanguageChanged(NcLanguageChanged);
// Setup tooltable listeners
if (SiemensToolSvc == null)
{
SiemensToolSvc = new ToolMngmntSvc(1);
ToolMngmtListGuid = SiemensToolSvc.Subscribe(ToolMngmtSvcHandler);
MagazinePositionSvc = new DataSvc();
MagazineActionsSvc = new DataSvc();
SetupToolTableData();
}
// Setup magazine position listener
if (MagazinePositionSvc == null)
{
MagazinePositionSvc = new DataSvc();
SetupMagazinePositionListener();
}
// Setup magazine action
if(MagazineActionsSvc == null)
{
MagazineActionsSvc = new DataSvc();
SetupMagazineActionListener();
}
}
catch (Exception ex)
{
@@ -299,11 +311,13 @@ namespace CMS_CORE_Library.Siemens
if (MagazinePositionSvc != null)
{
MagazinePositionSvc.UnSubscribe(MagazinePositionEnabled_OnChange);
MagazinePositionSvc = null;
// MagazinePositionSvc.Dispose();
}
if (MagazineActionsSvc != null)
{
MagazineActionsSvc.UnSubscribe(MagazineAction_OnChange);
MagazineActionsSvc = null;
// MagazineActionsSvc.Dispose();
}
@@ -359,6 +373,15 @@ namespace CMS_CORE_Library.Siemens
PopulateToolsTableFromFileStrings(toolsStrings);
Array.Clear(toolsStrings, 0, toolsStrings.Count());
//// Subscribe to multitools number
//DataSvc d = new DataSvc();
//Item i = new Item() { Path = "/Tool/MTCatalogue/numMultiTools[u1]" };
//d.Subscribe(MultitoolsNumber_OnChange, i);
}
private void SetupMagazinePositionListener()
{
// Setup magazine positions listener
List<Item> magPosItems = new List<Item>();
foreach (var position in MagazinePositionsData)
@@ -374,15 +397,14 @@ namespace CMS_CORE_Library.Siemens
if (magPosItems.Count > 0)
// Subscribe
MagazinePositionSvc.Subscribe(MagazinePositionEnabled_OnChange, magPosItems.ToArray());
}
private void SetupMagazineActionListener()
{
Item magActionsItem = new Item() { Path = MAGAZINE_ACTION_PATH };
// Setup magazine actions listener
MagazineActionsSvc.Subscribe(MagazineAction_OnChange, magActionsItem);
//// Subscribe to multitools number
//DataSvc d = new DataSvc();
//Item i = new Item() { Path = "/Tool/MTCatalogue/numMultiTools[u1]" };
//d.Subscribe(MultitoolsNumber_OnChange, i);
}
private void RemoveLifeParamsFromConfig()
@@ -453,11 +475,14 @@ namespace CMS_CORE_Library.Siemens
var splittedFileName = fileName.Split('_');
if (splittedFileName.Count() == 2)
{
// Get lang from threeletter
var lang = GetCultureFromThreeLetter(splittedFileName[1]);
if(splittedFileName[0].ToLower() == "cmsalarm")
{
// Get lang from threeletter
var lang = GetCultureFromThreeLetter(splittedFileName[1]);
if (lang != null)
languages.Add(lang);
if (lang != null)
languages.Add(lang);
}
}
}
}
@@ -3621,7 +3646,7 @@ namespace CMS_CORE_Library.Siemens
// Max speed
new Item() { Path = "/Tool/Data/toolMaxVelo[" + tool.Id + "]", Value = tool.MaxSpeed },
// Max acceleration
new Item() { Path = "/Tool/Data/toolMaxAcc[" + tool.Id + "]", Value = tool.MaxAcceleration },
// new Item() { Path = "/Tool/Data/toolMaxAcc[" + tool.Id + "]", Value = tool.MaxAcceleration },
// Custom fields
new Item() {Path = "/Tool/User/data[c1," + tool.Id + "]", Value = tool.Load},
@@ -4043,6 +4068,9 @@ namespace CMS_CORE_Library.Siemens
// Set edge id type
items.Add(new Item() { Path = string.Format("/Tool/Compensation/edgeData[c{0},{1}]", tool.Id, edgeParamsIndex + 1), Value = tool.ToolType });
// Update edge type to 9
items.Add(new Item() { Path = string.Format("/Tool/Compensation/edgeData[c{0}, {1}]", tool.Id, edgeParamsIndex + 2), Value = 9 });
// Set edge additional params, read by configuration
foreach (EdgeConfigModel conf in toolTypeConfig)
{
@@ -4144,12 +4172,43 @@ namespace CMS_CORE_Library.Siemens
if (newToolPositionType != position.Type)
return TOOL_AND_POSITION_NOT_MATCHING_ERROR;
// Check if near positions are disabled
var posizionDisabled = MagazinePositionsData.Where(x => x.MagazineId == magazineId && x.Disabled == true &&
(x.PositionId <= (tool as SiemensToolModel).PositionId + (tool as SiemensToolModel).RightSize / 2.0
|| (tool as SiemensToolModel).PositionId + x.PositionId >= (tool as SiemensToolModel).LeftSize / 2.0)).ToList();
if (posizionDisabled.Count() > 0)
return MAGAZINE_POSITION_OCCUPIED_ERROR;
// Check if tool can fit in the position considering disabled positions
if (magConfig.Type != SIEMENS_MAGAZINE_TYPE.BOX_MAGAZINE)
{
foreach(var pos in MagazinePositionsData)
{
if (pos.Disabled && pos.MagazineId == magazineId)
{
// If magazine is circular, move position before ( for left case ) or after ( right case ) the location you want to mount the tool
var right = pos.PositionId < newMagazineTool.PositionId ? pos.PositionId + magConfig.MaxPositions : pos.PositionId;
var left = pos.PositionId > newMagazineTool.PositionId ? pos.PositionId - magConfig.MaxPositions : pos.PositionId;
// Calculate right space needed
double rightToBeMount = newMagazineTool.PositionId + ((tool as SiemensToolModel).RightSize / 2.0);
if (right < rightToBeMount)
return MAGAZINE_POSITION_OCCUPIED_ERROR;
// Left check
// Calculate left space needed
double leftToBeMounted = newMagazineTool.PositionId - ((tool as SiemensToolModel).LeftSize / 2.0);
if (left > leftToBeMounted)
return MAGAZINE_POSITION_OCCUPIED_ERROR;
}
}
}
else
{
// Check if near positions are disabled
var posizionDisabled = MagazinePositionsData.Where(
x => x.MagazineId == magazineId && x.Disabled == true &&
((x.PositionId > newMagazineTool.PositionId && x.PositionId <= newMagazineTool.PositionId + (tool as SiemensToolModel).RightSize / 2.0)
|| (x.PositionId < newMagazineTool.PositionId && x.PositionId >= newMagazineTool.PositionId - (tool as SiemensToolModel).LeftSize / 2.0)))
.ToList();
if (posizionDisabled.Count() > 0)
return MAGAZINE_POSITION_OCCUPIED_ERROR;
}
// Check if tool can fit in the position considering other tools
foreach (var mountedTool in MagazineMountedTools)
@@ -4242,7 +4301,7 @@ namespace CMS_CORE_Library.Siemens
}
// Mount temporarily till the Siemens notification arrives
MountToolToMagazineList(newMagazineTool.ToolId, magazineId, newMagazineTool.PositionId);
//MountToolToMagazineList(newMagazineTool.ToolId, magazineId, newMagazineTool.PositionId);
newMountedTool = new MountedToolModel()
{
@@ -4293,10 +4352,10 @@ namespace CMS_CORE_Library.Siemens
return ManageException(ex);
}
// Smount temporarily till the Siemens notification arrives
int magPosIndex = MagazineMountedTools.FindIndex(x => x.MagazineId == magazineId && x.PositionId == positionId);
if (magPosIndex >= 0)
MagazineMountedTools.Remove(MagazineMountedTools[magPosIndex]);
//// Smount temporarily till the Siemens notification arrives
//int magPosIndex = MagazineMountedTools.FindIndex(x => x.MagazineId == magazineId && x.PositionId == positionId);
//if (magPosIndex >= 0)
// MagazineMountedTools.Remove(MagazineMountedTools[magPosIndex]);
return NO_ERROR;
}
@@ -5161,9 +5220,9 @@ namespace CMS_CORE_Library.Siemens
ToolTableData[toolIndex].MaxSpeed = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat);
break;
case "$TC_TP_MAX_ACC":
ToolTableData[toolIndex].MaxAcceleration = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat);
break;
//case "$TC_TP_MAX_ACC":
// ToolTableData[toolIndex].MaxAcceleration = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat);
// break;
// Custom CMS fields
case "$TC_TPC1":
ToolTableData[toolIndex].Load = Convert.ToInt32(actualString.Split('=').LastOrDefault(), numberFormat);
@@ -5395,7 +5454,7 @@ namespace CMS_CORE_Library.Siemens
}
break;
case "$TC_DP2":
//case "$TC_DP2":
case "$TC_DP3":
case "$TC_DP4":
case "$TC_DP5":
@@ -5624,9 +5683,9 @@ namespace CMS_CORE_Library.Siemens
outputTool.MaxSpeed = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat);
break;
case "$TC_TP_MAX_ACC":
outputTool.MaxAcceleration = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat);
break;
//case "$TC_TP_MAX_ACC":
// outputTool.MaxAcceleration = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat);
// break;
// Custom CMS fields
case "$TC_TPC1":
outputTool.Load = Convert.ToInt32(actualString.Split('=').LastOrDefault(), numberFormat);
@@ -5673,7 +5732,7 @@ namespace CMS_CORE_Library.Siemens
{
outputTool
.EdgesData[edgeIndex]
.PreAlmLife = Convert.ToInt32(actualString.Split('=').LastOrDefault());
.PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault());
}
}
break;
@@ -5695,7 +5754,7 @@ namespace CMS_CORE_Library.Siemens
{
outputTool
.EdgesData[edgeIndex]
.NominalLife = Convert.ToInt32(actualString.Split('=').LastOrDefault());
.NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault());
}
}
break;
@@ -5706,7 +5765,7 @@ namespace CMS_CORE_Library.Siemens
{
outputTool
.EdgesData[edgeIndex]
.PreAlmLife = Convert.ToInt32(actualString.Split('=').LastOrDefault());
.PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault());
}
}
break;
@@ -5717,7 +5776,7 @@ namespace CMS_CORE_Library.Siemens
{
outputTool
.EdgesData[edgeIndex]
.ResidualLife = Convert.ToInt32(actualString.Split('=').LastOrDefault());
.ResidualLife = Convert.ToDouble(actualString.Split('=').LastOrDefault());
}
}
break;
@@ -5728,7 +5787,7 @@ namespace CMS_CORE_Library.Siemens
{
outputTool
.EdgesData[edgeIndex]
.NominalLife = Convert.ToInt32(actualString.Split('=').LastOrDefault());
.NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault());
}
}
break;
@@ -5766,7 +5825,7 @@ namespace CMS_CORE_Library.Siemens
}
break;
case "$TC_DP2":
//case "$TC_DP2":
case "$TC_DP3":
case "$TC_DP4":
case "$TC_DP5":
CMS_CORE_Library/Siemens/SiemensEdgesConfigurations.cs
+34 -34
View File
@@ -18,7 +18,7 @@ namespace CMS_CORE_Library.Siemens
{
100, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -29,7 +29,7 @@ namespace CMS_CORE_Library.Siemens
{
110, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -40,7 +40,7 @@ namespace CMS_CORE_Library.Siemens
{
111, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "cornerRadius", Path = "$TC_DP7[", Number = 7},
@@ -52,7 +52,7 @@ namespace CMS_CORE_Library.Siemens
{
120, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -63,7 +63,7 @@ namespace CMS_CORE_Library.Siemens
{
121, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -74,7 +74,7 @@ namespace CMS_CORE_Library.Siemens
{
130, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "geomLenght1", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "geomLenght2", Path = "$TC_DP4[", Number = 4},
new EdgeConfigModel{ Name = "geomLenght3", Path = "$TC_DP5[", Number = 5},
@@ -96,7 +96,7 @@ namespace CMS_CORE_Library.Siemens
{
131, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "geomLenght1", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "geomLenght2", Path = "$TC_DP4[", Number = 4},
new EdgeConfigModel{ Name = "geomLenght3", Path = "$TC_DP5[", Number = 5},
@@ -119,7 +119,7 @@ namespace CMS_CORE_Library.Siemens
{
140, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "outsideRadius", Path = "$TC_DP7[", Number = 7},
@@ -131,7 +131,7 @@ namespace CMS_CORE_Library.Siemens
{
145, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -142,7 +142,7 @@ namespace CMS_CORE_Library.Siemens
{
150, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "width", Path = "$TC_DP9[", Number = 9 },
@@ -154,7 +154,7 @@ namespace CMS_CORE_Library.Siemens
{
151, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "width", Path = "$TC_DP9[", Number = 9 },
@@ -166,7 +166,7 @@ namespace CMS_CORE_Library.Siemens
{
155, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "taperAngle", Path = "$TC_DP11[", Number = 11 },
@@ -178,7 +178,7 @@ namespace CMS_CORE_Library.Siemens
{
156, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "cornerRadius", Path = "$TC_DP7[", Number = 7},
@@ -191,7 +191,7 @@ namespace CMS_CORE_Library.Siemens
{
157, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "taperAngle", Path = "$TC_DP11[", Number = 11},
@@ -203,7 +203,7 @@ namespace CMS_CORE_Library.Siemens
{
160, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -215,7 +215,7 @@ namespace CMS_CORE_Library.Siemens
{
200, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -226,7 +226,7 @@ namespace CMS_CORE_Library.Siemens
{
205, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -236,7 +236,7 @@ namespace CMS_CORE_Library.Siemens
{
210, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -246,7 +246,7 @@ namespace CMS_CORE_Library.Siemens
{
220, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -257,7 +257,7 @@ namespace CMS_CORE_Library.Siemens
{
230, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -268,7 +268,7 @@ namespace CMS_CORE_Library.Siemens
{
231, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -278,7 +278,7 @@ namespace CMS_CORE_Library.Siemens
{
240, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "pitch", Path = "$TC_DP9[", Number = 9},
@@ -289,7 +289,7 @@ namespace CMS_CORE_Library.Siemens
{
241, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -299,7 +299,7 @@ namespace CMS_CORE_Library.Siemens
{
242, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -309,7 +309,7 @@ namespace CMS_CORE_Library.Siemens
{
250, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -320,7 +320,7 @@ namespace CMS_CORE_Library.Siemens
{
700, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "geomLenght1", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "geomLenght2", Path = "$TC_DP4[", Number = 4},
new EdgeConfigModel{ Name = "geomLenght3", Path = "$TC_DP5[", Number = 5},
@@ -341,7 +341,7 @@ namespace CMS_CORE_Library.Siemens
{
710, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -351,7 +351,7 @@ namespace CMS_CORE_Library.Siemens
{
711, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -361,7 +361,7 @@ namespace CMS_CORE_Library.Siemens
{
712, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "corrAngle", Path = "$TC_DP10[", Number = 10},
@@ -372,7 +372,7 @@ namespace CMS_CORE_Library.Siemens
{
713, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "geomLenght1", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "geomLenght2", Path = "$TC_DP4[", Number = 4},
new EdgeConfigModel{ Name = "geomLenght3", Path = "$TC_DP5[", Number = 5},
@@ -391,7 +391,7 @@ namespace CMS_CORE_Library.Siemens
{
714, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "geomLenght1", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "geomLenght2", Path = "$TC_DP4[", Number = 4},
new EdgeConfigModel{ Name = "geomLenght3", Path = "$TC_DP5[", Number = 5},
@@ -410,7 +410,7 @@ namespace CMS_CORE_Library.Siemens
{
725, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "geomLenght1", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "geomLenght2", Path = "$TC_DP4[", Number = 4},
new EdgeConfigModel{ Name = "geomLenght3", Path = "$TC_DP5[", Number = 5},
@@ -428,7 +428,7 @@ namespace CMS_CORE_Library.Siemens
{
730, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
@@ -438,7 +438,7 @@ namespace CMS_CORE_Library.Siemens
{
900, new List<EdgeConfigModel>()
{
new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
//new EdgeConfigModel{ Name = "cuttingEdge", Path = "$TC_DP2[", Number = 2},
new EdgeConfigModel{ Name = "lenght", Path = "$TC_DP3[", Number = 3},
new EdgeConfigModel{ Name = "radius", Path = "$TC_DP6[", Number = 6},
new EdgeConfigModel{ Name = "wearLenght", Path = "$TC_DP12[", Number = 12},
CMS_CORE_Library/ToolConfigurations.cs
+6 -7
View File
@@ -166,14 +166,13 @@ namespace CMS_CORE_Library
new FieldsConfiguration{ Name = "leftSize", Type = "int", SelectValues = null, Category = "magazine", ReadOnly = false, MinValue = 1, MaxValue = 7},
new FieldsConfiguration{ Name = "rightSize", Type = "int", SelectValues = null, Category = "magazine", ReadOnly = false, MinValue = 1, MaxValue = 7},
new FieldsConfiguration{ Name = "rotation", Type = "select", SelectValues = rotationTypeList, Category = "head", ReadOnly = false, MinValue = 0, MaxValue = 0},
new FieldsConfiguration{ Name = "maxSpeed", Type = "double", SelectValues = null, Category = "head", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue },
new FieldsConfiguration{ Name = "maxAcceleration", Type = "double", SelectValues = null, Category = "head", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue },
new FieldsConfiguration{ Name = "maxSpeed", Type = "double", SelectValues = null, Category = "head", ReadOnly = false, MinValue = 0, MaxValue = 40000 },
// Custom fields
new FieldsConfiguration{ Name = "load", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "gamma", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "maxLoadPctAutoload", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "minLoadPctAutoload", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "toolTypeCode", Type = "select", SelectValues = toolTypeCodeList, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "load", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = 149},
new FieldsConfiguration{ Name = "gamma", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = 5},
new FieldsConfiguration{ Name = "maxLoadPctAutoload", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = 149},
new FieldsConfiguration{ Name = "minLoadPctAutoload", Type = "int", SelectValues = null, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = 149},
new FieldsConfiguration{ Name = "toolTypeCode", Type = "select", SelectValues = toolTypeCodeList, Category = "custom", ReadOnly = false, MinValue = 0, MaxValue = 110},
};