cosmos 3.8.3 → 3.9.1

data/lib/cosmos/tools/table_manager/table_item.rb

@@ -11,64 +11,48 @@
 require 'cosmos'
 
 module Cosmos
-
-  # Maintains knowledge of an item in a Table
+  # Implements the attributes that are unique to a TableItem such as editable
+  # and hidden. All other functionality is inherited from {PacketItem}.
   class TableItem < PacketItem
-    attr_reader :display_type
-    attr_accessor :editable
-    attr_reader :constraint
+    # @return [Boolean] Whether this item is editable
+    attr_reader :editable
+    # @return [Boolean] Whether this item is hidden (not displayed)
+    attr_reader :hidden
 
     # (see PacketItem#initialize)
-    # It also initializes the attributes of the TableItem.
     def initialize(name, bit_offset, bit_size, data_type, endianness, array_size = nil, overflow = :ERROR)
       super(name, bit_offset, bit_size, data_type, endianness, array_size, overflow)
       @display_type = nil
       @editable = true
-      @constraint = nil
+      @hidden = false
     end
 
-    def display_type=(display_type)
-      if display_type
-        raise ArgumentError, "#{@name}: display_type must be a Symbol but is a #{display_type.class}" unless Symbol === display_type
-        @display_type = display_type
-      else
-        @display_type = nil
-      end
+    # @param editable [Boolean] Whether this item can be edited
+    def editable=(editable)
+      raise ArgumentError, "#{@name}: editable must be a boolean but is a #{editable.class}" unless !!editable == editable
+      @editable = editable
     end
 
-    def constraint=(constraint)
-      if constraint
-        raise ArgumentError, "#{@name}: constraint must be a Conversion but is a #{constraint.class}" unless Cosmos::Conversion === constraint
-        @constraint = constraint.clone
-      else
-        @constraint = nil
-      end
+    # @param hidden [Boolean] Whether this item should be hidden
+    def hidden=(hidden)
+      raise ArgumentError, "#{@name}: hidden must be a boolean but is a #{hidden.class}" unless !!hidden == hidden
+      @hidden = hidden
     end
 
     # Make a light weight clone of this item
     def clone
       item = super()
-      item.constraint = self.constraint.clone if self.constraint
+      item.editable = self.editable
       item
     end
     alias dup clone
 
+    # Create a hash of this item's attributes
     def to_hash
       hash = super()
-      if self.display_type
-        hash['display_type'] = self.display_type.to_s
-      else
-        hash['display_type'] = nil
-      end
       hash['editable'] = self.editable
-      if self.constraint
-        hash['constraint'] = self.constraint.to_s
-      else
-        hash['constraint'] = nil
-      end
+      hash['hidden'] = self.hidden
       hash
     end
-
-  end # class TableItem
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/tools/table_manager/table_item_parser.rb

@@ -0,0 +1,46 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+require 'cosmos/packets/packet_config'
+require 'cosmos/packets/packet_item'
+
+module Cosmos
+  class TableItemParser < PacketItemParser
+    # @param parser [ConfigParser] Configuration parser
+    # @param table [Table] Table all parsed items should be added to
+    def self.parse(parser, table)
+      parser = TableItemParser.new(parser)
+      parser.verify_parameters(PacketConfig::COMMAND)
+      parser.create_table_item(table)
+    end
+
+    # @param table [Table] Table created items are added to
+    def create_table_item(table)
+      name = @parser.parameters[0]
+      if table.type == :TWO_DIMENSIONAL
+        name = "#{name}0"
+        table.num_columns += 1
+      end
+      item = TableItem.new(name, get_bit_offset(), get_bit_size(), get_data_type(),
+                           get_endianness(table), get_array_size(), :ERROR) # overflow
+      item.range = get_range()
+      item.default = get_default()
+      item.description = get_description()
+      if append?
+        item = table.append(item)
+      else
+        item = table.define(item)
+      end
+      item
+    rescue => err
+      raise @parser.error(err, @usage)
+    end
+  end
+end

data/lib/cosmos/tools/table_manager/table_manager.rb

@@ -33,16 +33,17 @@ Cosmos.disable_warnings do
 end
 
 module Cosmos
-
+  # This class applies to all items in the table but its only purpose is to
+  # determine if table cells should be rendered as comboboxes. Any table items
+  # with states are rendered as comboboxes.
   class ComboBoxItemDelegate < Qt::StyledItemDelegate
-    def initialize(parent)
-      @table = parent
-      super(parent)
-    end
-
+    # Create the combobox widget to display the values
+    # @param parent [Qt::Widget] Parent to created widget
+    # @param option [Qt::StyleOptionViewItem] Style options (not used)
+    # @param index [Qt::ModelIndex] Indicates which table item is active
     def createEditor(parent, option, index)
-      table = TableManager.instance.core.table_def.get_table(TableManager.instance.currently_displayed_table_name)
-      gui_table = TableManager.instance.gui_tables[TableManager.instance.currently_displayed_table_name]
+      table = TableManager.instance.core.config.table(TableManager.instance.current_table_name)
+      gui_table = TableManager.instance.tabbook.tab(TableManager.instance.current_table_name)
       if table.type == :TWO_DIMENSIONAL
         item_name = gui_table.horizontalHeaderItem(index.column).text + index.row.to_s
         item = table.get_item(item_name)
@@ -50,7 +51,7 @@ module Cosmos
         item_name = gui_table.verticalHeaderItem(index.row).text
         item = table.get_item(item_name)
       end
-      if item.display_type == :STATE and item.editable
+      if item.states && item.editable
         combo = Qt::ComboBox.new(parent)
         combo.addItems(item.states.keys.sort)
         combo.setCurrentText(table.read(item.name).to_s)
@@ -64,6 +65,11 @@ module Cosmos
       end
     end
 
+    # Gets the current item from the combobox if it exists and writes it back
+    # to the model.
+    # @param editor [Qt::Widget] Editor widget
+    # @param model [Qt::AbstractItemModel] Model to write the gui data to
+    # @param index [Qt::ModelIndex] Where in the model to update the data
     def setModelData(editor, model, index)
       if Qt::ComboBox === editor
         model.setData(index, Qt::Variant.new(editor.currentText), Qt::EditRole)
@@ -72,6 +78,9 @@ module Cosmos
       end
     end
 
+    # Sets the current item in the combobox based on the model data
+    # @param editor [Qt::Widget] Editor widget
+    # @param index [Qt::ModelIndex] Where in the model to grab the data
     def setEditorData(editor, index)
       if Qt::ComboBox === editor
         v = index.data(Qt::EditRole)
@@ -88,13 +97,14 @@ module Cosmos
   end
 
   # A dialog box containing a text field and ok button
-  class TextDialog < Qt::Dialog
+  class HexDumpDialog < Qt::Dialog
+    # @param parent [Qt::Widget] Dialog parent
     def initialize(parent)
