ifmapper 0.7 → 0.8

data/lib/IFMapper/FXMapperWindow.rb

@@ -39,7 +39,7 @@ require 'IFMapper/FXMapColorBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = 0.7
+  VERSION      = 0.8
   AUTHOR       = "Gonzalo Garramuno"
   TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
 
@@ -65,6 +65,19 @@ class FXMapperWindow < FXMainWindow
     return map
   end
 
+
+  def start_automap_cb(sender, sel, ptr)
+    map = current_map
+    return if not map
+    map.start_automap
+  end
+
+  def stop_automap_cb(sender, sel, ptr)
+    map = current_map
+    return if not map
+    map.stop_automap
+  end
+
   def open_cb(sender, sel, ptr)
     file = FXMapFileDialog.new(self, "Load New Map").filename
     return if file == ''
@@ -110,6 +123,7 @@ class FXMapperWindow < FXMainWindow
       status "Could not load '#{file}'. Error: #{tmp}."
       if map.close_cb
 	@maps.delete(map) if make_new_map
+	GC.start
       end
       sleep 2
       return
@@ -118,8 +132,8 @@ class FXMapperWindow < FXMainWindow
     map.copy(tmp)
     map.create_pathmap
     map.verify_integrity
-    map.update_title
     map.window.create
+    map.update_title
     map.draw
     update_section
     status "Loaded '#{file}'."
@@ -168,6 +182,7 @@ class FXMapperWindow < FXMainWindow
       map = current_map
       if map.close_cb
 	@maps.delete(map)
+	GC.start
       end
     }
 
@@ -243,32 +258,6 @@ class FXMapperWindow < FXMainWindow
     end
   end
 
-  #
-  # Export current map as a Postscript file
-  #
-  def ps_export_cb(sender, sel, msg)
-    map = current_map
-    return unless map
-
-    require 'IFMapper/MapPrinting'
-
-    d = FXMapFileDialog.new(self, "Save Postscript File", 
-			    [
-			      "Postscript (*.ps)"
-			    ])
-    if d.filename != ''
-      printer = FXPrinter.new
-      printer.firstpage = 1
-      printer.lastpage  = map.sections.size
-      printer.mediawidth = 612.0
-      printer.mediaheight = 792.0
-      printer.leftmargin = printer.rightmargin =
-	printer.topmargin = printer.bottommargin = 72.0
-      printer.flags |= PRINT_DEST_FILE
-      printer.name   = d.filename
-      map.print(printer)
-    end
-  end
 
   def pdf_export_cb(sender, sel, msg)
     map = current_map
@@ -605,6 +594,7 @@ class FXMapperWindow < FXMainWindow
     }
   end
 
+
   def about_cb(sender, id, event )
     FXAboutDialogBox.new(self, "About This Software...", <<"EOF").execute
 #{TITLE} - #{VERSION}
@@ -644,9 +634,6 @@ EOF
     cmd = FXMenuCommand.new(submenu, "&Export as PDF...\t\tExport map as Acrobat PDF document.", nil)
     cmd.connect(SEL_COMMAND, method(:pdf_export_cb))
 
-    cmd = FXMenuCommand.new(submenu, "&Export as Postscript...\t\tExport map as Postscript document.", nil)
-    cmd.connect(SEL_COMMAND, method(:ps_export_cb))
-
     cmd = FXMenuCommand.new(submenu, "&Export as IFM...\t\tExport map as an IFM map.", nil)
     cmd.connect(SEL_COMMAND, method(:ifm_export_cb))
     FXMenuCascade.new(filemenu, "Export", nil, submenu)
@@ -713,6 +700,16 @@ EOF
     cmd = FXMenuCommand.new(mapmenu, "Map Information\t\tChange Map Information.")
     cmd.connect(SEL_COMMAND) {  map_properties }
 
