ifmapper 1.1.0 → 1.1.1

data/HISTORY.txt

@@ -1,8 +1,12 @@
+v1.1.1  Improvements:
+	- Added support for Trizbort maps for reading and writing.
+	- Made failed connections turn cyan upon selection.
+
 v1.1.0  - Bug fixed select all so it can be done with keyboard.
  
 v1.0.9  - Bug fixed crash of cut selection when stubs were present.
 	- Added option to automap rooms with all caps.
-	- Bug fixed Select All rooms to show the selection.
+	- Bug fixed Select All/None rooms to show the selection.
 
 v1.0.8  - Added option to load a map from command-line.
 	- Bug fixed pdf output of letters near exits.

data/IFMapper.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '1.1.0'
+	spec.version = '1.1.1'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarra13@gmail.com'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'

data/lib/IFMapper/FXConnection.rb

@@ -122,7 +122,11 @@ class FXConnection < Connection
   #
   def draw(dc, zoom, opt)
     if @selected
-      dc.foreground = 'yellow'
+      if @failed
+        dc.foreground = 'cyan'
+      else
+        dc.foreground = 'yellow'
+      end
     elsif @failed
       dc.foreground = 'red'
     else

data/lib/IFMapper/FXMap.rb

@@ -2116,10 +2116,19 @@ class FXMap < Map
   #
   def export_inform7(file)
     require 'IFMapper/Inform7Writer'
-    file.sub!(/.inform$/, '')
+    file.sub!(/\.inform$/, '')
     Inform7Writer.new(self, file)
   end
 
+  #
+  # Export map as a set of Inform source code files
+  #
+  def export_trizbort(file)
+    require 'IFMapper/TrizbortWriter'
+    file.sub!(/\.trizbort$/, '')
+    TrizbortWriter.new(self, file)
+  end
+
   #
   # Export map as a set of Inform source code files
   #
@@ -2153,6 +2162,8 @@ class FXMap < Map
 	export_ifm(file)
       when /\.t$/
 	export_tads(file)
+      when /\.trizbort$/
+        export_trizbort(file)
       else
 	@filename = file
 	return _save

data/lib/IFMapper/FXMapFileDialog.rb

@@ -8,12 +8,12 @@ class FXMapFileDialog < FXFileDialog
   @@last_path = nil
 
   KNOWN_LOAD_EXTENSIONS = [
-    "#{EXT_MAP_FILES} (*.map,*.gmp,*.ifm,*.inf,*.t,*.t3m)",
+    "#{EXT_MAP_FILES} (*.map,*.gmp,*.ifm,*.inf,*.t,*.t3m,*.trizbort)",
     EXT_ALL_FILES,
   ]
 
   KNOWN_SAVE_EXTENSIONS = [
-    "#{EXT_MAP_FILES} (*.map,*.gmp,*.ifm,*.inf,*.inform,*.t,*.t3m)",
+    "#{EXT_MAP_FILES} (*.map,*.gmp,*.ifm,*.inf,*.inform,*.t,*.t3m,*.trizbort)",
     EXT_ALL_FILES,
   ]
 

data/lib/IFMapper/FXMapperWindow.rb

@@ -46,7 +46,7 @@ require 'IFMapper/FXWarningBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '1.1.0'
+  VERSION      = '1.1.1'
   AUTHOR = "Gonzalo Garramuño"
 
   @@copy_buffer = nil
@@ -98,7 +98,7 @@ class FXMapperWindow < FXMainWindow
     begin
       TADSReader.new(file, map)
     rescue => e
-      return "#{e}"
+      return "#{e} #{e.backtrace}"
     end
     return map
   end
@@ -108,7 +108,7 @@ class FXMapperWindow < FXMainWindow
     begin
       InformReader.new(file, map)
     rescue => e
-      return "#{e}"
+      return "#{e} #{e.backtrace}"
     end
     return map
   end
@@ -118,7 +118,17 @@ class FXMapperWindow < FXMainWindow
     begin
       GUEReader.new(file, map)
     rescue => e
-      return "#{e}"
+      return "#{e} #{e.backtrace}"
+    end
+    return map
+  end
+
+  def open_trizbort(file, map)
+    require 'IFMapper/TrizbortReader'
+    begin
+      TrizbortReader.new(file, map)
+    rescue => e
+      return "#{e} #{e.backtrace}"
     end
     return map
   end
