ifmapper 0.6 → 0.7

data/lib/IFMapper/FXMapperSettings.rb

@@ -3,16 +3,35 @@
 # This class contains the applicatio and map's settings
 #
 class FXMapperSettings < Hash
+  def home
+    if ENV['HOME']
+      homedir = File.expand_path('~')
+      # Ahh... you have to love windows...
+    elsif ENV['USERPROFILE']
+      homedir = ENV['USERPROFILE']
+    elsif ENV['HOMEDRIVE'] and ENV['HOMEPATH']
+      homedir = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
+    else
+      homedir = '.'
+    end
+    return homedir
+  end
+
   def write
-    file = File.expand_path('~/.ifmapper')
-    f = File.open(file, 'w')
-    f.puts YAML.dump(self)
-    f.close
+    begin
+      file = home + '/.ifmapper'
+      f = File.open(file, 'w')
+      f.puts YAML.dump(self)
+      f.close
+    rescue => e
+      $stderr.puts "Preferences not saved:"
+      $stderr.puts e
+    end
   end
 
   def initialize
-    f = File.expand_path('~/.ifmapper')
     begin
+      f = home + '/.ifmapper'
       self.replace( YAML.load_file(f) )
     rescue
       self.replace( {
@@ -25,8 +44,8 @@ class FXMapperSettings < Hash
 		     'Box Number Color'   => 'grey',
 		     
 		     # Fonts
-		     'Font Text'          => 'times new roman',
-		     'Font Objects'       => 'times new roman',
+		     'Font Text'          => 'Times',
+		     'Font Objects'       => 'Times',
 		     
 		     # Creation options
 		     'Create on Connection' => true,

data/lib/IFMapper/FXMapperWindow.rb

@@ -1,20 +1,26 @@
 
+begin
+  $rubygems = false
+  require 'rubygems'
+  $rubygems = true
+rescue LoadError
+end
+
 begin
   require 'fox12'
-rescue => e
-  $stderr.puts "Please install the fox library v1.2 or later."
+rescue LoadError => e
+  $stderr.puts "Please install the FXRuby (FOX) library v1.2 or later."
   if $rubygems
-    $stderr.puts "You can usually do so if you do 'gem install fox'."
+    $stderr.puts "You can usually do so if you do 'gem install fxruby'."
   end
   exit(1)
 end
 
 begin
   require 'yaml'
-rescue => e
+rescue LoadError => e
   $stderr.puts "Please install the yaml library."
-  $stderr.puts "Without it, preferences cannot be saved."
-  exit(1)
+  $stderr.puts "Without it, preferences cannot be loaded or saved."
 end
 
 
@@ -27,13 +33,13 @@ require 'IFMapper/FXAboutDialogBox'
 require 'IFMapper/FXSearchDialogBox'
 require 'IFMapper/FXMapFileDialog'
 require 'IFMapper/FXMapColorBox'
-require 'IFMapper/IFMReader'
+
 
 
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = 0.6
+  VERSION      = 0.7
   AUTHOR       = "Gonzalo Garramuno"
   TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
 
@@ -54,6 +60,7 @@ class FXMapperWindow < FXMainWindow
   end
 
   def open_ifm(file, map)
+    require 'IFMapper/IFMReader'
     IFMReader.new(file, map)
     return map
   end
@@ -110,8 +117,10 @@ class FXMapperWindow < FXMainWindow
     
     map.copy(tmp)
     map.create_pathmap
+    map.verify_integrity
     map.update_title
     map.window.create
+    map.draw
     update_section
     status "Loaded '#{file}'."
   end
@@ -193,34 +202,13 @@ class FXMapperWindow < FXMainWindow
     map.delete_selected
   end
 
-  #
-  # Export current map as a Postscript file
-  #
-  def ps_export
-    map = current_map
-    return unless map
-    raise "Postscript Exporting not yet supported."
-
-    begin
-      require "IFMapper/PSMapExporter"
-    rescue => e
-      # bring up fox warning dialog box
-      return
-    end
-
-    printer = printer_dialog
-    map.ps_export(printer) if printer
-  end
-
-
   #
   # Popup a printer dialog and return the settings or false if user cancels
   #
-  def printer_dialog
+  def printer_dialog(title = 'Print Map')
     map = current_map
-    dlg = FXPrintDialog.new(self, "Print Map #{map.name}")
-    # Set printer to always use Landscape printing
-    dlg.printer.flags |= PRINT_DEST_PAPER | PRINT_LANDSCAPE | PRINT_NOBOUNDS
+    dlg = FXPrintDialog.new(self, title + " for #{map.name}")
+    dlg.printer.flags |= PRINT_DEST_PAPER 
     return dlg.printer if dlg.execute != 0
     return false
   end
@@ -234,7 +222,7 @@ class FXMapperWindow < FXMainWindow
     w.execute
     return
 
-    printer = printer_dialog
+    printer = printer_dialog "Print Locations"
     map.print_locations( printer ) if printer
   end
 
@@ -242,20 +230,44 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    w = FXWarningBox.new( self, "Sorry, but IFM exporting is not yet implemented\n" + 
-			 "in this version.")
-    w.execute
-    return
+    require 'IFMapper/IFMWriter'
+
+    d = FXMapFileDialog.new(self, "Save Map as IFM File", 
+			    [
+			      "IFM Map (*.ifm)"
+			    ])
+    if d.filename != ''
+      file  = d.filename
+      file += '.ifm' if file !~ /\.ifm$/
+      IFMWriter.new(map, file)
+    end
   end
 
+  #
+  # Export current map as a Postscript file
+  #
   def ps_export_cb(sender, sel, msg)
     map = current_map
     return unless map
 
-    w = FXWarningBox.new( self, "Sorry, but Postscript exporting is not implemented\n" +
-			 "in this version.")
-    w.execute
-    return
+    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)
@@ -264,13 +276,14 @@ class FXMapperWindow < FXMainWindow
 
     begin
       require 'IFMapper/PDFMapExporter'
-    rescue => e
+    rescue LoadError => e
       w = FXWarningBox.new( self, "#{e}")
       w.execute
       return
     end
 
 
+
     d = FXMapFileDialog.new(self, "Save Acrobat PDF File", 
 			    [
 			      "Acrobat PDF (*.pdf)"
@@ -288,6 +301,7 @@ class FXMapperWindow < FXMainWindow
 			 "in this version.")
     w.execute
     return
+    require 'IFMapper/MapPrinting'
 
     printer = printer_dialog
     map.print( printer ) if printer
@@ -324,9 +338,26 @@ class FXMapperWindow < FXMainWindow
   end
 
   def self.copy_selected(map)
-    selection = map.sections[map.section].rooms.find_all { |r| r.selected }
-    return if selection.size > 1
-    @@copy_buffer = selection[0]
+    sect = map.sections[map.section]
+
+    # Get all selected rooms
+    rooms = sect.rooms.find_all { |r| r.selected }
+    return if rooms.size < 1
+
+    # Get all selected connections
+    links = sect.connections.find_all { |c| c.selected }
+
+    # Make sure we store only those connections for
+    # those rooms we selected
+    delete = []
+    links.each { |c|
+      delete << c if not rooms.include?(c.roomA) or not rooms.include?(c.roomB)
+    }
+    links -= delete
+
+    selection = [ rooms, links ]
+
+    @@copy_buffer = selection
   end
 
   def self.cut_selected(map)
@@ -335,8 +366,37 @@ class FXMapperWindow < FXMainWindow
   end
 
   def self.paste_selected(map)
-    selection = map.sections[map.section].rooms.find_all { |r| r.selected }
-    selection.each { |r| r.copy(@@copy_buffer) }
+    return if not @@copy_buffer
+    return map.navigation_warning if map.navigation
+
+    sel = @@copy_buffer
+    pos = map.find_empty_area( sel[0] )
+    if not pos
+      w = FXWarningBox.new( map.window, 
+			   "Sorry. No free room in map to paste the nodes.")
+      w.execute
+    else
+      map.clear_selection
+
+      # Add rooms
+      r_to_nr = {}  # orig room to new room hash
+      sel[0].each { |r|
+	nr = map.new_room(r.x + pos[0], r.y + pos[1])
+	nr.copy(r) # copy the room data
+	r_to_nr[r] = nr
+      }
+
+      # Add connections
+      sel[1].each { |c|
+	exitA = c.roomA.exits.index(c)
+	exitB = c.roomB.exits.rindex(c)
+	roomA = r_to_nr[c.roomA]
+	roomB = r_to_nr[c.roomB]
+	c = map.new_connection(roomA, exitA, roomB, exitB)
+	map.path_find(c)
+      }
+      map.draw
+    end
   end
 
   def cut_selected_cb(*o)
@@ -357,9 +417,10 @@ class FXMapperWindow < FXMainWindow
     FXMapperWindow::paste_selected(map)
   end
 
+
   def hilite_matches(map, matches, re, idx = 0 )
     if matches.size == 0
-      status "No objects match regex '#{re}'."
+      status "No matches for regex '#{re}'."
       return
     end
 
@@ -368,13 +429,21 @@ class FXMapperWindow < FXMainWindow
 
     # Jump to first section of match
     map.section = matches[idx][0]
-    map.sections[map.section].rooms.each { |r| r.selected = false }
+    map.sections.each { |s|
+      s.rooms.each { |r| r.selected = false }
+    }
 
-    matches.each { |p, r| r.selected = true }
+    matches.each { |p, r| 
+      next if p != map.section
+      r.selected = true
+    }
 
     num = matches.find_all { |p, r| p == matches[idx][0] }
+    room = matches[idx][1]
+    map.center_view_on_room( room )
+    update_section
 
-    status "#{matches.size} in map, #{num.size} in section."
+    status "'#{room.name}' matches. #{matches.size} matches in map, #{num.size} in section."
     map.draw
   end
 
@@ -453,6 +522,23 @@ class FXMapperWindow < FXMainWindow
     hilite_matches(map, matches, re, @search.index)
   end
 
+  def find_task_in_map(s, m, e)
+    map = current_map
+    return unless map
+
+    re = /#{s.text}/
+    matches = []
+    (0...map.sections.size).each { |p|
+      map.sections[p].rooms.each { |r|
+	next unless r.tasks =~ re
+	matches.push( [p, r] )
+      }
+    }
+    idx = @search.index
+    @search.index = matches.size-1 if idx >= matches.size
+    hilite_matches(map, matches, re, @search.index)
+  end
+
   def find_object_in_map_cb(s, m, e)
     map = current_map
     return unless map
@@ -467,6 +553,20 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  def find_task_in_map_cb(s, m, e)
+    map = current_map
+    return unless map
+
+    title = "Find Task In Map"
+    if not @search
+      @search = FXSearchDialogBox.new(self)
+    end
+    @search.proc  = method(:find_task_in_map)
+    @search.title = title
+    @search.text  = ''
+    @search.show
+  end
+
   def colors_cb(sender, id, msg)
     map = current_map
     return if not map
@@ -479,7 +579,33 @@ class FXMapperWindow < FXMainWindow
     @colors.copy_from(map)
   end
 
-  def about_cb(sender, id, msg)
+
+  def select_none_cb( sender, id, event )
+    map = current_map
+    return if not map
+    sect = map.sections[map.section]
+    sect.rooms.each { |r|
+      r.selected = false
+    }
+    sect.connections.each { |c|
+      c.selected = false
+    }
+  end
+
+
+  def select_all_cb( sender, id, event )
+    map = current_map
+    return if not map
+    sect = map.sections[map.section]
+    sect.rooms.each { |r|
+      r.selected = true
+    }
+    sect.connections.each { |c|
+      c.selected = true
+    }
+  end
+
+  def about_cb(sender, id, event )
     FXAboutDialogBox.new(self, "About This Software...", <<"EOF").execute
 #{TITLE} - #{VERSION}
 
@@ -487,10 +613,10 @@ A WYSIWYG mapping tool for interactive fiction.
 Written by Gonzalo Garramuno.
 
 ggarra@advancedsl.com.ar
-GGarramuno@aol.com
 EOF
   end
 
+
   def create_menus
     # Construct these icons
     newdoc    = load_icon("filenew")
@@ -536,8 +662,8 @@ EOF
     FXMenuCascade.new(filemenu, "Print", nil, submenu)
 
 
-    FXMenuCommand.new(filemenu, "&Quit\tCtl-Q\tQuit the application.", nil, 
-		      getApp(), FXApp::ID_QUIT)
+    cmd = FXMenuCommand.new(filemenu, "&Quit\tCtl-Q\tQuit the application.", nil)
+    cmd.connect( SEL_COMMAND, method(:close_cb) )
 
     # Edit Menu
     editmenu = FXMenuPane.new(self)
@@ -550,14 +676,27 @@ EOF
 			    nil) 
     cmd.connect(SEL_COMMAND, method(:paste_selected_cb))
 
-    # Searching menu
+    # Select submenu
     FXMenuSeparator.new(editmenu)
-    cmd = FXMenuCommand.new(editmenu, "&Search Location in Map\tCtl-F\tFind a Location Name in Map")
+    submenu = FXMenuPane.new(self)
+    cmd = FXMenuCommand.new(submenu, "&All Locations\tAlt-A\tSelect all locations in section")
+    cmd.connect(SEL_COMMAND, method(:select_all_cb))
+    cmd = FXMenuCommand.new(submenu, "&None\tAlt-N\tClear selection in section.")
+    cmd.connect(SEL_COMMAND, method(:select_none_cb))
+    FXMenuCascade.new(editmenu, "Select", nil, submenu)
+
+    # Searching submenu
+    FXMenuSeparator.new(editmenu)
+    submenu = FXMenuPane.new(self)
+    cmd = FXMenuCommand.new(submenu, "&Location in Map\tCtl-F\tFind a Location Name in Map")
     cmd.connect(SEL_COMMAND, method(:find_in_map_cb))
-    cmd = FXMenuCommand.new(editmenu, "&Search Location in Section\tAlt-F\tFind a Location Name in Current Section")
+    cmd = FXMenuCommand.new(submenu, "Location in &Section\tAlt-F\tFind a Location Name in Current Section")
     cmd.connect(SEL_COMMAND, method(:find_in_section_cb))
-    cmd = FXMenuCommand.new(editmenu, "&Search Object in Map\tAlt-O\tFind Location with an Object in the Map")
+    cmd = FXMenuCommand.new(submenu, "&Object in Map\tAlt-O\tFind Location with an Object in the Map")
     cmd.connect(SEL_COMMAND, method(:find_object_in_map_cb))
+    cmd = FXMenuCommand.new(submenu, "&Task in Map\tAlt-T\tFind Location with a Task in the Map")
+    cmd.connect(SEL_COMMAND, method(:find_task_in_map_cb))
+    FXMenuCascade.new(editmenu, "Search", nil, submenu)
 
     # Complex Connection
     FXMenuSeparator.new(editmenu)
@@ -1062,7 +1201,17 @@ EOF
     create_toolbar(toolbar)
     new_map
 
-    self.connect(SEL_CLOSE) { 
+    self.connect(SEL_CLOSE, method(:close_cb))
+    show
+
+    # Trap CTRL-C signals and exit nicely
+    trap('SIGINT') {
+      close_cb
+      exit(0)
+    }
+  end
+
+  def close_cb(*args)
       exit = true
       @maps.each { |m| 
 	if not m.close_cb
@@ -1073,13 +1222,5 @@ EOF
 	end
       }
       self.close if exit
-    }
-
-    show
-
-    # Trap CTRL-C signals and exit nicely
-    trap('SIGINT') { 
-      exit(0)
-    }
   end
 end