cosmos 3.8.3 → 3.9.1

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

@@ -0,0 +1,75 @@
+# 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/tools/table_manager/table'
+
+module Cosmos
+  # Parses the TABLE keyword definition in table configuration files.
+  class TableParser < PacketParser
+    # @param parser [ConfigParser] Configuration parser
+    # @param tables [Hash] Hash of the currently defined tables
+    # @param warnings [Array<String>] Any warning strings generated while
+    #   parsing this command will be appened to this array
+    def self.parse_table(parser, tables, warnings)
+      parser = TableParser.new(parser)
+      parser.verify_parameters()
+      parser.create_table(tables, warnings)
+    end
+
+    # Verify the correct number of arguments to the TABLE keyword
+    def verify_parameters
+      @usage = "TABLE <TABLE NAME> <ENDIANNESS: BIG_ENDIAN/LITTLE_ENDIAN> <DISPLAY: ONE_DIMENSIONAL/TWO_DIMENSIONAL> <TWO_DIMENSIONAL TABLE ROWS> <DESCRIPTION (Optional)>"
+      @parser.verify_num_parameters(3, 5, @usage)
+    end
+
+    # @param tables [Array<Table>] All tables defined in the configuration
+    # @param warnings [String] List of warnings to append to
+    def create_table(tables, warnings)
+      params = @parser.parameters
+      table_name = params[0].to_s.upcase
+      endianness = params[1].to_s.upcase.to_sym
+      if endianness != :BIG_ENDIAN && endianness != :LITTLE_ENDIAN
+        raise @parser.error("Invalid endianness #{params[1]}. Must be BIG_ENDIAN or LITTLE_ENDIAN.", @usage)
+      end
+      type = params[2].to_s.upcase.to_sym
+      case type
+      when :ONE_DIMENSIONAL
+        @parser.verify_num_parameters(3, 4, @usage)
+        description = params[3].to_s
+      when :TWO_DIMENSIONAL
+        @parser.verify_num_parameters(4, 5, @usage)
+        num_rows = params[3].to_i
+        description = params[4].to_s
+      else
+        raise @parser.error("Invalid display type #{params[2]}. Must be ONE_DIMENSIONAL or TWO_DIMENSIONAL.", @usage)
+      end
+      table = Table.new(table_name, endianness, type, description, @parser.filename)
+      table.num_rows = num_rows if type == :TWO_DIMENSIONAL
+      TableParser.finish_create_table(table, tables, warnings)
+    end
+
+    protected
+
+    def self.check_for_duplicate(tables, table)
+      msg = nil
+      if tables[Table::TARGET][table.table_name]
+        msg = "Table #{table.table_name} redefined."
+        Logger.instance.warn msg
+      end
+      msg
+    end
+
+    def self.finish_create_table(table, tables, warnings)
+      warning = TableParser.check_for_duplicate(tables, table)
+      warnings << warning if warning
+      table
+    end
+  end
+end

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

@@ -197,7 +197,7 @@ module Cosmos
       file_list
     end
 
-    # @param progress_dialog [ProgressDialog] The dialog that was cancelled
+    # @param progress_dialog [ProgressDialog] The dialog that was canceled
     def cancel_callback(progress_dialog = nil)
       @canceled = true
       return true, false

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

@@ -394,6 +394,17 @@ module Cosmos
       end
     end
 
+    # Called by cosmos_script_module by the user calling the status_bar scripting method
+    def script_set_status(message)
+      Qt.execute_in_main_thread(true) do
+        # Check for self.disposed? to work around crash when using SimpleCov
+        unless self.disposed?
+          status_bar = statusBar()
+          status_bar.showMessage(message)
+        end
+      end
+    end
+
     def continue_without_pausing_on_errors?
       if !@pause_on_error.isChecked()
         msg = ""

data/lib/cosmos/tools/tlm_grapher/data_object_adders/housekeeping_data_object_adder.rb

@@ -24,8 +24,8 @@ module Cosmos
     # Callback called when the add button is pressed - call(data_object)
     attr_accessor :add_data_object_callback
 
-    # @parent [Qt::Widget] Parent widget to hold this frame
-    # @orientation [Integer] How to layout the frame.
+    # @param parent [Qt::Widget] Parent widget to hold this frame
+    # @param orientation [Integer] How to layout the frame.
     #   Must be Qt::Horizontal or Qt::Vertical.
     def initialize(parent, orientation = Qt::Horizontal)
       super(parent)

data/lib/cosmos/tools/tlm_grapher/data_object_adders/singlexy_data_object_adder.rb

@@ -20,8 +20,8 @@ module Cosmos
   # Widget for adding a single X-Y data object to a plot
   class SinglexyDataObjectAdder < XyDataObjectAdder
 
