geotree 1.1.1 → 1.1.2

data/lib/geotree/multitree.rb

@@ -16,7 +16,7 @@ module GeoTreeModule
   # When querying a MultiTree, the user must specify which level of detail (i.e.,
   # which of the contained trees) is to be examined.   
   #
-  #  {An animation of a MultiTree in action.}[link:../../doc/multi_tree.pdf]   
+  # {An animation of a MultiTree in action.}[link:http://www.cs.ubc.ca/~jpsember/multi_tree.ps]   
   #
   class MultiTree
 
@@ -123,9 +123,7 @@ module GeoTreeModule
     end
 
     def add_buffered_point(data_point)
-      db = false
-      #      db = true
-
+      
       # Determine which is the lowest detail level at which
       # this point is to be found
 
@@ -137,8 +135,6 @@ module GeoTreeModule
 
       randval = (wt + stretch*rf) / MAX_POINT_WEIGHT
 
-      !db || pr("add pt#%4d  wt%2d  rf=%6.3f rand=%6.3f:  ",data_point.name,wt,rf,randval)
-
       num_trees.times do |ti|
         di = num_trees - 1 - ti
 
@@ -146,10 +142,8 @@ module GeoTreeModule
           break
         end
 
-        !db || pr("  ++ #{di}  ")
         tree(di).add_buffered_point(data_point)
       end
-      !db || pr("\n")
     end
 
     private
@@ -177,16 +171,3 @@ module GeoTreeModule
   end
 end
 
-if main?(__FILE__)
-  include GeoTreeModule
-  newdir = File.join(File.dirname(__FILE__),"../../test/workdir")
-  assert!(File.directory?(newdir))
-  Dir.chdir(newdir)
-  remove_file_or_dir("_multitree_")
-
-  mt = MultiTree.new("_multitree_",3)
-
-  pts = DataPoint.rnd_many(100)
-  pts.each{|x| mt.add(x)}
-
-end

data/lib/geotree/pswriter.rb

@@ -1,6 +1,22 @@
 require_relative 'tools'
 
 module PS_Private
+  LT_SOLID_ = 1900
+  LT_DASHED_ = 1901
+  LT_DOTTED_ = 1902
+
+  LINEWIDTH_FACTOR_ = 3.0
+  LINETYPE_ = 1
+  LINEWIDTH_ = 2
+  TRANS_ = 3
+  RGB_ = 4
+  FONTHEIGHT_ = 5
+  SCALE_ = 6
+
+  S_START_ = 0
+  S_OPEN_ = 1
+  S_CLOSED_ = 2
+  
   class SOper
     attr_reader :type
     def self.null
@@ -24,35 +40,40 @@ module PS_Private
   end
 end
 
-# A debugging / demonstration utility class that 
+# A debugging / demonstration utility class that
 # generates postscript images
 #
 class PSWriter
   include PS_Private
 
-  LT_SOLID = 1900
-  LT_DASHED = 1901
-  LT_DOTTED = 1902
-
-  LINEWIDTH_FACTOR = 3.0
-  LINETYPE = 1
-  LINEWIDTH = 2
-  TRANS = 3
-  RGB = 4
-  FONTHEIGHT = 5
-  SCALE = 6
-
-  S_START = 0
-  S_OPEN = 1
-  S_CLOSED = 2
   # @param path path of file to write (e.g. xxx.ps)
   def initialize(path)
     @path = path
     @line_width = -1
     @rgb = [-1,0,0]
     @phys_size = [612,792]
-    @state = S_START
+    @state = S_START_
     @stack = []
+    @buffer_stack = []
+    @dict = {}
+    @dict_keys = []
+
+    de("A","{arc} bind")
+    de("CP","{closepath} bind")
+    de('F','{fill} bind')
+    de('I','{index} bind')
+    de("L","{lineto} bind")
+    de("M","{moveto} bind")
+    de("NP","{newpath} bind")
+    de('SRGB','{setrgbcolor} bind')
+    de('SLW','{setlinewidth} bind')
+    de('P','{pop} bind')
+    de("R","{rmoveto} bind")
+    de("S","{stroke} bind")
+    de('SCL','{scale} bind')
+    de('TR','{translate} bind')
+    de("V","{rlineto} bind")
+    de("DSH","{setdash} bind")
 
     set_logical_page_size(1000,1200)
 
@@ -65,22 +86,45 @@ class PSWriter
     @s = ''
   end
 
+  def start_buffer
+    raise IllegalStateException if !@buffer_stack.empty?
+    @buffer_stack << @s
+    @s = ''
+  end
+  
+  def stop_buffer
+    raise IllegalStateException if @buffer_stack.empty?
+    ret = @s
+    @s = @buffer_stack.pop
+    ret
+  end
+  
+    
   # Close document and write to disk
   def close
