Release candidate 3; adjusted colours and a test

Author: an-Iceberg

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rust_graph_visualiser"
-version = "1.9.2"
+version = "1.9.3"
 edition = "2021"
 authors = ["Sandra"]
 repository = "https://github.com/an-Iceberg/rust_graph_visualiser"

Cargo.toml

@@ -439,7 +439,7 @@ impl DijkstraGraph
     self.add_line(13, 2, 1);
     self.add_line(15, 8, 10);
     self.add_line(14, 8, 14);
-    self.add_line(1, 18, 10); // TODO: reduce length to 9
+    self.add_line(1, 18, 9);
     self.add_line(17, 18, 3);
     self.add_line(16, 17, 2);
     self.add_line(7, 3, 1);

src/graph.rs

@@ -35,8 +35,8 @@ pub(crate) const BG_COLOR: u32 = 0x400080;
 pub(crate) const PATH_COLOR: u32 = 0x00ff00;
 pub(crate) const LINE_COLOR: u32 = 0x00c0c0;
 pub(crate) const POINT_COLOR: u32 = 0xff8000;
-pub(crate) const LINE_LENGTH_COLOR: u32 = 0xc09a9a;
-pub(crate) const  UI_SPACE: f32 = 225.;
+pub(crate) const LINE_LENGTH_COLOR: u32 = 0xc09ac0;
+pub(crate) const  UI_SPACING: f32 = 229.;
 
 #[macroquad::main(window_configuration)]
 async fn main()

src/main.rs

@@ -310,8 +310,8 @@ fn shortest_path_large_b()
   let mut graph = DijkstraGraph::new();
   graph.insert_large_graph();
 
-  // TODO: add second valid path
-  let should_path = vec![6, 4, 1, 2, 16, 17, 18];
+  let should_path1 = vec![6, 4, 1, 2, 16, 17, 18];
+  let should_path2 = vec![6, 4, 1, 18];
 
   graph.set_start(6);
   graph.set_end(18);
@@ -323,9 +323,10 @@ fn shortest_path_large_b()
     Some(path) =>
     {
       path.iter()
-        .zip(should_path.iter())
-        .for_each(|(path_id, should_id)|
-        { assert_eq!(*path_id, *should_id); });
+        .zip(should_path1.iter())
+        .zip(should_path2.iter())
+        .for_each(|((path_id, should_id1), should_id2)|
+        { assert!(*path_id == *should_id1 || *path_id == *should_id2); });
     },
     None => panic!("A path should have been found"),
   }

src/tests/graph_tests.rs

@@ -1,4 +1,6 @@
-use crate::{graph::DijkstraGraph, Mode, VERSION, AUTHORS, UI_SPACE};
+use std::ops::Mul;
+
+use crate::{graph::DijkstraGraph, Mode, VERSION, AUTHORS, UI_SPACING};
 
 use egui_macroquad::{
   egui::{epaint::Shadow, Align2, Rounding, Slider, Vec2, Visuals, Window, Color32, Stroke},
@@ -35,7 +37,7 @@ pub(crate) fn paint_ui(
       },
       window_fill: Color32::from_rgb(32, 0, 64),
       window_stroke: Stroke::new(2., Color32::from_rgb(0, 192, 192)),
-      override_text_color: Some(Color32::from_rgb(216, 167, 215)),
+      override_text_color: Some(Color32::from_rgb(255, 210, 255)),
       // widgets: Widgets::style(&self, response),
       ..Default::default()
     });
@@ -114,11 +116,11 @@ pub(crate) fn paint_ui(
 
         ui.add_space(match (&mode, selected_point_id)
         {
-          (Mode::Move, _) => UI_SPACE,
-          (Mode::Line, None) => UI_SPACE-33.,
-          (Mode::Line, Some(_)) => UI_SPACE-75.,
-          (Mode::Point, _) => UI_SPACE-14.,
-          (Mode::Path, _) => UI_SPACE-58.
+          (Mode::Move, _) => UI_SPACING,
+          (Mode::Line, None) => UI_SPACING-33.,
+          (Mode::Line, Some(_)) => UI_SPACING-75.,
+          (Mode::Point, _) => UI_SPACING-14.,
+          (Mode::Path, _) => UI_SPACING-58.
         });
 
         ui.separator();
@@ -139,14 +141,10 @@ pub(crate) fn paint_ui(
         ui.separator();
         ui.heading("✨Style✨");
         ui.separator();
+        ui.checkbox(hexagons, "Hexagons");
+        ui.separator();
 
-        ui.horizontal(|ui|
-        {
-          // TODO: print angle as plain text
-          ui.label("Angle:");
-          ui.add_enabled_ui(false, |ui|
-          { ui.drag_angle(angle); });
-        });
+        ui.label(format!("Angle: {:.2}°", angle.mul(180./3.14159265)));
 
         ui.horizontal(|ui|
         {
@@ -184,10 +182,6 @@ pub(crate) fn paint_ui(
           if ui.button("Reset").clicked() { *path_thickness = 2.0; }
         });
 
-        ui.separator();
-
-        ui.checkbox(hexagons, "Hexagons");
-
         /*
         ui.separator();