@@ -202,6 +212,8 @@ class FXMapperWindow < FXMainWindow
       tmp = open_tads(file, map)
     elsif file =~ /\.gmp$/
       tmp = open_guemap(file, map)
+    elsif file =~ /\.trizbort$/
+      tmp = open_trizbort(file, map)
     else
       tmp = open_map(file)
     end
@@ -395,6 +407,21 @@ class FXMapperWindow < FXMainWindow
     map.export_ifm(d.filename) if d.filename != ''
   end
 
+  #
+  # Export current map as an IFM file
+  #
+  def trizbort_export_cb(sender, sel, msg)
+    map = current_map
+    return unless map
+
+    require 'IFMapper/FXMapFileDialog'
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_TRIZBORT, 
+			    [
+			      FMT_TRIZBORT
+			    ])
+    map.export_trizbort(d.filename) if d.filename != ''
+  end
+
   #
   # Export current map as an Inform source file
   #
@@ -952,6 +979,9 @@ class FXMapperWindow < FXMainWindow
     cmd = FXMenuCommand.new(submenu, MENU_EXPORT_PDF, nil)
     cmd.connect(SEL_COMMAND, method(:pdf_export_cb))
 
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_TRIZBORT, nil)
+    cmd.connect(SEL_COMMAND, method(:trizbort_export_cb))
+
     cmd = FXMenuCommand.new(submenu, MENU_EXPORT_IFM, nil)
     cmd.connect(SEL_COMMAND, method(:ifm_export_cb))
 

data/lib/IFMapper/FXSection.rb

@@ -30,4 +30,10 @@ class FXSection < Section
     @win.copy_from(self)
     @win.show
   end
+
+  def initialize()
+    super
+    @win = nil
+  end
+
 end

data/lib/IFMapper/TranscriptReader.rb

@@ -1200,7 +1200,7 @@ class TranscriptReader
 	      debug "*** CANNOT AUTOMAP --- MAZE ***"
 	      dir = Room::DIRECTIONS[dir]
 	      @map.cannot_automap "Maze detected.\n'#{from}' #{dir} leads to '#{c.roomB}',\nnot to this '#{to}'."
-	      # self.stop
+	      self.stop
 	      return nil
 	    end
 	  end

data/lib/IFMapper/TrizbortReader.rb

