diff --git a/src/bin/topola-sdl2-demo/main.rs b/src/bin/topola-sdl2-demo/main.rs index a0b8cc5..742ff14 100644 --- a/src/bin/topola-sdl2-demo/main.rs +++ b/src/bin/topola-sdl2-demo/main.rs @@ -87,22 +87,6 @@ enum RouterOrLayout<'a, R: RulesTrait> { Layout(Arc>>), } -struct EmptyRouterObserver; - -impl RouterObserverTrait for EmptyRouterObserver { - fn on_rework(&mut self, _tracer: &Tracer, _trace: &Trace) {} - fn before_probe(&mut self, _tracer: &Tracer, _trace: &Trace, _edge: NavmeshEdgeReference) {} - fn on_probe( - &mut self, - _tracer: &Tracer, - _trace: &Trace, - _edge: NavmeshEdgeReference, - _result: Result<(), DrawException>, - ) { - } - fn on_estimate(&mut self, _tracer: &Tracer, _vertex: VertexIndex) {} -} - struct DebugRouterObserver<'a> { event_pump: &'a mut sdl2::EventPump, window: &'a Window, @@ -262,7 +246,9 @@ fn main() -> Result<(), anyhow::Error> { ]), }));*/ - let design = DsnDesign::load_from_file("tests/data/0603_breakout/0603_breakout.dsn")?; + let design = DsnDesign::load_from_file( + "tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.dsn", + )?; //let design = DsnDesign::load_from_file("tests/data/test/test.dsn")?; //dbg!(&design); let layout = Arc::new(Mutex::new(design.make_layout())); diff --git a/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female-backups/de9_tht_female_tht_female-2024-05-11_150104.zip b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female-backups/de9_tht_female_tht_female-2024-05-11_150104.zip new file mode 100644 index 0000000..6cbe20b Binary files /dev/null and b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female-backups/de9_tht_female_tht_female-2024-05-11_150104.zip differ diff --git a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.dsn b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.dsn similarity index 99% rename from tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.dsn rename to tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.dsn index 0bcaba8..3da789d 100644 --- a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.dsn +++ b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.dsn @@ -1,4 +1,4 @@ -(pcb /home/mikolaj/proj/topola/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.dsn +(pcb /home/mikolaj/proj/topola/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.dsn (parser (string_quote ") (space_in_quoted_tokens on) diff --git a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_pcb b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_pcb similarity index 99% rename from tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_pcb rename to tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_pcb index 0f147be..0a2179c 100644 --- a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_pcb +++ b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_pcb @@ -156,7 +156,7 @@ (property ki_fp_filters "DSUB*Female*") (path "/8013bc03-7ea4-4584-996e-6232d4bc171c") (sheetname "Root") - (sheetfile "de9_tht_female_tht_female.kicad_sch") + (sheetfile "de9_tht_female_to_tht_female.kicad_sch") (attr through_hole) (fp_line (start 3.07 7.78) @@ -997,7 +997,7 @@ (property ki_fp_filters "DSUB*Female*") (path "/58f03954-5a09-4a36-97c8-68071de3aeab") (sheetname "Root") - (sheetfile "de9_tht_female_tht_female.kicad_sch") + (sheetfile "de9_tht_female_to_tht_female.kicad_sch") (attr through_hole) (fp_line (start -14.15 7.78) diff --git a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_prl b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_prl similarity index 95% rename from tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_prl rename to tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_prl index edfa7f0..8946f23 100644 --- a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_prl +++ b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_prl @@ -74,7 +74,7 @@ "ssh_key": "" }, "meta": { - "filename": "de9_tht_female_tht_female.kicad_prl", + "filename": "de9_tht_female_to_tht_female.kicad_prl", "version": 3 }, "project": { diff --git a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_pro b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_pro similarity index 99% rename from tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_pro rename to tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_pro index 7e94e5b..08d13a0 100644 --- a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_pro +++ b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_pro @@ -430,7 +430,7 @@ "pinned_symbol_libs": [] }, "meta": { - "filename": "de9_tht_female_tht_female.kicad_pro", + "filename": "de9_tht_female_to_tht_female.kicad_pro", "version": 1 }, "net_settings": { @@ -467,7 +467,7 @@ "netlist": "", "plot": "", "pos_files": "", - "specctra_dsn": "de9_tht_female_tht_female.dsn", + "specctra_dsn": "de9_tht_female_to_tht_female.dsn", "step": "", "svg": "", "vrml": "" diff --git a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_sch b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_sch similarity index 99% rename from tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_sch rename to tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_sch index fa8d42a..d0760b3 100644 --- a/tests/data/de9_tht_female_tht_female/de9_tht_female_tht_female.kicad_sch +++ b/tests/data/de9_tht_female_to_tht_female/de9_tht_female_to_tht_female.kicad_sch @@ -872,7 +872,7 @@ (uuid "2470e536-8251-42cc-b52f-556944d3120f") ) (instances - (project "de9_tht_female_tht_female" + (project "de9_tht_female_to_tht_female" (path "/e3e5797e-752b-4633-8c10-5bf78b070097" (reference "J2") (unit 1) @@ -961,7 +961,7 @@ (uuid "9680cc24-7906-4fa2-b70d-e653122e4f83") ) (instances - (project "de9_tht_female_tht_female" + (project "de9_tht_female_to_tht_female" (path "/e3e5797e-752b-4633-8c10-5bf78b070097" (reference "J1") (unit 1) diff --git a/tests/data/de9_tht_female_tht_female/fp-info-cache b/tests/data/de9_tht_female_to_tht_female/fp-info-cache similarity index 100% rename from tests/data/de9_tht_female_tht_female/fp-info-cache rename to tests/data/de9_tht_female_to_tht_female/fp-info-cache diff --git a/tests/data/de9_tht_female_to_tht_female/~de9_tht_female_to_tht_female.kicad_pcb.lck b/tests/data/de9_tht_female_to_tht_female/~de9_tht_female_to_tht_female.kicad_pcb.lck new file mode 100644 index 0000000..5cac09d --- /dev/null +++ b/tests/data/de9_tht_female_to_tht_female/~de9_tht_female_to_tht_female.kicad_pcb.lck @@ -0,0 +1 @@ +{"hostname":"luckmann","username":"mikolaj"} \ No newline at end of file