ifmapper 1.0.7 → 1.0.8

data/HISTORY.txt

@@ -1,3 +1,7 @@
+v1.0.8  - Added option to load a map from command-line.
+	- Bug fixed pdf output of letters near exits.
+	- Added support for comments in each location.
+
 v1.0.7  - Bug fixed cutting and pasting of rooms, 
 	  which could overlap previous rooms in map and 
 	  leave rooms without new connections.
@@ -10,7 +14,7 @@ v1.0.5  - Improved PDF output in Letter box mode.
 	- Fixed IFM writer styles and syntax.
 
 v1.0.4  - Fixed IFM connections to same room (loop paths)
-	- Improved PDF output, applied samwise patch.
+	- Improve PDF output, applied samwise patch.
 	- Fixed Inform7, 6 and TADS output of loop paths.
 
 v1.0.2  - Added keyboard shortcut + and - for zooming in map

data/IFMapper.gemspec

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

data/IFMapper.rbw

@@ -18,6 +18,12 @@ if __FILE__ == $0
   # Create the application windows
   application.create
 
+  # Optionally, open a map from command-line
+  file = FXMapperWindow::default_options['Map']
+  if file
+    m.open_file(file)
+  end
+
   # Run the application
   begin
     application.run

data/bin/IFMapper

@@ -3,7 +3,7 @@
 
 # cd to install path, so modules are found locally
 install_loc = $0.sub(/\/?[^\/]*$/, '')
-install_loc = install_loc + '/../'
+install_loc = '..' if install_loc == '.' or install_loc == ''
 Dir.chdir(install_loc)
 $LOAD_PATH << './lib'
 require 'IFMapper/FXMapperWindow'
@@ -18,6 +18,12 @@ if __FILE__ == $0
   # Create the application windows
   application.create
 
+  # Optionally, open a map from command-line
+  file = FXMapperWindow::default_options['Map']
+  if file
+    m.open_file(file)
+  end
+
   # Run the application
   begin
     application.run

data/lib/IFMapper/FXMapperSettings.rb

@@ -145,6 +145,8 @@ class FXMapperSettings < Hash
 	language = ARGV.shift
 	language = language[0,2].downcase
 	self['Language'] = language
+      when /.*\.(?:map|ifm|gmp|t|t3m|inf)$/
+        self['Map'] = param
       else
 	$stderr.puts "Unknown parameter '#{param}'."
 	exit(1)
@@ -187,6 +189,8 @@ class FXMapperSettings < Hash
       'Grid Straight Connections' => true,
       'Grid Diagonal Connections' => false,
 
+      # Map options
+      'Map' => nil
     }
 
     self.replace( defaults.merge(self) )

data/lib/IFMapper/FXMapperWindow.rb

@@ -52,6 +52,10 @@ class FXMapperWindow < FXMainWindow
   @@copy_buffer = nil
   @@default_options = FXMapperSettings.new
 