-    if @state < S_CLOSED
+    if @state < S_CLOSED_
       if @stack.size != 0
         warn("state stack nonempty for #{@path}")
       end
+
       flush_page
-      set_state(S_CLOSED)
-      write_text_file(@path, @s)
+
+      # Construct file by combining header, dictionary, and
+      # the user text
+
+      s = get_doc_header
+      s << get_doc_dictionary
+      s << @s
+      set_state(S_CLOSED_)
+
+      write_text_file(@path, s)
     end
   end
 
   # Set logical page size.  Subsequent drawing operations will be scaled
   # appropriately.  Default logical page size is 1000 x 1200 units.
   def set_logical_page_size( width,  height)
-    raise IllegalStateException if @state != S_START
+    raise IllegalStateException if @state != S_START_
     @document_size = [width,height]
   end
 
@@ -91,83 +135,103 @@ class PSWriter
   # Draw a rectangle
   # @param inset distance to inset rectangle boundary (positive: shrink; negative:expand)
   def draw_rect(x,y,w,h,inset = 0)
+    de("RC","{3 I 3 I M 1 I 0 V 0 1 I V 1 I neg 0 V P P P P CP S }")
     a(x + inset)
     a(y + inset)
     a(w - 2 * inset);
     a(h - 2 * inset);
-    a(" RECT\n");
+    a("RC");
+    cr
   end
 
   def set_font_size(height)
-    raise IllegalStateException if @state != S_OPEN
+    raise IllegalStateException if @state != S_OPEN_
 
     ret = SOper.null
 
-    if   @font_height != height
-      ret = SOper.new(FONTHEIGHT, @font_height)
+    if @font_height != height
+      ret = SOper.new(FONTHEIGHT_, @font_height)
       @font_height = height;
       @scaled_font_height = height / @scale;
       a("/Monaco findfont ");
       a(@scaled_font_height);
       a("scalefont setfont\n");
+      cr
     end
     ret
   end
 
   def draw_string(string, x, y)
+    if @font_height == 0
+      set_font_size(28)
+    end
+
+    #    /TEXTL { currentpoint S M 0 0 R show } def
+    #    % Right-justified text
+    #    /TEXTR { currentpoint S M dup stringwidth pop neg 0 R show } def
+    #    % Centered text
+    de("TX", "{currentpoint S M dup stringwidth pop -2 div 0 R show }")
+
     a(x)
     a(y - @scaled_font_height / 2);
-    a("M ")
+    a("M")
     work = make_eps_safe(string)
     a(work)
-    a(" TEXTC\n")
+    a("TX")
+    cr
   end
 
-  def draw_disc(cx,   cy,    radius)
-    a("NP");
+  def draw_disc(cx,cy,radius)
+    de("CF", "{NP 0 360 A CP F}")
     a(cx);
     a(cy);
     a(radius);
-    a("0 360 A CP F\n");
+    a("CF")
+    cr
   end
 
   def draw_circle(cx, cy, radius)
+    de("CH", "{NP 0 360 A CP S}")
     a("NP");
     a(cx);
     a(cy);
     a(radius);
-    a("0 360 A CP S\n");
+    a("CH");
+    cr
   end
 
   def draw_line(x1,y1,x2,y2)
-    a("NP ");
+    de("LN", "{NP 4 2 roll M L CP S}")
+
+    #    a("NP");
     a(x1);
     a(y1);
-    a(" M ");
+    #    a("M");
     a(x2);
     a(y2);
-    a(" L CP S\n");
+    a("LN");
+    cr
   end
 
   def set_line_solid
-    set_line_type(LT_SOLID)
+    set_line_type(LT_SOLID_)
   end
 
   def set_line_dashed
-    set_line_type(LT_DASHED)
+    set_line_type(LT_DASHED_)
   end
 
   def set_line_dotted
-    set_line_type(LT_DOTTED)
+    set_line_type(LT_DOTTED_)
   end
 
   def set_scale(f)
     ret = SOper.null
     if   f != 1
-      ret = SOper.new(SCALE, 1.0 / f)
+      ret = SOper.new(SCALE_, 1.0 / f)
       a(f);
       a(f);
-      a("scale\n");
+      a("SCL");
     end
     ret
   end
@@ -175,24 +239,24 @@ class PSWriter
   def set_line_type(type)
     ret = SOper.null
     if  @line_type != type
-      ret = SOper.new(LINETYPE, @line_type)
+      ret = SOper.new(LINETYPE_, @line_type)
       @line_type = type
       case type
-      when LT_DASHED
+      when LT_DASHED_
         n =    (@scale * 30).to_i
         a("[");
         a(n);
         a(n);
