cosmos 4.2.4-java → 4.5.0-java

data/lib/cosmos/tools/test_runner/test.rb

@@ -126,7 +126,7 @@ module Cosmos
       if result
         results << result
         yield result if block_given?
-        raise StopScript if result.stopped
+        raise StopScript if (results[-1].exceptions and @@abort_on_exception) or results[-1].stopped
       end
 
       # Run each test case
@@ -141,7 +141,7 @@ module Cosmos
       if result
         results << result
         yield result if block_given?
-        raise StopScript if result.stopped
+        raise StopScript if (results[-1].exceptions and @@abort_on_exception) or results[-1].stopped
       end
 
       results
@@ -387,17 +387,20 @@ module Cosmos
           result = run_test_case(test_class, test_case, true)
           results << result
           yield result if block_given?
+          raise StopScript if (result.exceptions and test_class.abort_on_exception) or result.stopped
         when :TEST_SETUP
           result = run_test_setup(test_class, true)
           if result
             results << result
             yield result if block_given?
+            raise StopScript if (result.exceptions and test_class.abort_on_exception) or result.stopped
           end
         when :TEST_TEARDOWN
           result = run_test_teardown(test_class, true)
           if result
             results << result
             yield result if block_given?
+            raise StopScript if (result.exceptions and test_class.abort_on_exception) or result.stopped
           end
         end
       end

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -93,59 +93,71 @@ module Cosmos
       super()
 
       # File Actions
-      @show_last = Qt::Action.new(tr('Show &Results'), self)
-      @show_last_keyseq = Qt::KeySequence.new(tr('Ctrl+R'))
+      @show_last = Qt::Action.new('Show &Results', self)
+      @show_last_keyseq = Qt::KeySequence.new('Ctrl+R')
       @show_last.shortcut = @show_last_keyseq
-      @show_last.statusTip = tr('Show the Results dialog from the last run')
+      @show_last.statusTip = 'Show the Results dialog from the last run'
       @show_last.connect(SIGNAL('triggered()')) { show_results }
 
-      @select = Qt::Action.new(tr('Test &Selection'), self)
-      @select_keyseq = Qt::KeySequence.new(tr('Ctrl+S'))
+      @select = Qt::Action.new('Test &Selection', self)
+      @select_keyseq = Qt::KeySequence.new('Ctrl+S')
       @select.shortcut = @select_keyseq
-      @select.statusTip = tr('Select Test Suites/Groups/Cases')
+      @select.statusTip = 'Select Test Suites/Groups/Cases'
       @select.connect(SIGNAL('triggered()')) { show_select }
 
-      @file_options = Qt::Action.new(tr('O&ptions'), self)
-      @file_options.statusTip = tr('Application Options')
+      @file_options = Qt::Action.new('O&ptions', self)
+      @file_options.statusTip = 'Application Options'
       @file_options.connect(SIGNAL('triggered()')) { file_options() }
 
+      # Edit Actions
+      @edit_zoom_in = Qt::Action.new('&Increase Font Size', self)
+      @edit_zoom_in_keyseq = Qt::KeySequence.new(Qt::KeySequence::ZoomIn)
+      @edit_zoom_in.shortcut  = @edit_zoom_in_keyseq
+      @edit_zoom_in.connect(SIGNAL('triggered()')) { @script_runner_frame.zoom_in }
+        @edit_zoom_out = Qt::Action.new('&Decrease Font Size', self)
+      @edit_zoom_out_keyseq = Qt::KeySequence.new(Qt::KeySequence::ZoomOut)
+      @edit_zoom_out.shortcut  = @edit_zoom_out_keyseq
+      @edit_zoom_out.connect(SIGNAL('triggered()')) { @script_runner_frame.zoom_out }
+        @edit_zoom_default = Qt::Action.new('Restore &Font Size', self)
+      @edit_zoom_default.connect(SIGNAL('triggered()')) { @script_runner_frame.zoom_default }
+
       # Script Actions