@@ -0,0 +1,259 @@
+#
+# Trizbort map reader
+#
+
+class FXMap; end
+
+require 'rexml/document'
+require 'IFMapper/FXConnection'
+
+#
+# Class that allows importing a Trizbort map file.
+#
+class TrizbortReader
+
+  class ParseError < StandardError; end
+  class MapError < StandardError; end
+
+
+
+  DIRS = { 
+    'n' => 0, # n
+    's' => 4, # s
+    'e' => 2, # e
+    'w' => 6, # w
+    'ne' => 1, # ne
+    'nw' => 7, # nw
+    'se' => 3, # se
+    'sw' => 5, # sw
+
+    # Trizbort also support connections to the sides of centers
+    #
+    #  --*--*--
+    #  *      *
+    #  *      *
+    #  --*--*--
+    #
+    # We translate these as corner connections.
+    #
+    'ene' => [2, 1], #   ----*-
+    'ese' => [2, 3], #   ----*-
+    'nne' => [0, 1],
+    'wnw' => [6, 7],
+    'wsw' => [6, 5],
+    'nnw' => [0, 7],
+    'ssw' => [4, 5],
+  }
+  
+
+  attr :doc
+
+  @@debug = nil
+
+  def debug(x)
+    if @@debug.to_i > 0
+      $stderr.puts x
+    end
+  end
+
+  #
+  # Read Trimap rexml from file stream
+  #
+  def parse
+    
+    rooms = {}
+
+
+    @doc.elements.each('trizbort/info/title') { |e|
+      @map.name = e.text
+    }
+
+    @doc.elements.each('trizbort/info/author') { |e|
+      @map.creator = e.text
+    }
+
+    @doc.elements.each('trizbort/map/room') { |e|
+      id = e.attributes['id'].to_i
+      name = e.attributes['name']
+      x = e.attributes['x'].to_i
+      y = e.attributes['y'].to_i 
+      w = e.attributes['w'].to_i 
+      h = e.attributes['h'].to_i
+      r = @map.new_room(x, y)
+      r.name = name
+      rooms[id] = r
+      e.elements.each('objects') { |o|
+        r.objects = o.text.to_s.gsub('|',"\n")
+      }
+    }
+
+    @doc.elements.each('trizbort/map/line') { |e|
+      style = e.attributes['style'].to_s
+
+      if style == 'dashed'
+        style = Connection::SPECIAL
+      else
+        style = Connection::FREE
+      end
+
+      id = e.attributes['id'].to_i
+      flow = e.attributes['flow']
+
+      if flow == 'oneWay'
+        flow = Connection::AtoB
+      else
+        flow = Connection::BOTH
+      end
+
+      startText = e.attributes['startText'].to_s
+      endText = e.attributes['endText'].to_s
+
+      line = {}
+
+      e.elements.each { |x|
+        name = x.local_name
+        if name == 'dock'
+          port = x.attributes['port']
+          room = x.attributes['id'].to_i
+          index = x.attributes['index'].to_i
+          line[index] = [port, rooms[room]]
+        elsif name == 'point'
+          index = x.attributes['index'].to_i
+          line[index] = [nil, nil]
+        end
+      }
+
+      if line.size > 0
+        roomA = line[0][1]
+        dirA  = DIRS[line[0][0]]
+
+        if dirA.kind_of?(Array)
+          dirA.each { |d|
+            next if roomA[d]
+            dirA = d
+            break
+          }
+          if dirA.kind_of? Array
+            dirA = dirA[0]
+          end
+        end
+
+        if line.size > 1
+          roomB = line[1][1]
+          dirB  = DIRS[line[1][0]]
+
+          if dirB.kind_of? Array
+            dirB.each { |d|
+              next if roomB[d]
+              dirB = d
+              break
+            }
+            if dirB.kind_of?(Array)
+              dirB = dirB[0]
+            end
+          end
+        end
+
+        debug "Connect: #{roomA} ->#{roomB} "
+        debug "dirA: #{dirA} dirB: #{dirB}"
+
+        if startText =~ /up?/i
+          startText = 1
+        elsif startText =~ /d(?:own)?/i
+          startText = 2
+        elsif startText =~ /in?/i
+          startText = 3
+        elsif startText =~ /o(?:ut)?/i
+          startText = 4
+        else
+          startText = 0
+        end
+
+        if endText =~ /up?/i
+          endText = 1
+        elsif endText =~ /d(?:own)?/i
+          endText = 2
+        elsif endText =~ /in?/i
+          endText = 3
+        elsif endText =~ /o(?:ut)?/i
+          endText = 4
+        else
+          endText = 0
+        end
+
+        debug "exitA: #{startText} exitB: #{endText}"
+
+        begin
+          c = @map.new_connection( roomA, dirA, roomB, dirB )
+          c.exitAtext = startText
+          if roomB
+            c.exitBtext = endText
+          end
+          c.type = style
+          c.dir = flow
+          debug c
+        rescue Section::ConnectionError
+        end
+      end
+      
+    }
+
+  end
+
+
+
+  def reposition
+    @map.sections.each do |sect|
+      minXY, = sect.min_max_rooms
+      sect.rooms.each do |r|
+        r.x -= minXY[0]
+	r.y -= minXY[1]
+	r.x /= 128.0
+	r.y /= 64.0
+      end
+    end
+
+    @map.sections.each do |sect|
+      sect.rooms.each_with_index do |r, idx|
+	x = r.x
+	y = r.y
+	xf = x.floor
+	yf = y.floor
+	if x != xf or y != yf
+	  sect.rooms.each do |r2|
+	    next if r == r2
+	    if xf == r2.x.floor and yf == r2.y.floor
+	      dx = (x - xf).ceil
+	      dy = (y - yf).ceil
+	      sect.shift(x, y, dx, dy)
+	      break
+	    end
+	  end
+	end
+	r.x = r.x.floor.to_i
+        r.y = r.y.floor.to_i
+      end
+    end
+  end
+
+  def initialize(file, map = Map.new('Trizbort Imported Map'))
+    @map = map
+    
+    f = File.open( file )
+    @doc = REXML::Document.new f
+
+    parse
+
+    reposition
+
+    @map.fit
+    @map.section = 0
+
+    if @map.kind_of?(FXMap)
+      @map.filename   = file.sub(/\.trizbort$/i, '.map')
+      @map.navigation = true
+      @map.window.show
+    end
+  end
+
+end