-        a("] 0 setdash\n");
-      when LT_DOTTED
+        a("] 0 DSH");
+      when LT_DOTTED_
         int n =    (@scale * 30).to_i
         n2 = n / 4
         a("[");
         a(n2);
         a(n);
-        a("] 0 setdash\n");
-      else # LT_SOLID
-        a("[] 0 setdash\n");
+        a("] 0 DSH");
+      else # LT_SOLID_
+        a("[] 0 DSH");
       end
     end
     ret
@@ -203,38 +267,39 @@ class PSWriter
   # @param x translation to apply to coordinates
   # @param y
   def draw_polygon(polygon, x, y)
+
     push(translate(x, y))
-    a("NP ")
+    a("NP")
     i = 0
     while i < polygon.size
       a(polygon[i])
-      a(' ');
       a((polygon[i + 1]))
       if (i == 0)
-        a(" M ");
+        a("M");
       else
-        a(" L ");
+        a("L");
       end
       i += 2
     end
-
-    a(" CP S\n")
+    a("CP S")
+    cr
     pop()
   end
 
   # Translate subsequent drawing operations
   def translate(tx,ty,neg=false)
+
     ret = SOper.null
     if (neg)
       tx = -tx;
       ty = -ty;
     end
     if (tx != 0 || ty != 0)
-      ret = SOper.new(TRANS, -tx, -ty)
+      ret = SOper.new(TRANS_, -tx, -ty)
 
       a(tx);
       a(ty);
-      a("TR\n");
+      a("TR");
     end
     ret
   end
@@ -242,10 +307,11 @@ class PSWriter
   def set_line_width(w)
     ret = SOper.null
     if @line_width != w
-      ret = SOper.new(LINEWIDTH, @line_width)
+
+      ret = SOper.new(LINEWIDTH_, @line_width)
       @line_width = w
-      a(LINEWIDTH_FACTOR * @scale   * @line_width)
-      a("SLW\n");
+      a(LINEWIDTH_FACTOR_ * @scale   * @line_width)
+      a("SLW");
     end
     ret
   end
@@ -253,12 +319,13 @@ class PSWriter
   def set_rgb(r,g,b)
     ret = SOper.null
     if (r != @rgb[0] || g != @rgb[1] || b != @rgb[2])
-      ret = SOper.new(RGB, @rgb[0], @rgb[1], @rgb[2])
+
+      ret = SOper.new(RGB_, @rgb[0], @rgb[1], @rgb[2])
       a(r)
       a(g)
       a(b)
       @rgb = [r,g,b]
-      a("SRGB\n");
+      a("SRGB");
     end
     ret
   end
@@ -270,11 +337,11 @@ class PSWriter
   def set_state(  s)
     if (@state != s)
       case s
-      when S_OPEN
-        raise IllegalStateException if @state != S_START
+      when S_OPEN_
+        raise IllegalStateException if @state != S_START_
         @state = s
-        print_document_header
-      when S_START
+        #        print_document_header
+      when S_START_
         raise IllegalStateException
       end
       @state = s
@@ -284,7 +351,7 @@ class PSWriter
   # Start a new page
   # @param page_title title of new page
   def new_page(page_title)
-    set_state(S_OPEN);
+    set_state(S_OPEN_);
     flush_page
 
     print_page_header(page_title);
@@ -303,39 +370,82 @@ class PSWriter
       n = @stack.size   - 1
       op = @stack.pop
       case op.type
-      when RGB
+      when RGB_
         set_rgb(op.arg(0),op.arg(1),op.arg(2))
-      when LINETYPE
+      when LINETYPE_
         set_line_type(op.arg(0))
-      when LINEWIDTH
+      when LINEWIDTH_
         set_line_width(op.arg(0))
-      when TRANS
+      when TRANS_
         translate(op.arg(0),op.arg(1))
-      when FONTHEIGHT
+      when FONTHEIGHT_
         set_font_size(op.arg(0))
-      when SCALE
+      when SCALE_
         set_scale(op.arg(0))
       end
     end
   end
 
+  # Define an element by placing it in the dictionary
+  def add_element(key,val)
+    de(key,'{'+val+'}')
+  end
+  
+  def draw_element(key)
+    val = @dict[key]
+    raise ArgumentError if !@dict.member?(key)
+    a(key)
+  end
+  
   private
 
+  def cr
+    if true
+      if @sp_req
+        @s << ' '
+        @sp_req = false
+      end
+    else
+      @sp_req = false
+      @s << "\n"
+    end
+  end
+
   def a(obj)
+    if @sp_req
+      @s << ' '
+    end
     if obj.is_a? Numeric
       if obj.is_a? Float
