adfasdfa
This commit is contained in:
@ -8,6 +8,7 @@ import SetName from "./components/menubox/SetName.vue";
|
||||
import SetWorkmode from "./components/menubox/SetWorkmode.vue";
|
||||
import setCalibrate from "./components/menubox/SetCalibrate.vue";
|
||||
import setWavelenthCoeff from "./components/menubox/SetWavelenthcoeff.vue";
|
||||
import Help from "./components/menubox/help.vue";
|
||||
import Greet from "./components/Greet.vue";
|
||||
import EventBus from "./eventBus.js";
|
||||
import {$ref} from "vue3-json-editor/dist/vue3-json-editor.cjs.js";
|
||||
@ -32,6 +33,14 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
if (command.type=="info"){
|
||||
if (command.name=="help"){
|
||||
this.modaltitle="关于";
|
||||
this.modalcomponent=Help;
|
||||
this.showModal();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -34,8 +34,10 @@ async function Set_Gain(gain)
|
||||
//todo 增益设置
|
||||
}
|
||||
|
||||
async function Get_Data_from_dev(Datatype) {
|
||||
|
||||
|
||||
|
||||
async function Get_Data_from_dev(Datatype,shuttertimes,avgnumber=1) {
|
||||
|
||||
let drection=Datatype;
|
||||
//获取数据 UPDN
|
||||
let data = {
|
||||
|
@ -81,14 +81,21 @@ export default {
|
||||
}
|
||||
if (Command=="DC")
|
||||
{
|
||||
|
||||
|
||||
let r= await confirm(' 请扣上遮光罩--》再点击确定');
|
||||
let r=true
|
||||
let has_shutter=false;
|
||||
if (typeof(this.Devinfo.has_shutter)!="undefined")
|
||||
{
|
||||
has_shutter=this.Devinfo.has_shutter;
|
||||
}
|
||||
|
||||
if (!has_shutter)
|
||||
{r= await confirm(' 请扣上遮光罩--》再点击确定');}
|
||||
|
||||
if (r)
|
||||
{
|
||||
this.iscollecting=true;
|
||||
|
||||
let datatoshow=await SerialportMethod.Get_Dark_Data("UP",this.ShutterTime[0],this.caijiavgNumber);
|
||||
let datatoshow=await SerialportMethod.Get_Dark_Data("UP",this.ShutterTime[0],10);
|
||||
this.iscollecting=false;
|
||||
// this.showdataasup(datatoshow);
|
||||
this.GetoneData();
|
||||
|
@ -126,17 +126,11 @@ export default {
|
||||
<BDropdownDivider></BDropdownDivider>
|
||||
<BDropdownItem href="#">退出</BDropdownItem>
|
||||
<BDropdownItem href="#" @click="onmenuclick('File','Advance')">高级</BDropdownItem>
|
||||
|
||||
<BDropdownItem @click="onmenuclick('info','help')">帮助</BDropdownItem>
|
||||
</BNavItemDropdown>
|
||||
|
||||
<!-- <!– Navbar dropdowns –>-->
|
||||
<BNavItemDropdown text="窗口" right>
|
||||
|
||||
<!-- <BDropdownItem @click="showbox">EN</BDropdownItem>-->
|
||||
<!-- <BDropdownItem >ES</BDropdownItem>-->
|
||||
<!-- <BDropdownItem href="#">RU</BDropdownItem>-->
|
||||
<!-- <BDropdownItem href="#">FA</BDropdownItem>-->
|
||||
</BNavItemDropdown>
|
||||
|
||||
<BNavItemDropdown text="设置" right>
|
||||
<BDropdownItem @click="onmenuclick('Set','Workmode')">工作模式</BDropdownItem>
|
||||
@ -146,7 +140,14 @@ export default {
|
||||
<BDropdownItem @click="onmenuclick('Set','Calibrate')">定标</BDropdownItem>
|
||||
</BNavItemDropdown>
|
||||
|
||||
<BNavItemDropdown text="窗口" right>
|
||||
|
||||
|
||||
<!-- <BDropdownItem @click="showbox">EN</BDropdownItem>-->
|
||||
<!-- <BDropdownItem >ES</BDropdownItem>-->
|
||||
<!-- <BDropdownItem href="#">RU</BDropdownItem>-->
|
||||
<!-- <BDropdownItem href="#">FA</BDropdownItem>-->
|
||||
</BNavItemDropdown>
|
||||
|
||||
|
||||
|
||||
|
@ -221,10 +221,12 @@ export default {
|
||||
|
||||
this.shutter_time_up = ret;
|
||||
this.sensor_gain_up = 0;
|
||||
let datatoshow=await SensorMethod.Get_Dark_Data("UP",this.shutter_time_up,10);
|
||||
} else if (dire == 1) {
|
||||
var ret = await SensorMethod.Dev_Opt_Two(70);
|
||||
this.shutter_time_down = ret;
|
||||
this.sensor_gain_down = 0;
|
||||
let datatoshow=await SensorMethod.Get_Dark_Data("UP",this.shutter_time_down,10);
|
||||
}
|
||||
|
||||
|
||||
|
27
src/components/menubox/help.vue
Normal file
27
src/components/menubox/help.vue
Normal file
@ -0,0 +1,27 @@
|
||||
<template>
|
||||
<div class="help">
|
||||
<h1>更新日志</h1>
|
||||
<MarkdownFile></MarkdownFile>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.help {
|
||||
padding: 20px;
|
||||
font-family: Arial, sans-serif;
|
||||
}
|
||||
|
||||
.help h1 {
|
||||
font-size: 24px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.help p {
|
||||
font-size: 16px;
|
||||
}
|
||||
</style>
|
0
src/components/menubox/updatelog.md
Normal file
0
src/components/menubox/updatelog.md
Normal file
@ -258,9 +258,21 @@ export default {
|
||||
var lenthofdataup=dataup.data.length;
|
||||
for (var i=0;i<lenthofdataup;i++)
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(this.Devinfo.name=="IRIS-IS11")
|
||||
{
|
||||
yValues.push(dataup.data[lenthofdataup-i-1]);
|
||||
yvalues2.push(datadown.data[lenthofdataup-i-1]);
|
||||
}
|
||||
else{
|
||||
yValues.push(dataup.data[i]);
|
||||
yvalues2.push(datadown.data[i]);
|
||||
}
|
||||
}
|
||||
if (this.outputconfig.isChongCaiyang)
|
||||
{
|
||||
let aaa= await invoke("interpolate_spline",{x:xValues,y:yValues,step:this.outputconfig.ChongCaiyanginterval})
|
||||
@ -321,7 +333,13 @@ export default {
|
||||
var lenthofdataup=datatosave.data.length;
|
||||
for (var i=0;i<lenthofdataup;i++)
|
||||
{
|
||||
yValues.push(datatosave.data[lenthofdataup-i-1]);
|
||||
if(this.Devinfo.sensor_type=="IRIS-IS11")
|
||||
{
|
||||
yValues.push(datatosave.data[lenthofdataup-i-1]);
|
||||
}else {
|
||||
yValues.push(datatosave.data[i]);
|
||||
}
|
||||
|
||||
}
|
||||
var yValuesofchongcaiyang = []
|
||||
if (this.outputconfig.isChongCaiyang)
|
||||
|
Reference in New Issue
Block a user