data/lib/IFMapper/TrizbortWriter.rb

@@ -0,0 +1,107 @@
+
+
+
+class TrizbortWriter
+
+  W = 128
+  H = 64
+
+
+  DIRECTIONS = [
+    'n',
+    'ne',
+    'e',
+    'se',
+    's',
+    'sw',
+    'w',
+    'nw',
+  ]
+
+  OTHERDIRS = [
+    '',
+    'u',
+    'd',
+    'in',
+    'out',
+  ]
+
+  def write_objects( room )
+    if room.objects
+      @f.print "\t\t\ŧ<objects>"
+      room.objects.split("\n").each_with_index { |obj,idx|
+        if idx > 0
+          @f.print "|"
+        end
+        @f.print "#{obj}"
+      }
+      @f.puts "</objects>"
+    end
+  end
+
+  def write_map
+    @f.puts "\t<map>"
+    hash = {}
+    x = 0
+    y = 0
+    maxX = 0
+    maxY = 0
+    id = 0
+    @map.sections.each { |s|
+      s.rooms.each { |r|
+        @f.puts "\t\t<room id=\"#{id}\" name=\"#{r.name}\" x=\"#{x + r.x*(W+32)}\" y=\"#{y + r.y*(H+32)}\" w=\"#{W}\" h=\"#{H}\">"
+        write_objects r
+        @f.puts "\t\t</room>"
+        hash[r] = id
+        id += 1
+        maxX = r.x if r.x > maxX
+        maxY = r.y if r.y > maxY
+      }
+      x = maxX * (W+32)
+      s.connections.each { |c|
+        @f.print "\t\t<line id=\"#{id}\""
+        if c.type == Connection::SPECIAL
+          @f.print " style=\"dashed\""
+        end
+        if c.dir == Connection::AtoB
+          @f.print " flow=\"oneWay\""
+        end
+        @f.puts ">"
+        dirA, dirB = c.dirs
+        id += 1
+        @f.print "\t\t\t<dock index=\"0\" id=\"#{hash[c.roomA]}\" "
+        portA = DIRECTIONS[dirA]
+        @f.puts "port=\"#{portA}\" />"
+        if c.roomB
+          portB = DIRECTIONS[dirB]
+          @f.print "\t\t\t<dock index=\"1\" id=\"#{hash[c.roomB]}\" "
+          @f.puts "port=\"#{portB}\" />"
+        end
+        @f.puts "\t\t</line>"
+      }
+    }
+    @f.puts "\t</map>"
+  end
+  
+  def write_info
+    @f.puts "\t<info>\n\t\t<title>#{@map.name}</title>"
+    @f.puts "\t\t<author>#{@map.creator}</author>"
+    @f.puts "\t</info>"
+  end
+
+  def write
+    @f.puts '<?xml version="1.0" encoding="utf-8"?>'
+    @f.puts '<trizbort>'
+    write_info
+    write_map
+    @f.puts '</trizbort>'
+  end
+
+  def initialize(map, fileroot)
+    @root = fileroot
+    @base = File.basename(@root)
+    @f = File.open "#{fileroot}.trizbort", 'w'
+    @map = map
+    write
+  end
+end

data/lib/IFMapper/locales/en/Messages.rb

@@ -55,6 +55,9 @@ MSG_SAVE_MAP = 'Save Map'
 MSG_WAS_MODIFIED = "was modified.\n"
 MSG_SHOULD_I_SAVE_CHANGES = 'Should I save the changes?'
 
+MSG_SAVE_MAP_AS_TRIZBORT = 'Save Map as Trizbort File'
+FMT_TRIZBORT             = 'Trizbort Map (*.trizbort)'
+
 MSG_SAVE_MAP_AS_IFM = 'Save Map as IFM File'
 FMT_IFM             = 'IFM Map (*.ifm)'
 
