From: ian <ian>
Date: Wed, 28 May 2008 17:12:18 +0000 (+0000)
Subject: better, and configurable, line widths on colourful gui plan
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=2fb0413aa189a119c8a6480a9e48c56135cbec32;p=trains.git

better, and configurable, line widths on colourful gui plan
---

diff --git a/layout/Makefile b/layout/Makefile
index 4948e66..e7a216f 100644
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -11,7 +11,7 @@ LAYOUTOPTS_PS=	-e'[sp]=*rm' -e'p=5C'
 XLAYOUTOPTS_LAYER= -e'=5AN' -E'*~=5rsm' -e'p~=5r' -e'*~=9C' -e'*=*l' \
 		$(LAYOUTOPTS_PS)
 
-LAYOUTOPTS_SEGS= '-e*=*rm'
+LAYOUTOPTS_SEGS= '-e*=*rm' -Lsubseglwm=80 -Lsubseglwe=150 -Lsubseglwq=50
 
 LAYERS_LS=	0 4 10 26 30
 LAYERS_PS=	$(addsuffix .ps, $(LAYERS_LS))
diff --git a/layout/layout b/layout/layout
index 4109dbe..40e7235 100755
--- a/layout/layout
+++ b/layout/layout
@@ -47,6 +47,11 @@ our %chdraw_emap= qw(A ARScgd
 		     m mnol
 		     G Garsclmno);
 
+our %psu_subseglw;
+$psu_subseglw{'e'}= 20.0;
+$psu_subseglw{'m'}= 15.0;
+$psu_subseglw{'q'}= 20.0;
+
 while (@ARGV && $ARGV[0] =~ m/^\-/) {
     last if $ARGV[0] eq '-';
     $_= shift @ARGV;
@@ -59,7 +64,10 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
 	elsif (s/^l(\d+|\*)//) { $output_layer=$1; }
 	elsif (s/^S([0-9.]+)$//) { $scale= $1 * 1.0; }
 	elsif (s/^P(\d+)x(\d+)$//) { $page_x= $1; $page_y= $2; }
-	elsif (s/^GR//) { $subsegcmapreq=1; }
+	elsif (s/^Lsubseglw(\w)\=(\d+)$//) {
+	    exists $psu_subseglw{$1} or die "unknown -L<spec> spec";
+	    $psu_subseglw{$1}= $2*0.1;
+	} elsif (s/^GR//) { $subsegcmapreq=1; }
 	elsif (s/^GP(\d+|f)$//) { $subsegmovfeatpos=$1; }
 	elsif (s/^GL(.*)$//) {
 	    my ($sscmfn) = $1;
@@ -164,11 +172,7 @@ our $psu_sleeperlen= 17;
 our $psu_sleeperlw= 15;
 our $psu_raillw= 1.0;
 our $psu_thinlw= 1.0;
-our %psu_subseglw;
 
-$psu_subseglw{'e'}= 20.0;
-$psu_subseglw{'m'}= 15.0;
-$psu_subseglw{'q'}= 20.0;
 our $lmu_segtpt= 25;
 our $lmu_segtxtoff= -8;