-        w = sprintf(" %.2f",obj)
-        @s << w
+        w = sprintf("%.2f",obj)
+        # Trim extraneous leading/trailing zeros
+
+        if w[0,2] == '0.'
+          w = w[1.. -1]
+        elsif w[0,3] == '-0.'
+          w[1,1] = ''
+        end
+
+        j = w.index('.')
+        if j
+          while w[-1] == '0'
+            w = w[0..-2]
+          end
+          if w[-1] == '.'
+            w = w[0..-2]
+          end
+        end
+        @s <<    w
       else
-        @s << " #{obj}"
+        @s << obj.to_s
       end
     else
-      @s <<' ' << obj
+      @s <<   obj
     end
+    @sp_req = true
   end
 
   def print_page_header(page_title)
-
     # set up transformation
     lMargin = @phys_size[0] * 0.07
     lWorkX = @phys_size[0] - 2 * lMargin
@@ -348,10 +458,10 @@ class PSWriter
 
     a(lcx)
     a(lcy)
-    a("TR\n");
+    a("TR");
     a(scl);
     a(scl);
-    a("SCL\n\n");
+    a("SCL");
     set_line_width(1);
     set_gray(0);
 
@@ -366,46 +476,40 @@ class PSWriter
     end
   end
 
-  def print_document_header
-
-    a("%!PS\n");
-
-    a("/Monaco findfont 28 scalefont setfont\n")
-    a(<<"TXT"
-/A {arc} bind def
-/CP {closepath} bind def
-/NP {newpath} bind def
-/TR {translate} bind def
-/SCL {scale} bind def
-/SLW {setlinewidth} bind def
-/SRGB {setrgbcolor} bind def
-/S {stroke} bind def
-/F {fill} bind def
-/M {moveto} bind def
-/L {lineto} bind def
-/R {rmoveto} bind def
-/V {rlineto} bind def
-% Left-justified text
-/TEXTL { currentpoint S M 0 0 R show } def
-% Right-justified text
-/TEXTR { currentpoint S M dup stringwidth pop neg 0 R show } def
-% Centered text
-/TEXTC { currentpoint S M dup stringwidth pop -2 div 0 R show } def
-  
-% Plot rectangle at x,y,w,h
-/RECT {  3 index 3 index M
- 1 index 0 V
- 0 1 index V
- 1 index neg 0 V
- pop pop pop pop CP
- S } def
-TXT
-    )
+  def get_doc_header
+    h = "%!PS\n"
+  end
+
+  def get_doc_dictionary
+    s = ''
+    @dict_keys.each do |k|
+      v = @dict[k]
+      if v.size
+        s << '/' << k << ' ' << v << " def\n"
+      else
+        s2 << '/' << k << "\n"
+      end
+    end
+    s
   end
 
+  def de(key,val)
+    if !@dict.member? key
+      @dict_keys << key
+      @dict[key] = val
+    else
+      vexist = @dict[key]
+      if vexist != val
+        raise ArgumentError,"Attempt to change value for key #{key} to #{val}, was #{vexist}"
+      end
+
+    end
+  end
+
+
   def flush_page
     if @page_used
-      @s << "showpage\n\n"
+      a("showpage")
       @page_used = false
     end
   end
@@ -432,40 +536,3 @@ TXT
 
 end
 
-if __FILE__ == $0
-
-  poly  = [ 0, 0, 50, 30, 30, 80]
-
-  w = PSWriter.new("_jeff_.ps")
-
-  w.set_logical_page_size(1000, 1000)
-  10.times do |i|
-
-    w.new_page("example page #{i}" )
-
-    w.draw_disc(200, 700, 200 - i * 18)
-    w.draw_circle(700, 220, 10 + i * 5);
-
-    w.push(w.set_gray(0.8));
-    w.draw_disc(500, 500, 30 + i * 10);
-    w.pop();
-    w.push(w.set_line_width(3));
-    w.push(w.set_line_dashed());
-    w.draw_circle(500, 500, 30 + i * 10);
-    w.pop(2);
-
-    w.draw_line(20 + i * 10, 20, 980, 500 + i * 48);
-    w.push(w.set_line_width(1.2   + 0.3   * i));
-    w.push(w.translate(500 - i * 40, 500 - i * 40));
-    w.push(w.set_scale(1 + i * 0.7));
-    w.draw_polygon(poly, 0, 0);
-    w.pop(3);
-
-    w.push(w.set_rgb(1, 0.2, 0.2));
-    w.push(w.set_font_size(10 + i * 3));
-    w.draw_string("Hello", 10 + i * 30, 900 - i * 40);
-    w.pop();
-    w.pop();
-  end
-  w.close();
-end