From a53c240e79f08009124b5d0e0044bb8b70dfd097 Mon Sep 17 00:00:00 2001 From: Piyush Raj Date: Mon, 18 Jan 2021 22:12:49 +0530 Subject: [PATCH] changes --- Cargo.lock | 28 +- Cargo.toml | 2 +- chitra.png | Bin 0 -> 11890 bytes icon.svg | 104 +++ ui/main_window.glade~ => main_window.glade~ | 0 src/lib.rs | 11 +- src/main.rs | 6 +- test.txt | 1 - ui/main_window.glade => ui.glade | 8 +- ui.glade~ | 667 ++++++++++++++++++++ 10 files changed, 804 insertions(+), 23 deletions(-) create mode 100644 chitra.png create mode 100644 icon.svg rename ui/main_window.glade~ => main_window.glade~ (100%) delete mode 100644 test.txt rename ui/main_window.glade => ui.glade (98%) create mode 100644 ui.glade~ diff --git a/Cargo.lock b/Cargo.lock index f7178be..1150bf3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -891,6 +891,20 @@ dependencies = [ "version-compare", ] +[[package]] +name = "tarangam" +version = "0.1.0" +dependencies = [ + "cairo-rs", + "gio", + "glib", + "gtk", + "libmath", + "png", + "rand 0.8.1", + "serialport", +] + [[package]] name = "thiserror" version = "1.0.20" @@ -929,20 +943,6 @@ dependencies = [ "serde", ] -[[package]] -name = "trangam" -version = "0.1.0" -dependencies = [ - "cairo-rs", - "gio", - "glib", - "gtk", - "libmath", - "png", - "rand 0.8.1", - "serialport", -] - [[package]] name = "unicode-segmentation" version = "1.6.0" diff --git a/Cargo.toml b/Cargo.toml index ce60aa8..2737c7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "trangam" +name = "tarangam" version = "0.1.0" authors = ["PiyushXCoder "] edition = "2018" diff --git a/chitra.png b/chitra.png new file mode 100644 index 0000000000000000000000000000000000000000..afdae13616fe92f7ee5d61d9cd1082b8adc19d36 GIT binary patch literal 11890 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 literal 0 HcmV?d00001 diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..76b6f75 --- /dev/null +++ b/icon.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ui/main_window.glade~ b/main_window.glade~ similarity index 100% rename from ui/main_window.glade~ rename to main_window.glade~ diff --git a/src/lib.rs b/src/lib.rs index 853c4a7..d3a7073 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,5 @@ +/// Feel free to see through codes. Application is not written to be used as a library for other app. :) + mod graph; use gtk::prelude::*; @@ -17,13 +19,13 @@ enum Status { JAGRIT, SAYAN, AVRODTIH, PARIVARTIT } +/// Configuration to read from Serial Port pub struct Config { status: Status, bondrate: u32, port: String } -// impl Config { pub fn new() -> Config { Config { @@ -34,13 +36,15 @@ impl Config { } } +/// For communication between mpsc of graph and serial port enum MessageSerialThread { Msg(String), Status(String) } +// Building and configuring GUI pub fn build_ui(app: >k::Application, config: Arc::>) { - let builder = gtk::Builder::from_file("ui/main_window.glade"); + let builder = gtk::Builder::from_file("ui.glade"); let win = builder.get_object::("win").expect("Resource file missing!"); win.set_application(Some(app)); @@ -63,6 +67,7 @@ pub fn build_ui(app: >k::Application, config: Arc::>) { // exit_menu let exit_menu = builder.get_object::("exit_menu").expect("Resource file missing!"); + let tmp_win = win.clone(); exit_menu.connect_activate(move |_|{ unsafe { @@ -364,6 +369,7 @@ pub fn build_ui(app: >k::Application, config: Arc::>) { }); } +// Controls the thread and read from serial port fn serial_thread_work( config: &Arc>, bufread: &mut Option>>, @@ -414,6 +420,7 @@ fn serial_thread_work( } } +// Receives MessageSerialThread from Serial Port managing thread and add points to draw on graph fn receiver_for_msg(text: String, graph: &Rc>, full_log: >k::CheckButton, log_area: >k::TextView) { for text in text.lines() { if text.len() == 0 { diff --git a/src/main.rs b/src/main.rs index 7476050..9bcee56 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,14 +3,14 @@ use std::env::args; use std::sync::{Arc, Mutex}; fn main() { - let app = gtk::Application::new(Some("sng.trangm"), Default::default()) + let app = gtk::Application::new(Some("sng.tarangm"), Default::default()) .expect("Failed to initiate gtk"); - let config = Arc::new(Mutex::new(trangam::Config::new())); + let config = Arc::new(Mutex::new(tarangam::Config::new())); app.connect_activate(move |app| { let config = Arc::clone(&config); - trangam::build_ui(app, config); + tarangam::build_ui(app, config); }); app.run(&args().collect::>()); diff --git a/test.txt b/test.txt deleted file mode 100644 index 1fe5476..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -Bhai ka area hai \ No newline at end of file diff --git a/ui/main_window.glade b/ui.glade similarity index 98% rename from ui/main_window.glade rename to ui.glade index 9655ab8..9e7786a 100644 --- a/ui/main_window.glade +++ b/ui.glade @@ -4,11 +4,13 @@ False + Tarangam + icon.svg dialog Tarangam (तरंगम्) A simple serial plotter. एक सरल सीरीय्ल पलौटर। - image-missing + chitra.png False @@ -51,6 +53,7 @@ False + chitra.png dialog select-folder @@ -88,9 +91,10 @@ False - Trangam + Tarangam 850 600 + chitra.png True diff --git a/ui.glade~ b/ui.glade~ new file mode 100644 index 0000000..9e7786a --- /dev/null +++ b/ui.glade~ @@ -0,0 +1,667 @@ + + + + + + False + Tarangam + icon.svg + dialog + Tarangam (तरंगम्) + A simple serial plotter. +एक सरल सीरीय्ल पलौटर। + chitra.png + + + False + vertical + 2 + + + False + end + + + + + + + + + False + False + 0 + + + + + + + + + + True + False + document-save + + + 5 + 500 + 100 + 0.5 + 10 + + + False + chitra.png + dialog + select-folder + + + False + vertical + 2 + + + False + end + + + + + + + + + False + False + 0 + + + + + + + + + + True + False + go-next + + + False + Tarangam + 850 + 600 + chitra.png + + + True + False + vertical + + + True + False + + + True + False + _File + True + + + True + False + + + Save Log + True + False + document_save + False + + + + + True + False + + + + + gtk-quit + True + False + True + True + + + + + + + + + True + False + _Help + True + + + True + False + + + gtk-about + True + False + True + True + + + + + + + + + False + True + 0 + + + + + 30 + True + False + + + True + False + refresh + True + view-refresh + + + False + True + + + + + True + False + + + True + False + + + + + False + True + + + + + True + False + + + True + False + + 9600 + + + + + + False + True + + + + + True + False + Connect + True + media-playback-start + + + False + True + + + + + True + False + Stop + True + media-playback-stop + + + False + True + + + + + False + True + 1 + + + + + True + True + + + 500 + True + False + vertical + + + True + False + + + True + False + Clear + True + + + False + True + + + + + True + False + + + Patches + True + True + False + True + + + + + False + True + + + + + True + False + + + box + True + True + False + True + True + + + + + False + True + + + + + True + False + + + baarik box + True + True + False + True + + + + + False + True + + + + + True + False + + + False + True + + + + + True + False + + + True + False + 4 + Pankti + + + + + False + True + + + + + True + False + + + True + True + pankti_adjustment + 1 + True + True + + + + + False + True + + + + + False + True + 0 + + + + + 500 + 450 + True + False + True + True + + + False + True + 1 + + + + + True + False + + + True + False + + + nimna + True + True + False + True + + + + + False + True + + + + + True + False + + + True + False + 4 + S tambh 1 + + + + + False + True + + + + + True + False + True + + + True + False + True + 8 + 0 + + + + + False + True + + + + + True + False + + + True + False + 4 + Stambh 2 + + + + + False + True + + + + + True + False + True + + + True + False + True + 8 + 100 + + + + + False + True + + + + + False + True + 2 + + + + + True + True + + + + + True + False + vertical + + + True + False + + + True + False + Clear + True + + + False + True + + + + + True + False + + + Show full log + True + True + False + True + + + + + False + True + + + + + False + True + 0 + + + + + 300 + True + True + True + True + in + + + True + True + True + + + + + False + True + 1 + + + + + True + False + + + True + True + + + True + True + 0 + + + + + Send + True + True + True + send_image + + + False + True + 1 + + + + + False + True + 2 + + + + + False + True + + + + + False + True + 2 + + + + + True + False + 10 + 10 + 6 + 6 + True + False + vertical + 2 + + + False + True + 4 + + + + + +