Skip to content
This repository was archived by the owner on Jan 16, 2022. It is now read-only.

Commit accb306

Browse files
SindariusSindarius
committed
Update DWC and UI Changes
Updated this version to DWC 3.2.0-RC1 Made movement buttons a little larger on the dashboard. Added macros to the dashboard. Added sample DRO plugin - This simple plugin just provides very large font axes values so they can be read from a distance. Added test jog plugin - This plugin provides a different type of jogging control ui.
1 parent df3150a commit accb306

File tree

11 files changed

+692
-55
lines changed

11 files changed

+692
-55
lines changed

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/panels/CNCAxesPosition.vue‎

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,51 @@
11
<template>
2-
<v-card>
3-
<v-card-title class="py-2">
4-
<strong>{{ machinePosition ? $t('panel.status.machinePosition') : $t('panel.status.toolPosition') }} </strong>
5-
</v-card-title>
6-
<v-card-text>
7-
<v-row no-gutters class="flex-nowrap">
8-
<v-col>
9-
<v-row align-content="center" no-gutters>
10-
<v-col v-for="(axis, index) in visibleAxes" :key="index" class="d-flex flex-column align-center">
11-
<strong>
12-
{{ axis.letter }}
13-
</strong>
14-
<span>
15-
{{ displayAxisPosition(axis, index) }}
16-
</span>
17-
</v-col>
18-
</v-row>
19-
</v-col>
20-
</v-row>
21-
</v-card-text>
22-
</v-card>
2+
<v-card>
3+
<v-card-title class="py-2">
4+
<strong>{{ machinePosition ? $t('panel.status.machinePosition') : $t('panel.status.toolPosition') }} </strong>
5+
</v-card-title>
6+
<v-card-text>
7+
<v-row align-content="center" no-gutters :class="{'large-font' : !machinePosition}">
8+
<v-col v-for="(axis, index) in visibleAxes" :key="index" class="d-flex flex-column align-center">
9+
<div :class="{'large-font-height' : !machinePosition}">
10+
{{ axis.letter }}
11+
</div>
12+
<div>
13+
{{ displayAxisPosition(axis, index) }}
14+
</div>
15+
</v-col>
16+
</v-row>
17+
</v-card-text>
18+
</v-card>
2319
</template>
2420