-      super(parent)
-
-      layout = Qt::VBoxLayout.new
+      super(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
+      setWindowTitle("Hex Dump")
 
       @text = Qt::PlainTextEdit.new
+      @text.setWordWrapMode(Qt::TextOption::NoWrap)
       if Kernel.is_windows?
         @text.setFont(Cosmos.getFont('courier', 10))
       else
@@ -102,6 +112,7 @@ module Cosmos
       end
       @text.setReadOnly(true)
 
+      layout = Qt::VBoxLayout.new
       layout.addWidget(@text)
 
       button_layout = Qt::HBoxLayout.new
@@ -113,15 +124,18 @@ module Cosmos
 
       layout.addLayout(button_layout)
       setLayout(layout)
+      resize(650, 250)
     end
 
-    # Set the title of the dialog box and the text contents
+    # @param title [String] Dialog title
+    # @param text [String] Dialog text box is overwritten with this string
     def set_title_and_text(title, text)
       self.setWindowTitle(title)
       @text.setPlainText(text)
     end
 
-    # Set the size of the dialog box
+    # @param width [Integer]
+    # @param height [Integer]
     def set_size(width, height)
       resize(width, height)
     end
@@ -133,97 +147,162 @@ module Cosmos
     end
   end
 
-  # TableManager uses text based configuration files (see TableConfig) to define both
-  # the structure of the binary file and how it should be displayed. It takes this configuration
-  # information to dynamically build a tabbed GUI containing the visual representation of the binary data.
-  # In addition to displaying binary data it can also create the binary representation given
-  # the text configuration file. It can display the binary data as a hex dump and creates
-  # human readable reports of the given data.
+  # TableManager uses text based configuration files (see TableConfig) to define
+  # both the structure of the binary file and how it should be displayed. It
+  # takes this this configuration information to dynamically build a tabbed GUI
+  # containing the visual representation of the binary data.
+  # In addition to displaying binary data it can also create the binary
+  # representation given the text configuration file. It can display the binary
+  # data as a hex dump and creates human readable reports of the given data.
   class TableManager < QtTool
-    slots 'handle_tab_change(int)'
-    slots 'mouse_over(int, int)'
-    slots 'click_callback(QTableWidgetItem*)'
-    slots 'context_menu(const QPoint&)'
+    # Error raised when there is a problem saving a table
+    class SaveError < StandardError; end
+    # Error raised when there is a problem displaying a table
+    class DisplayError < StandardError; end
 
+    # @return [TableManagerCore] TableManagerCore instance
     attr_reader :core
+    # @return [Qt::TabWidget] TabWidget which holds the table tabs
+    attr_reader :tabbook
 
-    # Hash of all the created tables with the table name as the key value
-    attr_reader :gui_tables
-
-    # Array of all the created tables ordered by the way they were created.
-    # Thus they are ordered the same as the text configuration file.
-    attr_reader :ordered_gui_table_names
-
-    # Place holder for the current table
-    attr_reader :table
-
-    # The currently displayed table name
-    attr_reader :currently_displayed_table_name
-
-    # Label containing the full path name of the table definition file
-    attr_reader :table_def_label
-
-    # Label containing the full path name of the table binary file
-    attr_reader :table_bin_label
+    # @return [TableManager] Instance of the TableManager class
+    def self.instance
+      @@instance
+    end
 
-    # Top vertical layout where subclasses can put their own widgets
-    attr_accessor :top_layout
+    # Entry point into the application
+    #
+    # @param option_parser [OptionParser] Parses the command line options
+    # @param options [OpenStruct] Contains all the parsed options
+    def self.run(option_parser = nil, options = nil)
+      Cosmos.catch_fatal_exception do
+        unless option_parser && options
+          option_parser, options = create_default_options()
+          options.width = 800
+          options.height = 600
+          options.title = "Table Manager"
+          options.auto_size = false
+          options.no_tables = false
+          option_parser.separator "Table Manager Specific Options:"
+          option_parser.on("-n", "--notables", "Do not include table file editing options. This will remove the 'Table' menu.") do
+            options.no_tables = true
+          end
+          option_parser.on("-c", "--create FILE", "Use the specified definition file to create the table") do |arg|
+            options.create = arg
+          end
+          option_parser.on("-o", "--output DIRECTORY", "Create files in the specified directory") do |arg|
+            options.output_dir = File.expand_path(arg)
+          end
+          option_parser.on("--convert FILE", "Convert the specified configuration file to the new format") do |arg|
+            options.convert = arg
+          end
+        end
+        super(option_parser, options)
+      end
+    end
 
-    # File name of the png icon to use for the application.
-    # The application looks in the COSMOS PATH and USERPATH directories for the icon.
-    # This must be overloaded before calling super() in the intialize
-    # function to allow Table Manager to use the new file name.
-    attr_accessor :app_icon_filename
+    # Called after parsing all the command line options passed to the
+    # application. Returns false to operate without a GUI when certain command
+    # line options are specified.
+    #
+    # @param options [OpenStruct] The application options as configured in the
+    #   command line
+    # @return [Boolean] Whether to contine running the application
+    def self.post_options_parsed_hook(options)
+      if options.create
+        core = TableManagerCore.new
+        core.file_new(options.create, options.output_dir)
+        return false
+      end
+      if options.convert
+        if options.convert.include?("/")
+          parts = options.convert.split("/")
+        else
+          parts = options.convert.split("\\")
+        end
+        parts[-1] = "converted_#{parts[-1]}"
+        filename = parts.join(File::SEPARATOR)
+        File.open(filename, 'w') do |out|
+          config = File.read(options.convert).split("\n")
+          config.each do |line|
+            /TABLE\s+(\".*\")\s+(\".*\")\s+(ONE_DIMENSIONAL)\s+(.*_ENDIAN)/.match(line) do |m|
+              out.puts "TABLE #{m[1]} #{m[4]} #{m[3]} #{m[2]}"
+            end
+            /TABLE\s+(\".*\")\s+(\".*\")\s+(TWO_DIMENSIONAL)\s+(.*_ENDIAN)/.match(line) do |m|
+              rows = config.select {|item| item.strip =~ /^DEFAULT/ }.length
+              out.puts "TABLE #{m[1]} #{m[4]} #{m[3]} #{rows} #{m[2]}"
+            end
+            /PARAMETER\s+(\".*\")\s+(\".*\")\s+(.*)\s+(\d+)\s+(.*)\s+(.*)\s+(.*)\s+(.*)\s?/.match(line) do |m|
+              out.puts "  APPEND_PARAMETER #{m[1]} #{m[4]} #{m[3]} #{m[6]} #{m[7]} #{m[8]} #{m[2]}"
+              if m[5].include?('CHECK')
+                out.puts "    STATE UNCHECKED #{m[6]}"
+                out.puts "    STATE CHECKED #{m[7]}"
+              end
+              if m[5].include?('HEX')
+                out.puts '    FORMAT_STRING "0x%0X"'
+              end
+              if m[5].include?('-U')
+                out.puts '    UNEDITABLE'
+              end
+            end
+            if line.strip !~ /^(TABLE|PARAMETER|DEFAULT)/
+              out.puts line
+            end
+          end
+		 end
+        puts "Created #{filename}"
+        return false
+      end
+      true
+    end
 
     # Create a TableManager instance by initializing the globals,
     # setting the program icon, creating the menu, and laying out the GUI elements.
     def initialize(options)
       super(options) # MUST BE FIRST - All code before super is executed twice in RubyQt Based classes
+      @app_title = options.title
       @app_icon_filename = 'table_manager.png'
       Cosmos.load_cosmos_icon(@app_icon_filename)
 
+      @system_def_path = File.join(::Cosmos::USERPATH, %w(config tools table_manager))
+      @system_bin_path = System.paths['TABLES']
+      @def_path = @system_def_path
+      @bin_path = @system_bin_path
+      @core = TableManagerCore.new
+      @@instance = self
+
       initialize_actions(options.no_tables)
       initialize_menus(options.no_tables)
       initialize_central_widget()
       complete_initialize()
-      setMinimumSize(500, 300)
+      setMinimumSize(400, 250)
 
       statusBar.showMessage(tr("Ready")) # Show message to initialize status bar
-
-      @def_path = File.join(::Cosmos::USERPATH, %w(config tools table_manager))
-      @bin_path = System.paths['TABLES']
-      @gui_tables = Hash.new
-      @ordered_gui_table_names = Array.new
-      @currently_displayed_table_name = ""
-      @core = TableManagerCore.new
-      @@instance = self
-    end
-
-    def self.instance
-      @@instance
     end
 
     def initialize_actions(no_tables = false)
       super()
 
       # File Menu Actions
-      @file_new = Qt::Action.new(Cosmos.get_icon('file.png'), tr('&New File'), self)
-      @file_new_keyseq = Qt::KeySequence.new(Qt::KeySequence::New)
-      @file_new.shortcut = @file_new_keyseq
-      @file_new.statusTip = tr('Create new binary file based on definition')
-      @file_new.connect(SIGNAL('triggered()')) { file_new() }
-
-      @file_open = Qt::Action.new(Cosmos.get_icon('open.png'), tr('&Open File'), self)
-      @file_open_keyseq = Qt::KeySequence.new(Qt::KeySequence::Open)
-      @file_open.shortcut = @file_open_keyseq
-      @file_open.statusTip = tr('Open binary file for display and editing')
-      @file_open.connect(SIGNAL('triggered()')) { file_open() }
+      new_action = Qt::Action.new(self)
+      new_action.shortcut = Qt::KeySequence.new(Qt::KeySequence::New)
+      new_action.connect(SIGNAL('triggered()')) { file_new(@def_path) }
+      self.addAction(new_action) # Add it to the application
+
+      open_action = Qt::Action.new(self)
+      open_action.shortcut = Qt::KeySequence.new(Qt::KeySequence::Open)
+      open_action.connect(SIGNAL('triggered()')) { file_open(@bin_path) }
+      self.addAction(open_action) # Add it to the application
+
+      @file_open_both = Qt::Action.new(Cosmos.get_icon('open.png'), tr('Open &Both'), self)
+      @file_open_both.statusTip = tr('Specify both the binary file and the definition file to open')
+      @file_open_both.connect(SIGNAL('triggered()')) { file_open_both() }
 
       @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), tr('&Save File'), self)
       @file_save_keyseq = Qt::KeySequence.new(Qt::KeySequence::Save)
       @file_save.shortcut = @file_save_keyseq
       @file_save.statusTip = tr('Save the displayed data back to the binary file')
-      @file_save.connect(SIGNAL('triggered()')) { file_save(false) }
+      @file_save.connect(SIGNAL('triggered()')) { file_save() }
 
       @file_save_as = Qt::Action.new(Cosmos.get_icon('save_as.png'), tr('Save File &As'), self)
       @file_save_as_keyseq = Qt::KeySequence.new(Qt::KeySequence::SaveAs)
@@ -231,6 +310,12 @@ module Cosmos
       @file_save_as.statusTip = tr('Save the displayed data to a new binary file')
       @file_save_as.connect(SIGNAL('triggered()')) { file_save(true) }
 
+      @file_close = Qt::Action.new(Cosmos.get_icon('close.png'), tr('&Close File'), self)
+      @file_close_keyseq = Qt::KeySequence.new(tr("Ctrl+W")) # Qt::KeySequence::Close is Alt-F4 on Windows
+      @file_close.shortcut = @file_close_keyseq
+      @file_close.statusTip = tr('Close the current file')
+      @file_close.connect(SIGNAL('triggered()')) { file_close() }
+
       @file_check = Qt::Action.new(Cosmos.get_icon('checkmark.png'), tr('&Check All'), self)
       @file_check_keyseq = Qt::KeySequence.new(tr('Ctrl+K'))
       @file_check.shortcut = @file_check_keyseq
@@ -273,17 +358,23 @@ module Cosmos
         @table_commit.statusTip = tr('Incorporate the current table data into a binary file which already contains the table')
         @table_commit.connect(SIGNAL('triggered()')) { table_commit() }
 
-        @table_update = Qt::Action.new(tr('&Update Definition'), self)
-        @table_update.statusTip = tr('Change the defaults in the definition file to the displayed table data')
-        @table_update.connect(SIGNAL('triggered()')) { table_update() }
+        #        @table_update = Qt::Action.new(tr('&Update Definition'), self)
+        #        @table_update.statusTip = tr('Change the defaults in the definition file to the displayed table data')
+        #        @table_update.connect(SIGNAL('triggered()')) { table_update() }
       end
     end
 
     def initialize_menus(no_tables = false)
-      # File Menu
       file_menu = menuBar.addMenu(tr('&File'))
-      file_menu.addAction(@file_new)
-      file_menu.addAction(@file_open)
+
+      file_new = file_menu.addMenu(Cosmos.get_icon('file.png'), tr("&New File")) # \tCtrl-N displays shortcut
+      target_dirs_action(file_new, @system_def_path, 'tools/table_manager', method(:file_new))
+
+      file_open = file_menu.addMenu(Cosmos.get_icon('open.png'), tr("&Open")) # \tCtrl-O displays shortcut
+      target_dirs_action(file_open, @system_bin_path, 'tables', method(:file_open))
+
+      file_menu.addAction(@file_open_both)
+      file_menu.addAction(@file_close)
       file_menu.addAction(@file_save)
       file_menu.addAction(@file_save_as)
       file_menu.addSeparator()
@@ -302,7 +393,7 @@ module Cosmos
         table_menu.addSeparator()
         table_menu.addAction(@table_save)
         table_menu.addAction(@table_commit)
-        table_menu.addAction(@table_update)
+        #        table_menu.addAction(@table_update)
       end
 
       # Help Menu
@@ -315,640 +406,380 @@ module Cosmos
     end
 
     def initialize_central_widget
-      # Create the central widget
-      @central_widget = Qt::Widget.new
-      setCentralWidget(@central_widget)
-
-      # Create the top level vertical layout
-      @top_layout = Qt::VBoxLayout.new(@central_widget)
+      central_widget = Qt::Widget.new
+      setCentralWidget(central_widget)
+      top_layout = Qt::VBoxLayout.new(central_widget)
 
       # Create the information pane with the filenames
-      @filename_layout = Qt::FormLayout.new
+      filename_layout = Qt::FormLayout.new
       @table_def_label = Qt::Label.new("")
-      @filename_layout.addRow(tr("Definition File:"), @table_def_label)
+      filename_layout.addRow(tr("Definition File:"), @table_def_label)
       @table_bin_label = Qt::Label.new("")
-      @filename_layout.addRow(tr("Binary File:"), @table_bin_label)
-      @top_layout.addLayout(@filename_layout)
+      filename_layout.addRow(tr("Binary File:"), @table_bin_label)
+      top_layout.addLayout(filename_layout)
 
       # Separator before editor
-      @sep1 = Qt::Frame.new(@central_widget)
-      @sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
-      @top_layout.addWidget(@sep1)
+      sep1 = Qt::Frame.new(central_widget)
+      sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
+      top_layout.addWidget(sep1)
 
       @tabbook = Qt::TabWidget.new
-      connect(@tabbook, SIGNAL('currentChanged(int)'), self, SLOT('handle_tab_change(int)'))
-      @top_layout.addWidget(@tabbook)
+      top_layout.addWidget(@tabbook)
 
       @check_icons = []
       @check_icons << Cosmos.get_icon("CheckBoxEmpty.gif")
       @check_icons << Cosmos.get_icon("CheckBoxCheck.gif")
     end
 
-    # Menu option to check every table tab's values against their allowable ranges
-    def file_check
-      begin
-        result = ""
-        @ordered_gui_table_names.each do |name|
-          save_result = save_gui_data(name)
-          check_result = @core.table_check(name)
-          if not save_result.nil? or not check_result.empty?
-            result << "Error(s) in #{name}:\n" << save_result.to_s << check_result.to_s
+    # Menu option to create a new table binary file based on a table definition file.
+    #
+    # @param def_path [String] Path to a directory containing definition files
+    def file_new(def_path)
+      return if abort_on_modified()
+
+      filenames = Qt::FileDialog.getOpenFileNames(self, "Open Binary Definition Text File(s)",
+                                                  def_path, "Config File (*.txt)\nAll Files (*)")
+      return if filenames.length == 0 # User cancelled dialog
+
+      bin_path = bin_path_from_def_path(File.dirname(filenames[0]))
+      output_path = Qt::FileDialog.getExistingDirectory(self, "Select Output Directory", bin_path)
+      return unless output_path # User cancelled dialog
+
+      return if abort_on_check_for_existing(filenames, output_path)
+
+      success = false
+      bin_files = []
+      ProgressDialog.execute(self, 'Create New Files', 500, 50, true, false, false, false, false) do |dialog|
+        begin
+          filenames.each do |filename|
+            bin_files << @core.file_new(filename, output_path) do |progress|
+              dialog.set_overall_progress(progress)
+            end
           end
+          success = true
+          dialog.close_done
+        rescue => err
+          Qt.execute_in_main_thread(true) {|| ExceptionDialog.new(self, err, "File New Errors", false)}
+          dialog.close_done
         end
-        if result.empty?
-          result = "All parameters are within their constraints."
-        end
-        Qt::MessageBox.information(self, "File Check", result)
-      rescue => err
-        ExceptionDialog.new(self, err, "File Check Errors", false)
       end
+      if success
+        file_close()
+        file_open(bin_files[0], filenames[0])
+      end
+    rescue TableManagerCore::CoreError => err
+      Qt::MessageBox.warning(self, "File New Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "File New Errors", false)
     end
 
-    # Menu option to check the table values against their allowable ranges
-    def table_check
-      begin
-        save_result = save_gui_data(@currently_displayed_table_name)
-        check_result = @core.table_check(@currently_displayed_table_name)
-        if save_result.nil? and check_result.empty?
-          result = "All parameters are within their constraints."
-        elsif save_result.nil?
-          result = check_result
-        elsif check_result.nil?
-          result = save_result
-        else
-          result = save_result << check_result
-        end
-
-        Qt::MessageBox.information(self, "Table Check", result)
-      rescue => err
-        ExceptionDialog.new(self, err, "Table Check Errors", false)
+    # Menu option that opens a binary file (and it's associated definition
+    # file) for display in the GUI.
+    #
+    # @param bin_path [String] Path to the binary file or a directory
+    #   containing binary files
+    # @param def_path [String] Path to the definition file. If nil, the
+    #   definition file will be looked up automatically.
+    # @param user_select_definition [Boolean] If true, the user will be
+    #   required to select the definition file. It will not be automatically
+    #   looked up.
+    def file_open(bin_path, def_path = nil, user_select_definition = false)
+      return if abort_on_modified()
+
+      if File.directory?(bin_path)
+        bin_path = Qt::FileDialog.getOpenFileName(self, "Open Binary", bin_path,
+                                                  "Binary File (*.bin *.dat);;All Files (*)")
+        return unless bin_path
       end
-    end
 
-    # Menu option to set all the table items to their default values
-    def table_default
-      begin
-        @core.table_default(@currently_displayed_table_name)
-      rescue => err
-        ExceptionDialog.new(self, err, "Table Default Errors", false)
+      unless def_path
+        def_path = def_path_from_bin_path(bin_path)
+        def_path = get_best_def_path(def_path, bin_path) unless user_select_definition
+      end
+      if !def_path || !File.file?(def_path)
+        def_path = Qt::FileDialog.getOpenFileName(self, "Open Definition File", def_path,
+                                                  "Definition File (*.txt);;All Files (*)")
       end
+      return unless def_path
+
+      Qt::Application.setOverrideCursor(Qt::Cursor.new(Qt::WaitCursor))
       begin
-        display_gui_data(@currently_displayed_table_name)
-      rescue => err
-        ExceptionDialog.new(self, err, "Table Default Errors", false)
+        @core.file_open(bin_path, def_path)
+      rescue TableManagerCore::MismatchError => err
+        # Mismatch errors are recoverable so just warn the user
+        Qt::MessageBox.information(self, "Table Open Error", err.message)
       end
+      @def_path = File.dirname(def_path)
+      @bin_path = File.dirname(bin_path)
+      display_all_gui_data()
+      @table_bin_label.text = bin_path
+      @table_def_label.text = def_path
+      Qt::Application.restoreOverrideCursor()
+    rescue TableManagerCore::CoreError => err
+      Qt::Application.restoreOverrideCursor()
+      Qt::MessageBox.warning(self, "File Open Errors", err.message)
+    rescue => err
+      Qt::Application.restoreOverrideCursor()
+      ExceptionDialog.new(self, err, "File Open Errors", false)
     end
 
-    # Menu option to create a text file report of all the table data
-    def file_report
-      begin
-        @ordered_gui_table_names.each do |name|
-          save_gui_data(name)
-        end
+    # Menu option to require the user to specify both the binary and the
+    # definition file to parse it
+    def file_open_both
+      file_open(@bin_path, nil, true)
+    end
 
-        @core.file_report
-        statusBar.showMessage(tr("File Report Created Successfully"))
-      rescue => err
-        ExceptionDialog.new(self, err, "File Report Errors", false)
-      end
+    # Menu option to close the open table
+    def file_close
+      return if abort_on_modified()
+      @core.reset
+      @table_bin_label.text = ''
+      @table_def_label.text = ''
+      reset_gui()
+    rescue TableManagerCore::CoreError => err
+      Qt::MessageBox.warning(self, "File Close Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "File Close Errors", false)
     end
 
-    # Saves the binary data to a file.
+    # Menu option to save the binary data to a file.
     # It first commits the GUI data to the internal data structures and checks
     # for errors. If none are found, it saves the data to the table binary file.
     def file_save(save_as = false)
-      begin
-        @ordered_gui_table_names.each do |name|
-          save_gui_data(name)
-        end
-
-        filename = @table_bin_label.text
-        if save_as
-          filename = Qt::FileDialog.getSaveFileName(self,
-                                                  "File Save",
-                                                  @table_bin_label.text,
+      return unless file_check(false)
+      filename = @table_bin_label.text
+      if save_as
+        filename = Qt::FileDialog.getSaveFileName(self, "File Save", @table_bin_label.text,
                                                   "Binary File (*.bin *.dat);;All Files (*)")
-
-          # Check for an empty string which indicates the user clicked "Cancel" on the dialog
-          return if filename.to_s.empty?
-          @table_bin_label.text = filename
-        end
-
-        begin
-          @core.file_save(filename)
-        rescue => error
-          Qt::MessageBox.information(self, "File Save Errors", error.message)
-          return
-        end
-
-        @ordered_gui_table_names.each do |name|
-          display_gui_data(name)
-        end
-
-        statusBar.showMessage(tr("File Saved Successfully"))
-      rescue => err
-        ExceptionDialog.new(self, err, "File Save Errors", false)
+        return unless filename
+        @table_bin_label.text = filename
       end
-    end
-
-    # Menu option to display a dialog containing a hex dump of all table values
-    def display_hex(type)
-      begin
-        dialog = TextDialog.new(self)
-        if type == :file
-          str = @core.file_hex()
-          title = File.basename(@table_bin_label.text)
-        else
-          str = @core.table_hex(@currently_displayed_table_name)
-          title = @currently_displayed_table_name
-        end
-        dialog.set_title_and_text("#{title} Hex Dump", str)
-        dialog.set_size(650, 400)
-        dialog.exec
-        dialog.dispose
-      rescue => err
-        ExceptionDialog.new(self, err, "Display Hex Errors", false)
-      end
-    end
-
-    # Menu option to save the currently displayed table to an existing table binary file
-    # containing that table.
-    def table_commit
-      begin
-        save_gui_data(@currently_displayed_table_name)
 
-        # Ask for the file to save the current table to
-        bin_file, def_file = get_binary_and_definition_file_paths()
-        if bin_file.nil? or def_file.nil? then return 1 end
+      @core.file_save(filename)
+      @bin_path = File.dirname(filename)
 
-        @core.table_commit(@currently_displayed_table_name, bin_file, def_file)
-
-        # Update the labels
-        @table_bin_label.text = bin_file
-        @table_def_label.text = def_file
-
-        # Display the new table
-        delete_tabs()
-        @core.table_def.get_all_tables.each do |table|
-          create_table_tab(table)
-          display_gui_data(table.name)
-        end
-        @currently_displayed_table_name = @ordered_gui_table_names[0]
-        @currently_displayed_table_name ||= '' # ensure it's not nil
-      rescue => err
-        ExceptionDialog.new(self, err, "Table Commit Errors", false)
-      end
-    end
-
-    # Menu option to save the currently displayed table as a stand alone binary file
-    def table_save
-      begin
-        save_gui_data(@currently_displayed_table_name)
-
-        filename = Qt::FileDialog.getSaveFileName(self,
-                                                "File Save",
-                                                File.join(@bin_path, "#{@currently_displayed_table_name.gsub(/\s/,'')}.dat"),
-                                                "Binary File (*.bin *.dat);;All Files (*)")
-        # Check for a 0 length string which indicates the user clicked "Cancel" on the dialog
-        if filename.to_s.strip.length != 0
-          @bin_path = File.dirname(filename)
-          @core.table_save(@currently_displayed_table_name, filename)
-        end
-      rescue => err
-        ExceptionDialog.new(self, err, "Table Save Errors", false)
-      end
+      display_all_gui_data()
+      @table_bin_label.text = filename
+      statusBar.showMessage(tr("File Saved Successfully"))
+    rescue TableManagerCore::CoreError, SaveError => err
+      Qt::MessageBox.warning(self, "File Save Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "File Save Errors", false)
     end
 
-    # Menu option to update the definition file defaults with the currently
-    # displayed table values
-    def table_update
-      begin
-        save_gui_data(@currently_displayed_table_name)
-
-        result = Qt::MessageBox.question(self, "Update Table Definition File",
-          "Are you sure you want to update the table definition file. This action is irreversable!",
-          Qt::MessageBox::Yes | Qt::MessageBox::No, Qt::MessageBox::Yes)
-        if result == Qt::MessageBox::Yes
-          @core.table_update_def(@currently_displayed_table_name)
-        end # end if result == MBOX_CLICKED_YES
-      rescue => err
-        ExceptionDialog.new(self, err, "Table Update Errors", false)
-      end
+    # Menu option to check every table's values against their allowable ranges
+    #
+    # @param success_dialog [Boolean] Whether to display a dialog indicating
+    #   success. If false simply return true.
+    # @return [Boolean] Whether the file check was successful
+    def file_check(success_dialog = true)
+      return false if abort_on_no_current_table()
+      save_all_gui_data()
+      Qt::MessageBox.information(self, "File Check", @core.file_check()) if success_dialog
+      true
+    rescue TableManagerCore::CoreError, SaveError => err
+      Qt::MessageBox.warning(self, "File Check Errors", err.message)
+      false
+    rescue => err
+      ExceptionDialog.new(self, err, "Unknown File Check Errors", false)
+      false
     end
 
-    # Menu option that opens a dialog to allows the user to select a table binary
-    # file named XXX.dat. The associated table definition file (XXX_def.txt)
-    # is then opened and parsed to determine how to display the binary file in the gui.
-    def file_open(bin_file = nil, def_file = nil)
-      begin
-        unless bin_file and def_file
-          bin_file, def_file = get_binary_and_definition_file_paths()
-        end
-
-        # Do nothing if the binary or definition files are not found
-        if bin_file.nil? or def_file.nil? then return end
-
-        # Update the labels
-        @table_bin_label.text = bin_file
-        @table_def_label.text = def_file
-
-        # open the file
-        begin
-          @core.file_open(def_file, bin_file)
-        rescue => err
-          if err.message.include?("Binary")
-            Qt::MessageBox.information(self, "Table Open Error", err.message)
-          else
-            ExceptionDialog.new(self, err, "Table Open Errors", false)
-          end
-        end
-
-        Qt::Application.setOverrideCursor(Qt::Cursor.new(Qt::WaitCursor))
-
-        # display the file
-        delete_tabs()
-        @core.table_def.get_all_tables.each do |table|
-          create_table_tab(table)
-          display_gui_data(table.name)
-        end
-        @currently_displayed_table_name = @ordered_gui_table_names[0]
-        @currently_displayed_table_name ||= '' # ensure it's not nil
+    # Menu option to create a text file report of all the table data
+    def file_report
+      return unless file_check(false)
+      report_path = @core.file_report(@table_bin_label.text, @table_def_label.text)
 
-        Qt::Application.restoreOverrideCursor()
-      rescue => err
-        ExceptionDialog.new(self, err, "File Open Errors", false)
+      dialog = Qt::Dialog.new(self, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
+      dialog.setWindowTitle("File Report")
+      dialog_layout = Qt::VBoxLayout.new
+      dialog_layout.addWidget(Qt::Label.new("Report file created: #{report_path}"))
+      button_layout = Qt::HBoxLayout.new
+      ok_button = Qt::PushButton.new('&Ok')
+      ok_button.connect(SIGNAL('clicked()')) { dialog.accept }
+      ok_button.setEnabled(true)
+      button_layout.addWidget(ok_button)
+      button_layout.addStretch(1)
+      open_button = Qt::PushButton.new('Open in &Editor')
+      open_button.connect(SIGNAL('clicked()')) { Cosmos.open_in_text_editor(report_path) }
+      button_layout.addWidget(open_button)
+      if Kernel.is_windows?
+        open_excel_button = Qt::PushButton.new('Open in E&xcel')
+        open_excel_button.connect(SIGNAL('clicked()')) { system("start Excel.exe \"#{report_path}\"") }
+        button_layout.addWidget(open_excel_button)
       end
+      dialog_layout.addLayout(button_layout)
+      dialog.setLayout(dialog_layout)
+      dialog.exec
+    rescue TableManagerCore::CoreError, SaveError => err
+      Qt::MessageBox.warning(self, "File Report Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "File Report Errors", false)
     end
 
-    # Menu option to close the open table
-    def file_close
-      begin
-        @core.reset
-        @table_bin_label.text = ''
-        @table_def_label.text = ''
-        delete_tabs()
-      rescue => err
-        ExceptionDialog.new(self, err, "File New Errors", false)
+    # Menu option to display a dialog containing a hex dump of all table values
+    def display_hex(type)
+      return if abort_on_no_current_table()
+      dialog = HexDumpDialog.new(self)
+      if type == :file
+        str = @core.file_hex()
+        title = File.basename(@table_bin_label.text)
+      else # :table
+        str = @core.table_hex(current_table_name)
+        title = current_table_name
       end
+      dialog.set_title_and_text("#{title} Hex Dump", str)
+      dialog.exec
+      dialog.dispose
+    rescue TableManagerCore::CoreError => err
+      Qt::MessageBox.warning(self, "Display Hex Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "Display Hex Errors", false)
     end
 
-    # Menu option to create a new table binary file based on a table definition file.
-    def file_new
-      if !@currently_displayed_table_name.empty?
-        result = Qt::MessageBox.question(self, "File New",
-          "Creating new files will close the currently open file.  Are you sure?",
-          Qt::MessageBox::Yes | Qt::MessageBox::No, Qt::MessageBox::Yes)
-        if result != Qt::MessageBox::Yes
-          return
-        end
-      end
-
-      begin
-        success = nil
-        bin_files = []
-        filenames = Qt::FileDialog.getOpenFileNames(self,
-                                                  "Open Binary Definition Text File(s)",
-                                                  @def_path,
-                                                  "Config File (*.txt)\nAll Files (*)")
-
-        # Check for a 0 length string which indicates the user clicked "Cancel" on the dialog
-        if filenames and filenames.length != 0
-          @def_path = File.dirname(filenames[0])
-          file_close()
-          output_dir = Qt::FileDialog.getExistingDirectory(self, "Select Output Directory", @bin_path)
-          if output_dir
-            @bin_path = output_dir
-            filenames.each do |def_file|
-              if File.basename(def_file) =~ /_def\.txt/
-                basename = File.basename(def_file)[0...-8] # Get the basename without the _def.txt
-              else
-                basename = File.basename(def_file).split('.')[0...-1].join('.') # Get the basename without the extension
-              end
-
-              # Set the current_bin so the file_report function works correctly
-              output_filename = File.join(output_dir, "#{basename}.dat")
-              if File.exist?(output_filename)
-                result = Qt::MessageBox.question(self, "File New",
-                  "File: #{output_filename} already exists.  Overwrite?",
-                  Qt::MessageBox::Yes | Qt::MessageBox::No, Qt::MessageBox::Yes)
-                if result != Qt::MessageBox::Yes
-                  return
-                end
-              end
-            end
-
-            ProgressDialog.execute(self, 'Create New Files', 500, 50, true, false, false, false, false) do |dialog|
-              # create the file
-              begin
-                bin_files = @core.file_new(filenames, output_dir, dialog)
-                success = true
-                dialog.close_done
-              rescue => err
-                Qt.execute_in_main_thread(true) {|| ExceptionDialog.new(self, err, "File New Errors", false)}
-                dialog.close_done
-              end
-            end
-          end # end output_dir.nil? (user did NOT click cancel on dialog)
-          file_open(bin_files[0] ,filenames[0]) if success
-        end # end filename != 0 (user did NOT click cancel on dialog)
-      rescue => err
-        ExceptionDialog.new(self, err, "File New Errors", false)
+    # Menu option to check the table values against their allowable ranges
+    def table_check
+      return if abort_on_no_current_table()
+      save_gui_data(current_table_name)
+      result = @core.table_check(current_table_name)
+      if result.empty?
+        result = "All parameters are within their constraints."
       end
+      Qt::MessageBox.information(self, "Table Check", result)
+    rescue TableManagerCore::CoreError, SaveError => err
+      Qt::MessageBox.warning(self, "Table Check Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "Table Check Errors", false)
     end
 
-    # Called when the user selects another tab in the gui
-    def handle_tab_change(index)
-      @currently_displayed_table_name = @ordered_gui_table_names[index]
-      @currently_displayed_table_name ||= '' # ensure it's not nil
-    end
-
-    def mouse_over(row, col)
-      return if @currently_displayed_table_name.empty?
-      table = @core.table_def.get_table(@currently_displayed_table_name)
-      gui_table = @gui_tables[@currently_displayed_table_name]
-      if table and gui_table
-        if table.type == :TWO_DIMENSIONAL
-          item_name = gui_table.horizontalHeaderItem(col).text + row.to_s
-          item = table.get_item(item_name)
-          statusBar.showMessage(item.description)
-        else
-          item_name = gui_table.verticalHeaderItem(row).text
-          item = table.get_item(item_name)
-          statusBar.showMessage(item.description)
-        end
-      end
+    # Menu option to set all the table items to their default values
+    def table_default
+      return if abort_on_no_current_table()
+      @core.table_default(current_table_name)
+      set_table_modified(true)
+      display_gui_data(current_table_name)
+    rescue TableManagerCore::CoreError, DisplayError => err
+      Qt::MessageBox.warning(self, "Table Default Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "Table Default Errors", false)
     end
 
-    def click_callback(item)
-      table = @core.table_def.get_table(@currently_displayed_table_name)
-      gui_table = @gui_tables[@currently_displayed_table_name]
-      gui_table.editItem(item) if (item.flags & Qt::ItemIsEditable) != 0
+    # Menu option to save the currently displayed table as a stand alone binary file
+    def table_save
+      return if abort_on_no_current_table()
+      save_gui_data(current_table_name)
+      filename = File.join(@bin_path, "#{current_table_name.split.collect(&:capitalize).join}Table.dat")
+      filename = Qt::FileDialog.getSaveFileName(self, "File Save", filename,
+                                               "Binary File (*.bin *.dat);;All Files (*)")
+      return unless filename
+      @core.table_save(current_table_name, filename)
+    rescue TableManagerCore::CoreError, SaveError => err
+      Qt::MessageBox.warning(self, "Table Save Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "Table Save Errors", false)
     end
 
-    def context_menu(point)
-      begin
-        table = @core.table_def.get_table(@currently_displayed_table_name)
-        gui_table = @gui_tables[@currently_displayed_table_name]
-        if table and gui_table
-          table_item = gui_table.itemAt(point)
-          if table_item
-            menu = Qt::Menu.new()
-
-            if table.type == :TWO_DIMENSIONAL
-              item_name = gui_table.horizontalHeaderItem(table_item.column).text + table_item.row.to_s
-            else
-              item_name = gui_table.verticalHeaderItem(table_item.row).text
-            end
-            details_action = Qt::Action.new(tr("Details"), self)
-            details_action.statusTip = tr("Popup details about #{@currently_displayed_table_name} #{item_name}")
-            details_action.connect(SIGNAL('triggered()')) do
-              TlmDetailsDialog.new(nil,
-                                   'TABLE',
-                                   @currently_displayed_table_name.upcase,
-                                   item_name,
-                                   table)
-            end
-            menu.addAction(details_action)
-
-            default_action = Qt::Action.new(tr("Default"), self)
-            default_action.statusTip = tr("Set item to default value")
-            default_action.connect(SIGNAL('triggered()')) do
-              item = table.get_item(item_name)
-              table.write(item.name, item.default)
-              update_gui_item(@currently_displayed_table_name, table, item, table_item.row, table_item.column)
-            end
-            menu.addAction(default_action)
+    # Menu option to save the currently displayed table to an existing table binary file
+    # containing that table.
+    def table_commit
+      return if abort_on_no_current_table()
+      return if abort_on_modified()
+      save_gui_data(current_table_name)
 
-            global_point = gui_table.mapToGlobal(point)
-            global_point.x += gui_table.verticalHeader.width
-            menu.exec(global_point)
-            menu.dispose
-          end
-        end
-      rescue => err
-        ExceptionDialog.new(self, err, "context_menu Errors", false)
+      bin_path = Qt::FileDialog.getOpenFileName(self, "Open Binary", @bin_path,
+                                                "Binary File (*.bin *.dat);;All Files (*)")
+      return unless bin_path
+      def_path = def_path_from_bin_path(bin_path)
+      def_path = get_best_def_path(def_path, bin_path)
+      if !def_path || !File.file?(def_path)
+        def_path = Qt::FileDialog.getOpenFileName(self, "Open Definition File", def_path,
+                                                  "Definition File (*.txt);;All Files (*)")
       end
+      return unless def_path
+
+      @core.table_commit(current_table_name, bin_path, def_path)
+    rescue TableManagerCore::CoreError, SaveError, DisplayError => err
+      Qt::MessageBox.warning(self, "Table Commit Errors", err.message)
+    rescue => err
+      ExceptionDialog.new(self, err, "Table Commit Errors", false)
     end
 
-    # Creates a tab in the table manager gui
-    def create_table_tab(table_definition)
-      begin
-        # Table
-        @table = Qt::TableWidget.new(self)
-        delegate = ComboBoxItemDelegate.new(@table)
-        @table.setItemDelegate(delegate)
-        @table.setEditTriggers(Qt::AbstractItemView::AllEditTriggers)
-        @table.setSelectionMode(Qt::AbstractItemView::NoSelection)
-        #@table.setAlternatingRowColors(true)
-        @gui_tables[table_definition.name] = @table
-        @ordered_gui_table_names << table_definition.name
-        @tabbook.addTab(@table, table_definition.name)
-
-        @table.setRowCount(table_definition.num_rows)
-        @table.setColumnCount(table_definition.num_columns)
-        @table.setMouseTracking(true)
-        connect(@table, SIGNAL('cellEntered(int, int)'), self, SLOT('mouse_over(int, int)'))
-        connect(@table, SIGNAL('itemClicked(QTableWidgetItem*)'), self, SLOT('click_callback(QTableWidgetItem*)'))
-        @table.setContextMenuPolicy(Qt::CustomContextMenu)
-        connect(@table, SIGNAL('customContextMenuRequested(const QPoint&)'), self, SLOT('context_menu(const QPoint&)'))
-      rescue => err
-        ExceptionDialog.new(self, err, "create_table_tab Errors", false)
-      end
+    def current_table_name
+      @tabbook.current_name
     end
 
     # Saves all the information in the given gui table name to the underlying
     # binary structure (although it does not commit it to disk).
     def save_gui_data(name)
-      gui_table = @gui_tables[name]
-      table = @core.table_def.get_table(name)
-      result = ""
-
-      # Cancel any table selections so the text will be visible when it is refreshed
-      gui_table.clearSelection
+      table = @core.config.table(name)
+      gui_table = @tabbook.tab(name)
+      return unless table && gui_table
 
-      # don't do anything if we can't find the table
-      if gui_table.nil? or table.nil? then return end
+      result = ""
 
       # First go through the gui and set the underlying data to what is displayed
       (0...table.num_rows).each do |r|
         (0...table.num_columns).each do |c|
           if table.type == :TWO_DIMENSIONAL
-            # get the table item definition so we know how to save it
-            item_def = table.get_item("#{gui_table.horizontalHeaderItem(c).text}#{r}")
+            item = table.get_item("#{gui_table.horizontalHeaderItem(c).text}#{r}")
           else # table is ONE_DIMENSIONAL
-            # get the table item definition so we know how to save it
-            item_def = table.get_item(gui_table.verticalHeaderItem(r).text)
+            item = table.get_item(gui_table.verticalHeaderItem(r).text)
           end
+          next if item.hidden
 
-          # determine how to convert the display value to the actual value
           begin
-            case item_def.display_type
-            when :DEC
-              if item_def.data_type == :FLOAT
-                x = Float(gui_table.item(r,c).text)
-              else
-                x = Integer(gui_table.item(r,c).text)
-              end
-
-            when :HEX
-              x = Integer(gui_table.item(r,c).text)
-
-            when :CHECK
-              # the ItemData will be 0 for unchecked (corresponds with min value),
-              # and 1 for checked (corresponds with max value)
-              if gui_table.item(r,c).checkState == Qt::Checked
-                x = item_def.range.end.to_i
-              else
-                x = item_def.range.begin.to_i
-              end
-
-            when :STATE
-              x = item_def.states[gui_table.item(r,c).text]
-
-            when :STRING, :NONE
-              x = gui_table.item(r,c).text
-
-            end
+            value = get_item_value(item, gui_table.item(r, c))
 
             # If there is a read conversion we first read the converted value before writing.
             # This is to prevent writing the displayed value (which has the conversion applied)
             # back to the binary data if they are already equal.
-            if item_def.read_conversion
-              converted = table.read(item_def.name, :CONVERTED)
-              table.write(item_def.name, x) if converted != x
+            if item.read_conversion
+              converted = table.read(item.name, :CONVERTED)
+              table.write(item.name, value) if converted != value
             else
-              table.write(item_def.name, x)
+              table.write(item.name, value)
             end
 
           # if we have a problem casting the value it probably means the user put in garbage
           # in this case force the range check to fail
           rescue => error
-            text = gui_table.item(r,c).text
-            result << "Error saving #{item_def.name} value of '#{text}' due to #{error.message}.\nDefault value is '#{item_def.default}'\n"
+            text = gui_table.item(r, c).text
+            result << "Error saving #{item.name} value of '#{text}' due to #{error.message}.\nDefault value is '#{item.default}'\n"
           end
         end # end each table column
       end # end each table row
-      if result == ""
-        result = nil
-      end
-      result
+      raise SaveError, result unless result.empty?
     end
 
-    # Determines how to display all the binary table data based on
-    # the table definition and displays it using the various gui elements.
-    def display_gui_data(name)
-      table_def = @core.table_def.get_table(name)
-      gui_table = @gui_tables[name]
-
-      # Cancel any table selections so the text will be visible when it is refreshed
-      gui_table.clearSelection
-
-      # if we can't find the table do nothing
-      if table_def.nil? or gui_table.nil? then return end
-
-      items = table_def.sorted_items
-
-      if table_def.type == :TWO_DIMENSIONAL
-        row_headers = []
-        (0...table_def.num_rows).each {|i| row_headers << "#{i+1}" }
-        gui_table.setVerticalHeaderLabels(row_headers)
-
-        column_headers = []
-        (0...table_def.num_columns).each {|i| column_headers << items[i].name[0...-1] }
-        gui_table.setHorizontalHeaderLabels(column_headers)
+    def closeEvent(event)
+      if abort_on_modified()
+        event.ignore()
       else
-        row_headers = []
-        items.each {|item_def| row_headers << item_def.name }
-        gui_table.setVerticalHeaderLabels(row_headers)
-        gui_table.setHorizontalHeaderLabels(["Value"])
+        super(event)
       end
+    end
 
-      table_row = 0
-      table_column = 0
-
-      items.each do |item_def|
-        update_gui_item(name, table_def, item_def, table_row, table_column)
+    protected
 
-        if table_def.type == :TWO_DIMENSIONAL
-          # only increment our row when we've processed all the columns
-          if table_column == table_def.num_columns - 1
-            table_row += 1
-            table_column = 0
-          else
-            table_column += 1
-          end
-        else
-          table_row += 1
-        end
+    # Determine the binary directory path given the definition directory path
+    #
+    # @param def_path [String] Path to the definition directory
+    def bin_path_from_def_path(def_path)
+      if def_path.include?('targets') # target directory path
+        bin_path = File.expand_path(File.join(def_path, '..', '..', 'tables'))
+      else
+        bin_path = @system_bin_path
       end
-
-      gui_table.resizeColumnsToContents()
-      gui_table.resizeRowsToContents()
     end
 
-    # Updates the table by setting the value in the table to the properly formatted value.
-    def update_gui_item(table_name, table_def, item_def, table_row, table_column)
-      gui_table = @gui_tables[table_name]
-
-      case item_def.display_type
-      when :STATE
-        item = Qt::TableWidgetItem.new
-        item.setData(Qt::DisplayRole, Qt::Variant.new(table_def.read(item_def.name)))
-        gui_table.setItem(table_row, table_column, item)
-        if item_def.editable
-          gui_table.item(table_row, table_column).setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable)
-        else
-          gui_table.item(table_row, table_column).setFlags(Qt::NoItemFlags)
-        end
-
-      when :CHECK
-        gui_table.setItem(table_row, table_column, Qt::TableWidgetItem.new(table_def.read(item_def.name)))
-        # the ItemData will be 0 for unchecked (corresponds with min value),
-        # and 1 for checked (corresponds with max value)
-        if table_def.read(item_def.name) == item_def.range.begin
-          gui_table.item(table_row, table_column).setCheckState(Qt::Unchecked)
-        else
-          gui_table.item(table_row, table_column).setCheckState(Qt::Checked)
-        end
-        if item_def.editable
-          gui_table.item(table_row, table_column).setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable)
-        else
-          gui_table.item(table_row, table_column).setFlags(Qt::NoItemFlags)
-        end
-
-      when :STRING, :NONE, :DEC
-        gui_table.setItem(table_row, table_column, Qt::TableWidgetItem.new(tr(table_def.read(item_def.name).to_s)))
-        if item_def.editable
-          gui_table.item(table_row, table_column).setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled)
-        else
-          gui_table.item(table_row, table_column).setFlags(Qt::NoItemFlags)
-        end
-
-      when :HEX
-        case item_def.bit_size
-        when 8
-          x = sprintf("%02X", table_def.read(item_def.name).to_s)
-          # if the number was negative x will have .. and possibly another
-          # F in the string which we remove by taking the last 4 digits
-          x = /\w{2}$/.match(x)[0]
-        when 16
-          x = sprintf("%04X", table_def.read(item_def.name).to_s)
-          # if the number was negative x will have .. and possibly another
-          # F in the string which we remove by taking the last 4 digits
-          x = /\w{4}$/.match(x)[0]
-        else
-          x = sprintf("%08X", table_def.read(item_def.name).to_s)
-          # if the number was negative x will have .. and possibly another
-          # F in the string which we remove by taking the last 8 digits
-          x = /\w{8}$/.match(x)[0]
-        end
-        x = Integer("0x#{x}") # convert to Integer
-        gui_table.setItem(table_row, table_column, Qt::TableWidgetItem.new(tr("0x%X" % x)))
-        if item_def.editable
-          gui_table.item(table_row, table_column).setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled)
-        else
-          gui_table.item(table_row, table_column).setFlags(Qt::NoItemFlags)
-        end
+    # Determine the definition directory path given the binary directory path
+    #
+    # @param bin_path [String] Path to the binary directory
+    def def_path_from_bin_path(bin_path)
+      if bin_path.include?('targets') # target directory path
+        def_path = File.expand_path(File.join(File.dirname(bin_path), '..', 'tools', 'table_manager'))
+      else
+        def_path = @system_def_path
       end
     end
 
@@ -958,112 +789,344 @@ module Cosmos
     # a binary file name of XXX_YYY1_Extra.bin. A binary file of XXX_YYY2.bin
     # will not match.
     #
+    # @param def_path [String] Path to the definition files
+    # @param bin_path [String] Path to the binary file
     # @return [String|nil] Path to the best definition file or nil
-    def get_best_definition_file(path, bin_file)
+    def get_best_def_path(def_path, bin_path)
+      return nil unless (File.exist?(def_path) && File.exist?(bin_path))
+      bin_path = File.basename(bin_path).split('.')[0]
       def_file = nil
 
-      # compare the filename with all possibilities in the directory
-      Dir.foreach(path) do |possible_def_file|
+      Dir.foreach(def_path) do |possible_def_file|
         # only bother checking definition files
         index = possible_def_file.index('_def.txt')
         next unless index
 
         base_name = possible_def_file[0...index]
-        if bin_file.index(base_name)
+        if bin_path.index(base_name)
           # If we've already found a def_file and now found another match we
           # clear the first and stop the search. Force the user to decide.
           if def_file
             def_file = nil
             break
           end
-          def_file = File.join(path, possible_def_file)
+          def_file = File.join(def_path, possible_def_file)
         end
-      end # each file in the directory
-
-      return def_file
+      end
+      # Return the original path if we couldn't find anything
+      def_file = def_path unless def_file
+      def_file
     end
 
-    # Prompts the user to select a binary table file to open.
-    # (e.g. MyBinary_TC2.dat or MyBinaryJMT = MyBinary_def.dat)
-    # Returns both the path to the binary file and the table definition file or
-    # nil for both if either can not be found.
-    def get_binary_and_definition_file_paths
-      bin_file = nil
-      def_file = nil
+    def abort_on_check_for_existing(filenames, output_path)
+      user_abort = false
+      filenames.each do |def_file|
+        if File.basename(def_file) =~ /_def\.txt/
+          basename = File.basename(def_file)[0...-8] # Get the basename without the _def.txt
+        else
+          basename = File.basename(def_file).split('.')[0...-1].join('.') # Get the basename without the extension
+        end
 
-      bin_file = Qt::FileDialog.getOpenFileName(
-        self, "Open Binary", @bin_path, "Binary File (*.bin *.dat);;All Files (*)")
-      unless bin_file.nil? or bin_file.empty?
-        @bin_path = File.dirname(bin_file)
-        bin_file_base = File.basename(bin_file).split('.')[0]
+        output_filename = File.join(output_path, "#{basename}.dat")
+        if abort_on_existing_file(output_filename)
+          user_abort = true
+          break # No need to continue processing
+        end
+      end
+      user_abort
+    end
 
-        # Look in the binary file's base directory
-        def_file = get_best_definition_file(File.dirname(bin_file), bin_file_base)
-        def_found = !def_file.nil?
+    def abort_on_existing_file(filename)
+      user_abort = false
+      if File.exist?(filename)
+        result = Qt::MessageBox.question(self, "File New",
+          "#{filename} already exists. Overwrite?",
+          Qt::MessageBox::Yes | Qt::MessageBox::No, Qt::MessageBox::Yes)
+        if result != Qt::MessageBox::Yes
+          user_abort = true
+        end
+      end
+      user_abort
+    end
 
-        if not def_found
-          # Look in the stored definition file directory
-          def_file = get_best_definition_file(@def_path, bin_file_base)
-          def_found = !def_file.nil?
+    def abort_on_modified
+      user_abort = false
+      if self.windowTitle.include?("*")
+        result = Qt::MessageBox.warning(self, "Table Modified",
+          "Table has been modified. Continue and discard all changes?",
+          Qt::MessageBox::Yes | Qt::MessageBox::No, Qt::MessageBox::No)
+        if result != Qt::MessageBox::Yes
+          user_abort = true
         end
+      end
+      user_abort
+    end
 
-        if def_found # if the definition file was automatically found
-          return bin_file, def_file
-        else # the definition file was not automatically found
-          result = Qt::MessageBox.question(self, "Manually Open Definition File",
-            "The definition text file for #{File.basename(bin_file)} could not be found.\nWould you like to manually locate it?",
-            Qt::MessageBox::Yes | Qt::MessageBox::No | Qt::MessageBox::Cancel, Qt::MessageBox::Yes)
-          if result == Qt::MessageBox::Yes
-            def_file = Qt::FileDialog.getOpenFileName(self,
-                                                    "Open Definition File",
-                                                    @def_path,
-                                                    "Definition File (*.txt)\nAll Files (*)")
-            unless def_file.nil? or def_file.empty?
-              if File.basename(def_file) =~ /\.txt/
-                @def_path = File.dirname(def_file)
-                return bin_file, def_file
-              else
-                Qt::MessageBox.information(self, "Open Definition File Errors",
-                  "Definition file #{File.basename(def_file)} does not have .txt extension")
-              end
-            end # the user clicked Cancel on the File Open dialog
-          end # the user clicked No when prompted to find the definition file
-        end # end if the definition file wasn't found
-      end # end if the user did not click Cancel on the Open dialog
-      return nil, nil
+    def abort_on_no_current_table
+      user_abort = false
+      unless current_table_name
+        Qt::MessageBox.information(self, "No current table", "Please open a table.")
+        user_abort = true
+      end
+      user_abort
     end
 
     # Delete all the tabs in the table manager gui and initialize globals to
     # prepare for the next table to load.
-    def delete_tabs
-      @gui_tables = Hash.new
-      @ordered_gui_table_names = Array.new
-      @currently_displayed_table_name = ""
-
+    def reset_gui
+      set_table_modified(false)
       @tabbook.tabs.each_with_index do |tab, index|
         tab.dispose
         @tabbook.removeTab(index)
       end
     end
 
-    def self.run(option_parser = nil, options = nil)
-      Cosmos.catch_fatal_exception do
-        unless option_parser and options
-          option_parser, options = create_default_options()
-          options.width = 800
-          options.height = 600
-          options.title = "Table Manager"
-          options.auto_size = false
-          options.no_tables = false
-          option_parser.separator "Table Manager Specific Options:"
-          option_parser.on("-n", "--notables", "Do not include table file editing options. This will remove the 'Table' menu.") do
-            options.no_tables = true
+    def save_all_gui_data
+      result = ''
+      @core.config.tables.each do |table_name, table|
+        begin
+          save_gui_data(table_name)
+        rescue SaveError => err
+          result << "\nErrors in #{table_name}:\n#{err.message}"
+        end
+      end
+      raise SaveError, result.lstrip unless result.empty?
+    end
+
+    def display_all_gui_data
+      reset_gui()
+      @core.config.tables.each do |table_name, table|
+        create_table_tab(table)
+        display_gui_data(table_name)
+      end
+    end
+
+    def display_gui_data(table_name)
+      table = @core.config.table(table_name)
+      gui_table = @tabbook.tab(table_name)
+      return unless table && gui_table
+
+      gui_table.blockSignals(true) # block signals while we programatically update it
+      # Cancel any table selections so the text will be visible when it is refreshed
+      gui_table.clearSelection
+
+      set_table_headers(table, gui_table)
+
+      row = 0
+      column = 0
+      table.sorted_items.each do |item|
+        next if item.hidden
+        update_gui_item(table_name, table, gui_table, item, row, column)
+
+        if table.type == :TWO_DIMENSIONAL
+          # only increment our row when we've processed all the columns
+          if column == table.num_columns - 1
+            row += 1
+            column = 0
+          else
+            column += 1
           end
+        else
+          row += 1
         end
+      end
 
-        super(option_parser, options)
+      gui_table.resizeColumnsToContents()
+      gui_table.resizeRowsToContents()
+      gui_table.blockSignals(false)
+    end
+
+    # Updates the table by setting the value in the table to the properly formatted value.
+    def update_gui_item(table_name, table, gui_table, item, row, column)
+      value = table.read(item.name, :FORMATTED)
+
+      if item.states && item.states.keys.sort == %w(CHECKED UNCHECKED)
+        table_item = create_checkable_table_item(item, value)
+      else
+        table_item = create_table_item(item, value)
       end
+      gui_table.setItem(row, column, table_item)
+    end
+
+    def get_item_value(item, gui_item)
+      value = nil
+      if (gui_item.flags & Qt::ItemIsUserCheckable) != 0
+        check_state = gui_item.checkState
+        case check_state
+        when Qt::Checked
+          value = item.states["CHECKED"]
+        when Qt::Unchecked
+          value = item.states["UNCHECKED"]
+        when Qt::PartiallyChecked
+          value = gui_item.text # convert_to_value?
+        end
+      else
+        text = gui_item.text
+        quotes_removed = text.remove_quotes
+        if text == quotes_removed
+          value = text.convert_to_value
+        else
+          value = quotes_removed
+        end
+      end
+      value
     end
-  end
 
+    def set_table_modified(modified)
+      title = modified ? "#{@app_title} *" : @app_title
+      self.setWindowTitle(title)
+    end
+
+    def table_item_changed(table_item)
+      set_table_modified(true)
+      # If there is a checkbox value that contains a value that doesn't map to
+      # the checked or unchecked state, that value is displayed next to the
+      # "PartiallyChecked" checkbox. Once the user clicks to check or uncheck,
+      # the original value will disappear due to the following code:
+      table = @core.config.table(current_table_name)
+      gui_table = @tabbook.tab(current_table_name)
+      if table.type == :TWO_DIMENSIONAL
+        item_name = gui_table.horizontalHeaderItem(table_item.column).text + table_item.row.to_s
+      else
+        item_name = gui_table.verticalHeaderItem(table_item.row).text
+      end
+      item = table.get_item(item_name)
+      if item.states && item.states.keys.sort == %w(CHECKED UNCHECKED)
+        table_item.setText('')
+      end
+    end
+
+    def set_table_headers(table, gui_table)
+      items = table.sorted_items
+      if table.type == :TWO_DIMENSIONAL
+        row_headers = []
+        (0...table.num_rows).each {|i| row_headers << "#{i + 1}" }
+        gui_table.setVerticalHeaderLabels(row_headers)
+
+        column_headers = []
+        (0...table.num_columns).each {|i| column_headers << items[i].name[0...-1] unless items[i].hidden }
+        gui_table.setHorizontalHeaderLabels(column_headers)
+      else
+        row_headers = []
+        items.each {|item| row_headers << item.name unless item.hidden }
+        gui_table.setVerticalHeaderLabels(row_headers)
+        gui_table.setHorizontalHeaderLabels(["Value"])
+      end
+    end
+
+    def create_checkable_table_item(item, value)
+      table_item = Qt::TableWidgetItem.new()
+      if item.editable
+        table_item.setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate)
+      else
+        table_item.setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsTristate)
+      end
+      if value == "CHECKED"
+        table_item.setCheckState(Qt::Checked)
+      elsif value == "UNCHECKED"
+        table_item.setCheckState(Qt::Unchecked)
+      else # The value doesn't match our defined states
+        table_item.setText(value) # Display the actual value
+        table_item.setCheckState(Qt::PartiallyChecked) # Mark it partial since we can't tell
+      end
+      table_item
+    end
+
+    def create_table_item(item, value)
+      table_item = Qt::TableWidgetItem.new(value)
+      if item.editable
+        table_item.setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable)
+      else
+        table_item.setFlags(Qt::NoItemFlags)
+      end
+      table_item
+    end
+
+    def context_menu(point)
+      begin
+        table = @core.config.table(current_table_name)
+        gui_table = @tabbook.tab(current_table_name)
+        if table && gui_table
+          table_item = gui_table.itemAt(point)
+          if table_item
+            menu = Qt::Menu.new()
+
+            if table.type == :TWO_DIMENSIONAL
+              item_name = gui_table.horizontalHeaderItem(table_item.column).text + table_item.row.to_s
+            else
+              item_name = gui_table.verticalHeaderItem(table_item.row).text
+            end
+            details_action = Qt::Action.new(tr("Details"), self)
+            details_action.statusTip = tr("Popup details about #{current_table_name} #{item_name}")
+            details_action.connect(SIGNAL('triggered()')) do
+              TlmDetailsDialog.new(nil,
+                                   'TABLE',
+                                   current_table_name.upcase,
+                                   item_name,
+                                   table)
+            end
+            menu.addAction(details_action)
+
+            default_action = Qt::Action.new(tr("Default"), self)
+            default_action.statusTip = tr("Set item to default value")
+            default_action.connect(SIGNAL('triggered()')) do
+              item = table.get_item(item_name)
+              table.write(item.name, item.default)
+              update_gui_item(current_table_name, table, gui_table, item, table_item.row, table_item.column)
+            end
+            menu.addAction(default_action)
+
+            global_point = gui_table.mapToGlobal(point)
+            global_point.x += gui_table.verticalHeader.width
+            menu.exec(global_point)
+            menu.dispose
+          end
+        end
+      rescue => err
+        ExceptionDialog.new(self, err, "context_menu Errors", false)
+      end
+    end
+
+    # Creates a tab in the table manager gui
+    #
+    # @param table [Table] Table to display
+    def create_table_tab(table)
+      @table = Qt::TableWidget.new(self)
+      delegate = ComboBoxItemDelegate.new(@table)
+      @table.setItemDelegate(delegate)
+      @table.setEditTriggers(Qt::AbstractItemView::AllEditTriggers)
+      @table.setSelectionMode(Qt::AbstractItemView::NoSelection)
+      #@table.setAlternatingRowColors(true)
+      @tabbook.addTab(@table, table.table_name)
+
+      @table.setRowCount(table.num_rows)
+      @table.setColumnCount(table.num_columns)
+      @table.setMouseTracking(true)
+      @table.connect(SIGNAL('cellEntered(int, int)')) {|row, col| mouse_over(row, col) }
+      @table.connect(SIGNAL('itemChanged(QTableWidgetItem*)')) {|item| table_item_changed(item) }
+      @table.setContextMenuPolicy(Qt::CustomContextMenu)
+      @table.connect(SIGNAL('customContextMenuRequested(const QPoint&)')) {|point| context_menu(point) }
+    rescue => err
+      ExceptionDialog.new(self, err, "Create New Table Tab Errors", false)
+    end
+
+    def mouse_over(row, col)
+      return unless current_table_name
+      table = @core.config.table(current_table_name)
+      gui_table = @tabbook.tab(current_table_name)
+      if table && gui_table
+        if table.type == :TWO_DIMENSIONAL
+          item_name = gui_table.horizontalHeaderItem(col).text + row.to_s
+          item = table.get_item(item_name)
+          statusBar.showMessage(item.description)
+        else
+          item_name = gui_table.verticalHeaderItem(row).text
+          item = table.get_item(item_name)
+          statusBar.showMessage(item.description)
+        end
+      end
+    rescue
+      statusBar.showMessage('')
+    end
+  end
 end # module Cosmos