Merge branch 'airflow' into i2c_detect
This commit is contained in:
commit
8f5d9d1767
2 changed files with 8 additions and 8 deletions
2
package-lock.json
generated
2
package-lock.json
generated
|
|
@ -10911,7 +10911,7 @@
|
||||||
},
|
},
|
||||||
"node_modules/protobuf-ts": {
|
"node_modules/protobuf-ts": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#955871c0a855e8da5dd10b8d72a1ccc5e391d218",
|
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#953a6c9d04b26b3fdc78a71016aff37a62d9e22a",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobufjs": "^6.8.8"
|
"protobufjs": "^6.8.8"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -482,7 +482,7 @@ export default function ComponentForm(props: Props) {
|
||||||
|
|
||||||
const updateCalibrationTypes = (event: any, index: number) => {
|
const updateCalibrationTypes = (event: any, index: number) => {
|
||||||
let f = cloneDeep(form);
|
let f = cloneDeep(form);
|
||||||
f.component.settings.calibrations[index].type = event.target.value as quack.MeasurementType;
|
f.component.settings.calibrations[index].measurementType = event.target.value as quack.MeasurementType;
|
||||||
setForm(f);
|
setForm(f);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -508,7 +508,7 @@ export default function ComponentForm(props: Props) {
|
||||||
if (dimensions !== undefined && dimensions !== null) {
|
if (dimensions !== undefined && dimensions !== null) {
|
||||||
dimensions.lengthCm = value;
|
dimensions.lengthCm = value;
|
||||||
} else {
|
} else {
|
||||||
dimensions = pond.Dimensions.create({
|
dimensions = quack.Dimensions.create({
|
||||||
heightCm: 0,
|
heightCm: 0,
|
||||||
lengthCm: value,
|
lengthCm: value,
|
||||||
widthCm: 0
|
widthCm: 0
|
||||||
|
|
@ -537,7 +537,7 @@ export default function ComponentForm(props: Props) {
|
||||||
if (dimensions !== undefined && dimensions !== null) {
|
if (dimensions !== undefined && dimensions !== null) {
|
||||||
dimensions.heightCm = value;
|
dimensions.heightCm = value;
|
||||||
} else {
|
} else {
|
||||||
dimensions = pond.Dimensions.create({
|
dimensions = quack.Dimensions.create({
|
||||||
heightCm: value,
|
heightCm: value,
|
||||||
lengthCm: 0,
|
lengthCm: 0,
|
||||||
widthCm: 0
|
widthCm: 0
|
||||||
|
|
@ -566,7 +566,7 @@ export default function ComponentForm(props: Props) {
|
||||||
if (dimensions !== undefined && dimensions !== null) {
|
if (dimensions !== undefined && dimensions !== null) {
|
||||||
dimensions.widthCm = value;
|
dimensions.widthCm = value;
|
||||||
} else {
|
} else {
|
||||||
dimensions = pond.Dimensions.create({
|
dimensions = quack.Dimensions.create({
|
||||||
heightCm: 0,
|
heightCm: 0,
|
||||||
lengthCm: 0,
|
lengthCm: 0,
|
||||||
widthCm: value
|
widthCm: value
|
||||||
|
|
@ -788,7 +788,7 @@ export default function ComponentForm(props: Props) {
|
||||||
// !isMeasurementTypeValid(interaction.settings.conditions[index].measurementType)
|
// !isMeasurementTypeValid(interaction.settings.conditions[index].measurementType)
|
||||||
// }
|
// }
|
||||||
disabled={!component.settings.calibrate}
|
disabled={!component.settings.calibrate}
|
||||||
value={calibration.type ?? quack.MeasurementType.MEASUREMENT_TYPE_INVALID}
|
value={calibration.measurementType ?? quack.MeasurementType.MEASUREMENT_TYPE_INVALID}
|
||||||
onChange={event => updateCalibrationTypes(event, i)}
|
onChange={event => updateCalibrationTypes(event, i)}
|
||||||
autoFocus={false}
|
autoFocus={false}
|
||||||
margin="normal"
|
margin="normal"
|
||||||
|
|
@ -814,8 +814,8 @@ export default function ComponentForm(props: Props) {
|
||||||
f.coefficients.push("0");
|
f.coefficients.push("0");
|
||||||
f.offsets.push("0");
|
f.offsets.push("0");
|
||||||
f.component.settings.calibrations.push(
|
f.component.settings.calibrations.push(
|
||||||
pond.Calibration.create({
|
quack.Calibration.create({
|
||||||
type: quack.MeasurementType.MEASUREMENT_TYPE_INVALID,
|
measurementType: quack.MeasurementType.MEASUREMENT_TYPE_INVALID,
|
||||||
calibrationOffset: 0,
|
calibrationOffset: 0,
|
||||||
calibrationCoefficient: 0
|
calibrationCoefficient: 0
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue