From 4ab88630376a1d2499429a877b07963deda08426 Mon Sep 17 00:00:00 2001 From: renlixin Date: Mon, 13 Jul 2026 14:37:51 +0800 Subject: [PATCH] 6.95 --- src-tauri/iris_is3lib.dll | Bin 35328 -> 34816 bytes src-tauri/src/iris_spectral/spectralserver.rs | 5 ++ src-tauri/tauri.conf.json | 2 +- src/components/menubox/SetWavelenth.vue | 45 +++++++++++++++--- src/components/menubox/SetWavelenthcoeff.vue | 42 ++++++++++++++-- 5 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src-tauri/iris_is3lib.dll b/src-tauri/iris_is3lib.dll index e070ea132e8ec79df6b4976ecad02c69119d6096..8f5d0ec7591359e4c6ff0948a838bd2d845750f7 100644 GIT binary patch delta 8065 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 delta 8156 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[0;bandsunm]; sensor_set_shutter_open(0); + //延时200ms + +thread::sleep(std::time::Duration::from_millis(2000)); + for _i in 0..averagenumber { let data=super::spectralbase::sensor_get_data(shuttertime as i32); @@ -271,6 +275,7 @@ pub fn collcect_dark(shuttertime:u32) drop(dev_stat); //释放锁 } sensor_set_shutter_open(1); + thread::sleep(std::time::Duration::from_millis(2000)); let data=datasum.iter().map(|x| *x as f32/averagenumber as f32).collect::>(); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 427679a..985ae1a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -10,7 +10,7 @@ "package": { "productName": "SpectralPlot", - "version": "0.6.93" + "version": "0.6.95" }, "tauri": { diff --git a/src/components/menubox/SetWavelenth.vue b/src/components/menubox/SetWavelenth.vue index 7bfd37e..2149bd3 100644 --- a/src/components/menubox/SetWavelenth.vue +++ b/src/components/menubox/SetWavelenth.vue @@ -1,5 +1,6 @@