From: ian <ian>
Date: Sat, 23 Oct 2004 20:04:45 +0000 (+0000)
Subject: an attempt at making A5 and A6 P and J points distinct; but does not work - see TODO
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=958f96c180704125bd8fd4cc567af67288106027;p=trains.git

an attempt at making A5 and A6 P and J points distinct; but does not work - see TODO
---

diff --git a/TODO b/TODO
index 7ae2cb9..1bc6634 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,10 @@ layout polarity diagram colourful segment encoding:
  wire layout diagram thing into Tcl and see speed etc.
  make moveable feature selection in subseg2display bitwise rather than
   setwise
- fix points on A5 and A6 so that J points are separate from M points
+
+fix points on A5 and A6 so that J points are separate from M points
+  done that but it's not coming out right.  the p0.segenco.ppm has
+  the right encodings for the different points but they are displaying
+  the same so must check subseg2display and test-ui
 
 1. Write lots and lots and lots of PIC programs
diff --git a/layout/ours.m4 b/layout/ours.m4
index d79df8d..6c3154f 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -160,15 +160,19 @@ part bot_0mx cross_pecof_s bl
 extend -bot_0mx_br -bot_0rj_b len 8
 
 segment -A5
+segmap A5/P J
 part bot_0rj ^pt_main_r b
 join bot_0rm_a bot_0rj_c 450
+segmap A5/P P
 
 rel bot_0mx_tr -bot_0lj_b
 
 segment A6
+segmap A6/P J
 part bot_0lj pt_main_r b
+segmap A6/P P
 
-segment -A5/P0 53 -A6/P0
+segment -A5/J0 53 -A6/J0
 join bot_0rj_a -bot_0lj_a 450
 
 segment -A6