chiark / gitweb /
trains.git
13 years agoours: rename segments from P* to * wip.phase-2-segments
Ian Jackson [Sun, 26 Dec 2010 19:34:49 +0000 (19:34 +0000)]
ours: rename segments from P* to *

13 years agoours.m4: minor segment assignment changes to correspond more closely to as built
Ian Jackson [Sun, 26 Dec 2010 19:29:09 +0000 (19:29 +0000)]
ours.m4: minor segment assignment changes to correspond more closely to as built

13 years agoours.wiring: correct movfeatposmap for PB9, so that P0J0 is straight through; P is...
Ian Jackson [Sat, 25 Dec 2010 17:03:55 +0000 (17:03 +0000)]
ours.wiring: correct movfeatposmap for PB9, so that P0J0 is straight through; P is junction to outside track; J is junction to fig-8

13 years agolayout/parts.i4: better comment for positions of slip2's
Ian Jackson [Sat, 25 Dec 2010 17:02:25 +0000 (17:02 +0000)]
layout/parts.i4: better comment for positions of slip2's

13 years agolayout/ours.wiring: remove dummy detection wiring specs as now we can specify points...
Ian Jackson [Fri, 24 Dec 2010 00:39:48 +0000 (00:39 +0000)]
layout/ours.wiring: remove dummy detection wiring specs as now we can specify points without corresponding detection

13 years agolayout/data2safety: ditch rather than mistake on point relating to unwired segment...
Ian Jackson [Fri, 24 Dec 2010 00:37:05 +0000 (00:37 +0000)]
layout/data2safety: ditch rather than mistake on point relating to unwired segment - but still count the point as present

13 years agolayout/data2safety: ditch rather than mistake on movfeatposmap of an unwired segment
Ian Jackson [Fri, 24 Dec 2010 00:36:28 +0000 (00:36 +0000)]
layout/data2safety: ditch rather than mistake on movfeatposmap of an unwired segment

13 years agolayout/data2safety: tiny improvement to autogenerated comment
Ian Jackson [Fri, 24 Dec 2010 00:29:33 +0000 (00:29 +0000)]
layout/data2safety: tiny improvement to autogenerated comment

13 years agolayout/Makefile: add for-pic to default target
Ian Jackson [Fri, 24 Dec 2010 00:28:49 +0000 (00:28 +0000)]
layout/Makefile: add for-pic to default target

13 years agoours.wiring: actual wiring for many phase 2 points; segment wiring for P* segments...
Ian Jackson [Mon, 20 Dec 2010 02:45:21 +0000 (02:45 +0000)]
ours.wiring: actual wiring for many phase 2 points; segment wiring for P* segments is still fiction

13 years agodetpic, wiring: add board 3, detectors (hardware tested and works)
Ian Jackson [Mon, 20 Dec 2010 02:44:31 +0000 (02:44 +0000)]
detpic, wiring: add board 3, detectors (hardware tested and works)

13 years agopcb/Makefile: build points-pin-alloc.{lout,ps} by default
Ian Jackson [Mon, 20 Dec 2010 01:16:21 +0000 (01:16 +0000)]
pcb/Makefile: build points-pin-alloc.{lout,ps} by default

13 years agoours.wiring: actual wiring for C9/P; PC9 detection is still a lie
Ian Jackson [Sun, 19 Dec 2010 22:23:28 +0000 (22:23 +0000)]
ours.wiring: actual wiring for C9/P; PC9 detection is still a lie

13 years agodetpic/Makefile: verify target does not echo echo command
Ian Jackson [Sun, 19 Dec 2010 18:46:08 +0000 (18:46 +0000)]
detpic/Makefile: verify target does not echo echo command

13 years agodetpic/Makefile: honour TTY variable
Ian Jackson [Sun, 19 Dec 2010 18:45:57 +0000 (18:45 +0000)]
detpic/Makefile: honour TTY variable

13 years agodetpic/Makefile: add a useful comment pointing to pic.make
Ian Jackson [Sun, 19 Dec 2010 18:45:44 +0000 (18:45 +0000)]
detpic/Makefile: add a useful comment pointing to pic.make

13 years agolayout/data2safety: Transfer description of movfeatposmap, now implemented, from...
Ian Jackson [Mon, 13 Dec 2010 02:10:40 +0000 (02:10 +0000)]
layout/data2safety: Transfer description of movfeatposmap, now implemented, from TODO.slip-multi-movfeat

13 years agolayout/plan-to-gui-data: when $t{Edge}, adjust boundaries of background, to make...
Ian Jackson [Sun, 12 Dec 2010 12:54:56 +0000 (12:54 +0000)]
layout/plan-to-gui-data: when $t{Edge}, adjust boundaries of background, to make sure we cover everything (avoids GraphicsExpose event in gui-plan due to background pixmap not covering whole screen

13 years agolayout/plan-to-gui-data: xpmdata_pixel supports $pcharstr=undef, to simply adjust...
Ian Jackson [Sun, 12 Dec 2010 12:53:57 +0000 (12:53 +0000)]
layout/plan-to-gui-data: xpmdata_pixel supports $pcharstr=undef, to simply adjust boundaries

13 years agohostside/gui-plan: break XCopyArea calls out into own function to aid debugging ...
Ian Jackson [Sun, 12 Dec 2010 12:07:35 +0000 (12:07 +0000)]
hostside/gui-plan: break XCopyArea calls out into own function to aid debugging (no functional change)

13 years agohostside/gui-plan: special die handler for GrapicsExpose events (no change other...
Ian Jackson [Sun, 12 Dec 2010 12:06:55 +0000 (12:06 +0000)]
hostside/gui-plan: special die handler for GrapicsExpose events (no change other than in die path)

13 years agohostside/gui-plan: rename w to win and d to display (no functional changes)
Ian Jackson [Sun, 12 Dec 2010 12:04:54 +0000 (12:04 +0000)]
hostside/gui-plan: rename w to win and d to display (no functional changes)

13 years agolayout/ours.wiring: dummy wiring for PB9 for software testing
Ian Jackson [Sun, 12 Dec 2010 12:08:53 +0000 (12:08 +0000)]
layout/ours.wiring: dummy wiring for PB9 for software testing

13 years agolayout/data2safety: use new $desc variable for error reporting - no serious functiona...
Ian Jackson [Sun, 12 Dec 2010 02:07:14 +0000 (02:07 +0000)]
layout/data2safety: use new $desc variable for error reporting - no serious functional change intended other than possible improvements to error messages

13 years agolayout/data2safety: honour movfeatposmap on input and output, and check that we used...
Ian Jackson [Sun, 12 Dec 2010 02:05:59 +0000 (02:05 +0000)]
layout/data2safety: honour movfeatposmap on input and output, and check that we used it all

13 years agolayout/data2safety: when constructing SegmentInfo.pname, sort movfeats into alphabeti...
Ian Jackson [Sun, 12 Dec 2010 02:04:51 +0000 (02:04 +0000)]
layout/data2safety: when constructing SegmentInfo.pname, sort movfeats into alphabetical order

13 years agolayout/data2safety: parse movfeatposmap (but actual implementation still lacking)
Ian Jackson [Sun, 12 Dec 2010 01:21:27 +0000 (01:21 +0000)]
layout/data2safety: parse movfeatposmap (but actual implementation still lacking)

13 years agolayout/data2safety: improve TODO.slip-multi-movfeat plan
Ian Jackson [Sun, 12 Dec 2010 01:20:49 +0000 (01:20 +0000)]
layout/data2safety: improve TODO.slip-multi-movfeat plan

13 years agolayout/data2safety: improve another error report
Ian Jackson [Sun, 12 Dec 2010 01:19:17 +0000 (01:19 +0000)]
layout/data2safety: improve another error report

13 years agolayout/data2safety: improve some error reports
Ian Jackson [Sun, 12 Dec 2010 01:17:55 +0000 (01:17 +0000)]
layout/data2safety: improve some error reports

13 years agolayout/ours.m4: provisional phase 2 - adjust for fouling overlaps at converging junctions
Ian Jackson [Sun, 5 Dec 2010 11:52:39 +0000 (11:52 +0000)]
layout/ours.m4: provisional phase 2 - adjust for fouling overlaps at converging junctions

13 years agolayout/ours.m4: Add a scale to the diagrams.
Ian Jackson [Sun, 5 Dec 2010 11:05:29 +0000 (11:05 +0000)]
layout/ours.m4: Add a scale to the diagrams.

13 years agolayout/ours.m4: provisional phase 2 - adjust segments (fixing offsets in III)
Ian Jackson [Sun, 5 Dec 2010 03:02:45 +0000 (03:02 +0000)]
layout/ours.m4: provisional phase 2 - adjust segments (fixing offsets in III)

13 years agolayout/layout: when segment spec runs out, properly account for the rounding error
Ian Jackson [Sun, 5 Dec 2010 02:31:19 +0000 (02:31 +0000)]
layout/layout: when segment spec runs out, properly account for the rounding error

13 years agolayout/ours.m4: provisional phase 2 - adjust segment numbers
Ian Jackson [Sun, 5 Dec 2010 01:54:12 +0000 (01:54 +0000)]
layout/ours.m4: provisional phase 2 - adjust segment numbers

13 years agolayout/ours.m4: adjust provisional phase 2
Ian Jackson [Sun, 5 Dec 2010 01:44:19 +0000 (01:44 +0000)]
layout/ours.m4: adjust provisional phase 2

13 years agopcb/points-pin-alloc: use actual INDIV0 etc. pin info and net info
Ian Jackson [Sat, 4 Dec 2010 18:29:24 +0000 (18:29 +0000)]
pcb/points-pin-alloc: use actual INDIV0 etc. pin info and net info

13 years agopcb/points-pin-alloc: Clean it on clean
Ian Jackson [Sat, 4 Dec 2010 17:36:29 +0000 (17:36 +0000)]
pcb/points-pin-alloc: Clean it on clean

13 years agopcb/points-pin-alloc: Improvements
Ian Jackson [Sat, 4 Dec 2010 17:35:58 +0000 (17:35 +0000)]
pcb/points-pin-alloc: Improvements

13 years agopcb/points-pin-alloc: Print in landscape mode
Ian Jackson [Sat, 4 Dec 2010 17:18:06 +0000 (17:18 +0000)]
pcb/points-pin-alloc: Print in landscape mode

13 years agopcb/points-pin-alloc: Copy lout doc file to local directory (from lout 3.36-1)
Ian Jackson [Sat, 4 Dec 2010 17:16:04 +0000 (17:16 +0000)]
pcb/points-pin-alloc: Copy lout doc file to local directory (from lout 3.36-1)

13 years agopcb/points-pin-alloc: Fix up makefile rules
Ian Jackson [Sat, 4 Dec 2010 17:13:46 +0000 (17:13 +0000)]
pcb/points-pin-alloc: Fix up makefile rules

13 years agopcb/points-pin-alloc: Initial checkin
Ian Jackson [Sat, 4 Dec 2010 17:12:12 +0000 (17:12 +0000)]
pcb/points-pin-alloc: Initial checkin

13 years agoTODO.slip-multi-movfeat: plan for dealing with the double slip
Ian Jackson [Thu, 2 Dec 2010 00:42:04 +0000 (00:42 +0000)]
TODO.slip-multi-movfeat: plan for dealing with the double slip

13 years agolayout/data2safety: cope properly with segposcombs which do not appear in ours.redact...
Ian Jackson [Wed, 1 Dec 2010 22:44:03 +0000 (22:44 +0000)]
layout/data2safety: cope properly with segposcombs which do not appear in ours.redacted.forsafety because they are useless

13 years agolayout/redactgraph: comment fix
Ian Jackson [Wed, 1 Dec 2010 21:05:28 +0000 (21:05 +0000)]
layout/redactgraph: comment fix

13 years agolayout/redactgraph: summary has edge parameter len=2 to make it less crowded
Ian Jackson [Mon, 29 Nov 2010 02:59:56 +0000 (02:59 +0000)]
layout/redactgraph: summary has edge parameter len=2 to make it less crowded

13 years agolayout/redactgraph: summary has distances on line below the edge label
Ian Jackson [Mon, 29 Nov 2010 02:59:15 +0000 (02:59 +0000)]
layout/redactgraph: summary has distances on line below the edge label

13 years agolayout/ours.m4: fix up PB9 for compatibility with corrected double slip
Ian Jackson [Mon, 29 Nov 2010 02:31:11 +0000 (02:31 +0000)]
layout/ours.m4: fix up PB9 for compatibility with corrected double slip

13 years agolayout/data2safety: fix an unimportant undefined variable reference
Ian Jackson [Mon, 29 Nov 2010 02:30:10 +0000 (02:30 +0000)]
layout/data2safety: fix an unimportant undefined variable reference

13 years agolayout/parts.i4: attempt at a non-broken segment assignment for slips
Ian Jackson [Mon, 29 Nov 2010 01:53:23 +0000 (01:53 +0000)]
layout/parts.i4: attempt at a non-broken segment assignment for slips

13 years agolayout/ours.m4: wip segment annotations for phase 2, more and final (P)
Ian Jackson [Mon, 29 Nov 2010 00:39:26 +0000 (00:39 +0000)]
layout/ours.m4: wip segment annotations for phase 2, more and final (P)

13 years agolayout/ours.m4: wip segment annotations for phase 2, more
Ian Jackson [Sun, 28 Nov 2010 23:14:23 +0000 (23:14 +0000)]
layout/ours.m4: wip segment annotations for phase 2, more

13 years agolayout/ours.m4: wip segment annotations for phase 2. These are PB<n> and PC<n> and...
Ian Jackson [Sun, 28 Nov 2010 22:47:49 +0000 (22:47 +0000)]
layout/ours.m4: wip segment annotations for phase 2.  These are PB<n> and PC<n> and small extensions to A5 and A6.  P means "provisional" and indicates that we still need to check that the various distances are as intended, and perhaps renumber, and all of this is entirely theoretical as none of it has been laid yet.

13 years agolayout/ours.m4: eliminate useless loc rim_3tt1
Ian Jackson [Mon, 29 Nov 2010 00:26:27 +0000 (00:26 +0000)]
layout/ours.m4: eliminate useless loc rim_3tt1

13 years agolayout/layout: join arcline gets sense of tracks right when swap=-1
Ian Jackson [Sun, 28 Nov 2010 17:26:02 +0000 (17:26 +0000)]
layout/layout: join arcline gets sense of tracks right when swap=-1

13 years agolayout/redactgraph: specify graph name for neato, -t option
Ian Jackson [Sun, 28 Nov 2010 15:43:37 +0000 (15:43 +0000)]
layout/redactgraph: specify graph name for neato, -t option

13 years agolayout/psenlarge: break ps enlargement rune out from Makefile into new script
Ian Jackson [Sun, 28 Nov 2010 15:34:24 +0000 (15:34 +0000)]
layout/psenlarge: break ps enlargement rune out from Makefile into new script

13 years agolayout/redactgraph: new movfeatsplitnodesall which repeatedly splits until all are...
Ian Jackson [Sun, 28 Nov 2010 15:33:57 +0000 (15:33 +0000)]
layout/redactgraph: new movfeatsplitnodesall which repeatedly splits until all are done; needed because a node may need to be split into more than two new nodes, and each iteration only splits a node in two

13 years agolayout/.gitignore: add new ours.*.large.ps
Ian Jackson [Sun, 28 Nov 2010 13:39:28 +0000 (13:39 +0000)]
layout/.gitignore: add new ours.*.large.ps

13 years agolayout/Makefile: new for-segments target for segment assignment diagrams
Ian Jackson [Sun, 28 Nov 2010 13:38:17 +0000 (13:38 +0000)]
layout/Makefile: new for-segments target for segment assignment diagrams

13 years agolayout/Makefile: adhoc rune for expanding some of our PostScript files
Ian Jackson [Sun, 28 Nov 2010 13:34:36 +0000 (13:34 +0000)]
layout/Makefile: adhoc rune for expanding some of our PostScript files

13 years agosafety.h: fix typo in comment
Ian Jackson [Tue, 23 Nov 2010 21:05:48 +0000 (21:05 +0000)]
safety.h: fix typo in comment

13 years agolayout/Makefile: add ours-E*.ps
Ian Jackson [Mon, 22 Nov 2010 02:12:15 +0000 (02:12 +0000)]
layout/Makefile: add ours-E*.ps

13 years agolayout/Makefile: break out LAYOUTOPTS_E and LAYOUTOPTS_BS
Ian Jackson [Mon, 22 Nov 2010 02:11:54 +0000 (02:11 +0000)]
layout/Makefile: break out LAYOUTOPTS_E and LAYOUTOPTS_BS

13 years agosafety.h: comment Traininfo.ts and .xs
Ian Jackson [Mon, 8 Nov 2010 01:36:40 +0000 (01:36 +0000)]
safety.h: comment Traininfo.ts and .xs

13 years agohostside/analyse-speeds: fix usage message to mention <train>.manual
Ian Jackson [Mon, 8 Nov 2010 01:28:29 +0000 (01:28 +0000)]
hostside/analyse-speeds: fix usage message to mention <train>.manual

13 years agolayout/Makefile: on phys pages, draw sleepers in 50% grey
Ian Jackson [Sun, 7 Nov 2010 22:14:57 +0000 (22:14 +0000)]
layout/Makefile: on phys pages, draw sleepers in 50% grey

13 years agolayout: draw sleepers first so that rails can draw over, in case sleepers are lighter
Ian Jackson [Sun, 7 Nov 2010 22:14:41 +0000 (22:14 +0000)]
layout: draw sleepers first so that rails can draw over, in case sleepers are lighter

13 years agolayout/Makefile: break options for *-m4-*.ps out into a separate variable, and create...
Ian Jackson [Sun, 7 Nov 2010 17:23:30 +0000 (17:23 +0000)]
layout/Makefile: break options for *-m4-*.ps out into a separate variable, and create new *-b4-* pages with target bpages

13 years agolayout: support fractional page numbers
Ian Jackson [Sun, 7 Nov 2010 17:16:56 +0000 (17:16 +0000)]
layout: support fractional page numbers

13 years agolayout: support transparent colour setting, for loc label backgrounds
Ian Jackson [Sun, 7 Nov 2010 17:16:40 +0000 (17:16 +0000)]
layout: support transparent colour setting, for loc label backgrounds

13 years agolayout: reduce minimum label size
Ian Jackson [Sun, 7 Nov 2010 17:16:08 +0000 (17:16 +0000)]
layout: reduce minimum label size

13 years agolayout: fix largescale_text_reduce
Ian Jackson [Sun, 7 Nov 2010 17:13:59 +0000 (17:13 +0000)]
layout: fix largescale_text_reduce

13 years agolayout/Makefile: include loc labels and dists on physpages
Ian Jackson [Sun, 7 Nov 2010 16:04:13 +0000 (16:04 +0000)]
layout/Makefile: include loc labels and dists on physpages

13 years agolayout: make loc labels and track distances have a scaling limit
Ian Jackson [Sun, 7 Nov 2010 16:02:56 +0000 (16:02 +0000)]
layout: make loc labels and track distances have a scaling limit

13 years agoslopecalc: support 1:xxx slopes
Ian Jackson [Sun, 7 Nov 2010 02:08:17 +0000 (02:08 +0000)]
slopecalc: support 1:xxx slopes

13 years agoslopecalc: get abs interpolations right
Ian Jackson [Sat, 6 Nov 2010 18:59:01 +0000 (18:59 +0000)]
slopecalc: get abs interpolations right

13 years agolayout/Makefile: add colouring options to appropriate invocations
Ian Jackson [Sat, 6 Nov 2010 17:35:51 +0000 (17:35 +0000)]
layout/Makefile: add colouring options to appropriate invocations

13 years agogit-revid: add a "+" if working tree not equal to HEAD
Ian Jackson [Sat, 6 Nov 2010 17:35:19 +0000 (17:35 +0000)]
git-revid: add a "+" if working tree not equal to HEAD

13 years agolayout: support specifying colours, colour parsing. no functional change intended...
Ian Jackson [Sat, 6 Nov 2010 17:27:23 +0000 (17:27 +0000)]
layout: support specifying colours, colour parsing.  no functional change intended in the case where no -C options are passed

13 years agolayout: support separate colour for loc label box backgrounds
Ian Jackson [Sat, 6 Nov 2010 17:25:14 +0000 (17:25 +0000)]
layout: support separate colour for loc label box backgrounds

13 years agolayout: hooks for colouring output; no intentional change to meaning of output or...
Ian Jackson [Sat, 6 Nov 2010 16:28:39 +0000 (16:28 +0000)]
layout: hooks for colouring output; no intentional change to meaning of output or colour of any drawn object

13 years agolayout: add some divvying comments to source code
Ian Jackson [Sat, 6 Nov 2010 16:21:34 +0000 (16:21 +0000)]
layout: add some divvying comments to source code

13 years agorename informat.txt to README.layout
Ian Jackson [Sat, 6 Nov 2010 15:54:41 +0000 (15:54 +0000)]
rename informat.txt to README.layout

13 years agoslopecalc: widen height output fields to support heights >100mm
Ian Jackson [Sat, 6 Nov 2010 13:56:49 +0000 (13:56 +0000)]
slopecalc: widen height output fields to support heights >100mm

13 years agoslopecalc shows cp relative heights
Ian Jackson [Sat, 6 Nov 2010 13:54:30 +0000 (13:54 +0000)]
slopecalc shows cp relative heights

13 years agoslopecalc showing args is more abstract and can wrap properly
Ian Jackson [Sat, 6 Nov 2010 13:50:53 +0000 (13:50 +0000)]
slopecalc showing args is more abstract and can wrap properly

13 years agoslopecalc shows args more nicely
Ian Jackson [Sat, 6 Nov 2010 13:35:42 +0000 (13:35 +0000)]
slopecalc shows args more nicely

13 years agoslopecalc handles non-initial @ correctly
Ian Jackson [Sat, 6 Nov 2010 12:57:40 +0000 (12:57 +0000)]
slopecalc handles non-initial @ correctly

13 years agoremove .submakefile shell thing; use $(eval ) instead
Ian Jackson [Sun, 31 Oct 2010 22:01:11 +0000 (22:01 +0000)]
remove .submakefile shell thing; use $(eval ) instead

13 years agoadd *.o to gitignore, to match cvs
Ian Jackson [Sun, 31 Oct 2010 21:59:28 +0000 (21:59 +0000)]
add *.o to gitignore, to match cvs

13 years ago.git-revid uses git-describe too now
Ian Jackson [Sun, 31 Oct 2010 21:08:41 +0000 (21:08 +0000)]
.git-revid uses git-describe too now

13 years agoremove $Id$ references from places where we will no longer support them, oh well
Ian Jackson [Sun, 31 Oct 2010 21:03:17 +0000 (21:03 +0000)]
remove $Id$ references from places where we will no longer support them, oh well

13 years agoremove $Id$ references from places where they are now no longer needed
Ian Jackson [Sun, 31 Oct 2010 21:03:03 +0000 (21:03 +0000)]
remove $Id$ references from places where they are now no longer needed

13 years agosupport adding .git-revid output to various things, notably layout
Ian Jackson [Sun, 31 Oct 2010 21:01:45 +0000 (21:01 +0000)]
support adding .git-revid output to various things, notably layout

13 years agominor fixes related to revision ids
Ian Jackson [Sun, 31 Oct 2010 21:00:51 +0000 (21:00 +0000)]
minor fixes related to revision ids

13 years agonew .git-revid script for producing revision info
Ian Jackson [Sun, 31 Oct 2010 20:55:44 +0000 (20:55 +0000)]
new .git-revid script for producing revision info

13 years agorename every .cvsignore to .gitignore
Ian Jackson [Sun, 31 Oct 2010 20:55:21 +0000 (20:55 +0000)]
rename every .cvsignore to .gitignore

13 years agomove .cvsignore to .gitignore; add *~
Ian Jackson [Wed, 27 Oct 2010 23:59:17 +0000 (00:59 +0100)]
move .cvsignore to .gitignore; add *~