cosmos 3.9.2 → 4.0.0

data/lib/cosmos/tools/packet_viewer/packet_viewer.rb

@@ -14,6 +14,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/dialogs/tlm_details_dialog'
   require 'cosmos/gui/dialogs/tlm_edit_dialog'
+  require 'cosmos/gui/dialogs/tlm_graph_dialog'
   require 'cosmos/gui/dialogs/exception_dialog'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/widgets/full_text_search_line_edit'
@@ -83,6 +84,14 @@ module Cosmos
     def initialize_actions
       super()
 
+      @edit_action = Qt::Action.new(Cosmos.get_icon('edit.png'),
+                                    tr('&Edit Definition'),
+                                    self)
+      @edit_keyseq = Qt::KeySequence.new(tr('Ctrl+E'))
+      @edit_action.shortcut = @edit_keyseq
+      @edit_action.statusTip = tr('Open packet definition in a editor')
+      @edit_action.connect(SIGNAL('triggered()')) { edit_definition }
+
       @reset_action = Qt::Action.new(tr('&Reset'), self)
       @reset_keyseq = Qt::KeySequence.new(tr('Ctrl+R'))
       @reset_action.shortcut = @reset_keyseq
@@ -168,6 +177,7 @@ module Cosmos
     def initialize_menus
       # File Menu
       file_menu = menuBar.addMenu(tr('&File'))
+      file_menu.addAction(@edit_action)
       file_menu.addAction(@reset_action)
       file_menu.addAction(@option_action)
       file_menu.addSeparator()
@@ -217,11 +227,8 @@ module Cosmos
       cmd_label.setBuddy(@packet_select)
 
       # Mnemonic Search Box
-      @search_layout = Qt::HBoxLayout.new
       @search_box = FullTextSearchLineEdit.new(self)
-      @search_box.setStyleSheet("padding-right: 20px;padding-left: 5px;background: url(#{File.join(Cosmos::PATH, 'data', 'search-14.png')});background-position: right;background-repeat: no-repeat;")
-      @search_layout.addWidget(@search_box)
-      top_layout.addLayout(@search_layout)
+      top_layout.addWidget(@search_box)
 
       # Layout the top level selection
       select_layout = Qt::HBoxLayout.new
@@ -258,6 +265,33 @@ module Cosmos
                                                 @polling_rate, 0, 1000, 1, nil)
     end
 
+    def edit_definition
+      # Grab all the cmd_tlm_files and processes them in reverse sort order
+      # because typically we'll have cmd.txt and tlm.txt and we want to process
+      # tlm.txt first
+      found = false
+      System.targets[@target_select.text].cmd_tlm_files.sort.reverse.each do |filename|
+        # Skip partials which begin with an underscore
+        next if File.basename(filename)[0] == '_'
+        file = File.read(filename)
+        # Wild card the target name because it is not used and is often aliased
+        if file =~ /TELEMETRY\s+.*\s+#{@packet_select.text}/
+          Cosmos.open_in_text_editor(filename)
+          found = true
+          break
+        end
+      end
+      # A packet definition might not be found due to ERB templates or other
+      # strange things they're doing. Pop up a warning and make them go look.
+      if !found
+        target_name = System.targets[@target_select.text].original_name
+        Qt::MessageBox.warning(self, "Definition Not Found",
+                               "Could not find definition for #{@target_select.text} #{@packet_select.text}.\n"\
+                               "Perhaps some ERB code is preventing automatic detection.\n"\
+                               "You should manually explore the files in config/targets/#{target_name}/cmd_tlm.")
+      end
+    end
+
     def update_all
       update_targets()
       update_packets()
@@ -396,7 +430,7 @@ module Cosmos
       @tlm_thread = Thread.new do
         begin
           while true
-            time = Time.now
+            time = Time.now.sys
             break if @shutdown_tlm_thread
 
             begin
@@ -475,7 +509,7 @@ module Cosmos
             # Delay for 1/10 of polling rate
             10.times do
               break if @shutdown_tlm_thread
