ifmapper 0.6 → 0.7

data/HISTORY.txt

@@ -1,4 +1,71 @@
 
+v0.7 - Fix the issue of users trying to fire up the application from another
+       directory, without cd'ing themselves to the IFMapper directory.
+
+       Added IFM export.
+       Note that albeit you can load and save out an IFM map file, if you load 
+       and then save an ifm file, the integrity of the ifm file created by hand 
+       will not be kept.
+       Things such as ifm variables, task and object dependencies will be
+       lost if you do that.  It is unlikely I will add full walkthru 
+       functionality to IFMapper.
+       IFMapper's main format remains its propietary .map format (which is
+       just marshalling of its internal ruby classes).
+
+       Added a popup menu to the use of the right mouse button.  The main
+       functionality of this is to allow you to easily shift or switch
+       a connection from one room exit to another.  
+       To use it, select a single connection among rooms, then press RMB 
+       and select the room and the exit you want to shift the connection to.  
+       Voila!  Much easier than having to delete and recreate the connection.
+
+       Improved selection mechanism a tad to be more accurate.  Now you
+       can create complex connections near other complex connections, allowing
+       you to make, for example, intercrossing connections like:
+		R---R
+		|\ /|
+		| X |
+		|/ \|
+		R---R
+       This still needs some minor work as you cannot select long connections
+       near room transition areas.
+
+       Fixed a startup crashing bug when HOME variable was not defined.
+       If it is, IFMapper will use the value of it.  If not, user preferences 
+       will get saved to %USERPROFILE% if defined or %HOMEDRIVE%/%HOMEPATH%.
+       If all fails, prefs will get saved to the current directory.
+
+       Searching rooms, objects or tasks now also tries to center the window
+       on the current room being found.  The Next/Previous button now make
+       a tad more sense.  Also, rooms in other sections are not selected
+       until you move to that section using Next/Previous.
+
+       There's now an additional search item to allow searching for keywords
+       in tasks. 
+
+       You can now select all nodes or none of them from a menu option.
+
+       Zooming with mousewheel is a tad faster.
+
+       There's now some very bare bones Postscript exporting, albeit no
+       printing yet.  Printing is really a tough cookie to crack across 
+       platforms.
+
+       Fixed a minor bug regarding failed connections that could show with some
+       ifm files (mainly Zork1.ifm)
+
+       Added some more documentation and also some thank yous.
+
+       Added proper cut/copy/pasting of rooms and connections to the same
+       section, to new sections or even to different maps.  Just select the
+       rooms and connections you want to copy and do cut/copy and then paste.
+       Rooms are pasted to the first map area that has enough free nodes to
+       support them.
+
+       Made SHIFT-DRAG selection also select connections.
+
+       Updated my email.
+
 v0.6 - Fixed a crashing bug when nodes were moved too far to the right or
        to the bottom of the map area.
        
@@ -22,7 +89,7 @@ v0.6 - Fixed a crashing bug when nodes were moved too far to the right or
        Added the ability to set the map width/height from the Map Information
        panel.
 
-       Fixed an obscure bug when loading IMF maps that were bigger than the
+       Fixed an obscure bug when loading IFM maps that were bigger than the
        default map size.
 
 v0.5 - First public release on Rubyforge.

data/IFMapper.gemspec

@@ -2,9 +2,9 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '0.6'
+	spec.version = '0.7'
 	spec.author = "Gonzalo Garramuno" 
-	spec.email = 'GGarramuno@aol.com or ggarram@advance.dsl.com.ar'
+	spec.email = 'ggarram@advance.dsl.com.ar'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'
 	spec.summary = 'Interactive Fiction Mapping Tool.'
 	spec.require_path = "lib"

data/IFMapper.rb

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 
-# Add current path, so modules are found locally
+
+# cd to install path, so modules are found locally
+install_loc = $0.sub(/\/?[^\/]*$/, '')
+install_loc = '.' if install_loc == ''
+Dir.chdir(install_loc)
 $LOAD_PATH << './lib'
 require 'IFMapper/FXMapperWindow'
 

data/lib/IFMapper/AStar.rb

@@ -230,13 +230,13 @@ class MapNode
   def cost( successor )
     g  = get_map(@x,@y)
 