+    # Automap submenu
+    #
+    submenu = FXMenuPane.new(self)
+    cmd = FXMenuCommand.new(submenu, "&Start...\tCtl-T\tStart creating map from transcript file.")
+    cmd.connect(SEL_COMMAND, method(:start_automap_cb))
+    cmd = FXMenuCommand.new(submenu, "S&top...\tCtl-P\tStop autocreating map.")
+    cmd.connect(SEL_COMMAND, method(:stop_automap_cb))
+    FXMenuCascade.new(mapmenu, "Automap", nil, submenu)
+
+    # Sections submenu
     submenu = FXMenuPane.new(self)
     cmd = FXMenuCommand.new(submenu, "Next Section\t\tGo to Next Map Section.")
     cmd.connect(SEL_COMMAND) { 
@@ -751,7 +748,9 @@ EOF
     }
     FXMenuCascade.new(mapmenu, "Sections", nil, submenu)
     
-
+    #
+    # Zoom submenu
+    #
     submenu = FXMenuPane.new(self)
     [25, 50, 75, 100, 125].each { |v| 
       cmd = FXMenuCommand.new(submenu, v.to_s + "%\t\tZoom page to #{v}%.")

data/lib/IFMapper/IFMReader.rb

@@ -56,6 +56,7 @@ class IFMReader
     @map.section = 0
 
     if @map.kind_of?(FXMap)
+      @map.options['Edit on Creation'] = false
       @map.window.hide
     end
 
@@ -413,6 +414,7 @@ class IFMReader
 	# so we check we are in the right section.
 	@map.sections.each_with_index { |p, idx|
 	  if p.rooms.include?(roomA)
+	    @map.fit
 	    @map.section = idx
 	    break
 	  end
@@ -484,6 +486,7 @@ class IFMReader
       # current section... so we check for that here
       @map.sections.each_with_index { |p, idx|
 	if p.rooms.include?(roomA)
+	  @map.fit
 	  @map.section = idx
 	  break
 	end
@@ -542,48 +545,6 @@ class IFMReader
   #   a) Adjust map's width/height
   #   b) Shift all rooms so that no rooms are in negative locations
   #
-  def adjust_map
-    # First, adjust map's width and height
-    @map.width = @map.height = 1
-    minXY = []
-    maxXY = []
-    @map.sections.each { |section|
-      next if section.rooms.empty?
-
-      sizes = section.min_max_rooms
-      minXY.push sizes[0]
-      maxXY.push sizes[1]
-
-      w = maxXY[-1][0] - minXY[-1][0]
-      h = maxXY[-1][1] - minXY[-1][1]
-
-      # We store +3 to allow for complex connections if needed.
-      @map.width  = w + 3 if w >= @map.width - 2
-      @map.height = h + 3 if h >= @map.height - 2
-    }
-
-
-    # Okay, minXY[]/maxXY[] contains all the minXY/maxXY positions of
-    # each section.  With that info and @map.weight/height, we can
-    # start shifting all nodes in the section so that they will fit.
-    idx = 0
-    @map.sections.each  { |p|
-      next if p.rooms.size == 0
-      x = y = 0
-      x = 1 - minXY[idx][0] if minXY[idx][0] < 1
-      y = 1 - minXY[idx][1] if minXY[idx][1] < 1
-      x = @map.width  - maxXY[idx][0] - 1 if maxXY[idx][0] >= @map.width  - 1
-      y = @map.height - maxXY[idx][1] - 1 if maxXY[idx][1] >= @map.height - 1
-      idx += 1
-      next if x == 0 and y == 0 # nothing to shift
-      p.rooms.each { |r| 
-	r.x += x
-	r.y += y
-      }
-    }
-
-    @map.create_pathmap if @map.kind_of?(FXMap)
-  end
 
   def initialize(file, map = Map.new('IFM Imported Map'))
     @tags   = {}
@@ -595,13 +556,13 @@ class IFMReader
       parse(f)
     }
     # puts '--------------- second pass'
+    @map.fit
     @resolve_tags = true
     File.open(file) { |f|
       parse(f)
     }
     # puts '--------------- second pass done'
-    @map.section    = 0
-    adjust_map
+    @map.section = 0
     if @map.kind_of?(FXMap)
       @map.filename   = file.sub(/\.ifm$/i, '.map')
       @map.navigation = true

data/lib/IFMapper/Map.rb

@@ -58,6 +58,52 @@ class Map
     }
   end
 
+  #
+  # Change map's width and height to make sure all rooms and connections
+  # will fit in map
+  #
+  def fit
+    # First, adjust map's width and height
+    @width = @height = 3
+    minXY = []
+    maxXY = []
+
+    @sections.each { |section|
+      next if section.rooms.empty?
+
+      sizes = section.min_max_rooms
+      minXY.push sizes[0]
+      maxXY.push sizes[1]
+
+      w = maxXY[-1][0] - minXY[-1][0]
+      h = maxXY[-1][1] - minXY[-1][1]
+
+      # We store +3 to allow for complex connections if needed.
+      @width  = w + 3 if w >= @width - 2
+      @height = h + 3 if h >= @height - 2
+    }
+
+
+    # Okay, minXY[]/maxXY[] contains all the minXY/maxXY positions of
+    # each section.  With that info and @weight/@height, we can
+    # start shifting all nodes in the section so that they will fit.
+    idx = 0
+    @sections.each  { |p|
+      next if p.rooms.size == 0
+      x = y = 0
+      x = 1 - minXY[idx][0] if minXY[idx][0] < 1
+      y = 1 - minXY[idx][1] if minXY[idx][1] < 1
+      x = @width  - maxXY[idx][0] - 2 if maxXY[idx][0] >= @width  - 1
+      y = @height - maxXY[idx][1] - 2 if maxXY[idx][1] >= @height - 1
+      idx += 1
+      next if x == 0 and y == 0 # nothing to shift
+      p.rooms.each { |r| 
+	r.x += x
+	r.y += y
+      }
+    }
+  end
+
   def initialize(name)
     @section = 0
     @name    = name
@@ -81,6 +127,17 @@ class Map
     @date     = b.date
   end
 
+  #
+  # Return true or false if map is free at location x,y
+  #
+  def free?(x, y)
+    return @sections[@section].free?(x,y)
+  end
+
+  def shift(x, y, dx, dy)
+    @sections[@section].shift(x, y, dx, dy)
+  end
+
   def delete_connection(c)
     @sections[@section].delete_connection(c)
   end

data/lib/IFMapper/PDFMapExporter.rb

@@ -20,7 +20,7 @@ PDF_ROOM_WIDTH  = W  * PDF_ZOOM
 PDF_ROOM_HEIGHT = H  * PDF_ZOOM 
 PDF_ROOM_WS     = WS * PDF_ZOOM
 PDF_ROOM_HS     = HS * PDF_ZOOM
-PDF_MARGIN      = 20
+PDF_MARGIN      = 20.0
 
 #
 # Open all the map class and add all pdf methods there
@@ -256,46 +256,86 @@ class FXSection
   end
 
 
-  def pdf_draw_section_name( pdf, opts )
+  def pdf_draw_section_name( pdf, opts, px, py )
     return if not @name or @name == ''
-    y = (opts['height']) * opts['hh'] + 16
     xymin, xymax = min_max_rooms
-    x = (xymax[0] + 2) * opts['ww'] / 2
-    pdf.add_text( x, y, @name, 16 )
+    text = @name
+    text += " (#{px}, #{py})" if px > 0 or py > 0
+    y = (opts['height']) * opts['hh'] + 16
+    w = xymax[0]
+    w = opts['width'] if w > opts['width']
+    x = (w + 2) * opts['ww'] / 2 - text.size / 2 * 16
+    x = 0 if x < 0
+    pdf.add_text( x, y, text, 16 )
   end
 
 
   def pdf_draw(pdf, opts, mapname )
-    if rotate
-      pdf.rotate_axis(90.0)
-      pdf.translate_axis( 0, -pdf.page_height )
-    end
 
-    # Move section to its position in page
-    pack = [@xoff * opts['ww'], @yoff * -opts['hh']]
-    pdf.translate_axis( pack[0], pack[1] )
 
-    # Use times-roman as font
-    pdf.select_font 'Times-Roman'
-    pdf.stroke_color(Color::RGB::Black)
-    pdf.fill_color(Color::RGB::Black)
+    w, h = rooms_width_height
+    x, y = [0, 0]
 
-    pdf_draw_section_name( pdf, opts )
+    loop do
 
-    xymin, = min_max_rooms
+      if rotate
+	pdf.rotate_axis(90.0)
+	pdf.translate_axis( 0, -pdf.page_height )
+      end
 
-    x = -(xymin[0]-1) * opts['ww']
-    y =  (xymin[1]-1) * opts['hh']
-    pdf.translate_axis( x, y )
+      # Move section to its position in page
+      tx1, ty1 = [@xoff * opts['ww'], @yoff * -opts['hh']]
+      pdf.translate_axis( tx1, ty1 )
+
+      # Use times-roman as font
+      pdf.select_font 'Times-Roman'
+      pdf.stroke_color(Color::RGB::Black)
+      pdf.fill_color(Color::RGB::Black)
+
+      pdf_draw_section_name( pdf, opts, x, y )
+
+      xymin,  = min_max_rooms
+
+      # Move rooms, so that we don't print empty areas
+      tx2 = -(xymin[0]) * opts['ww'] - x * opts['ww']
+      ty2 =  (xymin[1]) * opts['hh'] - 60 + (y - (y > 0? 1 : 0)) * opts['hh']
+      pdf.translate_axis( tx2, ty2 )
+      
+      
+      # For testing purposes only, draw grid of boxes
+      # pdf_draw_grid( pdf, opts, width, height )
+      @connections.each { |c| 
+	a = c.roomA
+	b = c.roomB
+	next if a.y < y and b and b.y < y
+	c.pdf_draw( pdf, opts )
+      }
+      @rooms.each_with_index { |r, idx| 
+	next if r.y < y
+	r.pdf_draw( pdf, opts, idx) 
+      }
+      
+      # Reset axis
+      pdf.translate_axis(-tx2, -ty2)
+      pdf.translate_axis(-tx1, -ty1)
+      
+      xi = opts['width']
+      yi = opts['height']
+      if rotate
+	xi = (pdf.page_height / opts['ww']).to_i - 1
+	yi = (pdf.page_width  / opts['hh']).to_i - 1
+      end
 
-    # For testing purposes only, draw grid of boxes
-    # pdf_draw_grid( pdf, opts, width, height )
-    @connections.each { |c| c.pdf_draw( pdf, opts ) }
-    @rooms.each_with_index { |r, idx| r.pdf_draw( pdf, opts, idx) }
+      x += xi
+      if x >= w
+	x = 0
+	y += yi
+	break if y >= h
+      end
 
-    # Reset axis
-    pdf.translate_axis(-x, -y)
-    pdf.translate_axis(-pack[0], -pack[1])
+      # We could not fit all rooms in page.  Start new page
+      pdf.start_new_page
+    end
   end
 end
 
@@ -332,6 +372,7 @@ class FXMap
     create_pathmap
   end
 
+
   def pdf_export(pdffile = Dir::tmpdir + "/ifmap.pdf", printer = nil)
 
     paper = 'LETTER'
@@ -353,6 +394,7 @@ class FXMap
     # Open a new PDF writer with paper selected
     pdf = PDF::Writer.new :paper => paper
 
+    pdf.margins_pt 0
 
     pdf_options = @options.dup
 

data/lib/IFMapper/Room.rb

@@ -84,6 +84,9 @@ class Room
     if self == b
       raise "next_to? comparing same room #{self}"
     end
+    if b.x == @x and b.y == @y
+      raise "#{self} and #{b} in same location."
+    end
     dx = (b.x - @x)
     dy = (b.y - @y)
     return nil if dx.abs > 1 or dy.abs > 1

data/lib/IFMapper/Section.rb

@@ -48,6 +48,36 @@ class Section
     return [ minXY, maxXY ]
   end
 
+  #
+  # Return true or false if map is free at location x,y
+  #
+  def free?(x,y)
+    @rooms.each { |r|
+      return false if r.x == x and r.y == y
+    }
+    return true
+  end
+
+  #
+  # Shift rooms in dx and dy direction from x,y position on.
+  #
+  def shift(x, y, dx, dy)
+    @rooms.each { |r|
+      ox = oy = 0
+      if (dx < 0 and r.x <= x) or
+	  (dx > 0 and r.x >= x)
+	ox = dx
+      end
+      if (dy < 0 and r.y <= y) or
+	  (dy > 0 and r.y >= y)
+	oy = dy
+      end
+      r.x += ox
+      r.y += oy
+    }
+  end
+
+
   #
   # Delete a connection from section
   #