-    # @parent [Qt::Widget] Parent widget to hold this frame
-    # @orientation [Integer] How to layout the frame.
+    # @param parent [Qt::Widget] Parent widget to hold this frame
+    # @param orientation [Integer] How to layout the frame.
     #   Must be Qt::Horizontal or Qt::Vertical.
     def initialize(parent, orientation = Qt::Horizontal)
       super(parent, orientation)

data/lib/cosmos/tools/tlm_grapher/data_object_adders/xy_data_object_adder.rb

@@ -24,8 +24,8 @@ module Cosmos
     # Callback called when the add button is pressed - call(data_object)
     attr_accessor :add_data_object_callback
 
-    # @parent [Qt::Widget] Parent widget to hold this frame
-    # @orientation [Integer] How to layout the frame.
+    # @param parent [Qt::Widget] Parent widget to hold this frame
+    # @param orientation [Integer] How to layout the frame.
     #   Must be Qt::Horizontal or Qt::Vertical.
     def initialize(parent, orientation = Qt::Horizontal)
       super(parent)

data/lib/cosmos/tools/tlm_grapher/data_objects/data_object.rb

@@ -147,10 +147,10 @@ module Cosmos
     end
 
     # Edits the data object by updating its settings from another data object
-    def edit(editted_data_object)
-      @assigned_color = editted_data_object.assigned_color
-      @color = editted_data_object.color
-      self.max_points_saved = editted_data_object.max_points_saved
+    def edit(edited_data_object)
+      @assigned_color = edited_data_object.assigned_color
+      @color = edited_data_object.color
+      self.max_points_saved = edited_data_object.max_points_saved
     end
 
     # Indicates if the changes made to the data object are safe to perform without reseting

data/lib/cosmos/tools/tlm_grapher/data_objects/housekeeping_data_object.rb

@@ -304,26 +304,26 @@ module Cosmos
     end
 
     # Edits the data object - show_limits_lines is the only edit_safe? attribute
-    def edit(editted_data_object)
-      self.show_limits_lines = editted_data_object.show_limits_lines
-      super(editted_data_object)
+    def edit(edited_data_object)
+      self.show_limits_lines = edited_data_object.show_limits_lines
+      super(edited_data_object)
     end
 
     # Determines if changes can be made to the data object without affecting data
     #
     # @param edited_data_object [DataObject] The data object which was edited
-    def edit_safe?(editted_data_object)
-      if @target_name != editted_data_object.target_name or
-         @packet_name != editted_data_object.packet_name or
-         @item_name != editted_data_object.item_name or
-         @time_item_name != editted_data_object.time_item_name or
-         @formatted_time_item_name != editted_data_object.formatted_time_item_name or
-         @value_type != editted_data_object.value_type or
-         @analysis != editted_data_object.analysis or
-         @analysis_samples != editted_data_object.analysis_samples
+    def edit_safe?(edited_data_object)
+      if @target_name != edited_data_object.target_name or
+         @packet_name != edited_data_object.packet_name or
+         @item_name != edited_data_object.item_name or
+         @time_item_name != edited_data_object.time_item_name or
+         @formatted_time_item_name != edited_data_object.formatted_time_item_name or
+         @value_type != edited_data_object.value_type or
+         @analysis != edited_data_object.analysis or
+         @analysis_samples != edited_data_object.analysis_samples
         false
       else
-        super(editted_data_object)
+        super(edited_data_object)
       end
     end
 

data/lib/cosmos/tools/tlm_grapher/data_objects/linegraph_data_object.rb

@@ -139,18 +139,18 @@ module Cosmos
     end
 
     # Edits the data object
-    def edit(editted_data_object)
-      super(editted_data_object)
-      @horizontal_lines = editted_data_object.horizontal_lines
-      if @y_offset != editted_data_object.y_offset
+    def edit(edited_data_object)
+      super(edited_data_object)
+      @horizontal_lines = edited_data_object.horizontal_lines
+      if @y_offset != edited_data_object.y_offset
         old_y_offset = @y_offset
-        new_y_offset = editted_data_object.y_offset
+        new_y_offset = edited_data_object.y_offset
         @y_values.length.times {|index| @y_values[index] += (new_y_offset - old_y_offset)}
       end
-      @y_offset = editted_data_object.y_offset
-      @y_axis = editted_data_object.y_axis
-      @x_states = editted_data_object.x_states
-      @y_states = editted_data_object.y_states
+      @y_offset = edited_data_object.y_offset
+      @y_axis = edited_data_object.y_axis
+      @x_states = edited_data_object.x_states
+      @y_states = edited_data_object.y_states
     end
 
     protected

data/lib/cosmos/tools/tlm_grapher/data_objects/xy_data_object.rb

