Skip to content
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

Make arrows stable #57

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make arrows stable #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions src/screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::{
pub struct Screen {
pub max_id: u64,
pub nodes: HashMap<NodeID, Node>,
pub arrows: Vec<(NodeID, NodeID)>,
pub arrows: Vec<(NodeID, NodeID, String)>,
pub work_path: Option<String>,
pub autosave_every: usize,
pub config: Config,
Expand Down Expand Up @@ -849,7 +849,7 @@ impl Screen {
if let Some(node) = self.nodes.remove(&node_id) {
// clean up any arrow state
self.arrows
.retain(|&(ref from, ref to)| from != &node_id && to != &node_id);
.retain(|&(ref from, ref to, _)| from != &node_id && to != &node_id);

// remove from tag_db
self.tag_db.remove(node_id);
Expand Down Expand Up @@ -1625,7 +1625,7 @@ impl Screen {

debug!("testing that all arrows are existing nodes");
// no arrows that don't exist
for &(ref a, ref b) in &self.arrows {
for &(ref a, ref b, _) in &self.arrows {
assert!(self.nodes.get(a).is_some());
assert!(self.nodes.get(b).is_some());
}
Expand Down Expand Up @@ -1673,10 +1673,10 @@ impl Screen {
return;
}
let from = self.drawing_arrow.take().unwrap();
if let Some(arrow) = self.selected.map(|to| (from, to)) {
let (from, to) = arrow;
if let Some(arrow) = self.selected.map(|to| (from, to, random_fg_color())) {
let (from, to, _) = arrow;
if self.nodes.get(&from).is_some() && self.nodes.get(&to).is_some() {
let contains = self.arrows.iter().fold(false, |acc, &(ref nl1, ref nl2)| {
let contains = self.arrows.iter().fold(false, |acc, &(ref nl1, ref nl2, _)| {
if nl1 == &from && nl2 == &to {
true
} else {
Expand Down Expand Up @@ -1764,9 +1764,9 @@ impl Screen {
}

// print arrows
for &(ref from, ref to) in &self.arrows {
for &(ref from, ref to, ref color) in &self.arrows {
let (path, (direction1, direction2)) = self.path_between_nodes(*from, *to);
self.draw_path(path, direction1, direction2);
self.draw_path(path, direction1, direction2, color);
}

// conditionally print drag dest arrow
Expand All @@ -1778,11 +1778,11 @@ impl Screen {
if let Some(to_node) = self.lookup(to) {
let (path, (direction1, direction2)) =
self.path_between_nodes(*from_node, *to_node);
self.draw_path(path, direction1, direction2);
self.draw_path(path, direction1, direction2, &random_fg_color());
} else {
let (path, (direction1, direction2)) =
self.path_from_node_to_point(*from_node, to);
self.draw_path(path, direction1, direction2);
self.draw_path(path, direction1, direction2, &random_fg_color());
}
} else {
warn!("dragging_from set, but NOT dragging_to");
Expand Down Expand Up @@ -1992,13 +1992,13 @@ impl Screen {
drawn
}

fn draw_path(&self, internal_path: Vec<Coords>, start_dir: Dir, dest_dir: Dir) {
fn draw_path(&self, internal_path: Vec<Coords>, start_dir: Dir, dest_dir: Dir, color: &str) {
let path: Vec<_> = internal_path
.iter()
.filter_map(|&c| self.internal_to_screen_xy(c))
.collect();
trace!("draw_path({:?}, {:?}, {:?})", path, start_dir, dest_dir);
print!("{}", random_fg_color());
print!("{}", color);
if path.len() == 1 {
print!("{} ↺", cursor::Goto(path[0].0, path[0].1))
} else if path.len() > 1 {
Expand Down
4 changes: 2 additions & 2 deletions src/serialization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub fn serialize_screen(screen: &Screen) -> Vec<u8> {
let arrows = screen
.arrows
.iter()
.map(|&(from, to)| {
.map(|&(from, to, _)| {
let mut arrow_pb = pb::Arrow::default();
arrow_pb.set_from_node(from);
arrow_pb.set_to_node(to);
Expand Down Expand Up @@ -127,7 +127,7 @@ pub fn deserialize_screen(data: Vec<u8>) -> Result<Screen, protobuf::ProtobufErr
.map(|arrow_pb| {
let from = arrow_pb.get_from_node();
let to = arrow_pb.get_to_node();
(from, to)
(from, to, random_fg_color())
})
.collect();
Ok(screen)
Expand Down