-#     dx = (@x - successor.x).abs
-#     dy = (@y - successor.y).abs
-#     if dx + dy == 1
-#        g += 0   # straight move
-#      else
-#        g += 4  # diagonal move
-#     end
+    dx = (@x - successor.x).abs
+    dy = (@y - successor.y).abs
+    if dx + dy == 1
+       g += 10  # straight move
+     else
+       g += 14  # diagonal move
+    end
     return g
   end
 

data/lib/IFMapper/Connection.rb

@@ -42,7 +42,7 @@ class Connection
     a = @roomA? @roomA.name : 'nil'
     b = @roomB? @roomB.name : 'nil'
     if exitAtext > 0
-      dirA = EXIT_TEXT[exitBtext]
+      dirA = EXIT_TEXT[exitAtext]
     else
       if @roomA
 	idx  = @roomA.exits.index(self)
@@ -57,7 +57,7 @@ class Connection
 	dirB = Room::DIRECTIONS[idx] if idx
       end
     end
-    "#{a} #{dirA}<->#{b} #{dirB}"
+    "#{a} #{dirA.upcase}<->#{b} #{dirB.upcase}"
   end
 end
 

data/lib/IFMapper/FXConnection.rb

@@ -133,15 +133,18 @@ class FXConnection < Connection
   end
 
 
+  def update_properties(map)
+    return if not @@win or not @@win.shown?
+    @@win.map = map
+    @@win.copy_from(self)
+  end
+
   def properties(map, event = nil)
     if not @@win
       @@win = FXConnectionDialogBox.new(map, self, event)
-    else
-      @@win.map = map
     end
-    @@win.copy_from(self)
     @@win.show
-    return
+    update_properties(map)
   end
 
   protected

data/lib/IFMapper/FXDCPostscript.rb

