Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(protocol-designer, step-generation): custom z offset for blowout #14793

Merged
merged 8 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix when field is disabled
  • Loading branch information
jerader committed Apr 3, 2024
commit a42bc44e4a2d033b7e0f7515757340a4cd13c04b
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ export const TipPositionZAxisViz = (
const pixelsFromBottom =
Number(fractionOfWellHeight) * WELL_HEIGHT_PIXELS -
(mmFromBottom != null ? WELL_HEIGHT_PIXELS : 0)
const roundedPixelsFromBottom = round(pixelsFromBottom, PIXEL_DECIMALS)

const bottomPx = roundedPixelsFromBottom
const bottomPx = round(pixelsFromBottom, PIXEL_DECIMALS)

return (
<div className={styles.viz_wrapper}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,14 @@ export function getDisabledFieldsMixForm(
disabled.add('mix_touchTip_checkbox')
}

if (!hydratedForm.blowout_location) {
disabled.add('blowout_z_offset')
} else if (
if (
!hydratedForm.blowout_location ||
hydratedForm.blowout_location.includes('wasteChute') ||
hydratedForm.blowout_location.includes('trashBin')
) {
disabled.add('blowout_z_offset')
} else if (
hydratedForm.blowout_location === DEST_WELL_BLOWOUT_DESTINATION &&
!hydratedForm.labware
hydratedForm.blowout_location.includes('trashBin') ||
(hydratedForm.blowout_location === DEST_WELL_BLOWOUT_DESTINATION &&
!hydratedForm.labware)
) {
disabled.add('blowout_z_offset')
}

return disabled
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export function getDisabledFieldsMoveLiquidForm(
disabled.add('dispense_mix_checkbox')
disabled.add('dispense_touchTip_checkbox')
disabled.add('dispense_mmFromBottom')
disabled.add('blowout_z_offset')
}
if (hydratedForm.path === 'multiAspirate') {
disabled.add('aspirate_mix_checkbox')
Expand All @@ -43,21 +42,16 @@ export function getDisabledFieldsMoveLiquidForm(
}
})

if (!hydratedForm.blowout_location) {
disabled.add('blowout_z_offset')
} else if (
if (
!hydratedForm.blowout_location ||
hydratedForm.blowout_location.includes('wasteChute') ||
hydratedForm.blowout_location.includes('trashBin')
) {
disabled.add('blowout_z_offset')
} else if (
hydratedForm.blowout_location.includes('trashBin') ||
(hydratedForm.blowout_location === SOURCE_WELL_BLOWOUT_DESTINATION &&
!hydratedForm.aspirate_labware) ||
(hydratedForm.blowout_location === DEST_WELL_BLOWOUT_DESTINATION &&
!hydratedForm.dispense_labware)
) {
disabled.add('blowout_z_offset')
}

return disabled
}
Loading