cosmos 3.9.1 → 3.9.2

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -120,6 +120,7 @@ module Cosmos
     @@limits_sleeper = Sleeper.new
     @@cancel_output = false
     @@cancel_limits = false
+    @@file_number = 1
 
     def initialize(parent, default_tab_text = 'Untitled')
       super(parent)
@@ -128,6 +129,11 @@ module Cosmos
       @initialized = false
       @debug_frame = nil
 
+      # Keep track of a unique file number so we can differentiate untitled tabs
+      @file_number = @@file_number
+      @@file_number +=1
+      @filename = ''
+
       @layout = Qt::VBoxLayout.new
       @layout.setContentsMargins(0,0,0,0)
 
@@ -149,6 +155,7 @@ module Cosmos
 
       # Add Initial Text Window
       @script = create_ruby_editor()
+      @script.filename = unique_filename()
       @script.connect(SIGNAL('modificationChanged(bool)')) do |changed|
         emit modificationChanged(changed)
       end
@@ -182,7 +189,6 @@ module Cosmos
 
       # Configure Variables
       @line_offset = 0
-      @filename = ''
       @output_io = StringIO.new('', 'r+')
       @output_io_mutex = Mutex.new
       @change_callback = nil
@@ -210,19 +216,22 @@ module Cosmos
       @find_dialog = nil
       @replace_dialog = nil
 
-      mark_breakpoints('')
+      mark_breakpoints(@script.filename)
+    end
+
+    def unique_filename
+      if @filename and !@filename.empty?
+        return @filename
+      else
+        return @default_tab_text.strip + @file_number.to_s
+      end
     end
 
     def current_tab_filename
       if @tab_book_shown
-        filename = @tab_book.tabText(@tab_book.currentIndex)
-        if filename == @default_tab_text
-          return ''
-        else
-          return filename.strip
-        end
+        return @tab_book.widget(@tab_book.currentIndex).filename
       else
-        return @filename
+        return @script.filename
       end
     end
 
@@ -262,7 +271,17 @@ module Cosmos
       # Stop the message log so a new one will be created with the new filename
       stop_message_log()
       @filename = filename
-      mark_breakpoints(filename)
+
+      # Deal with breakpoints created under the previous filename.
+      bkpt_filename = unique_filename()
+      if @@breakpoints[bkpt_filename].nil?
+        @@breakpoints[bkpt_filename] = @@breakpoints[@script.filename]
+      end
+      if bkpt_filename != @script.filename
+        @@breakpoints.delete(@script.filename)
+        @script.filename = bkpt_filename
+      end
+      mark_breakpoints(@script.filename)
     end
 
     def modified
@@ -298,6 +317,7 @@ module Cosmos
     def clear
       self.set_text('')
       self.filename = ''
+      @script.filename = unique_filename()
       self.modified = false
     end
 
@@ -384,13 +404,15 @@ module Cosmos
         @script.setPlainText(text)
         @script.stop_highlight
         @filename = filename
-        mark_breakpoints(filename)
+        @script.filename = unique_filename()
+        mark_breakpoints(@script.filename)
       end
     end
 
     def set_text_from_file(filename)
       unless running?()
         @@file_cache[filename] = nil
+        @@breakpoints[filename] = nil
         load_file_into_script(filename)
         @filename = filename
       end
@@ -960,26 +982,27 @@ module Cosmos
     end
 
     def self.set_breakpoint(filename, line_number)
-      filename = File.basename(filename)
       @@breakpoints[filename] ||= {}
       @@breakpoints[filename][line_number] = true
     end
 
     def self.clear_breakpoint(filename, line_number)
-      filename = File.basename(filename)
       @@breakpoints[filename] ||= {}
       @@breakpoints[filename].delete(line_number) if @@breakpoints[filename][line_number]
     end
 
     def self.clear_breakpoints(filename = nil)
-      filename = File.basename(filename) unless filename.nil?
       if filename == nil or filename.empty?
         @@breakpoints = {}
       else
-        @@breakpoints[filename] = {}
+        @@breakpoints.delete(filename)
       end
     end
 
+    def clear_breakpoints
+      ScriptRunnerFrame.clear_breakpoints(unique_filename())
+    end
+
     def select_tab_and_destroy_tabs_after_index(index)
       Qt.execute_in_main_thread(true) do
         if @tab_book_shown
