Skip to content

Commit

Permalink
Add split chart ability.
Browse files Browse the repository at this point in the history
  • Loading branch information
@windelbouwman
windelbouwman committed Jun 22, 2020
1 parent 3edaa60 commit ec9c050
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 157 deletions.
90 changes: 4 additions & 86 deletions lognplotgtk/src/gui.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,6 @@
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_new_grid_plot_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">New 2x2 plot window</property>
<property name="use_underline">True</property>
</object>
</child>
</object>
</child>
</object>
Expand Down Expand Up @@ -553,88 +545,14 @@
</packing>
</child>
<child>
<object class="GtkBox" id="root_splittor_box">
<object class="GtkBox" id="root_splittor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkDrawingArea" id="chart_control">
<property name="width_request">200</property>
<property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_EXPOSURE_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="chart_control2">
<property name="width_request">200</property>
<property name="height_request">200</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="button_split_vertical">
<property name="label" translatable="yes">Split vertical</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_split_horizontal">
<property name="label" translatable="yes">Split horizontal</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
<placeholder/>
</child>
</object>
<packing>
Expand Down
4 changes: 2 additions & 2 deletions lognplotgtk/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ pub use state::{GuiState, GuiStateHandle};
mod io {
use super::GuiStateHandle;

pub fn save_data_as_hdf5(top_level: &gtk::Window, app_state: &GuiStateHandle) {
pub fn save_data_as_hdf5(_top_level: &gtk::Window, _app_state: &GuiStateHandle) {
unimplemented!();
}

pub fn load_data_from_hdf5(top_level: &gtk::Window, app_state: &GuiStateHandle) {
pub fn load_data_from_hdf5(_top_level: &gtk::Window, _app_state: &GuiStateHandle) {
unimplemented!();
}
}
Expand Down
164 changes: 96 additions & 68 deletions lognplotgtk/src/mainwindow.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,95 @@ fn build_ui(app: &gtk::Application, app_state: GuiStateHandle) {
window.show_all();
}

fn setup_chart_area(builder: &gtk::Builder, app_state: GuiStateHandle) {
// First chart:
let draw_area: gtk::DrawingArea = builder.get_object("chart_control").unwrap();
let chart_state1 = setup_drawing_area(draw_area, app_state.clone(), "chart1");
/// Create new chart area with extra buttons around it
/// to enable splitting in vertical and horizontal direction
fn create_new_chart_area(app_state: &GuiStateHandle, parent_box: gtk::Box) {
let box1 = gtk::Box::new(gtk::Orientation::Vertical, 0);
let draw_area: gtk::DrawingArea = gtk::DrawingArea::new();
massage_drawing_area(&draw_area);
box1.pack_start(&draw_area, true, true, 0);

// generate new unique chart id based on amount of charts so far:
let chart_id = format!("chart{}", app_state.borrow().num_charts() + 1);

let chart_state1 = setup_drawing_area(draw_area, app_state.clone(), &chart_id);
app_state.borrow_mut().add_chart(chart_state1);

// Second chart:
let draw_area2: gtk::DrawingArea = builder.get_object("chart_control2").unwrap();
let chart_state2 = setup_drawing_area(draw_area2, app_state.clone(), "chart2");
app_state.borrow_mut().add_chart(chart_state2);

// Split handler:
// TODO:
// let hbx: gtk::Box = builder.get_object("root_splittor_box").unwrap();
// let split_button: gtk::Button = builder.get_object("button_split_vertical").unwrap();
// split_button.connect_clicked(move |_| {
// println!("Split!");
// hbx.remove(&draw_area2);
// let paned = gtk::Paned::new(gtk::Orientation::Vertical);
// hbx.add(&paned);
// paned.add(&draw_area2);

// // hbx.add_widget(draw_area2);
// });
// Create split buttons:
let box2 = gtk::Box::new(gtk::Orientation::Horizontal, 0);
let button1 = gtk::Button::new();
button1.set_label("Split vertical");
box2.pack_start(&button1, false, false, 0);

let button2 = gtk::Button::new();
button2.set_label("Split horizontal");
box2.pack_start(&button2, false, false, 0);

box1.pack_start(&box2, false, false, 0);
box1.show_all();

button1.connect_clicked(
clone!(@strong app_state, @strong box1, @strong parent_box => move |_| {
info!("Split vertically");
split_chart(&app_state, &box1, gtk::Orientation::Vertical);
}),
);

button2.connect_clicked(
clone!(@strong app_state, @strong box1, @strong parent_box => move |_| {
info!("Split horizontally");
split_chart(&app_state, &box1, gtk::Orientation::Horizontal);
}),
);

parent_box.pack_start(&box1, true, true, 0);
}

/// Complex way of finding position of box in parent box:
fn find_index(box1: gtk::Box, parent: &gtk::Box) -> i32 {
for (index, child) in parent.get_children().iter().enumerate() {
let child_box: gtk::Box = child.clone().downcast::<gtk::Box>().unwrap();
if child_box == box1 {
return index as i32;
}
}

0
}

/// Takes care of splitting the chart into two areas
/// This is done by determining the containing box parent,
/// and removing this box from the parent, placing a new
/// box in between in the box hierarchy..
fn split_chart(app_state: &GuiStateHandle, box1: &gtk::Box, orientation: gtk::Orientation) {
// Create new split pane:
let new_box = gtk::Box::new(orientation, 0);

// Determine parent box (either vertical or horizontal)
let parent_box: gtk::Box = box1.get_parent().unwrap().downcast::<gtk::Box>().unwrap();

// find position in parent:
let index = find_index(box1.clone(), &parent_box);
info!("Old position: {:?}", index);

// Remove original container and add new box:
parent_box.remove(box1);
parent_box.pack_start(&new_box, true, true, 0);
parent_box.reorder_child(&new_box, index); // move to first position again!

new_box.pack_start(box1, true, true, 0);

// create new chart area:
create_new_chart_area(&app_state, new_box.clone());

new_box.show_all();
}

fn setup_chart_area(builder: &gtk::Builder, app_state: GuiStateHandle) {
let root_splittor: gtk::Box = builder.get_object("root_splittor").unwrap();

// Initial chart:
create_new_chart_area(&app_state, root_splittor);
}

fn setup_about_dialog(about_dialog: &gtk::AboutDialog) {
Expand All @@ -87,8 +152,8 @@ fn setup_about_dialog(about_dialog: &gtk::AboutDialog) {
about_dialog.connect_response(|p, _| p.hide());
}

/// Construct new plot window with the given number of plots.
fn new_plot_window(app_state: GuiStateHandle, amount: usize) {
/// Construct new plot window.
fn new_plot_window(app_state: GuiStateHandle) {
info!("New window!");
let chart_id = format!("chart{}", app_state.borrow().num_charts() + 1);
let new_window = gtk::WindowBuilder::new()
Expand All @@ -99,47 +164,15 @@ fn new_plot_window(app_state: GuiStateHandle, amount: usize) {
new_window.set_icon(Some(&icon));
}

let mut charts = vec![];
if amount > 1 {
let grid = gtk::Grid::new();
new_window.add(&grid);

// Create grid of plots:
for row in 0_i32..amount as i32 {
for column in 0_i32..amount as i32 {
let chart_id = format!(
"chart{}",
app_state.borrow().num_charts() + 1 + charts.len()
);
// println!("Row: {}", row);
let new_chart_area = gtk::DrawingArea::new();
grid.attach(&new_chart_area, column, row, 1, 1);
massage_drawing_area(&new_chart_area);

let chart_n = setup_drawing_area(new_chart_area, app_state.clone(), &chart_id);
charts.push(chart_n);
}
}

grid.show();
} else {
let new_chart_area = gtk::DrawingArea::new();
new_window.add(&new_chart_area);
massage_drawing_area(&new_chart_area);

let chart_n = setup_drawing_area(new_chart_area, app_state.clone(), &chart_id);
charts.push(chart_n);
}
let root_box = gtk::Box::new(gtk::Orientation::Vertical, 0);
new_window.add(&root_box);

for chart_n in &charts {
app_state.borrow_mut().add_chart(chart_n.clone());
}
create_new_chart_area(&app_state, root_box);

new_window.connect_delete_event(clone!(@strong app_state => move |_, _| {
// Remove all chart structs from the app state:
for chart_n in &charts {
app_state.borrow_mut().delete_chart(&chart_n);
}
// TODO: remove charts of this window!
// TODO: by not doing this, we suffer from some memory leakage?
Inhibit(false)
}));
new_window.show_all();
Expand All @@ -150,6 +183,7 @@ fn massage_drawing_area(new_chart_area: &gtk::DrawingArea) {
new_chart_area.show();
new_chart_area.set_hexpand(true);
new_chart_area.set_vexpand(true);
new_chart_area.set_size_request(200, 200);

new_chart_area.set_can_focus(true);
new_chart_area.set_can_default(true);
Expand Down Expand Up @@ -181,13 +215,7 @@ fn setup_menus(builder: &gtk::Builder, app_state: GuiStateHandle) {

let menu_new_plot_window: gtk::MenuItem = builder.get_object("menu_new_plot_window").unwrap();
menu_new_plot_window.connect_activate(clone!(@strong app_state => move |_| {
new_plot_window(app_state.clone(), 1);
}));

let menu_new_grid_plot_window: gtk::MenuItem =
builder.get_object("menu_new_grid_plot_window").unwrap();
menu_new_grid_plot_window.connect_activate(clone!(@strong app_state => move |_| {
new_plot_window(app_state.clone(), 2);
new_plot_window(app_state.clone());
}));

let top_level: gtk::Window = builder.get_object("top_unit").unwrap();
Expand Down
2 changes: 1 addition & 1 deletion lognplotgtk/src/state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl GuiState {
}

#[cfg(not(feature = "hdf5"))]
pub fn load(&self, filename: &Path) -> Result<(), String> {
pub fn load(&self, _filename: &Path) -> Result<(), String> {
Err("No hdf5 support!".to_owned())
}

Expand Down

0 comments on commit ec9c050

Please sign in to comment.