security_vision/laserspace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Settings config and black bg

Browse source
This commit is contained in:
Ruben van de Ven 2025-11-10 15:50:20 +01:00
parent 44dbd7fd7f
commit 3b5e023da3
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main.rs
View file

@ -36,11 +36,11 @@ use cv_core::FeatureMatch;
use std::error::Error; use std::error::Error;
use std::fs::File; use std::fs::File;
use std::io::BufReader; use std::io::BufReader;
use std::path::Path; use std::path::{Path, PathBuf};
// use egui_dropdown::DropDownBox; // use egui_dropdown::DropDownBox;
const CONFIG_FILE_PATH: &str = "./config.json"; // const CONFIG_FILE_PATH: &str = "./config.json";
const DRAGGING_THRESHOLD: u32 = 30; // allow for a slight cursor movement to still detect a click const DRAGGING_THRESHOLD: u32 = 30; // allow for a slight cursor movement to still detect a click
fn main() { fn main() {
@ -58,6 +58,7 @@ type StreamMap = HashMap<DacId, laser::FrameStream<LaserModel>>;
struct GuiModel { struct GuiModel {
// A handle to the laser API used for spawning streams and detecting DACs. // A handle to the laser API used for spawning streams and detecting DACs.
config_file_path: PathBuf,
laser_api: Arc<laser::Api>, laser_api: Arc<laser::Api>,
// All of the live stream handles. // All of the live stream handles.
laser_streams: StreamMap, laser_streams: StreamMap,
@ -304,8 +305,8 @@ fn save_config_file<P: AsRef<Path>>(path: P, config: SavedConfig) -> std::result
// Some hardcoded config. Not spending time on reading/writing config atm. // Some hardcoded config. Not spending time on reading/writing config atm.
fn get_dac_configs() -> DacConfigMap{ fn get_dac_configs(config_path: &PathBuf) -> DacConfigMap{
match read_config_from_file(CONFIG_FILE_PATH) { match read_config_from_file(config_path) {
Err(err) => { Err(err) => {
eprintln!("Could not load config {}", err); eprintln!("Could not load config {}", err);
return HashMap::new() return HashMap::new()
@ -317,6 +318,7 @@ fn get_dac_configs() -> DacConfigMap{
fn model(app: &App) -> GuiModel { fn model(app: &App) -> GuiModel {
let args: Vec<String> = std::env::args().collect(); let args: Vec<String> = std::env::args().collect();
let zmq_url = &args[1]; let zmq_url = &args[1];
let config_file_path = PathBuf::from(&args[2]);
// Create a window to receive keyboard events. // Create a window to receive keyboard events.
let w_id_lasersettings = app let w_id_lasersettings = app
@ -415,7 +417,10 @@ fn model(app: &App) -> GuiModel {
let current_layers = RenderableLayers::new(); //Vec::new(); let current_layers = RenderableLayers::new(); //Vec::new();
let per_laser_config = get_dac_configs(&config_file_path);
GuiModel { GuiModel {
config_file_path,
laser_api, laser_api,
laser_settings, laser_settings,
laser_model, laser_model,
@ -427,7 +432,7 @@ fn model(app: &App) -> GuiModel {
last_update: Instant::now(), last_update: Instant::now(),
lost_alpha: 1., lost_alpha: 1.,
connected: true, connected: true,
per_laser_config: get_dac_configs(), per_laser_config,
selected_stream: None, selected_stream: None,
canvas_scale: 25., canvas_scale: 25.,
canvas_translate: Vec2::new(-300.,100.), canvas_translate: Vec2::new(-300.,100.),
@ -606,7 +611,7 @@ fn update(_app: &App, model: &mut GuiModel, update: Update) {
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.heading("Laser Points"); ui.heading("Laser Points");
if ui.button("💾").clicked() { if ui.button("💾").clicked() {
save_config_file(CONFIG_FILE_PATH, per_laser_config.into()); save_config_file(&model.config_file_path, per_laser_config.into());
} }
}); });
@ -1051,7 +1056,8 @@ fn view_laser_preview(app: &App, model: &GuiModel, frame: Frame) {
let draw = app.draw(); let draw = app.draw();
draw.background().color(srgba(0.3,0.3,0.3,1.)); // draw.background().color(srgba(0.3,0.3,0.3,1.));
draw.background().color(srgba(0.,0.,0., 1.));
let win = app.window_rect(); let win = app.window_rect();