+  def self.default_options
+    return @@default_options
+  end
+
   LANGUAGES = {
     'English'  => 'en',
     'Español' => 'es',
@@ -155,6 +159,10 @@ class FXMapperWindow < FXMainWindow
     file = FXMapFileDialog.new(self, MSG_LOAD_MAP).filename
     return if file == ''
 
+    open_file( file )
+  end
+
+  def open_file(file)
     # First, make sure we don't have it loaded already...
     @maps.each { |m|
       if m.filename == file
@@ -214,6 +222,10 @@ class FXMapperWindow < FXMainWindow
       return
     end
     
+    copy_map(map, tmp, file)
+  end
+
+  def copy_map(map, tmp, file)
     map.copy(tmp)
     map.options.replace( @@default_options.merge(map.options) )
     map.verify_integrity
@@ -977,8 +989,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND, method(:cut_selected_cb))
     cmd = FXMenuCommand.new(editmenu, MENU_PASTE, nil) 
     cmd.connect(SEL_COMMAND, method(:paste_selected_cb))
-    # cmd = FXMenuCommand.new(editmenu, MENU_UNDO, nil) 
-    # cmd.connect(SEL_COMMAND, method(:undo_cb))
+    #cmd = FXMenuCommand.new(editmenu, MENU_UNDO, nil) 
+    #cmd.connect(SEL_COMMAND, method(:undo_cb))
 
     # Select submenu
     FXMenuSeparator.new(editmenu)
@@ -1559,10 +1571,12 @@ class FXMapperWindow < FXMainWindow
     create_mdiclient
     create_menus
     create_toolbar(toolbar)
-    new_map
+    
 
     self.connect(SEL_CLOSE, method(:close_cb))
     show
+
+    new_map
   end
 
   def initialize(app)
@@ -1572,6 +1586,7 @@ class FXMapperWindow < FXMainWindow
     @mdimenu = nil
 
     create_widgets
+  
 
     # Trap CTRL-C signals and exit nicely
     trap('SIGINT') {

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -15,6 +15,7 @@ class FXRoomDialogBox < FXDialogBox
     @room.tasks = @tasks.text
     @room.darkness = (@darkness.checkState == 1)
     @room.desc = @desc.text
+    @room.comment = @comment.text
 
     @map.draw_room(@room)
     @map.update_roomlist
@@ -28,6 +29,7 @@ class FXRoomDialogBox < FXDialogBox
     @objects.text        = room.objects
     @tasks.text          = room.tasks
     @desc.text           = room.desc
+    @comment.text        = room.comment
 
     # Select text for quick editing if it uses default location name
     @name.setCursorPos room.name.size 
@@ -42,12 +44,14 @@ class FXRoomDialogBox < FXDialogBox
       @objects.disable
       @tasks.disable
       @desc.disable
+      @comment.disable
     else
       @name.enable
       @darkness.enable
       @objects.enable
       @tasks.enable
       @desc.enable
+      @comment.enable
     end
 
     if @map.options['Location Tasks']
@@ -121,6 +125,13 @@ class FXRoomDialogBox < FXDialogBox
     @tasks.visibleRows = 8
     @tasks.visibleColumns = 40
 
+    @commentFrame = FXVerticalFrame.new(leftFrame, LAYOUT_SIDE_TOP|
+                                        LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    FXLabel.new(@commentFrame, BOX_COMMENTS, nil, 0, LAYOUT_FILL_X)
+    @comment = FXText.new(@commentFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @comment.visibleRows = 8
+    @comment.visibleColumns = 40
+
     ######## Add description
     @descFrame = FXVerticalFrame.new(all, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
 				LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y)
@@ -130,6 +141,7 @@ class FXRoomDialogBox < FXDialogBox
     @desc.visibleColumns = 70
     @desc.visibleRows = 18
 
+
     if modal
       buttons = FXHorizontalFrame.new(mainFrame, 
 				      LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
@@ -149,6 +161,7 @@ class FXRoomDialogBox < FXDialogBox
       @tasks.connect(SEL_CHANGED) { @room.tasks = @tasks.text }
       @darkness.connect(SEL_COMMAND) { copy_to() }
       @desc.connect(SEL_CHANGED) { @room.desc = @desc.text }
+      @comment.connect(SEL_CHANGED) { @room.comment = @comment.text }
     end
     
     @map = map

data/lib/IFMapper/PDFMapExporter.rb

@@ -62,7 +62,8 @@ class FXConnection
     return FXSpline::bspline(p)
   end
 
-  # PRE: If it's a loop exit that comes back to the same place, let's move it up and right
+  # PRE: If it's a loop exit that comes back to the same place, let's move 
+  #      it up and right
   def pdf_draw_complex_as_lines( pdf, opts )
     p = []
     maxy = opts['height'] * opts['hh'] + opts['hs_2'] + opts['margin_2'] 
@@ -210,8 +211,7 @@ class FXConnection
     end
     pdf.stroke_style( s )
     pdf.stroke_color  Color::RGB::Black
-    # PRE: Let's set the fill colour to white so that we can see the text
-    pdf.fill_color    Color::RGB::White
+    pdf.fill_color    Color::RGB::Black
     if @pts.size > 0
       pdf_draw_complex(pdf, opts)
     else

data/lib/IFMapper/Room.rb

@@ -10,6 +10,7 @@ class Room
   attr_accessor  :darkness  # Isxxxxxxxxxx room in darkness?
   attr_accessor  :x, :y     # Room location in grid
   attr_accessor  :desc      # Room description
+  attr_accessor  :comment   # Room comment
 
   DIR_TO_VECTOR = { 
     0 => [  0, -1 ],
@@ -31,16 +32,20 @@ class Room
     @x        = vars.shift
     @y        = vars.shift
     @desc     = nil
+    @comment  = nil
     if not vars.empty? and vars[0].kind_of?(String)
       @desc     = vars.shift
       @desc.gsub!(/(\w)\s*\n/, '\1 ')
       @desc.sub!(/\n+$/, '')
       @desc.strip!
     end
+    if not vars.empty? and vars[0].kind_of?(String)
+      @comment = vars.shift
+    end
   end
 
   def marshal_dump
-    [ @name, @objects, @tasks, @exits, @darkness, @x, @y, @desc ]
+    [ @name, @objects, @tasks, @exits, @darkness, @x, @y, @desc, @comment ]
   end
 
   def [](dir)

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

@@ -348,6 +348,7 @@ BOX_OBJECTS  = 'Objects: '
 BOX_DARKNESS = 'Darkness'
 BOX_TASKS    = 'Tasks: '
 BOX_DESCRIPTION = 'Description: '
+BOX_COMMENTS = 'Comments: '
 
 BOX_CONNECTION_TYPE = 'Connection Type: '
 BOX_CONNECTION_TYPE_TEXT = [

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

@@ -354,6 +354,7 @@ BOX_OBJECTS  = 'Objetos: '
 BOX_DARKNESS = 'Oscuridad'
 BOX_TASKS    = 'Tareas: '
 BOX_DESCRIPTION = 'Descripción: '
+BOX_COMMENTS = 'Comments: '
 
 BOX_CONNECTION_TYPE = 'Tipo de Conexión: '
 BOX_CONNECTION_TYPE_TEXT = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -03:00
+date: 2011-02-18 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -218,6 +218,7 @@ files:
 - maps/sherbet.map
 - maps/simple.map
 - maps/slouch.map
+- maps/Spelunker's_Quest.map
 - maps/splashdown.map
 - maps/spring.map
 - maps/squarecircle.map