@@ -0,0 +1,404 @@
+
+
+#
+# Class used to do Postscript printing.  This class has only the basic
+# functionality needed for doing so and replaces the still somewhat buggy version of
+# Fox's 1.2 FXDCPrint
+#
+class FXDCPostscript < FXDC
+  @@printcmd = 'lpr -P%s -o l -' # -#%d'
+
+  def setContentRange(xmin, ymin, xmax, ymax)
+    @pxmin = xmin.to_f
+    @pymin = ymin.to_f
+    @pxmax = xmax.to_f
+    @pymax = ymax.to_f
+  end
+
+  # Transform point
+  def tfm(xi, yi)
+    pxrange = @pxmax - @pxmin
+    pyrange = @pymax - @pymin
+
+    if @flags & PRINT_LANDSCAPE != 0
+      mxmin = @ymin.to_f
+      mxmax = @ymax.to_f
+      mymin = @width - @xmax
+      mymax = @width - @xmin
+      mxrange = mxmax - mxmin
+      myrange = mymax - mymin
+    else
+      mxmin = @xmin
+      mxmax = @xmax
+      mymin = @ymin
+      mymax = @ymax
+      mxrange = mxmax-mxmin
+      myrange = mymax-mymin
+    end
+
+    if pyrange/pxrange <= myrange/mxrange
+      # short/wide
+      xo = mxmin + ((xi.to_f-@pxmin)/pxrange) * mxrange;
+      yo = mymin + 0.5 * (myrange-pyrange * (mxrange/pxrange)) + 
+	  (pyrange-yi.to_f) * (mxrange/pxrange)
+    else
+      # tall/thin
+      xo = mxmin + 0.5 * (mxrange-pxrange * (myrange/pyrange)) + 
+	xi * (myrange/pyrange)
+      yo = mymin + ((pyrange-yi.to_f)/pyrange) * myrange
+    end
+    return [xo, yo]
+  end
+
+
+
+
+
+  def _header
+    @f.puts <<'HEADER'
+%%!PS-Adobe-3.0
+%%%%Title: Print Job
+%%%%Creator: IFMapper
+HEADER
+
+  end
+
+  def beginPrint(printer, &block)
+    @flags = printer.flags
+    if @flags & PRINT_DEST_FILE != 0
+      @f = File.open( printer.name, 'w' )
+    else
+      buffer = @@printcmd % [ printer.name, printer.numcopies ]
+      puts buffer
+      @f = File.popen( buffer, 'w')
+    end
+
+
+    @width  = printer.mediawidth.to_f
+    @height = printer.mediaheight.to_f
+
+    @xmin   = printer.leftmargin.to_f
+    @xmax   = @width - printer.rightmargin 
+
+    @ymin   = printer.bottommargin.to_f
+    @ymax   = @height - printer.topmargin 
+
+
+    _header
+    if @flags & PRINT_NOBOUNDS != 0
+      xmin = 10000000.0
+      xmax = -xmin
+      ymin = 10000000.0
+      ymax = -ymin
+      @f.puts "%%%%BoundingBox: (atend)"
+    else
+      @f.puts "%%%%BoundingBox: %d %d %d %d" %
+	[ @xmin, @ymin, @xmax, @ymax ]
+    end
+
+    @numpages = 1 + printer.firstpage - printer.lastpage
+    if    @flags & PRINT_PAGES_ODD
+      @numpages = 1 + (printer.topage - printer.frompage) / 2  
+    elsif @flags & PRINT_PAGES_EVEN
+      @numpages = 1 + (printer.topage - printer.frompage) / 2  
+    elsif @pages & PRINT_PAGES_RANGE
+      @numpages = 1 + printer.topage - printer.frompage
+    end
+
+    if @numpages == 0
+      @f.puts "%%%%Pages: (atend)"
+    else
+      @f.puts "%%%%Pages: #{@numpages}"
+    end
+
+    @f.puts "%%%%DocumentFonts:"
+    @f.puts "%%%%EndComments"
+    @f.puts "%%%%BeginProlog\n\n"
+
+    # Various definitions
+    @f.puts "%% h w x y drawRect\n"
+    @f.puts "/drawRect {\n\tnewpath moveto dup 0 rlineto exch dup 0 exch\n\trlineto exch neg 0 rlineto neg 0 exch rlineto\n\tclosepath stroke\n} def\n"
+    @f.puts "%% h w x y fillRect\n"
+    @f.puts "/fillRect {\n\tnewpath moveto dup 0 rlineto exch dup 0 exch\n\trlineto exch neg 0 rlineto neg 0 exch rlineto\n\tclosepath fill stroke\n} def\n"
+    @f.puts "%% x y a b drawLine\n"
+    @f.puts "/drawLine {\n\tnewpath moveto lineto stroke\n} def\n"
+    @f.puts "%% x y ..... npoints drawLines\n"
+    @f.puts "/drawLines {\n\t3 1 roll newpath moveto {lineto} repeat stroke\n} def\n"
+    @f.puts "%% x y a b ..... nsegments drawSegmt\n"
+    @f.puts "/drawSegmt {\n\tnewpath {\n\t\tmoveto lineto\n\t} repeat stroke\n} def\n"
+    @f.puts "%% x y drawPoint\n"
+    @f.puts "/drawPoint {\n\ttranslate 1 1 scale 8 8 1 [ 8 0 0 8 0 0 ] {<0000>} image\n} def\n"
+    @f.puts "%% centerx centery  startAngle endAngle radiusX radiusY drawArc\n"
+    @f.puts "/drawArc {\n\tgsave dup 3 1 roll div dup 1 scale 6 -1 roll\n\texch div 5 1 roll  3 -2 roll arc stroke grestore\n} def\n"
+    @f.puts "/fillChord {\n\tgsave dup 3 1 roll div dup 1 scale 6 -1 roll\n\texch div 5 1 roll  3 -2 roll arc fill grestore\n} def\n"
+    @f.puts "%% (string) x y height drawText\n"
+    @f.puts "/drawText {\n\tgsave findfont exch scalefont setfont moveto\n\tshow grestore\n} def\n"
+
+
+    @f.puts "%%%%EndProlog"
+
+    @f.puts "%%%%BeginSetup"
+    @f.puts "/#copies #{printer.numcopies} def"
+    @f.puts "%%%%EndSetup"
+
+    @page = 0
+
+    if block_given?
+      yield self
+      endPrint()
+    end
+  end
+
+
+  def endPrint
+    @f.puts "%%%%Trailer\n"
+
+    # We now know the bounding box
+    if @flags & PRINT_NOBOUNDS != 0
+      if @xmin < @xmax and @ymin < @ymax
+	@f.puts "%%%%BoundingBox: %d %d %d %d" %
+	  [ @xmin, @ymin, @xmax, @ymax ]
+      else
+	@f.puts "%%%%BoundingBox: 0 0 100 100"
+      end
+    end
+
+    # We now know the page count
+    if not (@flags & PRINT_PAGES_ODD|PRINT_PAGES_EVEN|PRINT_PAGES_RANGE)
+      @f.puts "%%%%Pages: #{page}"
+    end
+
+    @f.puts "%%%%EOF"
+    @f.close
+  end
+
+
+  def beginPage(num = 1, &block)
+    # Output page number
+    @f.puts "%%%%Page: #{@page} #{@page}" # Ghostscript requests this, I do not know if it is right
+
+    # Reset page bounding box
+    if @flags & PRINT_NOBOUNDS != 0
+      @xmin= 1000000;
+      @xmax=-1000000;
+      @ymin= 1000000;
+      @ymax=-1000000;
+      @f.puts "%%%%PageBoundingBox: (atend)"
+    else
+      # Use the doc bounding box
+      @f.puts "%%%%PageBoundingBox: %d %d %d %d" % [@xmin, @ymin, @xmax, @ymax]
+    end
+
+    # Page setup
+    @f.puts "%%%%BeginPageSetup"
+    @f.puts "%%%%EndPageSetup"
+    @f.puts "gsave"
+
+    # Maybe in landscape?
+    if @flags & PRINT_LANDSCAPE != 0
+      @f.puts "#{@width} 0.0 translate"
+      @f.puts "90 rotate"
+    end
+
+    if block_given?
+      yield self
+      endPage()
+    end
+  end
+
+  def endPage
+    @f.puts "%%%%PageTrailer"
+
+    # We now know the bounding box
+    if @flags & PRINT_NOBOUNDS != 0
+      if @xmin < @xmax and @ymin < @ymax
+	@f.puts "%%%%BoundingBox: %d %d %d %d" [@xmin, @ymin, @xmax, @ymax]
+      else
+	@f.puts "%%%%BoundingBox: 0 0 100 100" # Gotta come up with something...
+      end
+    end
+    @f.puts "showpage"
+    @f.puts "grestore"
+    @page += 1
+  end
+
+  # Extends bounding box with point x,y
+  def bbox(x, y)
+    @xmin = x if x < @xmin
+    @ymin = y if y < @ymin
+    @xmax = x if x > @xmax
+    @ymax = y if y > @ymax
+  end
+
+  def _rect(x, y, w, h)
+      xl, yt = tfm(x, y)
+      xr, yb = tfm(x + w - 1, y + h - 1)
+      bbox(xl,yt)
+      bbox(xr,yb)
+      @f.print "newpath %g %g moveto %g %g lineto %g %g lineto %g %g lineto %g %g lineto " % 
+	[xl,yt,xr,yt,xr,yb,xl,yb,xl,yt]
+  end
+
+  def drawRectangle(x, y, w, h)
+    _rect(x, y, w, h)
+    @f.puts "stroke"
+  end
+
+
+  def drawLine(x1, y1, x2, y2)
+    xx1, yy1 = tfm(x1, y1)
+    xx2, yy2 = tfm(x2, y2)
+    bbox(xx1,yy1)
+    bbox(xx2,yy2)
+    @f.puts "newpath %g %g moveto %g %g lineto stroke" % [xx1, yy1, xx2, yy2]
+  end
+
+  def drawLines(points)
+    return if points.size < 2
+    xx, yy = tfm(points[0].x, points[0].y)
+    bbox(xx,yy)
+    @f.print "newpath %g %g moveto" % [xx, yy]
+    1.upto(points.size-1) { |i|
+      xx, yy = tfm(points[i].x, points[i].y)
+      bbox(xx,yy)
+      @f.print " %g %g lineto" % [xx, yy]
+    }
+    @f.puts " stroke"
+  end
+
+  def drawText(x, y, text)
+    # Draw string (only foreground bits)
+    # Contributed by S. Ancelot <sancelot@online.fr>
+    xx, yy = tfm( x, y )
+
+    pxrange = @pxmax - @pxmin
+    pyrange = @pymax - @pymin
+
+    if @flags & PRINT_LANDSCAPE != 0
+      mxmin = @ymin
+      mxmax = @ymax
+      mymin = @width - @xmax
+      mymax = @width - @xmin
+      mxrange = mxmax - mxmin
+      myrange = mymax - mymin
+    else
+      mxmin = @xmin
+      mxmax = @xmax
+      mymin = @ymin
+      mymax = @ymax
+      mxrange = mxmax - mxmin
+      myrange = mymax - mymin
+    end
+
+    fsize = 0.1 * @font.getSize
+
+    # Hack...
+    # Account for dpi and scale up or down with graph...
+    # Perhaps override screen resolution via registry
+    # FXint screenres=getApp()->reg().readUnsignedEntry("SETTINGS","screenres",100);
+    # Validate
+    screenres = 100
+#     if(screenres<50) screenres=50;
+#       if(screenres>200) screenres=200;
+
+    if pyrange / pxrange <= myrange / mxrange
+      # short/wide
+      fsize *= (mxrange/pxrange)*(screenres/72.0)
+    else
+      # tall/thin
+      fsize *= (myrange/pyrange)*(screenres/72.0)
+    end
+
+    fname = @font.name
+    if fname =~ /times/i
+      fname = 'Times-Roman'
+    elsif fname =~ /(helvetica|verdana|tahoma|arial)/i
+      fname = 'Helvetica'
+    else
+      fname = 'Courier'
+    end
+
+    if @font.getWeight == FXFont::FONTWEIGHT_BOLD
+      fname << '-Bold'
+      if @font.getSlant == FXFont::FONTSLANT_ITALIC
+	fname << 'Italic'
+      elsif @font.getSlant == FXFont::FONTSLANT_OBLIQUE
+	fname << 'Oblique'
+      end
+    else
+      if @font.getSlant == FXFont::FONTSLANT_ITALIC
+	fname << '-Italic'
+      elsif @font.getSlant == FXFont::FONTSLANT_OBLIQUE
+	fname << '-Oblique'
+      end
+    end
+
+    @f.puts "(%s) %g %g %d /%s drawText" % [text, xx, yy, fsize, fname]
+  end
+
+  def fillRectangle(x, y, w, h)
+    _rect(x, y, w, h)
+    @f.puts "fill"
+  end
+
+  def fillPolygon(points)
+    return if points.size < 3
+    xx, yy = tfm(points[0].x, points[0].y)
+    bbox(xx,yy)
+    @f.print "newpath %g %g moveto" % [ xx, yy ]
+    1.upto(points.size-1) { |i|
+      xx, yy = tfm(points[i].x, points[i].y)
+      bbox(xx,yy)
+      @f.print " %g %g lineto" % [ xx, yy ]
+    }
+    @f.puts " fill"
+  end
+
+  def lineStyle=(x)
+    if x == LINE_SOLID
+      @f.puts "[ ] 0 setdash"
+    elsif x == LINE_ONOFF_DASH
+      @f.puts "[2 2] 0 setdash"
+    end
+  end
+
+  def foreground=(c)
+    if c.kind_of?(String)
+      clr = fxcolorfromname(c)
+    else
+      clr = c
+    end
+    @f.puts "%g %g %g setrgbcolor" % [FXREDVAL(clr)/255.0,FXGREENVAL(clr)/255.0,FXBLUEVAL(clr)/255.0]
+  end
+
+  def lineJoin=(x)
+  end
+
+  def lineCap=(x)
+    ncap = 0
+    ncap = 1 if CAP_ROUND == x
+    ncap = 3 if CAP_PROJECTING == x
+    @f.puts "#{ncap} setlinecap"
+  end
+
+  def lineWidth
+    return @lineWidth
+  end
+
+  def lineWidth=(x)
+    @lineWidth = x
+    @f.puts "%f setlinewidth" % [x * 0.5]
+  end
+
+  def initialize(app)
+    @font = app.getNormalFont()
+  end
+
+  def font=(x)
+    @font = x
+  end
+
+  def font
+    return @font
+  end
+end