-      @test_results_log_message = Qt::Action.new(tr('Log Message to Test Results'), self)
-      @test_results_log_message.statusTip = tr('Log Message to Test Results')
+      @test_results_log_message = Qt::Action.new('Log Message to Test Results', self)
+      @test_results_log_message.statusTip = 'Log Message to Test Results'
       @test_results_log_message.connect(SIGNAL('triggered()')) { on_test_results_log_message() }
       @test_results_log_message.setEnabled(false)
 
-      @script_log_message = Qt::Action.new(tr('Log Message to Script Log'), self)
-      @script_log_message.statusTip = tr('Log Message to Script Log')
+      @script_log_message = Qt::Action.new('Log Message to Script Log', self)
+      @script_log_message.statusTip = 'Log Message to Script Log'
       @script_log_message.connect(SIGNAL('triggered()')) { on_script_log_message() }
       @script_log_message.setEnabled(false)
 
-      @show_call_stack = Qt::Action.new(tr('Show Call Stack'), self)
-      @show_call_stack.statusTip = tr('Show Call Stack')
+      @show_call_stack = Qt::Action.new('Show Call Stack', self)
+      @show_call_stack.statusTip = 'Show Call Stack'
       @show_call_stack.connect(SIGNAL('triggered()')) { on_script_call_stack }
       @show_call_stack.setEnabled(false)
 
-      @toggle_debug = Qt::Action.new(Cosmos.get_icon('bug.png'), tr('&Toggle Debug'), self)
-      @toggle_debug_keyseq = Qt::KeySequence.new(tr('Ctrl+D'))
+      @toggle_debug = Qt::Action.new(Cosmos.get_icon('bug.png'), '&Toggle Debug', self)
+      @toggle_debug_keyseq = Qt::KeySequence.new('Ctrl+D')
       @toggle_debug.shortcut  = @toggle_debug_keyseq
-      @toggle_debug.statusTip = tr('Toggle Debug')
+      @toggle_debug.statusTip = 'Toggle Debug'
       @toggle_debug.connect(SIGNAL('triggered()')) { on_script_toggle_debug }
       @toggle_debug.setEnabled(false)
 
-      @script_disconnect = Qt::Action.new(Cosmos.get_icon('disconnected.png'), tr('&Toggle Disconnect'), self)
-      @script_disconnect_keyseq = Qt::KeySequence.new(tr('Ctrl+T'))
+      @script_disconnect = Qt::Action.new(Cosmos.get_icon('disconnected.png'), '&Toggle Disconnect', self)
+      @script_disconnect_keyseq = Qt::KeySequence.new('Ctrl+T')
       @script_disconnect.shortcut  = @script_disconnect_keyseq
-      @script_disconnect.statusTip = tr('Toggle disconnect from the server')
+      @script_disconnect.statusTip = 'Toggle disconnect from the server'
       @script_disconnect.connect(SIGNAL('triggered()')) { on_script_toggle_disconnect() }
 
-      @script_audit = Qt::Action.new(tr('&Generate Cmd/Tlm Audit'), self)
-      @script_audit.statusTip = tr('Generate audit about commands sent and telemetry checked')
+      @script_audit = Qt::Action.new('&Generate Cmd/Tlm Audit', self)
+      @script_audit.statusTip = 'Generate audit about commands sent and telemetry checked'
       @script_audit.connect(SIGNAL('triggered()')) { script_audit() }
     end
 
     def initialize_menus
       # File Menu
-      file_menu = menuBar.addMenu(tr('&File'))
+      file_menu = menuBar.addMenu('&File')
       file_menu.addAction(@show_last)
       file_menu.addAction(@select)
       file_menu.addSeparator()
@@ -153,8 +165,14 @@ module Cosmos
       file_menu.addSeparator()
       file_menu.addAction(@exit_action)
 
+      # Edit Menu (to match Script Runner)
+      edit_menu = menuBar.addMenu('&Edit')
+      edit_menu.addAction(@edit_zoom_in)
+      edit_menu.addAction(@edit_zoom_out)
+      edit_menu.addAction(@edit_zoom_default)
+
       # Script Menu
-      script_menu = menuBar.addMenu(tr('&Script'))
+      script_menu = menuBar.addMenu('&Script')
       script_menu.addAction(@test_results_log_message)
       script_menu.addAction(@script_log_message)
       script_menu.addAction(@show_call_stack)
@@ -634,7 +652,7 @@ module Cosmos
       ScriptRunnerFrame.instance = @script_runner_frame
       build = false
       @utilities.each do |utility|
-        if require_utility(utility)
+        if load_utility(utility)
           build = true
         end
       end
@@ -924,11 +942,11 @@ module Cosmos
       box = Qt::DoubleSpinBox.new
       box.setRange(0, 60)
       box.setValue(ScriptRunnerFrame.line_delay)
-      form.addRow(tr("&Delay between each script line:"), box)
+      form.addRow("&Delay between each script line:", box)
       monitor = Qt::CheckBox.new
-      form.addRow(tr("&Monitor limits:"), monitor)
+      form.addRow("&Monitor limits:", monitor)
       pause_on_red = Qt::CheckBox.new
-      form.addRow(tr("Pause on &red limit:"), pause_on_red)
+      form.addRow("Pause on &red limit:", pause_on_red)
       if ScriptRunnerFrame.monitor_limits
         monitor.setCheckState(Qt::Checked)
         pause_on_red.setCheckState(Qt::Checked) if ScriptRunnerFrame.pause_on_red
@@ -977,10 +995,11 @@ module Cosmos
       parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#test-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword
-        when 'REQUIRE_UTILITY'
-          parser.verify_num_parameters(1, 1, "REQUIRE_UTILITY <filename>")
+        # REQUIRE_UTILITY was deprecated > 4.3.0 but left for compatibility purposes
+        when 'LOAD_UTILITY', 'REQUIRE_UTILITY'
+          parser.verify_num_parameters(1, 1, "LOAD_UTILITY <filename>")
           begin
-            require_utility params[0]
+            load_utility(params[0])
             @utilities << params[0]
           rescue Exception => err
             require_errors << "<b>#{params[0]}</b>:\n#{err.formatted}\n"
@@ -1078,6 +1097,14 @@ module Cosmos
           parser.verify_num_parameters(0, 0, "#{keyword}")
           @@results_writer.metadata = true
 
+        when 'DISABLE_TEST_SUITE_START'
+          parser.verify_num_parameters(0, 0, "#{keyword}")
+          Qt.execute_in_main_thread { @test_runner_chooser.test_suite_start_disabled = true }
+
+        when 'DISABLE_TEST_GROUP_START'
+          parser.verify_num_parameters(0, 0, "#{keyword}")
+          Qt.execute_in_main_thread { @test_runner_chooser.test_group_start_disabled = true }
+
         else
           raise "Unhandled keyword: #{keyword}" if keyword
         end
@@ -1243,12 +1270,9 @@ module Cosmos
           options.height = 700
           options.title = "Test Runner"
           options.auto_size = false
-          options.config_file = File.join(Cosmos::USERPATH, 'config', 'tools', 'test_runner', 'test_runner.txt')
           options.server_config_file = CmdTlmServer::DEFAULT_CONFIG_FILE
+          options.config_file = true # config_file is required
           option_parser.separator "Test Runner Specific Options:"
-          option_parser.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
-            options.config_file = File.join(Cosmos::USERPATH, 'config', 'tools', 'test_runner', arg)
-          end
           option_parser.on("-s", "--server FILE", "Use the specified server configuration file for disconnect mode") do |arg|
             options.server_config_file = arg
           end
@@ -1274,6 +1298,5 @@ module Cosmos
         super(option_parser, options)
       end
     end
-  end # class TestRunner
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/tools/test_runner/test_runner_chooser.rb

@@ -54,6 +54,9 @@ module Cosmos
     # Callback called when the test teardown button is pressed - call(test_suite, test)
     attr_accessor :test_teardown_callback
 
+    # Whether the suite and group start button is disabled
+    attr_reader :test_suite_start_disabled, :test_group_start_disabled
+
     # Constructor
     def initialize(parent)
       super(parent)