@@ -256,17 +256,17 @@ module Cosmos
     # Determines if changes can be made to the data object without affecting data
     #
     # @param edited_data_object [DataObject] The data object which was edited
-    def edit_safe?(editted_data_object)
-      if @target_name != editted_data_object.target_name or
-         @packet_name != editted_data_object.packet_name or
-         @x_item_name != editted_data_object.x_item_name or
-         @y_item_name != editted_data_object.y_item_name or
-         @time_item_name != editted_data_object.time_item_name or
-         @x_value_type != editted_data_object.x_value_type or
-         @y_value_type != editted_data_object.y_value_type
+    def edit_safe?(edited_data_object)
+      if @target_name != edited_data_object.target_name or
+         @packet_name != edited_data_object.packet_name or
+         @x_item_name != edited_data_object.x_item_name or
+         @y_item_name != edited_data_object.y_item_name or
+         @time_item_name != edited_data_object.time_item_name or
+         @x_value_type != edited_data_object.x_value_type or
+         @y_value_type != edited_data_object.y_value_type
         false
       else
-        super(editted_data_object)
+        super(edited_data_object)
       end
     end
 

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb

@@ -266,14 +266,14 @@ module Cosmos
     end
 
     # Edits a data object in the definition
-    def edit_data_object(tab_index, plot_index, data_object_index, editted_data_object)
+    def edit_data_object(tab_index, plot_index, data_object_index, edited_data_object)
       data_object = @tabs[tab_index].plots[plot_index].data_objects[data_object_index]
-      if data_object.edit_safe?(editted_data_object)
+      if data_object.edit_safe?(edited_data_object)
         @mutex.synchronize do
-          data_object.edit(editted_data_object)
+          data_object.edit(edited_data_object)
         end
       else
-        replace_data_object(tab_index, plot_index, data_object_index, editted_data_object)
+        replace_data_object(tab_index, plot_index, data_object_index, edited_data_object)
       end
     end
 

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tool.rb

@@ -430,7 +430,7 @@ module Cosmos
         update_window_title() if delete
         statusBar.showMessage(tr("#{action.capitalize} #{item} successful"))
       else
-        statusBar.showMessage(tr("#{action.capitalize} #{item} cancelled"))
+        statusBar.showMessage(tr("#{action.capitalize} #{item} canceled"))
       end
     end
     def reset(item)

data/lib/cosmos/tools/tlm_viewer/tlm_viewer.rb

@@ -36,10 +36,9 @@ module Cosmos
       end
     end
   end
-end # module Cosmos
+end
 
 module Cosmos
-
   # The Telemetry Viewer Application provides a frameword for user defined
   # 'screens'. Screens can contain telemetry items but also command senders,
   # graphs, and any other user defined widgets. The TlmViewer class itself is
@@ -54,7 +53,7 @@ module Cosmos
     end
 
     def self.load_config(filename)
-      # Determine MD5 over main config file and all screens
+      # Find all screen files so we can calculate MD5
       tlmviewer_files = [filename, System.initial_filename]
       additional_data = ''
       System.targets.each do |target_name, target|
@@ -68,30 +67,23 @@ module Cosmos
             additional_data << target.original_name
           end
           Dir.new(screen_dir).each do |screen_dir_filename|
-            if screen_dir_filename[0..0] != '.'
+            if screen_dir_filename[0] != '.'
               tlmviewer_files << File.join(screen_dir, screen_dir_filename)
             end
           end
         end
       end
-
+      # Calculate MD5 and attempt to load marshal file
       md5 = Cosmos.md5_files(tlmviewer_files, additional_data)
-      md5_string = md5.hexdigest
-
-      # Build filename for marshal file
-      marshal_filename = File.join(System.paths['TMP'], 'tlmviewer_' << md5_string << '.bin')
-
-      # Attempt to load marshal file
+      marshal_filename = File.join(System.paths['TMP'], "tlmviewer_#{md5.hexdigest}.bin")
       config = Cosmos.marshal_load(marshal_filename)
       unless config
         # Marshal file load failed - Manually load configuration
         config = TlmViewerConfig.new(filename)
-
         # Create marshal file for next time
         Cosmos.marshal_dump(marshal_filename, config)
       end
-
-      return config
+      config
     end
 
     def initialize(options)
@@ -555,7 +547,5 @@ module Cosmos
         end
       end
     end
-
-  end # class TlmViewer
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb

@@ -252,17 +252,20 @@ module Cosmos
       screen_dir = File.join(@current_target.dir, 'screens')
       if File.exist?(screen_dir)
         Dir.new(screen_dir).each do |filename|
-          if filename[0..0] != '.'
-            start_screen(File.join(screen_dir, filename))
-          end
+          start_screen(File.join(screen_dir, filename)) if valid_screen_name(filename)
         end
       end
     end
 
+    def valid_screen_name(filename)
+      # Ignore directories and dot files, underscore partials, and only process txt
+      filename[0] != '.' && filename[0] != '_' && File.extname(filename) == '.txt'
+    end
+
     def num_screens(screen_dir)
       count = 0
       Dir.new(screen_dir).each do |filename|
-        count += 1 if filename[0..0] != '.'
+        count += 1 if valid_screen_name(filename)
       end
       count
     end

data/lib/cosmos/top_level.rb

@@ -616,6 +616,18 @@ module Cosmos
     end
   end
 
+  # Open a platform specific file browser at the given path
+  # @param path [String] Directory path
+  def self.open_file_browser(path)
+    if Kernel.is_windows?
+      self.run_process("start #{path}")
+    elsif Kernel.is_mac?
+      self.run_process("open #{path}")
+    else
+      self.run_process("xdg-open #{path}")
+    end
+  end
+
   # @param filename [String] Name of the file to open in the editor
   def self.open_in_text_editor(filename)
     if filename

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.8.3'
+COSMOS_VERSION = '3.9.1'
 module Cosmos
   module Version
     MAJOR = '3'
-    MINOR = '8'
-    PATCH = '3'
-    BUILD = 'e6be858ed961d6fe872435be2b74c3499167a62a'
+    MINOR = '9'
+    PATCH = '1'
+    BUILD = '0d2d495007138d6145a42b4cba9176f3e606640d'
   end
-  VERSION = '3.8.3'
+  VERSION = '3.9.1'
 end

data/run_gui_tests.bat

@@ -13,11 +13,15 @@ call bundle exec ruby autohotkey\tools\ReplayAHK
 call bundle exec ruby autohotkey\tools\ScriptRunnerAHK -w 600 -t 800
 call bundle exec ruby autohotkey\tools\ScriptRunnerAHK2 -w 600 -t 800
 call bundle exec ruby autohotkey\tools\TableManagerAHK -w 800 -t 800
+call bundle exec ruby autohotkey\tools\TableManagerAHK2 --convert config\tools\table_manager\OldOneDimensionalTable_def.txt
+call bundle exec ruby autohotkey\tools\TableManagerAHK3 --convert config\tools\table_manager\OldTwoDimensionalTable_def.txt
+call bundle exec ruby autohotkey\tools\TableManagerAHK4 --create config\tools\table_manager\ConfigTables_def.txt -o .
 call bundle exec ruby autohotkey\tools\TestRunnerAHK -w 800 -t 800
 call bundle exec ruby autohotkey\tools\TestRunnerAHK2 -w 800 -t 800 -c test_runner2.txt
 call bundle exec ruby autohotkey\tools\TestRunnerAHK3 -w 800 -t 800 -c test_runner3.txt
 call bundle exec ruby autohotkey\tools\TestRunnerAHK4 -w 800 -t 800 -c test_runner4.txt
 call bundle exec ruby autohotkey\tools\TestRunnerAHK5 -w 800 -t 800 --suite ExampleTestSuite --group ExampleTest --case test_3xx
+REM This test intentionally fails because it is missing a --suite
 call bundle exec ruby autohotkey\tools\TestRunnerAHK6 --group ExampleTest --case test_3xx
 call bundle exec ruby autohotkey\tools\TlmGrapherAHK -w 800 -t 800
 call bundle exec ruby autohotkey\tools\TlmGrapherAHK2 -s -c test2.txt -w 1200 -t 800
@@ -28,7 +32,9 @@ call bundle exec ruby autohotkey\tools\TlmExtractorAHK2 -c tlm_extractor2.txt -i
 call bundle exec ruby autohotkey\tools\TlmExtractorAHK3 -c tlm_extractor2.txt -i tlm.bin -o outputs/logs/tlm.txt
 call bundle exec ruby autohotkey\tools\TlmViewerAHK
 call bundle exec ruby autohotkey\tools\TlmViewerAHK2 -c tlm_viewer2.txt
+REM This test intentionally raises a Unknown keyword KEYWORD error
 call bundle exec ruby autohotkey\tools\TlmViewerAHK3 -s "BLAH" -c tlm_viewer3.txt
+REM This test intentionally raises a NoMethodError for columns
 call bundle exec ruby autohotkey\tools\TlmViewerAHK4 -c tlm_viewer3.txt
 call bundle exec ruby autohotkey\tools\TlmViewerAHK5 -n -s "INST ADCS"
 

data/spec/core_ext/array_spec.rb

@@ -28,7 +28,7 @@ describe Array do
 
   describe "nearest_index" do
     it "raises error if empty" do
-      expect { Array.new.nearest_index(nil) }.to raise_error
+      expect { Array.new.nearest_index(nil) }.to raise_error(/empty array/)
     end
 
     def find_sorted_value(array, sorted)