-              sleep(@polling_rate.to_f / 10.0) if (Time.now - time < @polling_rate)
+              sleep(@polling_rate.to_f / 10.0) if (Time.now.sys - time < @polling_rate)
             end
           end
         rescue Exception => error
@@ -506,6 +540,7 @@ module Cosmos
           details_action.statusTip = tr("Popup details about #{target_name} #{packet_name} #{item_name}")
           details_action.connect(SIGNAL('triggered()')) do
             TlmDetailsDialog.new(nil, target_name, packet_name, item_name)
+            @table.clearSelection
           end
           menu.addAction(details_action)
 
@@ -513,12 +548,14 @@ module Cosmos
           edit_action.statusTip = tr("Edit Settings for #{target_name} #{packet_name} #{item_name}")
           edit_action.connect(SIGNAL('triggered()')) do
             TlmEditDialog.new(self, target_name, packet_name, item_name)
+            @table.clearSelection
           end
           menu.addAction(edit_action)
 
           graph_action = Qt::Action.new(tr("Graph #{target_name} #{packet_name} #{item_name}"), self)
           graph_action.statusTip = tr("Create a new COSMOS graph of #{target_name} #{packet_name} #{item_name}")
           graph_action.connect(SIGNAL('triggered()')) do
+            @table.clearSelection
             if Kernel.is_windows?
               Cosmos.run_process("rubyw tools/TlmGrapher -i \"#{target_name} #{packet_name} #{item_name}\" --system #{File.basename(System.initial_filename)}")
             elsif Kernel.is_mac? and File.exist?("tools/mac/TlmGrapher.app")
@@ -526,6 +563,7 @@ module Cosmos
             else
               Cosmos.run_process("ruby tools/TlmGrapher -i \"#{target_name} #{packet_name} #{item_name}\" --system #{File.basename(System.initial_filename)}")
             end
+            TlmGraphDialog.new(self, target_name, packet_name, item_name)
           end
           menu.addAction(graph_action)
 

data/lib/cosmos/tools/replay/replay.rb

@@ -13,6 +13,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/dialogs/progress_dialog'
+  require 'cosmos/gui/dialogs/packet_log_dialog'
   require 'cosmos/tools/replay/replay_server'
   require 'cosmos/gui/choosers/string_chooser'
 end
@@ -48,7 +49,7 @@ module Cosmos
       end
 
       # Initialize variables
-      @packet_log_reader = System.default_packet_log_reader.new
+      @packet_log_reader = System.default_packet_log_reader.new(*System.default_packet_log_reader_params)
       @log_directory = System.paths['LOGS']
       @log_directory << '/' unless @log_directory[-1..-1] == '\\' or @log_directory[-1..-1] == '/'
       @log_filename = nil
@@ -209,27 +210,32 @@ module Cosmos
 
     def select_log_file
       unless @playback_thread
-        selection = Qt::FileDialog.getOpenFileName(
-          self, "Select Log File", @log_directory, Cosmos::TLM_FILE_PATTERN)
-        if selection
+        packet_log_dialog = PacketLogDialog.new(
+          self, 'Select Log File', @log_directory, @packet_log_reader,
+          [], nil, false, false, true, Cosmos::TLM_FILE_PATTERN,
+          Cosmos::BIN_FILE_PATTERN, false
+        )
+        case packet_log_dialog.exec
+        when Qt::Dialog::Accepted
           stop()
-          @log_directory = File.dirname(selection)
-          @log_name.text = selection
-          @log_filename = selection
+          @packet_log_reader = packet_log_dialog.packet_log_reader
+          @log_filename = packet_log_dialog.filenames[0]
+          @log_directory = File.dirname(@log_filename)
+          @log_directory << '/' unless @log_directory[-1..-1] == '\\'
+          @log_name.text = @log_filename
 
           System.telemetry.reset
-
           @cancel = false
           ProgressDialog.execute(self, 'Analyzing Log File', 500, 10, true, false, true, false, true) do |progress_dialog|
