berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

egui,autorouter: restore displaying navmesh

This commit is contained in:
Mikolaj Wielgus 2024-07-01 00:50:24 +02:00
parent ee6eeac6d8
commit 2259a75d92
9 changed files with 125 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/autorouter/autoroute.rs
View File

@ -1,7 +1,7 @@
use petgraph::graph::EdgeIndex;
use crate::{
autorouter::{Autorouter, AutorouterError, AutorouterStatus},
autorouter::{invoker::GetMaybeNavmesh, Autorouter, AutorouterError, AutorouterStatus},
board::mesadata::MesadataTrait,
router::{navmesh::Navmesh, route::Route, Router, RouterStatus},
};
@ -40,10 +40,15 @@ impl Autoroute {
autorouter: &mut Autorouter<M>,
) -> Result<AutorouterStatus, AutorouterError> {
let Some(ref mut route) = self.route else {
// Shouldn't happen.
return Ok(AutorouterStatus::Finished);
};
let (source, target) = autorouter.ratline_endpoints(self.cur_ratline.unwrap());
let Some(cur_ratline) = self.cur_ratline else {
return Ok(AutorouterStatus::Finished);
};
let (source, target) = autorouter.ratline_endpoints(cur_ratline);
let band = {
let mut router = Router::new(autorouter.board.layout_mut());
@ -63,7 +68,6 @@ impl Autoroute {
.try_set_band_between_nodes(source, target, band);
let Some(new_ratline) = self.ratlines_iter.next() else {
self.route = None;
self.cur_ratline = None;
return Ok(AutorouterStatus::Finished);
};
@ -81,3 +85,9 @@ impl Autoroute {
self.route.as_ref().map(|route| route.navmesh())
}
}
impl GetMaybeNavmesh for Autoroute {
fn maybe_navmesh(&self) -> Option<&Navmesh> {
self.route.as_ref().map(|route| route.navmesh())
}
}

47
src/autorouter/invoker.rs
View File

@ -1,4 +1,5 @@
use contracts::debug_requires;
use enum_dispatch::enum_dispatch;
use serde::{Deserialize, Serialize};
use thiserror::Error;
@ -12,8 +13,14 @@ use crate::{
},
board::mesadata::MesadataTrait,
layout::via::ViaWeight,
router::navmesh::Navmesh,
};
#[enum_dispatch]
pub trait GetMaybeNavmesh {
fn maybe_navmesh(&self) -> Option<&Navmesh>;
}
#[derive(Error, Debug, Clone)]
pub enum InvokerError {
#[error(transparent)]
@ -22,6 +29,7 @@ pub enum InvokerError {
Autorouter(#[from] AutorouterError),
}
#[derive(Debug, Clone, Copy)]
pub enum InvokerStatus {
Running,
Finished,
@ -33,6 +41,7 @@ pub enum Command {
PlaceVia(ViaWeight),
}
#[enum_dispatch(GetMaybeNavmesh)]
pub enum Execute {
Autoroute(Autoroute),
PlaceVia(PlaceVia),
@ -46,7 +55,10 @@ impl Execute {
match self.step_catch_err(invoker) {
Ok(InvokerStatus::Running) => Ok(InvokerStatus::Running),
Ok(InvokerStatus::Finished) => {
invoker.history.do_(invoker.ongoing_command.take().unwrap());
if let Some(command) = invoker.ongoing_command.take() {
invoker.history.do_(command);
}
Ok(InvokerStatus::Finished)
}
Err(err) => {
@ -73,6 +85,39 @@ impl Execute {
}
}
pub struct ExecuteWithStatus {
execute: Execute,
maybe_status: Option<InvokerStatus>,
}
impl ExecuteWithStatus {
pub fn new(execute: Execute) -> ExecuteWithStatus {
Self {
execute,
maybe_status: None,
}
}
pub fn step<M: MesadataTrait>(
&mut self,
invoker: &mut Invoker<M>,
) -> Result<InvokerStatus, InvokerError> {
let status = self.execute.step(invoker)?;
self.maybe_status = Some(status);
Ok(status)
}
pub fn maybe_status(&self) -> Option<InvokerStatus> {
self.maybe_status
}
}
impl GetMaybeNavmesh for ExecuteWithStatus {
fn maybe_navmesh(&self) -> Option<&Navmesh> {
self.execute.maybe_navmesh()
}
}
pub struct Invoker<M: MesadataTrait> {
autorouter: Autorouter<M>,
history: History,

10
src/autorouter/place_via.rs
View File

@ -1,9 +1,11 @@
use crate::{
autorouter::{Autorouter, AutorouterError},
autorouter::{invoker::GetMaybeNavmesh, Autorouter, AutorouterError},
board::mesadata::MesadataTrait,
layout::via::ViaWeight,
router::navmesh::Navmesh,
};
#[derive(Debug)]
pub struct PlaceVia {
weight: ViaWeight,
}
@ -20,3 +22,9 @@ impl PlaceVia {
autorouter.place_via(self.weight)
}
}
impl GetMaybeNavmesh for PlaceVia {
fn maybe_navmesh(&self) -> Option<&Navmesh> {
None
}
}

10
src/bin/topola-egui/app.rs
View File

@ -13,7 +13,7 @@ use std::{
use topola::{
autorouter::{
invoker::{Command, Execute, Invoker, InvokerStatus},
invoker::{Command, Execute, ExecuteWithStatus, Invoker, InvokerStatus},
Autorouter,
},
drawing::{
@ -56,7 +56,7 @@ pub struct App {
arc_mutex_maybe_invoker: Arc<Mutex<Option<Invoker<SpecctraMesadata>>>>,
#[serde(skip)]
maybe_execute: Option<Execute>,
maybe_execute: Option<ExecuteWithStatus>,
#[serde(skip)]
text_channel: (Sender<String>, Receiver<String>),
@ -129,11 +129,6 @@ impl App {
Ok(status) => status,
Err(err) => return,
};
if let InvokerStatus::Finished = status {
self.maybe_execute = None;
return;
}
}
}
}
@ -167,6 +162,7 @@ impl eframe::App for App {
ctx,
&self.top,
&mut self.arc_mutex_maybe_invoker.lock().unwrap(),
&mut self.maybe_execute,
&mut self.maybe_overlay,
&self.maybe_layers,
);

13
src/bin/topola-egui/top.rs
View File

@ -4,7 +4,7 @@ use std::{
};
use topola::{
autorouter::invoker::{Command, Execute, Invoker, InvokerStatus},
autorouter::invoker::{Command, Execute, ExecuteWithStatus, Invoker, InvokerStatus},
specctra::mesadata::SpecctraMesadata,
};
@ -33,7 +33,7 @@ impl Top {
ctx: &egui::Context,
sender: Sender<String>,
arc_mutex_maybe_invoker: Arc<Mutex<Option<Invoker<SpecctraMesadata>>>>,
maybe_execute: &mut Option<Execute>,
maybe_execute: &mut Option<ExecuteWithStatus>,
maybe_overlay: &Option<Overlay>,
) {
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
@ -116,14 +116,17 @@ impl Top {
ui.separator();
if ui.button("Autoroute").clicked() {
if maybe_execute.is_none() {
if maybe_execute.as_mut().map_or(true, |execute| {
matches!(execute.maybe_status(), Some(InvokerStatus::Finished))
}) {
if let (Some(invoker), Some(ref overlay)) = (
arc_mutex_maybe_invoker.lock().unwrap().as_mut(),
maybe_overlay,
) {
let selection = overlay.selection().clone();
maybe_execute
.insert(invoker.execute_walk(Command::Autoroute(selection)));
maybe_execute.insert(ExecuteWithStatus::new(
invoker.execute_walk(Command::Autoroute(selection)),
));
}
}
}

15
src/bin/topola-egui/viewport.rs
View File

@ -1,7 +1,7 @@
use geo::point;
use petgraph::visit::{EdgeRef, IntoEdgeReferences};
use topola::{
autorouter::invoker::{Command, Invoker},
autorouter::invoker::{Command, ExecuteWithStatus, GetMaybeNavmesh, Invoker},
board::mesadata::MesadataTrait,
drawing::{
graph::{MakePrimitive, PrimitiveIndex},
@ -31,6 +31,7 @@ impl Viewport {
ctx: &egui::Context,
top: &Top,
maybe_invoker: &mut Option<Invoker<SpecctraMesadata>>,
maybe_execute: &mut Option<ExecuteWithStatus>,
maybe_overlay: &mut Option<Overlay>,
maybe_layers: &Option<Layers>,
) -> egui::Rect {
@ -152,8 +153,9 @@ impl Viewport {
}
}
/*if top.show_navmesh {
if let Some(navmesh) = &shared_data.navmesh {
if top.show_navmesh {
if let Some(execute) = maybe_execute {
if let Some(navmesh) = execute.maybe_navmesh() {
for edge in navmesh.graph().edge_references() {
let from = PrimitiveIndex::from(navmesh.graph().node_weight(edge.source()).unwrap().node)
.primitive(board.layout().drawing())
@ -165,7 +167,7 @@ impl Viewport {
.center();
let stroke = 'blk: {
if let (Some(source_pos), Some(target_pos)) = (
/*if let (Some(source_pos), Some(target_pos)) = (
shared_data
.path
.iter()
@ -183,7 +185,7 @@ impl Viewport {
egui::Color32::from_rgb(250, 250, 0),
);
}
}
}*/
egui::Stroke::new(1.0, egui::Color32::from_rgb(125, 125, 125))
};
@ -192,8 +194,9 @@ impl Viewport {
}
}
}
}
for ghost in shared_data.ghosts.iter() {
/*for ghost in shared_data.ghosts.iter() {
painter.paint_primitive(&ghost, egui::Color32::from_rgb(75, 75, 150));
}

3
src/router/astar.rs
View File

@ -57,6 +57,7 @@ impl<K: PartialOrd, T> Ord for MinScored<K, T> {
}
}
#[derive(Debug)]
pub struct PathTracker<G>
where
G: GraphBase,
@ -111,6 +112,7 @@ where
fn estimate_cost(&mut self, graph: &G, node: G::NodeId) -> K;
}
#[derive(Debug)]
pub struct Astar<G, K>
where
G: GraphBase,
@ -131,6 +133,7 @@ pub enum AstarError {
NotFound,
}
#[derive(Debug)]
pub enum AstarStatus<G, K, R>
where
G: GraphBase,

1
src/router/route.rs
View File

@ -31,6 +31,7 @@ use crate::{
},
};
#[derive(Debug)]
pub struct Route {
astar: Astar<Navmesh, f64>,
trace: Trace,

3
src/router/router.rs
View File

@ -30,11 +30,13 @@ pub enum RouterError {
Astar(#[from] AstarError),
}
#[derive(Debug)]
pub enum RouterStatus {
Running,
Finished(BandFirstSegIndex),
}
#[derive(Debug)]
pub struct RouterAstarStrategy<'a, R: RulesTrait> {
pub tracer: Tracer<'a, R>,
pub trace: &'a mut Trace,
@ -142,6 +144,7 @@ impl<'a, R: RulesTrait> AstarStrategy<Navmesh, f64, BandFirstSegIndex>
}
}
#[derive(Debug)]
pub struct Router<'a, R: RulesTrait> {
layout: &'a mut Layout<R>,
}