@@ -1352,6 +1375,7 @@ module Cosmos
           else # new file
             # Create new tab
             new_script = create_ruby_editor()
+            new_script.filename = filename
             @tab_book.addTab(new_script, '  ' + File.basename(filename) + '  ')
 
             @call_stack.push(filename.dup)
@@ -1373,9 +1397,12 @@ module Cosmos
     end
 
     def handle_pause(filename, line_number)
-      filename = File.basename(filename)
+      bkpt_filename = ''
+      Qt.execute_in_main_thread(true) {bkpt_filename = @active_script.filename}
       breakpoint = false
-      breakpoint = true if @@breakpoints[filename] and @@breakpoints[filename][line_number]
+      breakpoint = true if @@breakpoints[bkpt_filename] and @@breakpoints[bkpt_filename][line_number]
+
+      filename = File.basename(filename)
       if @pause
         @pause = false unless @@step_mode
         if breakpoint
@@ -1544,8 +1571,7 @@ module Cosmos
     end
 
     def mark_breakpoints(filename)
-      @active_script.clear_breakpoints
-      breakpoints = @@breakpoints[File.basename(filename)]
+      breakpoints = @@breakpoints[filename]
       if breakpoints
         breakpoints.each do |line_number, present|
           @active_script.add_breakpoint(line_number) if present

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

@@ -249,7 +249,7 @@ module Cosmos
               out.puts line
             end
           end
-		 end
+        end
         puts "Created #{filename}"
         return false
       end
@@ -358,9 +358,9 @@ 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
 
@@ -385,7 +385,6 @@ module Cosmos
       file_menu.addAction(@exit_action)
 
       unless no_tables
-        # Table Menu
         table_menu = menuBar.addMenu(tr('&Table'))
         table_menu.addAction(@table_check)
         table_menu.addAction(@table_default)
@@ -393,7 +392,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
@@ -739,6 +738,7 @@ module Cosmos
             else
               table.write(item.name, value)
             end
+            raise "out of range" if item.range && !item.range.include?(table.read(item.name, :RAW))
 
           # 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
@@ -1129,4 +1129,4 @@ module Cosmos
       statusBar.showMessage('')
     end
   end
-end # module Cosmos
+end

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

@@ -182,10 +182,13 @@ module Cosmos
       # Check boxes
       @pause_on_error = Qt::CheckBox.new('Pause on Error')
       @pause_on_error.setChecked(true)
+      @pause_on_error.setObjectName('PauseOnError')
       @continue_test_case_after_error = Qt::CheckBox.new('Continue Test Case after Error')
       @continue_test_case_after_error.setChecked(true)
+      @continue_test_case_after_error.setObjectName('ContinueTestCaseAfterError')
       @abort_testing_after_error = Qt::CheckBox.new('Abort Testing after Error')
       @abort_testing_after_error.setChecked(false)
+      @abort_testing_after_error.setObjectName('AbortTestingAfterError')
 
       @checkbox_frame = Qt::VBoxLayout.new
       @checkbox_frame.setContentsMargins(0,0,0,0)
@@ -201,6 +204,7 @@ module Cosmos
 
       @manual = Qt::CheckBox.new('Manual')
       @manual.setChecked(true)
+      @manual.setObjectName('Manual')
       @manual.connect(SIGNAL('stateChanged(int)')) do
         if @manual.isChecked()
           $manual = true
@@ -212,6 +216,7 @@ module Cosmos
       $manual = true
       @loop_testing = Qt::CheckBox.new('Loop Testing')
       @loop_testing.setChecked(false)
+      @loop_testing.setObjectName('LoopTesting')
       @loop_testing.connect(SIGNAL('stateChanged(int)')) do
         if @loop_testing.isChecked()
           $loop_testing = true
@@ -226,6 +231,7 @@ module Cosmos
       @break_loop_after_error = Qt::CheckBox.new('Break Loop after Error')
       @break_loop_after_error.setChecked(false)
       @break_loop_after_error.setEnabled(false)
+      @break_loop_after_error.setObjectName('BreakLoopAfterError')
 
       @checkbox_frame = Qt::VBoxLayout.new
       @checkbox_frame.setContentsMargins(0,0,0,0)

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

@@ -19,6 +19,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/widgets/packet_log_frame'
   require 'cosmos/gui/dialogs/progress_dialog'
   require 'cosmos/gui/widgets/full_text_search_line_edit'
