Skip to content

Commit

Permalink
enable file loading
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spydr06
Spydr06 committed Nov 1, 2022
1 parent d571934 commit 7903bcb
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 115 deletions.
12 changes: 8 additions & 4 deletions src/application/data.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::{
},
simulator::Plot
};

use serde::{Serialize, Deserialize};

#[derive(Clone, Serialize, Deserialize)]
Expand Down Expand Up @@ -57,6 +56,7 @@ pub struct ApplicationData {
modules: HashMap<String, Module>,
plots: Vec<Plot>,
current_plot: usize,
file: Option<String>,

selection: Selection
}
Expand All @@ -72,15 +72,19 @@ impl Default for ApplicationData {

impl ApplicationData {
pub fn new() -> Self {
Self {
let mut data = Self {
modules: HashMap::new(),
plots: vec![Plot::new()],
current_plot: 0usize,
file: None,
selection: Selection::None
}
};

builtin::register(&mut data);
data
}

pub fn from_json<P>(path: P) -> Result<Self, String>
pub fn build<P>(path: P) -> Result<Self, String>
where P: AsRef<Path>
{
let f = File::open(path);
Expand Down
5 changes: 2 additions & 3 deletions src/application/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ impl Default for Application {

impl Application {
pub fn new() -> Self {
gio::resources_register_include!("logicrs.gresource")
.expect("Failed to register resources.");
gio::resources_register_include!("logicrs.gresource").expect("Failed to register resources.");
glib::Object::new(&[
("application-id", &"com.spydr06.logicrs"),
("flags", &gio::ApplicationFlags::empty()),
("flags", &gio::ApplicationFlags::HANDLES_OPEN),
])
.unwrap()
}
Expand Down
48 changes: 34 additions & 14 deletions src/application/template.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,23 @@ use gtk::{
prelude::{ApplicationImpl, GtkApplicationImpl},
widget::WidgetImpl,
},
gio::{File, prelude::FileExt},
gdk::Display,
CssProvider,
StyleContext,
STYLE_PROVIDER_PRIORITY_APPLICATION
};
use super::data::ApplicationData;
use crate::ui::main_window::MainWindow;
use std::cell::RefCell;

#[derive(Debug, Default)]
pub struct ApplicationTemplate {
window: RefCell<Option<MainWindow>>,
}

impl ApplicationTemplate {
const CSS_RESOURCE: &'static str = "/style/style.css";
}

#[glib::object_subclass]
impl ObjectSubclass for ApplicationTemplate {
const NAME: &'static str = "Application";
type Type = super::Application;
type ParentType = adw::Application;
}

impl ObjectImpl for ApplicationTemplate {}
impl ApplicationImpl for ApplicationTemplate {
fn activate(&self, application: &Self::Type) {
fn create_window(&self, application: &super::Application) {
StyleManager::default().set_color_scheme(ColorScheme::ForceDark);

let provider = CssProvider::new();
Expand All @@ -47,7 +37,37 @@ impl ApplicationImpl for ApplicationTemplate {
// build the application window and UI
let window = MainWindow::new(application);
window.show();
*self.window.borrow_mut() = Some(window);
}
}

#[glib::object_subclass]
impl ObjectSubclass for ApplicationTemplate {
const NAME: &'static str = "Application";
type Type = super::Application;
type ParentType = adw::Application;
}

impl ObjectImpl for ApplicationTemplate {}
impl ApplicationImpl for ApplicationTemplate {
fn activate(&self, application: &Self::Type) {
self.create_window(application);
}

fn open(&self, application: &Self::Type, files: &[File], _hint: &str) {
assert!(files.len() != 0);

let file = &files[0];
if file.path().is_none() {
crate::die("File path is None");
}

let data = ApplicationData::build(file.path().unwrap());
if let Err(err) = data {
crate::die(err.as_str());
}

crate::APPLICATION_DATA.with(|d| d.replace(data.unwrap()));
self.create_window(application);
}
}
impl GtkApplicationImpl for ApplicationTemplate {}
Expand Down
11 changes: 5 additions & 6 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ std::thread_local! {
}

fn init_new() {
APPLICATION_DATA.with(|data| {
modules::builtin::register(&mut *data.borrow_mut());
});

APPLICATION_DATA.with(|d| {
let mut data = d.borrow_mut();

Expand Down Expand Up @@ -52,8 +48,11 @@ fn init_new() {
}

fn main() -> std::io::Result<()> {
init_new();

let application = Application::new();
std::process::exit(application.run());
}

pub fn die<'a>(reason: &'a str) -> ! {
eprintln!("Fatal error: `{reason}`");
std::process::exit(1)
}
181 changes: 93 additions & 88 deletions src/ui/circuit_view.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,99 +138,104 @@ impl WidgetImpl for CircuitViewTemplate {
}
});

{
let gesture_drag = GestureDrag::builder().button(gdk::ffi::GDK_BUTTON_PRIMARY as u32).build();

let area = self.drawing_area.to_owned();
let renderer = self.renderer().unwrap();
gesture_drag.connect_drag_begin(move |gesture, x, y| {
gesture.set_state(gtk::EventSequenceState::Claimed);
crate::APPLICATION_DATA.with(|data| {
let mut data = data.borrow_mut();
let scale = renderer.borrow().scale();
let position = ((x / scale) as i32, (y / scale) as i32);

data.unhighlight();

match data.current_plot().get_block_at(position) {
Some(index) => {
if let Some(block) = data.current_plot_mut().get_block_mut(index) {
block.set_start_pos(block.position());
block.set_highlighted(true);
}
data.set_selection(Selection::Single(index));
}
_ => {
data.set_selection(Selection::Area(position, position));
}
}

area.queue_draw();
});
});

let area = self.drawing_area.to_owned();
let renderer = self.renderer().unwrap();
gesture_drag.connect_drag_update(move |gesture, x, y| {
gesture.set_state(gtk::EventSequenceState::Claimed);
crate::APPLICATION_DATA.with(|data| {
let mut data = data.borrow_mut();
let scale = renderer.borrow().scale();
let position = ((x / scale) as i32, (y / scale) as i32);

match data.selection().clone() {
Selection::Single(index) => {
let block = data.current_plot_mut().get_block_mut(index).unwrap();
let (start_x, start_y) = block.start_pos();
block.set_position((start_x + position.0, start_y + position.1));
area.queue_draw();
}
Selection::Area(area_start, _) => {
data.set_selection(Selection::Area(area_start, (area_start.0 + position.0, area_start.1 + position.1)));
area.queue_draw();
}
_ => ()
}
});
});

let area = self.drawing_area.to_owned();
let renderer = self.renderer().unwrap();
gesture_drag.connect_drag_end(move |gesture, x, y| {
gesture.set_state(gtk::EventSequenceState::Claimed);
if x == 0. && y == 0. {
return;
}
let gesture_drag = GestureDrag::builder().button(gdk::ffi::GDK_BUTTON_PRIMARY as u32).build();
let area = self.drawing_area.to_owned();
let renderer = self.renderer().unwrap();
gesture_drag.connect_drag_begin(move |gesture, x, y| {
gesture.set_state(gtk::EventSequenceState::Claimed);
drag_begin(&area, renderer.borrow().scale(), x, y)
});

crate::APPLICATION_DATA.with(|data| {
let mut data = data.borrow_mut();
let scale = renderer.borrow().scale();
let position = ((x / scale) as i32, (y / scale) as i32);

match data.selection().clone() {
Selection::Single(index) => {
let block = data.current_plot_mut().get_block_mut(index).unwrap();
let (start_x, start_y) = block.start_pos();
block.set_position((start_x + position.0, start_y + position.1));
},
Selection::Area(_, _) => {
data.highlight_area();
data.set_selection(Selection::None);
}
_ => {}
}

area.queue_draw()
});
});

self.drawing_area.add_controller(&gesture_drag);
}
let area = self.drawing_area.to_owned();
let renderer = self.renderer().unwrap();
gesture_drag.connect_drag_update(move |gesture, x, y| {
gesture.set_state(gtk::EventSequenceState::Claimed);
drag_update(&area, renderer.borrow().scale(), x, y)
});

let area = self.drawing_area.to_owned();
let renderer = self.renderer().unwrap();
gesture_drag.connect_drag_end(move |gesture, x, y| {
gesture.set_state(gtk::EventSequenceState::Claimed);
drag_end(&area, renderer.borrow().scale(), x, y)
});

self.drawing_area.add_controller(&gesture_drag);
}

fn unrealize(&self, widget: &Self::Type) {
self.parent_unrealize(widget);
}
}

impl BoxImpl for CircuitViewTemplate {}
impl BoxImpl for CircuitViewTemplate {}

fn drag_begin(area: &DrawingArea, scale: f64, x: f64, y: f64) {
crate::APPLICATION_DATA.with(|data| {
let mut data = data.borrow_mut();
let position = ((x / scale) as i32, (y / scale) as i32);

data.unhighlight();

match data.current_plot().get_block_at(position) {
Some(index) => {
if let Some(block) = data.current_plot_mut().get_block_mut(index) {
block.set_start_pos(block.position());
block.set_highlighted(true);
}
data.set_selection(Selection::Single(index));
}
_ => {
data.set_selection(Selection::Area(position, position));
}
}

area.queue_draw();
});
}

fn drag_update(area: &DrawingArea, scale: f64, x: f64, y: f64) {
crate::APPLICATION_DATA.with(|data| {
let mut data = data.borrow_mut();
let position = ((x / scale) as i32, (y / scale) as i32);

match data.selection().clone() {
Selection::Single(index) => {
let block = data.current_plot_mut().get_block_mut(index).unwrap();
let (start_x, start_y) = block.start_pos();
block.set_position((start_x + position.0, start_y + position.1));
area.queue_draw();
}
Selection::Area(area_start, _) => {
data.set_selection(Selection::Area(area_start, (area_start.0 + position.0, area_start.1 + position.1)));
area.queue_draw();
}
_ => ()
}
});
}

fn drag_end(area: &DrawingArea, scale: f64, x: f64, y: f64) {
if x == 0. && y == 0. {
return;
}

crate::APPLICATION_DATA.with(|data| {
let mut data = data.borrow_mut();
let position = ((x / scale) as i32, (y / scale) as i32);

match data.selection().clone() {
Selection::Single(index) => {
let block = data.current_plot_mut().get_block_mut(index).unwrap();
let (start_x, start_y) = block.start_pos();
block.set_position((start_x + position.0, start_y + position.1));
},
Selection::Area(_, _) => {
data.highlight_area();
}
_ => {}
}

area.queue_draw()
});
}

0 comments on commit 7903bcb

Please sign in to comment.