improved distance label placement when centrelines drawn

[trains.git] / layout / layout

diff --git a/layout/layout b/layout/layout
index 7269eb260290f2a14bdc55625ad69ae31a91b84b..31d1daf83046261aadb66e548b9abe00225e4fe0 100755 (executable)
--- a/layout/layout
+++ b/layout/layout
@@ -25,12 +25,12 @@ our @eopts;
 our @segments= ('/');
 our %subsegcmap;
 
-our $drawers= 'arsclmnog';
-our %chdraw_emap= qw(A ARScg
-                    R aRscg
-                    S aRScg
-                    C arsCg
-                    c Arscg
+our $drawers= 'arscldmnog';
+our %chdraw_emap= qw(A ARScgd
+                    R aRscgD
+                    S aRScgd
+                    C arsCgd
+                    c Arscgd
                     r arcs
                     L LMg
                     l l
@@ -157,7 +157,9 @@ our $psu_sleeperlen= 17;
 our $psu_sleeperlw= 15;
 our $psu_raillw= 1.0;
 our $psu_thinlw= 1.0;
-our $psu_subseglw= 15.0;
+our %psu_subseglw;
+$psu_subseglw{'e'}= 20.0;
+$psu_subseglw{'m'}= 15.0;
 
 our $lmu_marklw= 4;
 our $lmu_marktpt= 11;
@@ -166,6 +168,8 @@ our $lmu_txtboxh= $lmu_marktpt * 1.100;
 our $lmu_txtboxpadx= $lmu_marktpt * 0.335;
 our $lmu_txtboxoff= $lmu_marklw / 2;
 our $lmu_txtboxlw= 1;
+our $lmu_lenlabeloffctr= -$lmu_marklw * 1.0;
+our $lmu_lenlabeloff=     $lmu_marklw * 0.5;
 
 our $olu_left= 10 * $scale;
 our $olu_right= 217 * $scale - $olu_left;
@@ -626,10 +630,11 @@ sub parametric__o_pt ($) {
 our $segused_incurrent;
 our $segused_currentpt;
 our $segmentpart_counter=0;
+our $segused_restorecounter;
 
 sub segment_used__print ($) {
     my ($pt) = @_;
-    if ($segused_incurrent > 0) {
+    if ($segused_incurrent > 0 && $segused_restorecounter==1) {
        o("%L segmentpart ".
          $segmentpart_counter++." ".
          $ctx->{Layer}{Level}.$ctx->{Layer}{Kind}." ".
@@ -657,6 +662,17 @@ sub segment_used__len ($$) {
     o("% segments @segments\n");
 }
     
+sub segment_state_save () {
+    return [ 0, $segused_incurrent, $segused_currentpt,
+            $segmentpart_counter, @segments ];
+}
+sub segment_state_restore ($) {
+    my ($r) = @_;
+    ($segused_restorecounter, $segused_incurrent, $segused_currentpt,
+     $segmentpart_counter, @segments) = @$r;
+    $r->[0]++;
+}
+
 sub segment_used_begin ($) {
     $segused_incurrent= 0;
     $segused_currentpt= $_[0];
@@ -672,10 +688,10 @@ sub segment_used_end ($$) {
 }
 sub parametric_segment ($$$$$) {
     my ($p0,$p1,$lenperp,$minradius,$calcfn) = @_;
-    # makes $p (global) go from $p0 to $p1  ($p1>$p0)
+    # makes $param (global) go from $p0 to $p1  ($p1>$p0)
     # $lenperp is the length of one unit p, ie the curve
     # must have a uniform `density' in parameter space
-    # $calcfn is invoked with $p set and should return a loc
+    # $calcfn is invoked with $param set and should return a loc
     # (ie, ref to X =>, Y =>, A =>).
     my ($pa,$pb,@ends,$side,$ppu,$e,$v,$tick,$draw,$allwidth);
     return unless $ctx->{Draw} =~ m/[ARSCG]/;
@@ -689,54 +705,61 @@ sub parametric_segment ($$$$$) {
 print DEBUG "ps $p0 $p1 $lenperp ($ppu)\n";
     $draw= current_draw();
     if ($draw =~ m/G/) {
-       my ($pt,$going,$red,$csegbare,$movfeat,$movstroke,$used_last);
-       $going=0;
-       o("% segments @segments\n");
-       o("    $psu_subseglw setlinewidth\n");
-       $param=$p0;
-       $pt= &$calcfn;
-       segment_used_begin($pt);
-       for (;;) {
-           $movstroke= "      stroke\n";
-           $csegbare= $segments[0];
-           $csegbare =~ s/^\-//;
-           if ($subsegcmapreq) {
-               if (!exists $subsegcmap{$csegbare}) {
-                   print "$csegbare\n" or die $!;
-                   $subsegcmap{$csegbare}++;
-               }
-           } else {
-               $movfeat= $csegbare =~ s,(/\D+)(\d+)$,$1, ? $2 : 'f';
-               if ($subsegmovfeatpos ne $movfeat) {
-                   $movstroke= "%     no-stroke\n";
+       my ($pt,$going,$red,$csegbare,$movfeat,$movstroke);
+       my ($used_last,$me,$segsave);
+       $segsave= segment_state_save();
+       foreach $me (qw(e m)) {
+           segment_state_restore($segsave);
+           $going=0;
+           o("% segments @segments\n");
+           $param=$p0;
+           $pt= &$calcfn;
+           segment_used_begin($pt);
+           for (;;) {
+               $movstroke= "      cmapreq-stroke\n";
+               $csegbare= $segments[0];
+               $csegbare =~ s/^\-//;
+               if ($subsegcmapreq) {
+                   if (!exists $subsegcmap{$csegbare}) {
+                       print "$csegbare\n" or die $!;
+                       $subsegcmap{$csegbare}++;
+                   }
+               } else {
+                   $movfeat= $csegbare =~ s,(/\D+)(\d+)$,$1, ? $2 : 'f';
+                   die "unknown subsegment colour for $csegbare\n"
+                       unless exists $subsegcmap{$csegbare};
+                   $red= $pt->{A} / (2*$pi);
+                   $red *= $subsegcmapangscale;
+                   $red += $subsegcmapangscale*2;
+                   $red += $subsegcmapangscale/2 if $segments[0] =~ m/^\-/;
+                   $red %= $subsegcmapangscale;
+                   $red += $subsegcmapangscale if $me eq 'e';
+                   $red= sprintf("%f", $red / 255.0);
+                   $movstroke=
+                       ("    $red $subsegcmap{$csegbare} setrgbcolor\n".
+                        "    $psu_subseglw{$me} setlinewidth stroke\n");
+                   if ($subsegmovfeatpos ne $movfeat ||
+                       ($me eq 'e' && $csegbare =~ m,^/,)) {
+                       $movstroke= "%     no-stroke\n";
+                   }
                }
-               die "unknown subsegment colour for $csegbare\n"
-                   unless exists $subsegcmap{$csegbare};
-               $red= $pt->{A} / (2*$pi);
-               $red *= $subsegcmapangscale;
-               $red += $subsegcmapangscale*2;
-               $red += $subsegcmapangscale/2 if $segments[0] =~ m/^\-/;
-               $red %= $subsegcmapangscale;
-               $red /= 255.0;
-               $red= sprintf("%f", $red);
-               o("    $red $subsegcmap{$csegbare} setrgbcolor\n");
-           }
-           o_path_begin();
-           parametric__o_pt($pt);
+               o_path_begin();
+               parametric__o_pt($pt);
        
-           $param += $ppu;
-           last if $param>=$p1;
+               $param += $ppu;
+               last if $param>=$p1;
+               $pt= &$calcfn;
+               segment_used_middle($psu_ulen,$pt);
+               parametric__o_pt($pt);
+               o($movstroke);
+           }
+           $used_last= $p1-($param-$ppu);
+           $param=$p1;
            $pt= &$calcfn;
-           segment_used_middle($psu_ulen,$pt);
+           segment_used_end($used_last * $lenperp, $pt);
            parametric__o_pt($pt);
            o($movstroke);
        }
-       $used_last= $p1-($param-$ppu);
-       $param=$p1;
-       $pt= &$calcfn;
-       segment_used_end($used_last * $lenperp, $pt);
-       parametric__o_pt($pt);
-        o($movstroke);
     }
     if ($draw =~ m/C/) {
        my ($pt);
@@ -749,6 +772,21 @@ print DEBUG "ps $p0 $p1 $lenperp ($ppu)\n";
        parametric__o_pt(&$calcfn);
        o("      stroke\n");
     }
+    if ($draw =~ m/D/) {
+       my ($pt,$ad,$len,$off);
+       $param= ($p0+$p1)*0.5;
+       $pt= &$calcfn;
+       $ad= ang2deg($pt->{A});
+       $len= sprintf "%.0f", $lenperp * abs($p1-$p0);
+       $off= $draw =~ m/C/ ? $lmu_lenlabeloff : $lmu_lenlabeloffctr;
+       ol("      gsave\n".
+          "        $pt->{X} $pt->{Y} translate\n".
+          "        $ad rotate\n".
+          "        lf setfont\n".
+          "        0 $off moveto\n".
+          "        ($len) show\n".
+          "      grestore\n");
+    }
     return unless $draw =~ m/[ARS]/;
     for ($pa= $p0; $pa<$p1; $pa=$pb) {
        $pb= $pa + $ppu;