GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

camera: rwlock optimization

Browse source
This commit is contained in:
ardocrat 2024-05-15 14:45:13 +03:00
parent 18a1bc6734
commit 5004174f2d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui/views/camera.rs
View file

@ -12,17 +12,19 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::sync::{Arc, RwLock}; use std::sync::Arc;
use parking_lot::RwLock;
use std::thread; use std::thread;
use eframe::emath::Align; use eframe::emath::Align;
use egui::load::SizedTexture; use egui::load::SizedTexture;
use egui::{Layout, Pos2, Rect, TextureOptions, Widget}; use egui::{Layout, Pos2, Rect, TextureOptions, Widget};
use image::{DynamicImage, EncodableLayout, ImageFormat};
use grin_util::ZeroingString; use grin_util::ZeroingString;
use grin_wallet_libwallet::SlatepackAddress; use grin_wallet_libwallet::SlatepackAddress;
use image::{DynamicImage, EncodableLayout, ImageFormat};
use crate::gui::Colors; use crate::gui::Colors;
use crate::gui::icons::CAMERA_ROTATE; use crate::gui::icons::CAMERA_ROTATE;
use crate::gui::platform::PlatformCallbacks; use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::types::{QrScanResult, QrScanState}; use crate::gui::views::types::{QrScanResult, QrScanState};
use crate::gui::views::View; use crate::gui::views::View;
@ -129,7 +131,7 @@ impl CameraContent {
/// Check if image is processing to find QR code. /// Check if image is processing to find QR code.
fn image_processing(&self) -> bool { fn image_processing(&self) -> bool {
let r_scan = self.qr_scan_state.read().unwrap(); let r_scan = self.qr_scan_state.read();
r_scan.image_processing r_scan.image_processing
} }
@ -141,7 +143,7 @@ impl CameraContent {
} }
// Setup scanning flag. // Setup scanning flag.
{ {
let mut w_scan = self.qr_scan_state.write().unwrap(); let mut w_scan = self.qr_scan_state.write();
w_scan.image_processing = true; w_scan.image_processing = true;
} }
// Launch scanner at separate thread. // Launch scanner at separate thread.
@ -164,14 +166,14 @@ impl CameraContent {
let text = text.trim(); let text = text.trim();
if !text.is_empty() { if !text.is_empty() {
let result = Self::parse_scan_result(text); let result = Self::parse_scan_result(text);
let mut w_scan = qr_scan_state.write().unwrap(); let mut w_scan = qr_scan_state.write();
w_scan.qr_scan_result = Some(result); w_scan.qr_scan_result = Some(result);
} }
} }
} }
// Setup scanning flag. // Setup scanning flag.
{ {
let mut w_scan = qr_scan_state.write().unwrap(); let mut w_scan = qr_scan_state.write();
w_scan.image_processing = false; w_scan.image_processing = false;
} }
}); });
@ -196,7 +198,7 @@ impl CameraContent {
/// Get QR code scan result. /// Get QR code scan result.
pub fn qr_scan_result(&self) -> Option<QrScanResult> { pub fn qr_scan_result(&self) -> Option<QrScanResult> {
let r_scan = self.qr_scan_state.read().unwrap(); let r_scan = self.qr_scan_state.read();
if r_scan.qr_scan_result.is_some() { if r_scan.qr_scan_result.is_some() {
return Some(r_scan.qr_scan_result.clone().unwrap()); return Some(r_scan.qr_scan_result.clone().unwrap());
} }
@ -205,7 +207,7 @@ impl CameraContent {
/// Reset camera content state to default. /// Reset camera content state to default.
pub fn clear_state(&mut self) { pub fn clear_state(&mut self) {
let mut w_scan = self.qr_scan_state.write().unwrap(); let mut w_scan = self.qr_scan_state.write();
*w_scan = QrScanState::default(); *w_scan = QrScanState::default();
} }
} }