@@ -256,10 +259,11 @@ MENU_SAVE    = "&Save\tCtl-S\tSave document."
 MENU_SAVE_AS = "Save &As...\t\tSave document to another file."
 
 MENU_EXPORT  = 'Export'
-MENU_EXPORT_PDF    = "&Export as PDF...\t\tExport map as Acrobat PDF document."
-MENU_EXPORT_IFM    = "&Export as IFM...\t\tExport map as an IFM map."
-MENU_EXPORT_INFORM = "&Export as Inform Source...\t\tExport map as an Inform source code file."
-MENU_EXPORT_TADS = "&Export as TADS3 Source...\t\tExport map as a TADS3 source code file."
+MENU_EXPORT_PDF    = "Export as &PDF...\t\tExport map as Acrobat PDF document."
+MENU_EXPORT_TRIZBORT = "Export as Triz&bort...\t\tExport map as a Trizbort map."
+MENU_EXPORT_IFM    = "Export as &IFM...\t\tExport map as an IFM map."
+MENU_EXPORT_INFORM = "Export as &Inform Source...\t\tExport map as an Inform source code file."
+MENU_EXPORT_TADS = "Export as &TADS3 Source...\t\tExport map as a TADS3 source code file."
 
 MENU_PRINT = 'Print'
 MENU_PRINT_MAP = "&Map...\t\tPrint map (as graph)."

data/lib/IFMapper/locales/es/Messages.rb

@@ -59,6 +59,9 @@ MSG_SAVE_MAP = 'Grabar Mapa'
 MSG_WAS_MODIFIED = "fue modificado.\n"
 MSG_SHOULD_I_SAVE_CHANGES = '¿Grabo los cambios?'
 
+MSG_SAVE_MAP_AS_TRIZBORT = 'Grabar Mapa como Archivo Trizbort'
+FMT_TRIZBORT             = 'Mapa Trizbort (*.trizbort)'
+
 MSG_SAVE_MAP_AS_IFM = 'Grabar Mapa como Archivo IFM'
 FMT_IFM             = 'Mapa IFM (*.ifm)'
 
@@ -261,10 +264,11 @@ MENU_SAVE    = "&Grabar\tCtl-G\tGrabar un mapa."
 MENU_SAVE_AS = "Grabar &Como...\t\tGrabar mapa en otro archivo."
 
 MENU_EXPORT  = 'Exportar'
-MENU_EXPORT_PDF    = "&Exportar como PDF...\t\tExportar mapa como documento Acrobat PDF."
-MENU_EXPORT_IFM    = "&Exportar como IFM...\t\tExportar mapa como un archivo IFM."
-MENU_EXPORT_INFORM = "&Exportar como Código Fuente de Inform...\t\tExportar mapa como un código fuente de Inform."
-MENU_EXPORT_TADS = "&Exportar como Código Fuente de TADS3...\t\tExportar mapa como un código fuente de TADS3."
+MENU_EXPORT_PDF    = "Exportar como &PDF...\t\tExportar mapa como documento Acrobat PDF."
+MENU_EXPORT_TRIZBORT = "Exportar como Triz&bort...\t\tExportar mapa como un archivo Trizbort."
+MENU_EXPORT_IFM    = "Exportar como &IFM...\t\tExportar mapa como un archivo IFM."
+MENU_EXPORT_INFORM = "Exportar como Código Fuente de &Inform...\t\tExportar mapa como un código fuente de Inform."
+MENU_EXPORT_TADS = "Exportar como Código Fuente de &TADS3...\t\tExportar mapa como un código fuente de TADS3."
 
 MENU_PRINT = 'Imprimir'
 MENU_PRINT_MAP = "&Mapa...\t\tImprimir mapa (como gráfico)."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -03:00
+date: 2011-06-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,8 @@ files:
 - lib/IFMapper/TADSWriter.rb
 - lib/IFMapper/TranscriptDialogBox.rb
 - lib/IFMapper/TranscriptReader.rb
+- lib/IFMapper/TrizbortReader.rb
+- lib/IFMapper/TrizbortWriter.rb
 - lib/IFMapper/FXPDFMapExporterOptionsDialogBox.rb
 - lib/IFMapper/FXRoom.rb
 - lib/IFMapper/FXRoomDialogBox.rb