UI 3d mode, ConfigManager bugfixes (#103)

* stupid bugs I guess idk where else to put this commit

* Run spotless

* Fix config file loading

Splits load into own method

* Run spotless
This commit is contained in:
Matt
2020-08-26 10:03:56 -07:00
committed by GitHub
parent fea72e18bf
commit 9f0e89ea29
13 changed files with 105 additions and 36 deletions

View File

@@ -66,7 +66,10 @@
color: "Success",
text: ""
},
snack: false
snack: false,
selectedModel: {
isCustom: false
}
}
},
computed: {
@@ -164,7 +167,10 @@
this.uploadModel(this.selectedModel, true);
},
uploadModel(model, premade = false) {
this.axios.post("http://" + this.$address + "/api/vision/pnpModel", model).then(() => {
this.axios.post("http://" + this.$address + "/api/vision/pnpModel", {
['targetModel']: model,
['index']: this.$store.getters.currentCameraIndex
}).then(() => {
this.snackbar = {
color: "success",
text: premade ? "Target model changed successfully" : "Custom target model uploaded and selected successfully"

View File

@@ -195,7 +195,6 @@
'hsvHue': s.hsvHue,
'hsvSaturation': s.hsvSaturation,
'hsvValue': s.hsvValue,
'outputShowThresholded': this.showThresholdState,
'cameraIndex': this.$store.state.currentCameraIndex
}
});
@@ -208,6 +207,7 @@
case 0:
this.currentFunction = undefined;
this.$store.state.colorPicking = false;
this.handlePipelineUpdate("outputShouldDraw", true);
return;
case 1:
this.currentFunction = this.colorPicker.eyeDrop;