-            progress_dialog.append_text("Processing File: #{selection}\n")
+            progress_dialog.append_text("Processing File: #{@log_filename}\n")
             progress_dialog.set_overall_progress(0.0)
             progress_dialog.cancel_callback = method(:cancel_callback)
             progress_dialog.enable_cancel_button
-            Cosmos.check_log_configuration(@packet_log_reader, selection)
-            @packet_offsets = @packet_log_reader.packet_offsets(selection, lambda {|percentage| progress_dialog.set_overall_progress(percentage); @cancel})
+            Cosmos.check_log_configuration(@packet_log_reader, @log_filename)
+            @packet_offsets = @packet_log_reader.packet_offsets(@log_filename, lambda {|percentage| progress_dialog.set_overall_progress(percentage); @cancel})
             @playback_index = 0
             update_slider_and_current_time(nil)
-            @packet_log_reader.open(selection)
+            @packet_log_reader.open(@log_filename)
             progress_dialog.close_done
           end
 
@@ -258,7 +264,7 @@ module Cosmos
     def move_start
       if @log_filename and !@playback_thread
         packet = read_at_index(0, :FORWARD)
-        @start_time.value = packet.received_time.formatted if packet and packet.received_time
+        @start_time.value = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
       else
         stop()
       end
@@ -307,7 +313,7 @@ module Cosmos
     def move_end
       if @log_filename and !@playback_thread
         packet = read_at_index(@packet_offsets.length - 1, :FORWARD)
-        @end_time.value = packet.received_time.formatted if packet and packet.received_time
+        @end_time.value = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
       else
         stop()
       end
@@ -330,17 +336,17 @@ module Cosmos
           previous_packet = nil
           while (@playing)
             if @playback_delay
-              packet_start = Time.now
+              packet_start = Time.now.sys
               packet = read_at_index(@playback_index, direction)
               break unless packet
               delay_time = 0.0
               if @playback_delay > 0.0
-                delay_time = @playback_delay - (Time.now - packet_start)
+                delay_time = @playback_delay - (Time.now.sys - packet_start)
               elsif previous_packet and packet.received_time and previous_packet.received_time
                 if direction == :FORWARD
-                  delay_time = packet.received_time - previous_packet.received_time - (Time.now - packet_start)
+                  delay_time = packet.received_time - previous_packet.received_time - (Time.now.sys - packet_start)
                 else
-                  delay_time = previous_packet.received_time - packet.received_time - (Time.now - packet_start)
+                  delay_time = previous_packet.received_time - packet.received_time - (Time.now.sys - packet_start)
                 end
               end
               sleep(delay_time) if delay_time > 0.0
@@ -389,7 +395,7 @@ module Cosmos
         value = (((@playback_index - 1) / @packet_offsets.length.to_f) * 10000).to_i
         @slider.setSliderPosition(value)
         @slider.setValue(value)
-        @current_time.value = packet.received_time.formatted if packet and packet.received_time
+        @current_time.value = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
       end
     end
 
@@ -477,6 +483,16 @@ module Cosmos
       end
     end
 
+    def closeEvent(event)
+      Cosmos.kill_thread(self, @playback_thread)
+      super(event)
+    end
+
+    # Gracefully kill threads
+    def graceful_kill
+      stop()
+    end
+
     def self.run(option_parser = nil, options = nil)
       Cosmos.catch_fatal_exception do
         unless option_parser and options
@@ -496,6 +512,6 @@ module Cosmos
       end
     end
 
-  end # class TlmViewer
+  end # class Replay
 
 end # module Cosmos

data/lib/cosmos/tools/replay/replay_server.rb

@@ -34,7 +34,7 @@ module Cosmos
 
       @json_drb.method_whitelist = @api_whitelist
       begin
