xin/SpectralPlot
1
1
Fork 0
Code Pull Requests Releases 2 Wiki Activity

再次提交

Browse Source
This commit is contained in:
任立新
2024-08-21 14:19:40 +08:00
parent fb3257bb75
commit 6d47134dac
46 changed files with 1170 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Greet.vue
View File

@ -63,7 +63,7 @@ export default {
var that = this;
console.log(this.jsondata);
invoke("sendtoportAndgetreturn",{data:this.jsondata,datatype:"json"}).then((message) => {
invoke("sendtoport_andgetreturn",{data:this.jsondata,datatype:"json"}).then((message) => {
that.greetMsg = message;
that.jsonoutdata = JSON.parse(message.content);
console.log(message);

16
src/components/SerialPort/SerialportMethod.js
View File

@ -8,7 +8,7 @@ async function Dev_Opt() {
data:Command,
datatype:"json"
}
let message=await invoke("sendtoportAndgetreturn",data);
let message=await invoke("sendtoport_andgetreturn",data);
if (message.datatype==0x00)
{
let ret=JSON.parse(message.content);
@ -16,7 +16,7 @@ async function Dev_Opt() {
}
await EnsureNotWorking();
data.data.command="get_opt";
message=await invoke("sendtoportAndgetreturn",data);
message=await invoke("sendtoport_andgetreturn",data);
var shuttertimes=0;
if (message.datatype==0x00)
{
@ -58,7 +58,7 @@ async function Get_Date_on_Derction(drection,shuttertimes,autoremovedark=false,
data.data.remove_dark="no";
}
data.data.collect_times=avgnumber;
let message=await invoke("sendtoportAndgetreturn",data);
let message=await invoke("sendtoport_andgetreturn",data);
await EnsureNotWorking();
@ -81,10 +81,10 @@ async function Get_Date_on_Derction(drection,shuttertimes,autoremovedark=false,
data.data.return_data_type=CommanDeffine.DataTypeforSend.UpDarkDN;
}
message=await invoke("sendtoportAndgetreturn",data);
message=await invoke("sendtoport_andgetreturn",data);
while (message.datatype!=0x02)
{
message=await invoke("sendtoportAndgetreturn",data);
message=await invoke("sendtoport_andgetreturn",data);
}
return message.data
}
@ -95,7 +95,7 @@ async function Get_Device_Info() {
data:Command,
datatype:"json"
}
let message=await invoke("sendtoportAndgetreturn",data);
let message=await invoke("sendtoport_andgetreturn",data);
if (message.datatype==108)
{
return {error:"error"};
@ -122,7 +122,7 @@ async function EnsureNotWorking(){
},
datatype:"json"
}
let message=await invoke("sendtoportAndgetreturn",data);
let message=await invoke("sendtoport_andgetreturn",data);
let ret=JSON.parse(message.content);
while (ret.caiji_state!="finish")
@ -135,7 +135,7 @@ async function EnsureNotWorking(){
}
EventBus.emit('setprogressbar',dataforprocess);
await delay(1000);
message=await invoke("sendtoportAndgetreturn",data);
message=await invoke("sendtoport_andgetreturn",data);
if (message.content=="g time no data retrun")
{

19
src/components/SiderleftSerilportMethod.js
View File

@ -39,7 +39,8 @@ export default {
// let buffer = Buffer.alloc(0);
let portinfo ={
portname: this.Comname,
baudrate: 115200,
// baudrate: 115200,
baudrate: 921600,
}
let ret= await invoke("opencom",portinfo);
if (ret!="Port is open")
@ -153,7 +154,7 @@ export default {
}
if (this.dataprocessconfig.usehighpass)
{
datatoshow.data=await invoke("Gaussian_filter_high",{data:datatoshow.data,sigma:30});
datatoshow.data=await invoke("gaussian_filter_high",{data:datatoshow.data,sigma:30});
//console.log(aaa);
}
@ -217,7 +218,7 @@ export default {
},
datatype:"json"
}
let message=await invoke("sendtoportAndgetreturn",data);
let message=await invoke("sendtoport_andgetreturn",data);
let ret=JSON.parse(message.content);
while (ret.caiji_state!="finish")
@ -230,7 +231,7 @@ export default {
}
EventBus.emit('setprogressbar',dataforprocess);
await delay(100);
message=await invoke("sendtoportAndgetreturn",data);
message=await invoke("sendtoport_andgetreturn",data);
if (message.content=="g time no data retrun")
{
@ -282,10 +283,10 @@ export default {
},
datatype: "json"
}
let message1=await invoke("sendtoportAndgetreturn",data);
let message1=await invoke("sendtoport_andgetreturn",data);
while (message1.datatype!=0x02)
{
message1=await invoke("sendtoportAndgetreturn",data);
message1=await invoke("sendtoport_andgetreturn",data);
}
let datatoshowup=message1.data;
@ -321,10 +322,10 @@ export default {
},
datatype: "json"
}
let messagedown=await invoke("sendtoportAndgetreturn",data);
let messagedown=await invoke("sendtoport_andgetreturn",data);
while (messagedown.datatype!=0x02)
{
messagedown=await invoke("sendtoportAndgetreturn",data);
messagedown=await invoke("sendtoport_andgetreturn",data);
}
let datatoshowdown=messagedown.data;
this.datadown=datatoshowdown;
@ -379,7 +380,7 @@ export default {
datatype:"json"
}
let that = this;
let message=await invoke("sendtoportAndgetreturn",data);
let message=await invoke("sendtoport_andgetreturn",data);
if (message.datatype==108)
{
return false;

2
src/components/commentep.vue
View File

@ -16,7 +16,7 @@ export default {
data: Command,
datatype: "json"
}
let message = await invoke("sendtoportAndgetreturn", data);
let message = await invoke("sendtoport_andgetreturn", data);
this.Devinfo = JSON.parse(message);
}

2
src/components/menubox/SetWavelenth.vue
View File

@ -46,7 +46,7 @@ export default {
data: Command,
datatype: "json"
}
let message = await invoke("sendtoportAndgetreturn", data);
let message = await invoke("sendtoport_andgetreturn", data);
this.Devinfo = JSON.parse(message.content);
},

4
src/components/menubox/SetWorkmode.vue
View File

@ -24,7 +24,7 @@ export default {
data: Command,
datatype: "json"
}
let message = await invoke("sendtoportAndgetreturn", data);
let message = await invoke("sendtoport_andgetreturn", data);
this.Devinfo = JSON.parse(message.content);
this.Devinfo.start_time = this.convertimetostr(this.Devinfo.start_time);
this.Devinfo.stop_time = this.convertimetostr(this.Devinfo.stop_time);
@ -99,7 +99,7 @@ export default {
data: command,
datatype: "json"
}
await invoke("sendtoportAndgetreturn", data);
await invoke("sendtoport_andgetreturn", data);
}

10
src/components/siderleft.vue
View File

@ -147,15 +147,17 @@ export default {
<!-- <div style="margin: auto; margin-left: 10px;">SG<input type="checkbox" v-model="dataprocessconfig.useSG" ></div>-->
<!-- <div style="margin: auto; margin-left: 10px;"> HighPass<input type="checkbox" v-model="dataprocessconfig.usehighpass" ></div>-->
<!-- </b-input-group>-->
<b-input-group prepend="aa" size="sm" style="width: 100%">
<b-input-group prepend="平均次数" size="sm" style="width: 100%">
<b-form-input type="number" v-model="caijiavgNumber"></b-form-input>
<b-input-group-append>
</b-input-group-append>
</b-input-group>
<b-input-group prepend="bb" size="sm">
<div style="margin: auto; margin-left: 10px;"><input type="checkbox" v-model="dataprocessconfig.useSG" ></div>
<div style="margin: auto; margin-left: 10px;"><input type="checkbox" v-model="dataprocessconfig.usehighpass" ></div>
<b-input-group prepend="滤波" size="sm">
<div style="margin: auto; margin-left: 10px;">SG<input type="checkbox" v-model="dataprocessconfig.useSG" ></div>
<div style="margin: auto; margin-left: 10px;"> HighPass<input type="checkbox" v-model="dataprocessconfig.usehighpass" ></div>
<!-- <div style="margin: auto; margin-left: 10px;"><input type="checkbox" v-model="dataprocessconfig.useSG" ></div>
<div style="margin: auto; margin-left: 10px;"><input type="checkbox" v-model="dataprocessconfig.usehighpass" ></div> -->
</b-input-group>
<b-button @click="saveconfig" variant="light" size="sm">保存</b-button>
</BAccordionItem>