Misc bugfixes (#39)

* Selectively send pipeline changes

* Make input and output both rotated

* Notify UI of driver mode change over NT

* Fix "show multiple"

* Rename extent to fullness, fix area filtering

This is a breaking change to docs (make sure we note area is out of 100 and is percentage)

* Apply stream divisor to both streams

Co-authored-by: Banks T <btrout.dhrs@gmail.com>
This commit is contained in:
Matt
2020-07-17 20:05:03 -07:00
committed by GitHub
parent 0d155d9c6a
commit 768964c8fc
19 changed files with 231 additions and 145 deletions

View File

@@ -53,7 +53,7 @@ export default new Vuex.Store({
cameraGain: 3,
inputImageRotationMode: 0,
cameraVideoModeIndex: 0,
outputFrameDivisor: 0,
streamingFrameDivisor: 0,
// Settings that apply to reflective
hsvHue: [0, 15],
@@ -63,7 +63,7 @@ export default new Vuex.Store({
dilate: false,
contourArea: [0, 12],
contourRatio: [0, 12],
contourExtent: [0, 12],
contourFullness: [0, 12],
contourSpecklePercentage: 5,
contourGroupingMode: 0,
contourIntersection: 0,

View File

@@ -13,7 +13,7 @@ export default {
dilate: false,
area: [0, 12],
ratio: [0, 12],
extent: [0, 12],
fullness: [0, 12],
speckle: 5,
targetGrouping: 0,
targetIntersection: 0,

View File

@@ -19,12 +19,12 @@
@rollback="e=> rollback('contourRatio',e)"
/>
<CVrangeSlider
v-model="contourExtent"
name="Extent"
v-model="contourFullness"
name="Fullness"
min="0"
max="100"
@input="handlePipelineData('contourExtent')"
@rollback="e=> rollback('contourExtent',e)"
@input="handlePipelineData('contourFullness')"
@rollback="e=> rollback('contourFullness',e)"
/>
<CVslider
v-model="contourSpecklePercentage"
@@ -98,12 +98,12 @@
this.$store.commit("mutatePipeline", {"contourRatio": val});
}
},
contourExtent: {
contourFullness: {
get() {
return this.$store.getters.currentPipelineSettings.contourExtent
return this.$store.getters.currentPipelineSettings.contourFullness
},
set(val) {
this.$store.commit("mutatePipeline", {"contourExtent": val});
this.$store.commit("mutatePipeline", {"contourFullness": val});
}
},
contourSpecklePercentage: {

View File

@@ -45,12 +45,12 @@
@rollback="e => rollback('cameraVideoModeIndex', e)"
/>
<CVselect
v-model="outputFrameDivisor"
v-model="streamingFrameDivisor"
name="Stream Resolution"
:list="streamResolutionList"
:select-cols="largeBox"
@input="handlePipelineData('outputFrameDivisor')"
@rollback="e => rollback('outputFrameDivisor', e)"
@input="handlePipelineData('streamingFrameDivisor')"
@rollback="e => rollback('streamingFrameDivisor', e)"
/>
</div>
</template>
@@ -119,12 +119,12 @@
this.$store.commit("mutatePipeline", {"cameraVideoModeIndex": val});
}
},
outputFrameDivisor: {
streamingFrameDivisor: {
get() {
return this.$store.getters.currentPipelineSettings.outputFrameDivisor
return this.$store.getters.currentPipelineSettings.streamingFrameDivisor
},
set(val) {
this.$store.commit("mutatePipeline", {"outputFrameDivisor": val});
this.$store.commit("mutatePipeline", {"streamingFrameDivisor": val});
}
},