-        @json_drb.start_service("localhost", System.ports['CTS_API'], self)
+        @json_drb.start_service(System.listen_hosts['CTS_API'], System.ports['CTS_API'], self)
       rescue Exception
         raise FatalError.new("Error starting JsonDRb on port #{System.ports['CTS_API']}.\nPerhaps a Command and Telemetry Server is already running?")
       end

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

@@ -16,7 +16,7 @@ module Cosmos
   class ScriptRunnerConfig
     # Processes the config file
     def initialize(filename)
-      parser = ConfigParser.new
+      parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#script-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword
         when 'LINE_DELAY'

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

@@ -81,7 +81,7 @@ module Cosmos
                           enable_limits disable_limits wait_tolerance wait_tolerance_raw \
                           check_tolerance check_tolerance_raw wait_check_tolerance \
                           wait_check_tolerance_raw)
-    SET_TLM_KEYWORDS = %w(set_tlm set_tlm_raw)
+    SET_TLM_KEYWORDS = %w(set_tlm set_tlm_raw override_tlm_raw normalize_tlm_raw)
     CHECK_KEYWORDS   = %w(check check_raw wait wait_raw wait_check wait_check_raw)
 
     attr_accessor :use_instrumentation
@@ -203,7 +203,7 @@ module Cosmos
       @debug_history = []
       @debug_code_completion = nil
       @top_level_instrumented_cache = nil
-      @output_time = Time.now
+      @output_time = Time.now.sys
       initialize_variables()
 
       # Redirect $stdout and $stderr
@@ -360,6 +360,14 @@ module Cosmos
       @@instrumented_cache = value
     end
 
+    def self.file_cache
+      @@file_cache
+    end
+
+    def self.file_cache=(value)
+      @@file_cache = value
+    end
+
     def self.pause_on_error
       @@pause_on_error
     end
@@ -391,7 +399,7 @@ module Cosmos
     def self.show_backtrace=(value)
       @@show_backtrace = value
       if @@show_backtrace and @@error
-        puts Time.now.formatted + " (SCRIPTRUNNER): "  + "Most recent exception:\n" + @@error.formatted
+        puts Time.now.sys.formatted + " (SCRIPTRUNNER): "  + "Most recent exception:\n" + @@error.formatted
       end
     end
 
@@ -505,7 +513,7 @@ module Cosmos
                                false,  # don't show text
                                false,  # don't show done
                                true) do |progress_dialog| # show cancel
-          progress_dialog.cancel_callback = lambda {|dialog| @cancel_instrumentation = true; [true, false]}
+          progress_dialog.cancel_callback = lambda { |dialog| @cancel_instrumentation = true; [true, false] }
           progress_dialog.enable_cancel_button
           comments_removed_text = ruby_lex_utils.remove_comments(text)
           num_lines = comments_removed_text.num_lines.to_f
@@ -609,7 +617,10 @@ module Cosmos
         Logger.detail_string = detail_string
 
         # Highlight the line that is about to run
-        Qt.execute_in_main_thread(true) {@active_script.highlight_line(line_number)}
+        Qt.execute_in_main_thread(true) do
+          @active_script.center_line(line_number)
+          @active_script.highlight_line
+        end
 
         # Handle pausing the script
         handle_pause(filename, line_number)
@@ -1034,9 +1045,9 @@ module Cosmos
         dialog_layout = Qt::VBoxLayout.new
 
         chooser = FileChooser.new(self, "Config File", config_file, 'Select',
-                                  File.join('config', 'tools', 'cmd_tlm_server', config_file))
+                                  File.dirname(config_file))
         chooser.callback = lambda do |filename|
-          chooser.filename = File.basename(filename)
+          chooser.filename = filename
         end
         dialog_layout.addWidget(chooser)
 
@@ -1086,14 +1097,14 @@ module Cosmos
     end
 
     def scriptrunner_puts(string)
-      puts Time.now.formatted + " (SCRIPTRUNNER): "  + string
+      puts Time.now.sys.formatted + " (SCRIPTRUNNER): "  + string
     end
 
     def handle_output_io(filename = @current_filename, line_number = @current_line_number)