21+
22+
<style scoped>
23+
24+
@media screen and (max-width:600px)
25+
{
26+
.large-font-height {
27+
height:35px;
28+
}
29+
.large-font {
30+
font-size:30px;
31+
}
32+
}
33+
34+
@media screen and (min-width:601px)
35+
{
36+
.large-font-height {
37+
height: 55px;
38+
}
39+
.large-font {
40+
font-size: 50px;
41+
}
42+
}
43+
44+
45+
</style>
46+
2547
<script>
48+
'use strict'
2649
import { mapState } from 'vuex';
2750
export default {
2851
props: {
@@ -50,5 +73,3 @@ export default {
5073
};
5174
</script>
5275

53-
<style>
54-
</style>

‎src/components/panels/CNCContainerPanel.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<style>
1+
<style scoped>
22
.category-header {
33
flex: 0 0 100px;
44
}
@@ -7,7 +7,7 @@
77
<template>
88
<div>
99
<v-row dense align="stretch">
10-
<v-col cols="3" order="1" sm="4" lg="2" order-lg="1">
10+
<v-col cols="3" order="1" sm="4" md="2" lg="2" order-lg="1">
1111
<v-card class="justify-center fill-height">
1212
<v-card-title>
1313
<strong>Status</strong>
@@ -17,28 +17,28 @@
1717
</v-card-text>
1818
</v-card>
1919
</v-col>
20-
<v-col cols="6" order="4" sm="6" lg="3" order-lg="2">
20+
<v-col cols="12" order="4" sm="12" md="4" order-md="2" lg="4">
2121
<cnc-axes-position class="fill-height" :machinePosition="true"></cnc-axes-position>
2222
</v-col>
23-
<v-col cols="6" order="5" sm="6" lg="3" order-lg="3">
24-
<cnc-axes-position class="fill-height" :machinePosition="false"></cnc-axes-position>
25-
</v-col>
26-
<v-col cols="5" order="2" sm="4" lg="2" order-lg="4">
23+
<v-col cols="5" order="2" sm="4" md="3" lg="3" order-lg="3">
2724
<v-card class="fill-height">
2825
<v-card-title><strong>Requested Speed</strong></v-card-title>
2926
<v-card-text>
3027
{{ $display(move.currentMove.requestedSpeed, 0, 'mm/s') }}
3128
</v-card-text>
3229
</v-card>
3330
</v-col>
34-
<v-col cols="4" order="3" sm="4" lg="2" order-lg="5">
35-
<v-card class="fill-height">
31+
<v-col cols="4" order="2" sm="4" md="3" lg="3" order-lg="4">
32+
<v-card class="fill-height" order="5">
3633
<v-card-title><strong>Top Speed</strong></v-card-title>
3734
<v-card-text>
3835
{{ $display(move.currentMove.topSpeed, 0, 'mm/s') }}
3936
</v-card-text>
4037
</v-card>
4138
</v-col>
39+
<v-col cols="12" order="6">
40+
<cnc-axes-position class="fill-height" :machinePosition="false"></cnc-axes-position>
41+
</v-col>
4242
</v-row>
4343
</div>
4444
</template>

‎src/components/panels/CNCDashboardPanel.vue‎

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,44 @@
44
<v-col cols="12" class="pt-0 pb-0">
55
<cnc-movement-panel class="mb-2"></cnc-movement-panel>
66
</v-col>
7-
<v-col cols="12">
8-
<spindle-speed-panel></spindle-speed-panel>
7+
<v-col cols="12" md="9">
8+
<v-row dense>
9+
<v-col cols="12">
10+
<spindle-speed-panel></spindle-speed-panel>
11+
</v-col>
12+
<v-col cols="12">
13+
<v-card>
14+
<v-card-text>
15+
<job-progress></job-progress>
16+
</v-card-text>
17+
</v-card>
18+
</v-col>
19+
<v-col cols="4" class="flex-grow-1">
20+
<job-control-panel></job-control-panel>
21+
</v-col>
22+
<v-col cols="4" class="flex-grow-1">
23+
<z-babystep-panel class="fill-height"></z-babystep-panel>
24+
</v-col>
25+
<v-col cols="4" class="flex-grow-1">
26+
<speed-factor-panel class="fill-height"></speed-factor-panel>
27+
</v-col>
28+
</v-row>
929
</v-col>
10-
<v-col cols="12">
11-
<v-card>
12-
<v-card-text>
13-
<job-progress></job-progress>
14-
</v-card-text>
15-
</v-card>
16-
</v-col>
17-
<v-col cols="4" class="flex-grow-1">
18-
<job-control-panel></job-control-panel>
19-
</v-col>
20-
<v-col cols="4" class="flex-grow-1">
21-
<z-babystep-panel class="fill-height"></z-babystep-panel>
22-
</v-col>
23-
<v-col cols="4" class="flex-grow-1">
24-
<speed-factor-panel class="fill-height"></speed-factor-panel>
30+
<v-col cols="12" md="3">
31+
<v-row dense>
32+
<macro-list class="macro"></macro-list>
33+
</v-row>
2534
</v-col>
2635
</v-row>
2736
</div>
2837
</template>
2938

39+
<style scoped>
40+
.macro {
41+
width: 100%;
42+
}
43+
</style>
3044

3145
<script>
32-
export default {};
46+
export default {};
3347
</script>

‎src/components/panels/CNCMovementPanel.vue‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<style>
1+
<style scoped>
22
.move-btn {
33
padding-left: 0px !important;
44
padding-right: 0px !important;
55
min-width: 0;
6+
height: 65px !important;
67
}
78
.wcs-selection {
89
max-width: 200px;
@@ -20,14 +21,14 @@
2021
<v-card-text v-show="visibleAxes.length">
2122
<v-row dense>
2223
<v-col cols="6" order="1" md="2" order-md="1">
23-
<code-btn block v-show="visibleAxes.length" color="primary" code="G28" :title="$t('button.home.titleAll')" class="ml-0">
24+
<code-btn block v-show="visibleAxes.length" color="primary" code="G28" :title="$t('button.home.titleAll')" class="ml-0 move-btn">
2425
{{ $t('button.home.captionAll') }}
2526
</code-btn>
2627
</v-col>
2728
<v-col cols="6" order="2" md="8" order-md="2">
2829
<v-menu offset-y left :disabled="uiFrozen">
2930
<template #activator="{ on }">
30-
<v-btn v-show="visibleAxes.length" color="primary" block class="mx-0" :disabled="uiFrozen" v-on="on">
31+
<v-btn v-show="visibleAxes.length" color="primary" block class="mx-0 move-btn" :disabled="uiFrozen" v-on="on">
3132
{{ $t('panel.movement.compensation') }}
3233
<v-icon>mdi-menu-down</v-icon>
3334
</v-btn>
@@ -77,7 +78,7 @@
7778
</v-menu>
7879
</v-col>
7980
<v-col cols="12" order="3" md="2" order-md="3">
80-
<v-btn @click="setWorkspaceZero" block>Set Work XYZ</v-btn>
81+
<v-btn @click="setWorkspaceZero" block class="move-btn">Set Work XYZ</v-btn >
8182
</v-col>
8283
</v-row>
8384

‎src/plugins/DRO/DRO.vue‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<template>
2+
<div ref="primarycontainer">
3+
<div v-for="(axis, index) in visibleAxes" :key="index" :style="{fontSize : labelHeight}">
4+
{{ axis.letter }} {{ displayAxisPosition(axis)}}
5+
</div>
6+
</div>
7+
</template>
8+
9+
<script>
10+
'use strict';
11+
import { mapState } from 'vuex'
12+
export default {
13+
computed: {
14+
...mapState('machine/model', {
15+
move: state => state.move,
16+
}),
17+
visibleAxes() {
18+
return this.move.axes.filter(axis => axis.visible);
19+
},
20+
labelHeight() {
21+
return (this.windowHeight / (this.visibleAxes.length + 2 )) + 'px' ;
22+
},
23+
},
24+
data: function() { return {
25+
windowHeight :50
26+
}},
27+
activated(){
28+
this.resize();
29+
},
30+
mounted() {
31+
window.addEventListener('resize', () => {
32+
this.$nextTick(() => {
33+
this.resize();
34+
});
35+
});
36+
},
37+
methods: {
38+
displayAxisPosition(axis) {
39+
const position = this.machinePosition ? axis.machinePosition : axis.userPosition;
40+
return axis.letter === 'Z' ? this.$displayZ(position, false) : this.$display(position, 1);
41+
},
42+
resize() {
43+
this.windowHeight = window.innerHeight - document.getElementById('global-container').clientHeight - document.getElementsByClassName('v-toolbar__content')[0].clientHeight - 22;
44+
this.$refs.primarycontainer.style.height =this.windowHeight + 'px';
45+
},
46+
},
47+
};
48+
</script>
49+
50+
<style>
51+
</style>

‎src/plugins/DRO/index.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict'
2+
3+
import { registerRoute } from '../../routes'
4+
5+
import DRO from './DRO.vue'
6+
7+
// Register a route via Control -> Height Map
8+
registerRoute(DRO, {
9+
Control: {
10+
DRO: {
11+
icon: 'mdi-grid',
12+
caption: 'DRO',
13+
path: '/DRO'
14+
}
15+
}
16+
});

0 commit comments

Comments
 (0)