Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix siemens tool table

Browse Source 
WIP siemens tool data in heads
This commit is contained in:
Lucio Maranta
2019-09-19 12:19:25 +02:00
parent 8d10c11988
commit ddd7b0a2b0
8 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step/Listeners/SignalR/SignalRListener.cs
+22 -17
View File
@@ -13,7 +13,8 @@ using System.Diagnostics;
using System.Linq;
using System.Threading;
using static Step.Listeners.SignalRStaticObjects;
using static Step.Model.Constants;
using static Step.Model.Constants;
using static Step.Config.ServerConfig;
namespace Step.Listeners.SignalR
{
@@ -171,23 +172,27 @@ namespace Step.Listeners.SignalR
// Check if head is a spindle
if (head.Type == HEAD_TYPE.SPINDLE.ToString())
{
// Convert head into child model
var spindle = (head as DTOSpindleModel);
// Get tool data
var tool = controller.FindToolWithDependencies(spindle.MountedTool);
if( tool != null)
spindle.ToolData = new DTOToolInSpindleModel()
{
FamilyId = tool.FamilyId,
ShankId = tool.ShankId ?? 0,
Broken = ((DTONcToolModel)tool).Broken,
Disabled = ((DTONcToolModel)tool).Disabled,
Measured = ((DTONcToolModel)tool).Measured,
MaxLoad = tool.Family.MaxLoad,
MaxSpeed = tool.Family.MaxSpeed,
ResidualLife = tool.ResidualLife
};
if (NcConfig.NcVendor.ToUpper() != NC_VENDOR.SIEMENS)
{
// Convert head into child model
var spindle = (head as DTOSpindleModel);
// Get tool data
var tool = controller.FindToolWithDependencies(spindle.MountedTool);
if (tool != null)
spindle.ToolData = new DTOToolInSpindleModel()
{
FamilyId = tool.FamilyId,
ShankId = tool.ShankId ?? 0,
Broken = ((DTONcToolModel)tool).Broken,
Disabled = ((DTONcToolModel)tool).Disabled,
Measured = ((DTONcToolModel)tool).Measured,
MaxLoad = tool.Family.MaxLoad,
MaxSpeed = tool.Family.MaxSpeed,
ResidualLife = tool.ResidualLife
};
}
}
}
}
Step/wwwroot/assets/styles/base/head.less
+8
View File
@@ -127,6 +127,10 @@
}
}
.tool-box-siemens{
font-size: 15px;
}
.arrow-box {
display: flex;
align-items: center;
@@ -485,6 +489,10 @@
font-size: 11px;
font-weight: normal;
}
.tool-box-siemens{
font-size: 11px;
}
}
.tool-box,
Step/wwwroot/assets/styles/base/process-info.less
+5
View File
@@ -171,4 +171,9 @@
}
}
.process:first-child {
border-top: 4px solid #fff;
}
}
Step/wwwroot/assets/styles/style.css
+11
View File
@@ -4616,6 +4616,9 @@ footer .container button.big:before {
.process-selection .process:active:not(.selected) {
background-color: rgba(0, 0, 0, 0.5);
}
.process-selection .process:first-child {
border-top: 4px solid #fff;
}
#alarm-list,
#service-list {
position: absolute;
@@ -6778,6 +6781,11 @@ footer .container button.big:before {
font-size: 14px;
line-height: 18px;
}
.head-spindle .tool-box .tool-box-siemens,
.head-production .tool-box .tool-box-siemens,
.head-awj .tool-box .tool-box-siemens {
font-size: 15px;
}
.head-spindle .tool-box .arrow-box,
.head-production .tool-box .arrow-box,
.head-awj .tool-box .arrow-box {
@@ -7242,6 +7250,9 @@ footer .container button.big:before {
font-size: 11px;
font-weight: normal;
}
.head-std aside .tool-box .tool-box-siemens {
font-size: 11px;
}
.head-std aside .tool-box,
.head-std aside .load-box {
height: 50%;
Step/wwwroot/src/app_modules/production/components/head-production.vue
+1 -1
View File
@@ -58,7 +58,7 @@
<span class="tool-duplo" >{{'tooling_family_abbreviation' | localize('DP%d', toolData.familyId)}}
</span><span class="tool-duplo" v-if="toolData.shankId"> - {{'tooling_shank_abbreviation' | localize('DP%d', toolData.shankId)}}</span>
</span>
<span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span :class="{'tool-box-siemens': isSiemens}" class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d', toolDuplo)}}</span>
</div>
</div>
Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
+3 -3
View File
@@ -103,7 +103,7 @@
'disabled': pos.disabled,
'red': (enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))),
'selected': !toolAtPosition(pos.positionId) && pos.canLoadTool && checkMagPosType(pos.type) && draggingIn,
'occupied': checkIfToolIsMountedInSpindle(toolAtPosition(pos.positionId)) != 0
'occupied': pos.occupied
}">
<span>{{pos.positionId}}</span>
</div>
@@ -124,7 +124,7 @@
'disabled': pos.disabled,
'red': (enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))),
'selected': !toolAtPosition(pos.positionId) && pos.canLoadTool && checkMagPosType(pos.type) && draggingIn,
'occupied': checkIfToolIsMountedInSpindle(toolAtPosition(pos.positionId)) != 0
'occupied': pos.occupied
}">
<span>{{pos.positionId}}</span>
</div>
@@ -143,7 +143,7 @@
'disabled': pos.disabled,
'red': (enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))),
'selected': !toolAtPosition(pos.positionId) && pos.canLoadTool && checkMagPosType(pos.type) && draggingIn,
'occupied': checkIfToolIsMountedInSpindle(toolAtPosition(pos.positionId)) != 0
'occupied': pos.occupied
}">
<span>{{pos.positionId}}</span>
</div>
Step/wwwroot/src/modules/heads/head.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<span class="tool-duplo" >{{'tooling_family_abbreviation' | localize('DP%d', familyId)}}
</span><span class="tool-duplo" v-if="shankId"> - {{'tooling_shank_abbreviation' | localize('DP%d', shankId)}}</span>
</span>
<span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span class="tool-name" :class="{'tool-box-siemens': isSiemens}" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
</div>
<div class="load-box" :class="loadStatus()" :disabled="loadDisabled" :title="'heads_tooltip_load' | localize('Actual Load')">