6.98
This commit is contained in:
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "SpectralPlot",
|
"productName": "SpectralPlot",
|
||||||
"version": "0.6.97"
|
"version": "0.6.98"
|
||||||
},
|
},
|
||||||
"tauri": {
|
"tauri": {
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,8 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
},all_averagetime:1,
|
},all_averagetime:1,
|
||||||
|
sensor1Status: "", // loaded | computed | set
|
||||||
|
sensor2Status: "", // loaded | computed | set
|
||||||
WeavePeaksDeffine: [
|
WeavePeaksDeffine: [
|
||||||
0,
|
0,
|
||||||
253.652,
|
253.652,
|
||||||
@ -104,6 +106,8 @@ export default {
|
|||||||
// }
|
// }
|
||||||
// let message = await invoke("sendtoport_andgetreturn", data);
|
// let message = await invoke("sendtoport_andgetreturn", data);
|
||||||
this.Devinfo = await SensorMethod.Get_Device_Info();
|
this.Devinfo = await SensorMethod.Get_Device_Info();
|
||||||
|
this.sensor1Status = "loaded";
|
||||||
|
this.sensor2Status = "loaded";
|
||||||
this.sensor_gain_down = this.Devinfo.sensor_gain_down;
|
this.sensor_gain_down = this.Devinfo.sensor_gain_down;
|
||||||
if (typeof (this.Devinfo.fiber_type) == "string") {
|
if (typeof (this.Devinfo.fiber_type) == "string") {
|
||||||
this.Devinfo.fiber_type = this.Devinfo.fiber_type;
|
this.Devinfo.fiber_type = this.Devinfo.fiber_type;
|
||||||
@ -606,6 +610,7 @@ export default {
|
|||||||
chart_up.setOption(this.option);
|
chart_up.setOption(this.option);
|
||||||
|
|
||||||
await this.savePeakResultToCSV(0, orgdata);
|
await this.savePeakResultToCSV(0, orgdata);
|
||||||
|
this.sensor1Status = "computed";
|
||||||
|
|
||||||
} else if (spectralnumber == 1) {
|
} else if (spectralnumber == 1) {
|
||||||
this.Devinfo.bochangxishu2.a0 = result[3];
|
this.Devinfo.bochangxishu2.a0 = result[3];
|
||||||
@ -629,14 +634,18 @@ export default {
|
|||||||
chart_up.setOption(this.optiondown);
|
chart_up.setOption(this.optiondown);
|
||||||
|
|
||||||
await this.savePeakResultToCSV(1, orgdata);
|
await this.savePeakResultToCSV(1, orgdata);
|
||||||
|
this.sensor2Status = "computed";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
async Set_Weave_Coeff() {
|
async Set_Weave_Coeff() {
|
||||||
await SensorMethod.Set_Weave_Coeff(0, this.Devinfo.bochangxishu.a0, this.Devinfo.bochangxishu.a1, this.Devinfo.bochangxishu.a2, this.Devinfo.bochangxishu.a3);
|
await SensorMethod.Set_Weave_Coeff(0, this.Devinfo.bochangxishu.a0, this.Devinfo.bochangxishu.a1, this.Devinfo.bochangxishu.a2, this.Devinfo.bochangxishu.a3);
|
||||||
if (this.Devinfo.fiber_type == "Dual")
|
this.sensor1Status = "set";
|
||||||
await SensorMethod.Set_Weave_Coeff(1, this.Devinfo.bochangxishu2.a0, this.Devinfo.bochangxishu2.a1, this.Devinfo.bochangxishu2.a2, this.Devinfo.bochangxishu2.a3);
|
if (this.Devinfo.fiber_type == "Dual") {
|
||||||
|
await SensorMethod.Set_Weave_Coeff(1, this.Devinfo.bochangxishu2.a0, this.Devinfo.bochangxishu2.a1, this.Devinfo.bochangxishu2.a2, this.Devinfo.bochangxishu2.a3);
|
||||||
|
this.sensor2Status = "set";
|
||||||
|
}
|
||||||
|
|
||||||
await this.saveCoeffToFile();
|
await this.saveCoeffToFile();
|
||||||
|
|
||||||
@ -815,6 +824,12 @@ export default {
|
|||||||
<div class="col-2" style="height: 100%;">
|
<div class="col-2" style="height: 100%;">
|
||||||
<BCard header="sensor 1" header-text-variant="white" header-tag="header" header-bg-variant="dark"
|
<BCard header="sensor 1" header-text-variant="white" header-tag="header" header-bg-variant="dark"
|
||||||
style="max-width: 20rem">
|
style="max-width: 20rem">
|
||||||
|
<template #header>
|
||||||
|
sensor 1
|
||||||
|
<a-tag v-if="sensor1Status === 'loaded'" color="blue" size="small" style="float:right">已加载</a-tag>
|
||||||
|
<a-tag v-if="sensor1Status === 'computed'" color="green" size="small" style="float:right">已计算</a-tag>
|
||||||
|
<a-tag v-if="sensor1Status === 'set'" color="orange" size="small" style="float:right">已设置</a-tag>
|
||||||
|
</template>
|
||||||
<BCardText><b-input-group class="my-1">
|
<BCardText><b-input-group class="my-1">
|
||||||
<BInputGroupPrepend is-text class="myinputprepend">a0</BInputGroupPrepend>
|
<BInputGroupPrepend is-text class="myinputprepend">a0</BInputGroupPrepend>
|
||||||
<b-form-input type="number" step="0.00000000000001" v-model="Devinfo.bochangxishu.a0"></b-form-input>
|
<b-form-input type="number" step="0.00000000000001" v-model="Devinfo.bochangxishu.a0"></b-form-input>
|
||||||
@ -838,6 +853,12 @@ export default {
|
|||||||
</BCard>
|
</BCard>
|
||||||
<BCard header="sensor 2" header-text-variant="white" header-tag="header" header-bg-variant="dark"
|
<BCard header="sensor 2" header-text-variant="white" header-tag="header" header-bg-variant="dark"
|
||||||
style="max-width: 20rem" v-if="Devinfo.fiber_type == 'Dual'">
|
style="max-width: 20rem" v-if="Devinfo.fiber_type == 'Dual'">
|
||||||
|
<template #header>
|
||||||
|
sensor 2
|
||||||
|
<a-tag v-if="sensor2Status === 'loaded'" color="blue" size="small" style="float:right">已加载</a-tag>
|
||||||
|
<a-tag v-if="sensor2Status === 'computed'" color="green" size="small" style="float:right">已计算</a-tag>
|
||||||
|
<a-tag v-if="sensor2Status === 'set'" color="orange" size="small" style="float:right">已设置</a-tag>
|
||||||
|
</template>
|
||||||
<BCardText><b-input-group class="my-1">
|
<BCardText><b-input-group class="my-1">
|
||||||
<BInputGroupPrepend is-text class="myinputprepend">a0</BInputGroupPrepend>
|
<BInputGroupPrepend is-text class="myinputprepend">a0</BInputGroupPrepend>
|
||||||
<b-form-input type="number" step="0.00000000000001" v-model="Devinfo.bochangxishu2.a0"></b-form-input>
|
<b-form-input type="number" step="0.00000000000001" v-model="Devinfo.bochangxishu2.a0"></b-form-input>
|
||||||
|
|||||||
Reference in New Issue
Block a user