@@ -65,6 +68,9 @@ module Cosmos
       setup_button_width = 60
       teardown_button_width = 60
 
+      @test_suite_start_disabled = false
+      @test_group_start_disabled = false
+
       # Test Suite Selection
       @test_suite_combobox = Qt::ComboBox.new
       @test_suite_combobox.setSizePolicy(Qt::SizePolicy::Minimum, Qt::SizePolicy::Minimum)
@@ -77,7 +83,7 @@ module Cosmos
       @test_suite_setup_button.setFixedWidth(setup_button_width)
       @test_suite_teardown_button = Qt::PushButton.new('Teardown')
       @test_suite_teardown_button.setFixedWidth(teardown_button_width)
-      @test_suite_label = Qt::Label.new(tr("Test Suite:"))
+      @test_suite_label = Qt::Label.new("Test Suite:")
       @overall.addWidget(@test_suite_label, 0, 0)
       @overall.addWidget(@test_suite_combobox, 0, 1)
       @overall.addWidget(@test_suite_start_button, 0, 2)
@@ -96,7 +102,7 @@ module Cosmos
       @test_setup_button.setFixedWidth(setup_button_width)
       @test_teardown_button = Qt::PushButton.new('Teardown')
       @test_teardown_button.setFixedWidth(teardown_button_width)
-      @test_label = Qt::Label.new(tr("Test Group:"))
+      @test_label = Qt::Label.new("Test Group:")
       @overall.addWidget(@test_label, 1, 0)
       @overall.addWidget(@test_combobox, 1, 1)
       @overall.addWidget(@test_start_button, 1, 2)
@@ -111,7 +117,7 @@ module Cosmos
       @test_case_combobox.setCompleter(@test_case_completion)
       @test_case_start_button = Qt::PushButton.new('Start')
       @test_case_start_button.setFixedWidth(start_button_width)
-      @test_case_label = Qt::Label.new(tr("Test Case:"))
+      @test_case_label = Qt::Label.new("Test Case:")
       @overall.addWidget(@test_case_label, 2, 0)
       @overall.addWidget(@test_case_combobox, 2, 1)
       @overall.addWidget(@test_case_start_button, 2, 2)
@@ -154,14 +160,20 @@ module Cosmos
       @test_setup_callback = nil
       @test_suite_teardown_callback = nil
       @test_teardown_callback = nil
+    end
+
+    def test_suite_start_disabled=(bool)
+      @test_suite_start_disabled = bool
+      if @test_suite_start_disabled
+        @test_suite_start_button.setEnabled(false)
+      end
+    end
 
-      @test_suite_start_enabled = false
-      @test_suite_setup_enabled = false
-      @test_suite_teardown_enabled = false
-      @test_start_enabled = false
-      @test_setup_enabled = false
-      @test_teardown_enabled = false
-      @test_case_start_enabled = false
+    def test_group_start_disabled=(bool)
+      @test_group_start_disabled = bool
+      if @test_group_start_disabled
+        @test_start_button.setEnabled(false)
+      end
     end
 
     def select_suite(test_suite)
@@ -282,7 +294,7 @@ module Cosmos
           @test_suite_teardown_button.setEnabled(false)
         end
       end
-      if @test_suites.keys.empty?
+      if @test_suites.keys.empty? || @test_suite_start_disabled
         @test_suite_start_button.setEnabled(false)
       else
         @test_suite_start_button.setEnabled(true)
@@ -311,7 +323,7 @@ module Cosmos
               @test_teardown_button.setEnabled(false)
             end
           end
-          @test_start_button.setEnabled(true)
+          @test_start_button.setEnabled(true) unless @test_group_start_disabled
         else
           @test_start_button.setEnabled(false)
         end

data/lib/cosmos/tools/tlm_extractor/tlm_extractor.rb

@@ -10,8 +10,6 @@
 
 require 'cosmos'
 Cosmos.catch_fatal_exception do
-  require 'cosmos/tools/tlm_extractor/tlm_extractor_processor'
-  require 'cosmos/tools/tlm_extractor/text_item_chooser'
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/choosers/telemetry_chooser'
   require 'cosmos/gui/choosers/float_chooser'
@@ -21,6 +19,8 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/dialogs/progress_dialog'
   require 'cosmos/gui/widgets/full_text_search_line_edit'
   require 'cosmos/gui/utilities/analyze_log'
+  require 'cosmos/tools/tlm_extractor/tlm_extractor_processor'
+  require 'cosmos/tools/tlm_extractor/text_item_chooser'
 end
 
 module Cosmos
@@ -93,6 +93,7 @@ module Cosmos
 
         System.telemetry
         @search_box.completion_list = System.telemetry.all_item_strings(true, splash)
+        # Always create the TlmExtractorConfig but note that it's optional to pass a config file
         @tlm_extractor_config = TlmExtractorConfig.new(options.config_file)
         @tlm_extractor_processor = TlmExtractorProcessor.new
         Qt.execute_in_main_thread(true) do
@@ -109,68 +110,68 @@ module Cosmos
       super()
 
       # File Menu Actions
-      @open_config = Qt::Action.new(tr('Open &Config'), self)
-      @open_config.statusTip = tr('Open configuration file')
+      @open_config = Qt::Action.new('Open &Config', self)
+      @open_config.statusTip = 'Open configuration file'
       @open_config.connect(SIGNAL('triggered()')) { handle_browse_button() }
 
-      @save_config = Qt::Action.new(tr('&Save Config'), self)
-      @save_config_keyseq = Qt::KeySequence.new(tr('Ctrl+S'))
+      @save_config = Qt::Action.new('&Save Config', self)
+      @save_config_keyseq = Qt::KeySequence.new('Ctrl+S')
       @save_config.shortcut = @save_config_keyseq
-      @save_config.statusTip = tr('Save current configuration')
+      @save_config.statusTip = 'Save current configuration'
       @save_config.connect(SIGNAL('triggered()')) { handle_save_button() }
 
-      @file_options = Qt::Action.new(tr('O&ptions'), self)
-      @file_options.statusTip = tr('Open the options dialog')
+      @file_options = Qt::Action.new('O&ptions', self)
+      @file_options.statusTip = 'Open the options dialog'
       @file_options.connect(SIGNAL('triggered()')) { handle_options() }
 
-      @analyze_log = Qt::Action.new(tr('&Analyze Logs'), self)
-      @analyze_log.statusTip = tr('Analyze log file packet counts')
+      @analyze_log = Qt::Action.new('&Analyze Logs', self)
+      @analyze_log.statusTip = 'Analyze log file packet counts'
       @analyze_log.connect(SIGNAL('triggered()')) { analyze_log_files() }
 
       # Mode Menu Actions
-      @fill_down_check = Qt::Action.new(tr('&Fill Down'), self)
-      @fill_down_check_keyseq = Qt::KeySequence.new(tr('Ctrl+F'))
+      @fill_down_check = Qt::Action.new('&Fill Down', self)
+      @fill_down_check_keyseq = Qt::KeySequence.new('Ctrl+F')
       @fill_down_check.shortcut = @fill_down_check_keyseq
-      @fill_down_check.statusTip = tr('Fill Down')
+      @fill_down_check.statusTip = 'Fill Down'
       @fill_down_check.setCheckable(true)
 
-      @matlab_header_check = Qt::Action.new(tr('&Matlab Header'), self)
-      @matlab_header_check_keyseq = Qt::KeySequence.new(tr('Ctrl+M'))
+      @matlab_header_check = Qt::Action.new('&Matlab Header', self)
+      @matlab_header_check_keyseq = Qt::KeySequence.new('Ctrl+M')
       @matlab_header_check.shortcut = @matlab_header_check_keyseq
-      @matlab_header_check.statusTip = tr('Add a Matlab header to the output data')
+      @matlab_header_check.statusTip = 'Add a Matlab header to the output data'
       @matlab_header_check.setCheckable(true)
 
-      @unique_only_check = Qt::Action.new(tr('&Unique Only'), self)
-      @unique_only_check_keyseq = Qt::KeySequence.new(tr('Ctrl+U'))
+      @unique_only_check = Qt::Action.new('&Unique Only', self)
+      @unique_only_check_keyseq = Qt::KeySequence.new('Ctrl+U')
       @unique_only_check.shortcut = @unique_only_check_keyseq
-      @unique_only_check.statusTip = tr('Only output rows where data has changed')
+      @unique_only_check.statusTip = 'Only output rows where data has changed'
       @unique_only_check.setCheckable(true)
 
-      @batch_mode_check = Qt::Action.new(tr('&Batch Mode'), self)
-      @batch_mode_check_keyseq = Qt::KeySequence.new(tr('Ctrl+B'))
+      @batch_mode_check = Qt::Action.new('&Batch Mode', self)
+      @batch_mode_check_keyseq = Qt::KeySequence.new('Ctrl+B')
       @batch_mode_check.shortcut = @batch_mode_check_keyseq
-      @batch_mode_check.statusTip = tr('Process multiple config files with the same input files')
+      @batch_mode_check.statusTip = 'Process multiple config files with the same input files'
       @batch_mode_check.setCheckable(true)
       @batch_mode_check.connect(SIGNAL('triggered()')) { batch_mode_changed() }
 
-      @normal_columns_check = Qt::Action.new(tr('&Normal Columns'), self)
-      @normal_columns_check.statusTip = tr('Normal Columns')
+      @normal_columns_check = Qt::Action.new('&Normal Columns', self)
+      @normal_columns_check.statusTip = 'Normal Columns'
       @normal_columns_check.setCheckable(true)
       @normal_columns_check.setChecked(true)
       @normal_columns_check.connect(SIGNAL('triggered()')) { column_mode_changed() }
 
-      @share_columns_check = Qt::Action.new(tr('Share Columns (&All)'), self)
-      @share_columns_check.statusTip = tr('Share columns for all items with the same name')
+      @share_columns_check = Qt::Action.new('Share Columns (&All)', self)
+      @share_columns_check.statusTip = 'Share columns for all items with the same name'
       @share_columns_check.setCheckable(true)
       @share_columns_check.connect(SIGNAL('triggered()')) { column_mode_changed() }
 
-      @share_indiv_columns_check = Qt::Action.new(tr('Share Columns (&Selected)'), self)
-      @share_indiv_columns_check.statusTip = tr('Share columns for selected items with the same name')
+      @share_indiv_columns_check = Qt::Action.new('Share Columns (&Selected)', self)
+      @share_indiv_columns_check.statusTip = 'Share columns for selected items with the same name'
       @share_indiv_columns_check.setCheckable(true)
       @share_indiv_columns_check.connect(SIGNAL('triggered()')) { column_mode_changed() }
 
-      @full_column_names_check = Qt::Action.new(tr('Full &Column Names'), self)
-      @full_column_names_check.statusTip = tr('Use full item names in each column')
+      @full_column_names_check = Qt::Action.new('Full &Column Names', self)
+      @full_column_names_check.statusTip = 'Use full item names in each column'
       @full_column_names_check.setCheckable(true)
       @full_column_names_check.connect(SIGNAL('triggered()')) { column_mode_changed() }
 
@@ -182,26 +183,26 @@ module Cosmos
       column_group.addAction(@full_column_names_check)
 
       @shared_columns = []
-      @shared_columns_edit = Qt::Action.new(tr('S&elect Shared Columns'), self)
-      @shared_columns_edit.statusTip = tr('Select which columns are shared')
+      @shared_columns_edit = Qt::Action.new('S&elect Shared Columns', self)
+      @shared_columns_edit.statusTip = 'Select which columns are shared'
       @shared_columns_edit.setEnabled(false)
       @shared_columns_edit.connect(SIGNAL('triggered()')) { shared_columns_edit() }
 
       # Item Menu Actions
-      @item_edit = Qt::Action.new(tr('&Edit Items'), self)
-      @item_edit_keyseq = Qt::KeySequence.new(tr('Ctrl+E'))
+      @item_edit = Qt::Action.new('&Edit Items', self)
+      @item_edit_keyseq = Qt::KeySequence.new('Ctrl+E')
       @item_edit.shortcut = @item_edit_keyseq
-      @item_edit.statusTip = tr('Options')
+      @item_edit.statusTip = 'Options'
       @item_edit.connect(SIGNAL('triggered()')) { item_edit() }
 
-      @item_delete = Qt::Action.new(tr('&Delete Items'), self)
-      @item_delete.statusTip = tr('Options')
+      @item_delete = Qt::Action.new('&Delete Items', self)
+      @item_delete.statusTip = 'Options'
       @item_delete.connect(SIGNAL('triggered()')) { item_delete() }
     end
 
     def initialize_menus
       # File Menu
-      @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu = menuBar.addMenu('&File')
       @file_menu.addAction(@open_config)
       @file_menu.addAction(@save_config)
       @file_menu.addSeparator()
@@ -211,7 +212,7 @@ module Cosmos
       @file_menu.addAction(@exit_action)
 
       # Mode Menu
-      @mode_menu = menuBar.addMenu(tr('&Mode'))
+      @mode_menu = menuBar.addMenu('&Mode')
       @mode_menu.addAction(@fill_down_check)
       @mode_menu.addAction(@matlab_header_check)
       @mode_menu.addAction(@unique_only_check)
@@ -225,7 +226,7 @@ module Cosmos
       @mode_menu.addAction(@shared_columns_edit)
 
       # Item Menu
-      @item_menu = menuBar.addMenu(tr('&Item'))
+      @item_menu = menuBar.addMenu('&Item')
       @item_menu.addAction(@item_edit)
       @item_menu.addAction(@item_delete)
 
@@ -402,7 +403,7 @@ module Cosmos
       @data_source_layout.addWidget(label)
       @log_file_radio = Qt::RadioButton.new("Log File", self)
       @log_file_radio.setChecked(true)
-      @log_file_radio.connect(SIGNAL('clicked()')) do 
+      @log_file_radio.connect(SIGNAL('clicked()')) do
         @packet_log_frame.show_log_fields(true)
         @packet_log_frame.output_filename = ""
         @dart_meta_frame.hide
@@ -410,12 +411,12 @@ module Cosmos
       end
       @data_source_layout.addWidget(@log_file_radio)
       @dart_radio = Qt::RadioButton.new("DART Database", self)
-      @dart_radio.connect(SIGNAL('clicked()')) do 
+      @dart_radio.connect(SIGNAL('clicked()')) do
         @packet_log_frame.show_log_fields(false)
         @packet_log_frame.output_filename = ""
         @dart_meta_frame.show
         @resize_timer.start(100)
-      end      
+      end
       @data_source_layout.addWidget(@dart_radio)
       @data_source_layout.addStretch()
       @top_layout.addLayout(@data_source_layout)
@@ -453,6 +454,8 @@ module Cosmos
 
     def self.post_options_parsed_hook(options)
       if options.input_files or options.dart
+        normalize_config_options(options)
+        
         # Process config file
         raise "Configuration File must be specified for command line processing" unless options.config_file
 
@@ -500,9 +503,6 @@ module Cosmos
           options.title = "Telemetry Extractor"
           options.dart = false
           option_parser.separator "Telemetry Extractor Specific Options:"
-          option_parser.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
-            options.config_file = File.join(Cosmos::USERPATH, 'config', 'tools', 'tlm_extractor', arg)
-          end
           option_parser.on("-i", "--input FILE", "Process the specified input file") do |arg|
             options.input_files ||= []
             if arg[0..0] != '/' and arg[1..1] != ':'
@@ -609,7 +609,7 @@ module Cosmos
       clear_config_item_list()
       @tlm_extractor_config.items.each do |item_type, target_name_or_column_name, packet_name_or_text, item_name, value_type, dart_reduction, dart_reduced_type|
         if item_type == 'ITEM'
-          if dart_reduction == :NONE 
+          if dart_reduction == :NONE
             if value_type == :CONVERTED
               @config_item_list.addItem("#{item_type} #{target_name_or_column_name} #{packet_name_or_text} #{item_name}")
             else