+  require 'cosmos/gui/utilities/analyze_log'
 end
 
 module Cosmos
@@ -119,6 +120,10 @@ module Cosmos
       @file_options.statusTip = tr('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.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'))
@@ -132,10 +137,6 @@ module Cosmos
       @matlab_header_check.statusTip = tr('Add a Matlab header to the output data')
       @matlab_header_check.setCheckable(true)
 
-      @share_columns_check = Qt::Action.new(tr('&Share Columns'), self)
-      @share_columns_check.statusTip = tr('Share columns for items with the same name')
-      @share_columns_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.shortcut = @unique_only_check_keyseq
@@ -149,6 +150,40 @@ module Cosmos
       @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.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.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.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.setCheckable(true)
+      @full_column_names_check.connect(SIGNAL('triggered()')) { column_mode_changed() }
+
+      # The column options are mutually exclusive so create an action group
+      column_group = Qt::ActionGroup.new(self)
+      column_group.addAction(@normal_columns_check)
+      column_group.addAction(@share_columns_check)
+      column_group.addAction(@share_indiv_columns_check)
+      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.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'))
@@ -168,6 +203,7 @@ module Cosmos
       @file_menu.addAction(@save_config)
       @file_menu.addSeparator()
       @file_menu.addAction(@file_options)
+      @file_menu.addAction(@analyze_log)
       @file_menu.addSeparator()
       @file_menu.addAction(@exit_action)
 
@@ -175,9 +211,15 @@ module Cosmos
       @mode_menu = menuBar.addMenu(tr('&Mode'))
       @mode_menu.addAction(@fill_down_check)
       @mode_menu.addAction(@matlab_header_check)
-      @mode_menu.addAction(@share_columns_check)
       @mode_menu.addAction(@unique_only_check)
       @mode_menu.addAction(@batch_mode_check)
+      @mode_menu.addSeparator();
+      @mode_menu.addAction(@normal_columns_check)
+      @mode_menu.addAction(@share_columns_check)
+      @mode_menu.addAction(@share_indiv_columns_check)
+      @mode_menu.addAction(@full_column_names_check)
+      @mode_menu.addSeparator();
+      @mode_menu.addAction(@shared_columns_edit)
 
       # Item Menu
       @item_menu = menuBar.addMenu(tr('&Item'))
@@ -361,7 +403,6 @@ module Cosmos
 
       # Process and Open Buttons
       @button_layout = Qt::HBoxLayout.new
-
       @process_button = Qt::PushButton.new('&Process Files')
       @process_button.connect(SIGNAL('clicked()')) { process_log_files() }
       @button_layout.addWidget(@process_button)
@@ -451,7 +492,22 @@ module Cosmos
     def sync_gui_to_config
       @tlm_extractor_config.matlab_header = @matlab_header_check.checked?
       @tlm_extractor_config.fill_down = @fill_down_check.checked?
-      @tlm_extractor_config.share_columns = @share_columns_check.checked?
+      if @share_columns_check.checked?
+        @tlm_extractor_config.set_column_mode(:SHARE_ALL_COLUMNS)
+      elsif @share_indiv_columns_check.checked?
+        @tlm_extractor_config.set_column_mode(:SHARE_INDIV_COLUMNS)
+        @tlm_extractor_config.clear_shared_columns
+        @shared_columns.each do |item|
+          split_item = item.scan ConfigParser::PARSING_REGEX
+          item_name = split_item[0]
+          value_type = split_item[1].to_sym
+          @tlm_extractor_config.add_shared_column(item_name, value_type)
+        end
+      elsif @full_column_names_check.checked?
+        @tlm_extractor_config.set_column_mode(:FULL_COLUMN_NAMES)
+      else
+        @tlm_extractor_config.set_column_mode(:NORMAL)
+      end
       @tlm_extractor_config.unique_only = @unique_only_check.checked?
       @tlm_extractor_config.downsample_seconds = @downsample_entry.value
       @tlm_extractor_config.output_filename = @packet_log_frame.output_filename
@@ -480,7 +536,21 @@ module Cosmos
     def sync_config_to_gui
       @matlab_header_check.setChecked(@tlm_extractor_config.matlab_header)
       @fill_down_check.setChecked(@tlm_extractor_config.fill_down)
-      @share_columns_check.setChecked(@tlm_extractor_config.share_columns)
+      case @tlm_extractor_config.column_mode
+      when :SHARE_ALL_COLUMNS
+        @share_columns_check.setChecked(true)
+      when :SHARE_INDIV_COLUMNS
+        @share_indiv_columns_check.setChecked(true)
+        @shared_columns = []
+        @tlm_extractor_config.shared_indiv_columns.each do |shared_column|
+          @shared_columns << shared_column
+        end
+      when :FULL_COLUMN_NAMES
+        @full_column_names_check.setChecked(true)
+      else
+        @normal_columns_check.setChecked(true)
+      end
+      column_mode_changed()
       @unique_only_check.setChecked(@tlm_extractor_config.unique_only)
       @downsample_entry.value = @tlm_extractor_config.downsample_seconds
 
@@ -502,6 +572,10 @@ module Cosmos
     # File Menu Handlers
     ###############################################################################
 
+    def analyze_log_files
+      AnalyzeLog.execute(self, @packet_log_frame)
+    end
+
     # Handles processing log files
     def process_log_files
       @cancel = false
@@ -656,6 +730,15 @@ module Cosmos
       box.dispose
     end
 
+    def column_mode_changed()
+      if @share_indiv_columns_check.checked?
+        @shared_columns_edit.setEnabled(true)
+      else
+        @shared_columns_edit.setEnabled(false)
+        @shared_columns = []
+      end
+    end
+
     def batch_mode_changed
       if @batch_mode_check.checked?
         @config_box.hide
@@ -665,6 +748,7 @@ module Cosmos
         @fill_down_check.setEnabled(false)
         @matlab_header_check.setEnabled(false)
         @share_columns_check.setEnabled(false)
+        @full_column_names_check.setEnabled(false)
         @unique_only_check.setEnabled(false)
         @open_config.setEnabled(false)
         @save_config.setEnabled(false)
@@ -679,6 +763,7 @@ module Cosmos
         @fill_down_check.setEnabled(true)
         @matlab_header_check.setEnabled(true)
         @share_columns_check.setEnabled(true)
+        @full_column_names_check.setEnabled(true)
         @unique_only_check.setEnabled(true)
         @open_config.setEnabled(true)
         @save_config.setEnabled(true)
@@ -836,6 +921,58 @@ module Cosmos
       end
     end
 
+    def shared_columns_edit
+
+      # Get the list of "common" items in the config item list.
+      item_list = []
+      @config_item_list.each do |item|
+        split_item = item.text.scan ConfigParser::PARSING_REGEX
+        item_type = split_item[0]
+        item_name = split_item[3]
+        value_type = split_item[4]
+        if value_type
+          value_type = value_type.upcase.intern
+        else
+          value_type = :CONVERTED
+        end
+        if item_type == 'ITEM'
+          item_list << item_name + ' ' + value_type.to_s
+        end
+      end
+      shared_column_list = item_list.select {|item| item_list.count(item) > 1}
+      shared_column_list.uniq!
+
+      dialog = Qt::Dialog.new(self)
+      dialog.setWindowTitle("Select Common Items to Share Columns")
+      layout = Qt::VBoxLayout.new
+
+      list_layout = Qt::BoxLayout.new(Qt::Horizontal)
+      list = MyListWidget.new(self)
+      list.setSelectionMode(Qt::AbstractItemView::MultiSelection)
+      list.setMinimumHeight(150)
+      list.setMinimumWidth(400)
+      shared_column_list.each {|item| list.addItem(item)}
+      list_layout.addWidget(list)
+      layout.addLayout(list_layout)
+      list.each {|item| item.setSelected(true) if @shared_columns.include?(item.text)}
+
+      button_layout = Qt::BoxLayout.new(Qt::Horizontal)
+      cancel = Qt::PushButton.new("Cancel")
+      connect(cancel, SIGNAL('clicked()'), dialog, SLOT('reject()'))
+      button_layout.addWidget(cancel)
+      ok = Qt::PushButton.new("Save")
+      connect(ok, SIGNAL('clicked()'), dialog, SLOT('accept()'))
+      button_layout.addWidget(ok)
+      layout.addLayout(button_layout)
+      
+      dialog.setLayout(layout)
+      if dialog.exec == Qt::Dialog::Accepted
+        @shared_columns = []
+        list.each {|item| @shared_columns << item.text if item.isSelected()}
+      end
+      dialog.dispose
+    end
+
     def open_button
       Cosmos.open_in_text_editor(@packet_log_frame.output_filename)
     end