Skip to content

Integrate graph view into operations #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobvh merged 4 commits into from
Feb 21, 2025
Merged

Integrate graph view into operations #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
323e7b3
ton of stuff
Chris7 Feb 21, 2025
bfe2fc4
Merge code
Chris7 Feb 21, 2025
22e26a0
Reformat
Chris7 Feb 21, 2025
540c6f3
cleanup
Chris7 Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ fn main() {
.id,
);
if *interactive {
view_operations(&operation_conn, &operations);
view_operations(&conn, &operation_conn, &operations);
} else {
let mut indicator = "";
println!(
Expand Down
11 changes: 11 additions & 0 deletions src/models/block_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,17 @@ impl BlockGroup {
}
}

pub fn get_by_ids(conn: &Connection, ids: &[i64]) -> Vec<BlockGroup> {
let query = "SELECT * FROM block_groups WHERE id IN rarray(?1)";
Self::query(
conn,
query,
params!(Rc::new(
ids.iter().map(|i| SQLValue::from(*i)).collect::<Vec<_>>()
)),
)
}

pub fn clone(conn: &Connection, source_block_group_id: i64, target_block_group_id: i64) {
let existing_paths = Path::query(
conn,
Expand Down
47 changes: 35 additions & 12 deletions src/models/operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
use crate::graph::{all_simple_paths, OperationGraph};
use crate::graph::{all_simple_paths, GraphEdge, GraphNode, OperationGraph};
use crate::models::file_types::FileTypes;
use crate::models::traits::*;
use petgraph::graphmap::UnGraphMap;
use crate::operation_management::{
load_changeset, load_changeset_dependencies, load_changeset_models,
};
use crate::views::patch::get_change_graph;
use petgraph::graphmap::{DiGraphMap, UnGraphMap};
use petgraph::visit::{Dfs, Reversed};
use petgraph::Direction;
use rusqlite::session::ChangesetIter;
use rusqlite::types::Value;
use rusqlite::Error as SQLError;
use rusqlite::{params, params_from_iter, Connection, Result as SQLResult, Row};
use serde::{Deserialize, Serialize};
use std::collections::HashSet;
use std::collections::{HashMap, HashSet};
use std::io::Read;
use std::string::ToString;
use thiserror::Error;

#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)]
pub struct Operation {
Expand All @@ -19,6 +27,12 @@ pub struct Operation {
pub change_type: String,
}

#[derive(Debug, Error, PartialEq)]
pub enum OperationError {
#[error("SQLite Error: {0}")]
SqliteError(#[from] SQLError),
}

impl Operation {
pub fn create(
conn: &Connection,
Expand Down Expand Up @@ -106,6 +120,23 @@ impl Operation {
graph
}

pub fn get_change_graph(
conn: &Connection,
hash: &str,
) -> Result<HashMap<i64, DiGraphMap<GraphNode, GraphEdge>>, OperationError> {
let operation = Operation::get_by_hash(conn, hash)?;

let changeset = load_changeset(&operation);
let dependencies = load_changeset_dependencies(&operation);

let input: &mut dyn Read = &mut changeset.as_slice();
let mut iter = ChangesetIter::start_strm(&input).unwrap();

let new_models = load_changeset_models(&mut iter);

Ok(get_change_graph(&new_models, &dependencies))
}

pub fn get_path_between(
conn: &Connection,
source_id: &str,
Expand Down Expand Up @@ -160,19 +191,11 @@ impl Operation {
patch_path
}

pub fn get(conn: &Connection, query: &str, placeholders: Vec<Value>) -> SQLResult<Operation> {
let mut stmt = conn.prepare(query).unwrap();
let mut rows = stmt.query_map(params_from_iter(placeholders), |row| {
Ok(Self::process_row(row))
})?;
rows.next().unwrap()
}

pub fn get_by_hash(conn: &Connection, op_hash: &str) -> SQLResult<Operation> {
Operation::get(
conn,
"select * from operation where hash LIKE ?1",
vec![Value::from(format!("{op_hash}%"))],
params![Value::from(format!("{op_hash}%"))],
)
}
}
Expand Down
177 changes: 44 additions & 133 deletions src/views/block_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use crate::models::{block_group::BlockGroup, node::Node, traits::Query};
use crate::views::block_group_viewer::{NavDirection, PlotParameters, Viewer};
use crate::views::block_group_viewer::{PlotParameters, Viewer};
use rusqlite::{params, Connection};

use core::panic;
use std::error::Error;
use std::time::{Duration, Instant};

use crossterm::{
event::{self, KeyCode, KeyEventKind, KeyModifiers},
event::{self, KeyCode, KeyEventKind},
execute,
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
};
Expand Down Expand Up @@ -93,53 +93,67 @@ pub fn view_block_group(
// The outer layout is a vertical split between the canvas and the status bar
let outer_layout = ratatui::layout::Layout::default()
.direction(ratatui::layout::Direction::Vertical)
.constraints(vec!
[
ratatui::layout::Constraint::Min(1),
ratatui::layout::Constraint::Length(status_bar_height),
]
)
.constraints(vec![
ratatui::layout::Constraint::Min(1),
ratatui::layout::Constraint::Length(status_bar_height),
])
.split(frame.area());

// The inner layout is a vertical split between the canvas and the panel
let inner_layout = ratatui::layout::Layout::default()
.direction(ratatui::layout::Direction::Vertical)
.constraints(vec!
[
Constraint::Percentage(75),
Constraint::Percentage(25),
]
)
.constraints(vec![Constraint::Percentage(75), Constraint::Percentage(25)])
.split(outer_layout[0]);

let canvas_area = if show_panel { inner_layout[0] } else { outer_layout[0] };
let panel_area = if show_panel { inner_layout[1] } else { Rect::default() };
let canvas_area = if show_panel {
inner_layout[0]
} else {
outer_layout[0]
};
let panel_area = if show_panel {
inner_layout[1]
} else {
Rect::default()
};
let status_bar_area = outer_layout[1];

// Ask the viewer to paint the canvas
viewer.paint_canvas(frame, canvas_area);

let status_message = format!(
"{message} | return: show information on block | q=quit",
message = Viewer::get_status_line()
);
// Status bar
let status_bar_contents = format!(
"{:width$}",
"◀ ▼ ▲ ▶ select blocks (+shift/alt to scroll) | +/- zoom | return: show information on block | q=quit",
width = status_bar_area.width as usize);
"{status_message:width$}",
width = status_bar_area.width as usize
);

let status_bar = Paragraph::new(Text::styled(status_bar_contents,
Style::default().bg(Color::DarkGray).fg(Color::White)));
let status_bar = Paragraph::new(Text::styled(
status_bar_contents,
Style::default().bg(Color::DarkGray).fg(Color::White),
));

frame.render_widget(status_bar, status_bar_area);

// Ask the viewer to paint the canvas
viewer.draw(frame, canvas_area);

// Panel
if show_panel {
let panel_block = Block::bordered().padding(Padding::new(2, 2, 1, 1)).title("Details");
let panel_block = Block::bordered()
.padding(Padding::new(2, 2, 1, 1))
.title("Details");
let mut panel_text = Text::from("No content found");

// Get information about the currently selected block
if viewer.state.selected_block.is_some() {
let selected_block = viewer.state.selected_block.unwrap();
panel_text = Text::from(format!("Block ID: {}\nNode ID: {}\nStart: {}\nEnd: {}\n",
selected_block.block_id, selected_block.node_id, selected_block.sequence_start, selected_block.sequence_end));
panel_text = Text::from(format!(
"Block ID: {}\nNode ID: {}\nStart: {}\nEnd: {}\n",
selected_block.block_id,
selected_block.node_id,
selected_block.sequence_start,
selected_block.sequence_end
));
}

let panel_content = Paragraph::new(panel_text)
Expand Down Expand Up @@ -171,111 +185,6 @@ pub fn view_block_group(
break;
}
match key.code {
// Scrolling through the graph
KeyCode::Left => {
if key.modifiers.contains(KeyModifiers::SHIFT) {
viewer.state.offset_x -= viewer.state.viewport.width as i32 / 3;
viewer.unselect_if_not_visible();
} else if key.modifiers.contains(KeyModifiers::ALT) {
viewer.state.offset_x -= 1;
} else {
// If no block is selected, select the center block
if viewer.state.selected_block.is_none() {
viewer.select_center_block();
}
viewer.move_selection(NavDirection::Left);
}
}
KeyCode::Right => {
if key.modifiers.contains(KeyModifiers::SHIFT) {
viewer.state.offset_x += viewer.state.viewport.width as i32 / 3;
viewer.unselect_if_not_visible();
} else if key.modifiers.contains(KeyModifiers::ALT) {
viewer.state.offset_x += 1;
} else {
if viewer.state.selected_block.is_none() {
viewer.select_center_block();
}
viewer.move_selection(NavDirection::Right);
}
}
KeyCode::Up => {
if key.modifiers.contains(KeyModifiers::SHIFT) {
viewer.state.offset_y += viewer.state.viewport.height as i32 / 3;
viewer.unselect_if_not_visible();
} else if key.modifiers.contains(KeyModifiers::ALT) {
viewer.state.offset_y += 1;
} else {
if viewer.state.selected_block.is_none() {
viewer.select_center_block();
}
viewer.move_selection(NavDirection::Down);
}
}
KeyCode::Down => {
if key.modifiers.contains(KeyModifiers::SHIFT) {
viewer.state.offset_y -= viewer.state.viewport.height as i32 / 3;
viewer.unselect_if_not_visible();
} else if key.modifiers.contains(KeyModifiers::ALT) {
viewer.state.offset_y -= 1;
} else {
if viewer.state.selected_block.is_none() {
viewer.select_center_block();
}
viewer.move_selection(NavDirection::Up);
}
}
// Zooming in and out
KeyCode::Char('+') | KeyCode::Char('=') => {
// Increase how much of the sequence is shown in each block label.
if viewer.parameters.label_width == u32::MAX {
viewer.parameters.scale += 1;
} else {
viewer.parameters.label_width = match viewer.parameters.label_width
{
1 => 11,
11 => 100,
100 => u32::MAX,
_ => u32::MAX,
}
}

// If no block is selected, select the center block
if viewer.state.selected_block.is_none() {
viewer.select_center_block();
}

// Recalculate the layout.
viewer
.scaled_layout
.refresh(&viewer.base_layout, &viewer.parameters);
viewer.center_on_block(viewer.state.selected_block.unwrap());
}
KeyCode::Char('-') | KeyCode::Char('_') => {
// Decrease how much of the sequence is shown in each block label.
if viewer.parameters.scale > 2 {
viewer.parameters.scale -= 1;
} else {
viewer.parameters.label_width = match viewer.parameters.label_width
{
u32::MAX => 100,
100 => 11,
11 => 1,
_ => 1,
};
}

// If no block is selected, select the center block
if viewer.state.selected_block.is_none() {
viewer.select_center_block();
}

// Recalculate the layout.
viewer
.scaled_layout
.refresh(&viewer.base_layout, &viewer.parameters);
viewer.center_on_block(viewer.state.selected_block.unwrap());
}
// Performing actions on blocks
KeyCode::Tab => {
// Future implementation: switch between panels
Expand All @@ -290,7 +199,9 @@ pub fn view_block_group(
// Show information on the selected block, if there is one
show_panel = viewer.state.selected_block.is_some();
}
_ => {}
_ => {
viewer.handle_input(key);
}
}
}
}
Expand Down
Loading