Skip to content

GitLab

Commit 8099738d authored by 柳 佳乐's avatar 柳 佳乐
Browse files

修复分辨率×的问题

parent 231cbfd2
Show whitespace changes
Inline Side-by-side
src/components/dynamiCamera.vue
View file @ 8099738d
......@@ -34,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item label="保存路径">
<el-input v-model="dynamiSettings.savePath" placeholder="/images" style="width: 180px"></el-input>
<el-input v-model="dynamiSettings.savePath" placeholder="images" style="width: 180px"></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
......@@ -420,7 +420,7 @@ export default {
dynamiCameraisInitialized: false,
// 动态相机设置
dynamiSettings: {
resolution: '1920x1080',
resolution: '1920×1080',
fps: 60,
savePath: 'images/captures',
lowFpsMode: false
......@@ -485,7 +485,7 @@ export default {
initDynamiCameras() {
let cameraIds = [];
const [width, height] = this.dynamiSettings.resolution.split('x')
const [width, height] = this.dynamiSettings.resolution.split('×')
//
//设置相机
this.dynamiCameras.forEach(camera => {
......@@ -541,7 +541,7 @@ export default {
this.workers = {};
this.dynamiCameras = []
this.dynamiSettings = {
resolution: '1920x1080',
resolution: '1920×1080',
fps: 60,
savePath: 'images/captures',
lowFpsMode: false
......
src/components/stillCamera.vue
View file @ 8099738d
......@@ -16,9 +16,9 @@
<el-form inline class="params-form">
<el-form-item label="分辨率">
<el-select v-model="globalParams.resolution" style="width: 140px">
<el-option label="2560×1440" value="2560x1440"></el-option>
<el-option label="1920×1080" value="1920x1080"></el-option>
<el-option label="1280×960" value="1280x960"></el-option>
<el-option label="2560×1440" value="2560×1440"></el-option>
<el-option label="1920×1080" value="1920×1080"></el-option>
<el-option label="1280×960" value="1280×960"></el-option>
</el-select>
</el-form-item>
......@@ -31,7 +31,7 @@
</el-form-item>
<el-form-item label="保存路径">
<el-input v-model="globalParams.savePath" placeholder="/images" style="width: 180px"></el-input>
<el-input v-model="globalParams.savePath" placeholder="images" style="width: 180px"></el-input>
</el-form-item>
<el-form-item>
......@@ -68,7 +68,8 @@
<span class="demonstration">亮度</span>
</div>
<div class="config-item-slider">
<el-slider v-model="camera.brightness" :min="-100" :max="100" @change="handleBrightnessChange(camera)"></el-slider>
<el-slider v-model="camera.brightness" :min="-100" :max="100"
@change="handleBrightnessChange(camera)"></el-slider>
</div>
<div class="config-item-value">
{{ camera.brightness }}
......@@ -79,7 +80,8 @@
<span class="demonstration">对比度</span>
</div>
<div class="config-item-slider">
<el-slider v-model="camera.contrast" :min="-100" :max="100" @change="handleContrastChange(camera)"></el-slider>
<el-slider v-model="camera.contrast" :min="-100" :max="100"
@change="handleContrastChange(camera)"></el-slider>
</div>
<div class="config-item-value">
{{ camera.contrast }}
......@@ -90,7 +92,8 @@
<span class="demonstration">饱和度</span>
</div>
<div class="config-item-slider">
<el-slider v-model="camera.saturation" :min="-100" :max="100" @change="handleSaturationChange(camera)"></el-slider>
<el-slider v-model="camera.saturation" :min="-100" :max="100"
@change="handleSaturationChange(camera)"></el-slider>
</div>
<div class="config-item-value">
{{ camera.saturation }}
......@@ -101,7 +104,8 @@
<span class="demonstration">色调</span>
</div>
<div class="config-item-slider">
<el-slider v-model="camera.hue" :min="-100" :max="100" @change="handleHueChange(camera)"></el-slider>
<el-slider v-model="camera.hue" :min="-100" :max="100"
@change="handleHueChange(camera)"></el-slider>
</div>
<div class="config-item-value">
{{ camera.hue }}
......@@ -112,7 +116,8 @@
<span class="demonstration">增益</span>
</div>
<div class="config-item-slider">
<el-slider v-model="camera.gain" :min="-100" :max="100" @change="handleGainChange(camera)"></el-slider>
<el-slider v-model="camera.gain" :min="-100" :max="100"
@change="handleGainChange(camera)"></el-slider>
</div>
<div class="config-item-value">
{{ camera.gain }}
......@@ -123,7 +128,8 @@
<span class="demonstration">曝光</span>
</div>
<div class="config-item-slider">
<el-slider v-model="camera.exposure" :min="-100" :max="100" @change="handleExposureChange(camera)"></el-slider>
<el-slider v-model="camera.exposure" :min="-100" :max="100"
@change="handleExposureChange(camera)"></el-slider>
</div>
<div class="config-item-value">
{{ camera.exposure }}
......@@ -204,11 +210,13 @@ export default {
return {
globalParams: {
fps: 30,//帧率
resolution: '2560x1440',//分别率
resolution: '2560×1440',//分别率
savePath: 'images/captures',//存储路径
lowFpsMode: false,//低帧率模式开关
},
cameraList: [],//相机列表
cameraList: [
],//相机列表
isInitialized: false, // 初始化状态
workers: {} // 存储每个相机对应的worker
}
......@@ -267,7 +275,7 @@ export default {
initAllCameras() {
// 调用接口初始化所有相机
let cameraIds = [];
const [width, height] = this.globalParams.resolution.split('x')
const [width, height] = this.globalParams.resolution.split('×')
//设置相机
this.cameraList.forEach(camera => {
cameraIds.push(camera.id)
......@@ -505,7 +513,7 @@ export default {
this.isInitialized = false
this.globalParams = {
fps: 30,//帧率
resolution: '2560x1440',//分别率
resolution: '2560×1440',//分别率
savePath: 'images/captures',//存储路径
lowFpsMode: false,//低帧率模式开关
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment