cosmos 4.3.0-java → 4.4.0-java

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

@@ -85,9 +85,9 @@ module Cosmos
           when 'TABLEFILE'
             usage = "#{keyword} <File name>"
             parser.verify_num_parameters(1, 1, usage)
-            filename = File.join(File.dirname(filename), params[0])
-            raise parser.error("Table file #{filename} not found", usage) unless File.exist?(filename)
-            process_file(filename)
+            table_filename = File.join(File.dirname(filename), params[0])
+            raise parser.error("Table file #{table_filename} not found", usage) unless File.exist?(table_filename)
+            process_file(table_filename)
 
           when 'TABLE'
             finish_packet()
@@ -172,6 +172,8 @@ module Cosmos
     # duplicated until the specified number of rows are created.
     def finish_packet
       if @current_packet
+        warnings = @current_packet.check_bit_offsets
+        raise "Overlapping items not allowed in tables.\n#{warnings}" if warnings.length > 0
         if @current_packet.type == :TWO_DIMENSIONAL
           items = @current_packet.sorted_items.clone
           (@current_packet.num_rows - 1).times do |row|

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

@@ -192,7 +192,7 @@ module Cosmos
           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|
+          option_parser.on("-o", "--output DIRECTORY", "Create files in the specified directory (required with --create)") 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|
@@ -211,12 +211,15 @@ module Cosmos
     #   command line
     # @return [Boolean] Whether to contine running the application
     def self.post_options_parsed_hook(options)
-      if options.create
+      if options.create and options.output_dir
+        normalize_config_options(options)
         core = TableManagerCore.new
-        core.file_new(options.create, options.output_dir)
+        create_path = self.config_path(options, options.create, ".txt", "table_manager")
+        core.file_new(create_path, options.output_dir)
         return false
       end
       if options.convert
+        normalize_config_options(options)
         if options.convert.include?("/")
           parts = options.convert.split("/")
         else

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

@@ -995,8 +995,9 @@ 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]
             @utilities << params[0]
@@ -1096,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
@@ -1261,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
@@ -1292,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)
@@ -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

@@ -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
@@ -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] != ':'

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

@@ -16,11 +16,10 @@ module Cosmos
 
   # Thread used to gather telemetry in realtime and process it using a TabbedPlotsDefinition
   class TabbedPlotsRealtimeThread < InterfaceThread
-
     # Create a new TabbedPlotsRealtimeThread
     def initialize(tabbed_plots_config, connection_success_callback = nil, connection_failed_callback = nil, connection_lost_callback = nil, fatal_exception_callback = nil, replay_mode = false)
       if replay_mode
-        interface = TcpipClientInterface.new(System.connect_hosts['REPLAY_PREIDENTIFIED'], nil, System.ports['REPLAY_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
+        interface = TcpipClientInterface.new(System.connect_hosts['REPLAY_PREIDENTIFIED'], nil, System.ports['REPLAY_PREIDENTIFIED'], nil, nil, 'PREIDENTIFIED')
       else
         interface = TcpipClientInterface.new(System.connect_hosts['CTS_PREIDENTIFIED'], nil, System.ports['CTS_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
       end
@@ -52,7 +51,7 @@ module Cosmos
 
       # Start interface thread
       start()
-    end # def initialize
+    end
 
     # Callback to the system definition when a packet is received
     def received_packet_callback(packet)
@@ -65,7 +64,7 @@ module Cosmos
       stop()
       Cosmos.kill_thread(self, @process_thread)
       @process_thread = nil
-    end # def kill
+    end
 
     def graceful_kill
       # Allow the callbacks a chance to update the GUI so that they can die gracefully
@@ -76,7 +75,5 @@ module Cosmos
         end
       end
     end
-
-  end # class TabbedPlotsRealtimeThread
-
-end # module Cosmos
+  end
+end

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

@@ -24,15 +24,14 @@ require 'cosmos/gui/dialogs/dart_dialog'
 require 'cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots'
 
 module Cosmos
-
   # Displays multiple plots that perform various analysis on data.
   class TabbedPlotsTool < QtTool
-
     MINIMUM_LEFT_PANEL_WIDTH = 200
     DEFAULT_LEFT_PANEL_WIDTH = 250
 
     def initialize(options)
       super(options) # MUST BE FIRST - All code before super is executed twice in RubyQt Based classes
+      @options = options
       @base_title = self.windowTitle
       Cosmos.load_cosmos_icon("tlm_grapher.png")
 
@@ -77,9 +76,10 @@ module Cosmos
         System.telemetry
 
         # Create tabbed plots definition
-        @config_filename = File.join(Cosmos::USERPATH, 'config', 'tools', options.config_dir, options.config_file)
+        @config_filename = options.config_file ? options.config_file : ''
         Qt.execute_in_main_thread(true) do
           load_configuration()
+          toggle_replay_mode() if options.replay
         end
 
         # Unconfigure CosmosConfig to interact with splash screen
@@ -590,9 +590,14 @@ module Cosmos
       @tabbed_plots.pause
 
       if prompt_for_save_if_needed()
+        if @config_filename.empty?
+          load_filename = @options.config_dir
+        else
+          load_filename = @config_filename
+        end
         filename = Qt::FileDialog.getOpenFileName(self,
                                                   "Load Configuration",
-                                                  @config_filename,
+                                                  load_filename,
                                                   "Config File (*.txt);;All Files (*)")
         if filename and not filename.empty?
           @config_filename = filename
@@ -1070,7 +1075,5 @@ module Cosmos
     def realtime_thread_fatal_exception_callback(error)
       Cosmos.handle_fatal_exception(error)
     end # def realtime_thread_fatal_exception_callback
-
-  end # class TabbedPlotsTool
-
-end # module Cosmos
+  end
+end

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

@@ -16,15 +16,12 @@ end
 
 module Cosmos
 
-  # TlmGrapher class
-  #
-  # This class implements the TlmGrapher Application.  This application displays multiple line graphs
-  # that perform various analysis on housekeeping telemetry.
-  #
+  # Telemetry Grapher displays multiple line graphs that perform various
+  # analysis on housekeeping telemetry.
   class TlmGrapher < TabbedPlotsTool
 
     # Runs the application
-    def self.run (opts = nil, options = nil)
+    def self.run(opts = nil, options = nil)
       Cosmos.catch_fatal_exception do
         unless options
           opts, options = create_default_options()
@@ -32,8 +29,6 @@ module Cosmos
           options.width = 1000
           options.height = 800
           options.title = "Telemetry Grapher"
-          options.config_dir = 'tlm_grapher'
-          options.config_file = 'tlm_grapher.txt'
           options.tool_short_name = 'tlmgrapher'
           options.tabbed_plots_type = 'overview'
           options.data_object_types = ['HOUSEKEEPING', 'XY','SINGLEXY']
@@ -43,12 +38,10 @@ module Cosmos
           options.adder_orientation = Qt::Horizontal
           options.items = []
           options.start = false
+          options.replay = false
           options.about_string = "TlmGrapher provides realtime and log file graphing abilities to the COSMOS system."
 
           opts.separator "Telemetry Grapher Specific Options:"
-          opts.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
-            options.config_file = arg
-          end
           opts.on("-s", "--start", "Start graphing immediately") do |arg|
             options.start = true
           end
@@ -60,6 +53,9 @@ module Cosmos
             end
             options.items << split
           end
+          opts.on("--replay", "Start Telemetry Grapher in Replay mode") do
+            options.replay = true
+          end
         end
 
         super(opts, options)
@@ -97,7 +93,5 @@ module Cosmos
         plot_index += 1
       end
     end
-
-  end # class TlmGrapher
-
-end # module Cosmos
+  end
+end

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

@@ -23,7 +23,7 @@ module Cosmos
     # close_all_screens is called
     @@open_screens = []
 
-    attr_accessor :full_name, :width, :height, :window, :replay_flag
+    attr_accessor :full_name, :width, :height, :window, :replay_flag, :original_target_name
 
     include ClassificationBanner
 
@@ -340,6 +340,7 @@ module Cosmos
               # to the stack and that class doesn't have a complete method.
               current_widget.complete() if current_widget.respond_to? :complete
             when 'SETTING'
+              next unless current_widget
               parser.verify_num_parameters(1, nil, "#{keyword} <Setting Name> <Setting Values... (optional)>")
               if parameters.length > 1
                 current_widget.set_setting(parameters[0], parameters[1..-1])
@@ -347,6 +348,7 @@ module Cosmos
                 current_widget.set_setting(parameters[0], [])
               end
             when 'SUBSETTING'
+              next unless current_widget
               parser.verify_num_parameters(2, nil, "#{keyword} <Widget Index (0..?)> <Setting Name> <Setting Values... (optional)>")
               if parameters.length > 2
                 current_widget.set_subsetting(parameters[0], parameters[1], parameters[2..-1])

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

@@ -59,7 +59,7 @@ module Cosmos
     def self.load_config(filename)
       raise "Configuration file #{filename} does not exist." unless filename && File.exist?(filename)
 
-      # Find all screen files so we can calculate MD5
+      # Find all screen files so we can calculate hashing sum
       tlmviewer_files = [filename, System.initial_filename]
       additional_data = ''
       System.targets.each do |target_name, target|
@@ -79,9 +79,13 @@ module Cosmos
           end
         end
       end
-      # Calculate MD5 and attempt to load marshal file
-      md5 = Cosmos.md5_files(tlmviewer_files, additional_data)
-      marshal_filename = File.join(System.paths['TMP'], "tlmviewer_#{md5.hexdigest}.bin")
+      # Calculate the hashing sum and attempt to load marshal file
+      hashing_result = Cosmos.hash_files(tlmviewer_files, additional_data, System.hashing_algorithm)
+      # Only use at most, 32 characters of the hex
+      hash_string = hashing_result.hexdigest
+      hash_string = hash_string[-32..-1] if hash_string.length >= 32
+
+      marshal_filename = File.join(System.paths['TMP'], "tlmviewer_#{hash_string}.bin")
       config = Cosmos.marshal_load(marshal_filename)
       unless config
         # Marshal file load failed - Manually load configuration
@@ -145,6 +149,7 @@ module Cosmos
         @all_telemetry = System.telemetry.all_item_strings(false, splash)
 
         Qt.execute_in_main_thread(true) do
+          toggle_replay_mode() if options.replay
           @search_box.completion_list = @tlm_viewer_config.completion_list
           @search_box.callback = lambda do |tlm|
             mapping = @tlm_viewer_config.tlm_to_screen_mapping[tlm]
@@ -546,36 +551,35 @@ module Cosmos
           options.title = 'Telemetry Viewer'
           options.screen = nil
           options.listen = true
-          options.config_file = nil
           options.restore_size = false
           options.production = false
+          options.replay = false
+          options.config_file = true # config_file is required
 
           option_parser.separator "Telemetry Viewer Specific Options:"
-          option_parser.on("-c", "--config FILE", "Use the specified config file") { |arg| options.config_file = arg }
           option_parser.on("-s", "--screen SCREEN_NAME", "Start up the specified screen") { |arg| options.screen = arg }
           option_parser.on("-n", "--nolisten", "Don't listen for requests") do
             options.listen = false
             options.title << ' : Not Listening'
           end
-          option_parser.on("-p", "--production", "Run TlmServer in production mode which disables the edit buttons.") do |arg|
+          option_parser.on("-p", "--production", "Run Telemetry Viewer in production mode which disables the edit buttons.") do |arg|
             options.production = true
           end
+          option_parser.on("--replay", "Run Telemetry Viewer in Replay mode") do
+            options.replay = true
+          end
           option_parser.parse!(ARGV)
         end
 
         if options.screen
+          normalize_config_options(options)
           application = nil
           begin
             QtTool.redirect_io
             System.telemetry
             application = Qt::Application.new(ARGV)
             application.addLibraryPath(Qt::PLUGIN_PATH) if Kernel.is_windows?
-            if options.config_file
-              filename = File.join(::Cosmos::USERPATH, 'config', 'tools', 'tlm_viewer', options.config_file)
-            else
-              filename = File.join(::Cosmos::USERPATH, 'config', 'tools', 'tlm_viewer', 'tlm_viewer.txt')
-            end
-            tlm_viewer_config = load_config(filename)
+            tlm_viewer_config = load_config(options.config_file)
             screen_info = tlm_viewer_config.screen_infos[options.screen.upcase]
             raise "Unknown screen: #{options.screen.upcase}" unless screen_info
             if not options.auto_position
@@ -583,6 +587,8 @@ module Cosmos
             else
               screen_info.screen = Screen.new(screen_info.full_name, screen_info.filename, nil, :REALTIME, screen_info.x_pos, screen_info.y_pos, screen_info.original_target_name, screen_info.substitute, screen_info.force_substitute, true)
             end
+            set_replay_mode(true) if options.replay
+            Screen.update_replay_mode
             application.exec
           rescue Exception => error
             unless error.class == SystemExit or error.class == Interrupt