-      @output_time = Time.now
+      @output_time = Time.now.sys
       Qt.execute_in_main_thread(true) do
         if @output_io.string[-1..-1] == "\n"
-          time_formatted = Time.now.formatted
+          time_formatted = Time.now.sys.formatted
           lines_to_write = ''
           out_line_number = line_number.to_s
           out_filename = File.basename(filename) if filename
@@ -1152,7 +1163,6 @@ module Cosmos
     protected
 
     def initialize_variables
-      @@file_cache = {}
       @@error = nil
       @go = false
       if @@step_mode
@@ -1165,7 +1175,7 @@ module Cosmos
       @use_instrumentation = true
       @active_script = @script
       @call_stack = []
-      @pre_line_time = Time.now
+      @pre_line_time = Time.now.sys
       @current_file = @filename
       @exceptions = nil
       @script_binding = nil
@@ -1199,7 +1209,7 @@ module Cosmos
     def mark_running
       Qt.execute_in_main_thread(true) do
         @run_callback.call(self) if @run_callback
-        @active_script.rehighlight
+        @active_script.highlight_line
         @realtime_button_bar.state = 'Running'
         @realtime_button_bar.start_button.setText('Go')
         @realtime_button_bar.pause_button.setText('Pause')
@@ -1209,7 +1219,7 @@ module Cosmos
     def mark_paused
       Qt.execute_in_main_thread(true) do
         @pause_callback.call(self) if @pause_callback
-        @active_script.rehighlight('lightblue')
+        @active_script.highlight_line('lightblue')
         @realtime_button_bar.state = 'Paused'
       end
     end
@@ -1217,7 +1227,7 @@ module Cosmos
     def mark_error
       Qt.execute_in_main_thread(true) do
         @error_callback.call(self) if @error_callback
-        @active_script.rehighlight('pink')
+        @active_script.highlight_line('pink')
         @realtime_button_bar.state = 'Error'
         @realtime_button_bar.pause_button.setText('Retry')
       end
@@ -1235,7 +1245,7 @@ module Cosmos
 
     def mark_breakpoint
       Qt.execute_in_main_thread(true) do
-        @active_script.rehighlight('tan')
+        @active_script.highlight_line('tan')
         @realtime_button_bar.state = 'Breakpoint'
       end
     end
@@ -1291,7 +1301,7 @@ module Cosmos
 
           # Execute the script with warnings disabled
           Cosmos.disable_warnings do
-            @pre_line_time = Time.now
+            @pre_line_time = Time.now.sys
             Cosmos.set_working_dir do
               if text_binding
                 eval(instrumented_script, text_binding, @filename, 1)
@@ -1314,7 +1324,7 @@ module Cosmos
             handle_exception(error, true, filename, line_number)
             scriptrunner_puts "Exception in Control Statement - Script stopped: #{File.basename(@filename)}"
             handle_output_io()
-            Qt.execute_in_main_thread(true) {@script.rehighlight('red') }
+            Qt.execute_in_main_thread(true) { @script.highlight_line('red') }
           end
         ensure
           # Change Go Button to Start Button and remove highlight
@@ -1417,10 +1427,10 @@ module Cosmos
 
     def handle_line_delay
       if @@line_delay > 0.0
-        sleep_time = @@line_delay - (Time.now - @pre_line_time)
+        sleep_time = @@line_delay - (Time.now.sys - @pre_line_time)
         sleep(sleep_time) if sleep_time > 0.0
       end
-      @pre_line_time = Time.now
+      @pre_line_time = Time.now.sys
     end
 
     def continue_without_pausing_on_errors?
@@ -1717,7 +1727,7 @@ module Cosmos
       begin
         loop do
           break if @@cancel_output
-          handle_output_io() if (Time.now - @output_time) > 5.0
+          handle_output_io() if (Time.now.sys - @output_time) > 5.0
           break if @@cancel_output
           break if @@output_sleeper.sleep(1.0)
         end # loop