Skip to content

Commit

Permalink
Update MjpegstreamerAdaptive.vue
Browse files Browse the repository at this point in the history
  • Loading branch information
HelgeKeck committed Sep 19, 2023
1 parent 7592141 commit 80401c6
Showing 1 changed file with 24 additions and 4 deletions.
28 changes: 24 additions & 4 deletions src/components/webcams/MjpegstreamerAdaptive.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
v-for="tool in toolchangeMacros"
:key="tool.name"
small
:disabled="isPrinting || !homedAxes.includes('xyz')"
:disabled="
isPrinting ||
!homedAxes.includes('xyz') ||
(isIdex && (idexMode == 'copy' || idexMode == 'mirror'))
"
class="cmdButton"
:loading="loadings.includes('set_' + tool.name.toLowerCase())"
:style="{
Expand Down Expand Up @@ -99,7 +103,11 @@
<v-item-group class="ma-0">
<v-btn
small
:disabled="isPrinting || !homedAxes.includes('xyz')"
:disabled="
isPrinting ||
!homedAxes.includes('xyz') ||
(isIdex && (idexMode == 'copy' || idexMode == 'mirror'))
"
class="cmdButton"
:style="{ 'background-color': 'rgba(0,0,0,0.8)', 'min-width': '0' }"
:loading="loadings.includes('set_cp')"
Expand All @@ -109,7 +117,11 @@
<v-btn
small
class="cmdButton"
:disabled="isPrinting || !homedAxes.includes('xyz')"
:disabled="
isPrinting ||
!homedAxes.includes('xyz') ||
(isIdex && (idexMode == 'copy' || idexMode == 'mirror'))
"
:style="{
'background-color': xyMoveMode ? 'var(--color-primary)' : 'rgba(0,0,0,0.8)',
color: xyMoveMode ? 'var(--v-btn-text-primary)' : 'white',
Expand All @@ -125,7 +137,11 @@
v-if="hasZProbe"
small
class="cmdButton"
:disabled="!allowZProbe || !homedAxes.includes('xyz')"
:disabled="
!allowZProbe ||
!homedAxes.includes('xyz') ||
(isIdex && (idexMode == 'copy' || idexMode == 'mirror'))
"
:style="{
'background-color': 'rgba(255,86,86,1.0)',
'min-width': '0',
Expand Down Expand Up @@ -222,6 +238,10 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin, WebcamMixin
return 'dual_carriage' in this.$store.state.printer
}
get idexMode(): string {
return this.$store.state.printer.dual_carriage?.carriage_1?.toString().toLowerCase()
}
// ----------------------------------------------
// Nozzle Calibration
// ----------------------------------------------
Expand Down

0 comments on commit 80401c6

Please sign in to comment.