cosmos 4.3.0-java → 4.4.0-java

data/lib/cosmos/tools/launcher/launcher.rb

@@ -181,6 +181,7 @@ module Cosmos
         unless option_parser and options
           option_parser, options = create_default_options()
           options.title = 'Launcher'
+          options.config_file = true # config_file is required
         end
         option_parser.separator "Launcher Specific Options:"
         option_parser.on("-m", "--mini", "Create mini launcher") do |arg|

data/lib/cosmos/tools/limits_monitor/limits_monitor.rb

@@ -84,11 +84,13 @@ module Cosmos
     # @param update_item_callback [Proc] Method to update an item in the GUI
     # @param clear_items_callback [Proc] Method to clear all items in the GUI
     # @param remove_item_callback [Proc] Method to remove an item from the GUI
-    def initialize(new_item_callback, update_item_callback, clear_items_callback, remove_item_callback)
+    # @param clear_log_callback [Proc] Method to clear the log tab in the GUI
+    def initialize(new_item_callback, update_item_callback, clear_items_callback, remove_item_callback, clear_log_callback)
       @new_item_callback = new_item_callback
       @update_item_callback = update_item_callback
       @clear_items_callback = clear_items_callback
       @remove_item_callback = remove_item_callback
+      @clear_log_callback = clear_log_callback
       @ignored = []
       @ignored_stale = []
       @items = {}
@@ -98,15 +100,21 @@ module Cosmos
       @limits_set = :DEFAULT
       @colorblind = false
       @monitor_operational = true
+      @toggle_mode = false
       request_reset()
     end
 
     # Request that the limits items be refreshed from the server
-    def request_reset(toggle_mode = false)
-      @toggle_mode = toggle_mode
+    def request_reset
       @initialized = false
     end
 
+    # Switch between realtime and replay modes
+    def toggle_mode
+      @toggle_mode = true
+      request_reset()
+    end
+
     # Remove an item and optionally ignore it which means don't display it
     # again if it goes out of limits and don't have it count towards the
     # overall limit state. Still display its limits transitions in the log.
@@ -350,12 +358,16 @@ module Cosmos
       @items = {}
       @out_of_limits = []
       @stale = []
-      @limits_set = get_limits_set()
       unsubscribe_limits_events(@queue_id) if @queue_id
-      set_replay_mode(!get_replay_mode()) if @toggle_mode
-      @toggle_mode = false
-      @queue_id = subscribe_limits_events(100000)
+      if @toggle_mode
+        set_replay_mode(!get_replay_mode())
+        @clear_log_callback.call
+        @toggle_mode = false
+      end
       @clear_items_callback.call
+
+      @limits_set = get_limits_set()
+      @queue_id = subscribe_limits_events(100000)
       get_out_of_limits().each do |target, packet, item, state|
         limits_change(target, packet, item, state)
       end
@@ -534,8 +546,8 @@ module Cosmos
       initialize_central_widget()
       complete_initialize()
 
-      @limits_items = LimitsItems.new(
-        method(:new_gui_item), method(:update_gui_item), method(:clear_gui_items), method(:remove_gui_item))
+      @limits_items = LimitsItems.new(method(:new_gui_item), method(:update_gui_item), \
+        method(:clear_gui_items), method(:remove_gui_item), method(:clear_log))
       if options.config_file
         begin
           result = @limits_items.open_config(options.config_file)
@@ -547,6 +559,7 @@ module Cosmos
 
       limits_thread()
       value_thread()
+      toggle_replay_mode() if options.replay
     end
 
     # Initialize all the actions in the application Menu
@@ -610,7 +623,6 @@ module Cosmos
     # Layout the main GUI tab widget with a view of all the out of limits items
     # in one tab and a log tab showing all limits events.
     def initialize_central_widget
-
       widget = Qt::Widget.new
       layout = Qt::VBoxLayout.new(widget)
       setCentralWidget(widget)
@@ -707,7 +719,7 @@ module Cosmos
     end
 
     def toggle_replay_mode
-      @limits_items.request_reset(true)
+      @limits_items.toggle_mode()
     end
 
     # @return [String] Fully qualified path to the configuration file
@@ -815,9 +827,7 @@ module Cosmos
       @limits_thread = Thread.new do
         while true
           break if @cancel_thread
-          Qt.execute_in_main_thread(true) do
-            result, color = @limits_items.process_events()
-          end
+          result, color = @limits_items.process_events()
           if result
             update_log(result, color)
           else
@@ -877,6 +887,10 @@ module Cosmos
       end
     end
 
+    def clear_log
+      Qt.execute_in_main_thread(true) { @log_output.clear() }
+    end
+
     # Remove a limits item from the list and optionally ignore
     #
     # @param widget [Qt::Widget] Widget to remove
@@ -999,12 +1013,12 @@ module Cosmos
           options.remember_geometry = false
           options.title = "Limits Monitor"
           options.auto_size = false
-          options.config_file = nil
           options.production = false
           options.no_prompt = false
           option_parser.separator "Limits Monitor Specific Options:"
-          option_parser.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
-            options.config_file = arg
+          options.replay = false
+          option_parser.on("--replay", "Start Limits Monitor in Replay mode") do
+            options.replay = true
           end
         end
 

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

@@ -74,6 +74,7 @@ module Cosmos
               update_tlm_items(item_name)
             end
           end
+          toggle_replay_mode() if options.replay
         end
 
         # Unconfigure CosmosConfig to interact with splash screen
@@ -587,7 +588,7 @@ module Cosmos
           graph_action.statusTip = "Create a new COSMOS graph of #{target_name} #{packet_name} #{item_name}"
           graph_action.connect(SIGNAL('triggered()')) do
             @table.clearSelection
-            TlmGraphDialog.new(self, target_name, packet_name, item_name)
+            TlmGraphDialog.new(self, target_name, packet_name, item_name, get_replay_mode())
           end
           menu.addAction(graph_action)
 
@@ -628,12 +629,13 @@ module Cosmos
                            "Set the polling rate to PERIOD (unit seconds)") do |arg|
             options.rate = Float(arg)
           end
+          options.replay = false
+          option_parser.on("--replay", "Start Packet Viewer in Replay mode") do
+            options.replay = true
+          end
         end
-
         super(option_parser, options)
       end
     end
-
-  end # class PacketViewer
-
-end # module Cosmos
+  end
+end

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

@@ -26,6 +26,7 @@ module Cosmos
     slots 'undo_available(bool)'
 
     UNTITLED_TAB_TEXT = '  Untitled  '
+    MAX_RECENT_FILES = 20
 
     def initialize(options)
       # All code before super is executed twice in RubyQt Based classes
@@ -50,7 +51,9 @@ module Cosmos
       @no_icon = Qt::Icon.new
 
       begin
-        ScriptRunnerConfig.new(options.config_file)
+        # Always create the ScriptRunnerConfig but note that it's optional to pass a config file
+        # If the user doesn't have one it will be created automatically if the default config is changed
+        @config = ScriptRunnerConfig.new(options.config_file)
       rescue => error
         ExceptionDialog.new(self, error, "Error parsing #{options.config_file}")
       end
@@ -95,13 +98,17 @@ module Cosmos
       @file_new.statusTip = 'Start a new script'
       @file_new.connect(SIGNAL('triggered()')) { file_new() }
 
+      @clear_file_open_recent = Qt::Action.new('&Clear Recent', self)
+      @clear_file_open_recent.statusTip = 'Clear the recently opened file list'
+      @clear_file_open_recent.connect(SIGNAL('triggered()')) { clear_file_open_recent() }
+
       @file_close = Qt::Action.new('&Close', self)
       @file_close_keyseq = Qt::KeySequence.new('Ctrl+W')
       @file_close.shortcut  = @file_close_keyseq
       @file_close.statusTip = 'Close the script'
       @file_close.connect(SIGNAL('triggered()')) { file_close() }
 
-      @file_reload = Qt::Action.new('&Reload', self)
+      @file_reload = Qt::Action.new('Re&load', self)
       @file_reload_keyseq = Qt::KeySequence.new('Ctrl+R')
       @file_reload.shortcut  = @file_reload_keyseq
       @file_reload.statusTip = 'Reload a script'
@@ -257,6 +264,13 @@ module Cosmos
       @script_call_stack.connect(SIGNAL('triggered()')) { script_call_stack() }
       @script_call_stack.setEnabled(false)
 
+      @script_error_backtrace = Qt::Action.new('Show Error Backtrace', self)
+      @script_error_backtrace.statusTip = 'Show Error Backtrace from the last encountered exception'
+      @script_error_backtrace.connect(SIGNAL('triggered()')) do
+        ScriptRunnerFrame.show_backtrace = @script_error_backtrace.checked?
+      end
+      @script_error_backtrace.setCheckable(true)
+
       @script_debug = Qt::Action.new(Cosmos.get_icon('bug.png'), 'Toggle &Debug', self)
       @script_debug_keyseq = Qt::KeySequence.new('Ctrl+D')
       @script_debug.shortcut  = @script_debug_keyseq
@@ -284,6 +298,20 @@ module Cosmos
       @file_open.setIcon(Cosmos.get_icon('open.png'))
       target_dirs_action(@file_open, System.paths['PROCEDURES'], 'procedures', method(:file_open))
 
+      @file_open_recent = @file_menu.addMenu('Open &Recent')
+      @file_open_recent.setIcon(Cosmos.get_icon('open.png'))
+      settings = Qt::Settings.new('Ball Aerospace', self.class.to_s)
+      if settings.contains('recent_files')
+        recent = settings.value('recent_files').toStringList()
+        recent.each do |filename|
+          action = Qt::Action.new(filename, self)
+          action.connect(SIGNAL('triggered()')) { open_filename(filename) }
+          @file_open_recent.addAction(action)
+        end
+      end
+      @file_open_recent.addSeparator()
+      @file_open_recent.addAction(@clear_file_open_recent)
+
       @file_menu.addAction(@file_close)
       @file_menu.addAction(@file_reload)
       @file_menu.addSeparator()
@@ -334,6 +362,7 @@ module Cosmos
       view_menu.addSeparator()
       view_menu.addAction(@script_log_message)
       view_menu.addAction(@script_call_stack)
+      view_menu.addAction(@script_error_backtrace)
       view_menu.addAction(@script_debug)
       view_menu.addAction(@script_disconnect)
 
@@ -409,35 +438,63 @@ module Cosmos
     # File->Open
     def file_open(filename = nil)
       if File.directory?(filename)
-        filename = Qt::FileDialog.getOpenFileName(self, "Select Script", filename)
+        filenames = Qt::FileDialog.getOpenFileNames(self, "Select Script(s)", filename, "Scripts (*.rb);;All Files(*.*)")
+      else
+        filenames = [filename]
       end
-      unless filename.nil? || filename.empty?
-        # If the user opens a file we already have open
-        # just set the current tab to that file and return
-        @tab_book.tabs.each_with_index do |tab, index|
-          if tab.filename == filename
-            @tab_book.setCurrentIndex(index)
-            @tab_book.currentTab.set_text_from_file(filename)
-            @tab_book.currentTab.filename = filename
-            return
-          end
+      filenames.compact!
+      return if filenames.nil? || filenames.empty?
+      filenames.each do |filename|
+        open_filename(filename)
+
+        found = false
+        @file_open_recent.actions.each do |action|
+          found = true if action.text == filename
         end
+        next if found
+        action = Qt::Action.new(filename, self)
+        action.connect(SIGNAL('triggered()')) { open_filename(filename) }
+        @file_open_recent.insertAction(@file_open_recent.actions[0], action)
+        # Add 2 for the separator and Clear Recent action
+        if @file_open_recent.actions.length > (MAX_RECENT_FILES + 2)
+          @file_open_recent.removeAction(@file_open_recent.actions[-3]) # ignore last 2
+        end
+      end
+    end
+
+    def clear_file_open_recent
+      # Subtract 2 for the separator and Clear Recent action
+      (@file_open_recent.actions.length - 2).times do
+        @file_open_recent.removeAction(@file_open_recent.actions[0])
+      end
+    end
 
-        if ((@tab_book.count == 1) &&
-            @tab_book.currentTab.filename.empty? &&
-            !@tab_book.currentTab.modified)
-          # Active Tab is an unmodified Untitled so just open the file in it
+    def open_filename(filename)
+      # If the user opens a file we already have open
+      # just set the current tab to that file and return
+      @tab_book.tabs.each_with_index do |tab, index|
+        if tab.filename == filename
+          @tab_book.setCurrentIndex(index)
           @tab_book.currentTab.set_text_from_file(filename)
           @tab_book.currentTab.filename = filename
-          @tab_book.setTabText(@tab_book.currentIndex, File.basename(filename))
-        else
-          create_tab(filename)
+          return
         end
+      end
 
-        update_title()
-        @procedure_dir = File.dirname(filename)
-        @procedure_dir << '/' if @procedure_dir[-1..-1] != '/' and @procedure_dir[-1..-1] != '\\'
+      if ((@tab_book.count == 1) &&
+          @tab_book.currentTab.filename.empty? &&
+          !@tab_book.currentTab.modified)
+        # Active Tab is an unmodified Untitled so just open the file in it
+        @tab_book.currentTab.set_text_from_file(filename)
+        @tab_book.currentTab.filename = filename
+        @tab_book.setTabText(@tab_book.currentIndex, File.basename(filename))
+      else
+        create_tab(filename)
       end
+
+      update_title()
+      @procedure_dir = File.dirname(filename)
+      @procedure_dir << '/' if @procedure_dir[-1..-1] != '/' and @procedure_dir[-1..-1] != '\\'
     end
 
     # File->Reload
@@ -565,6 +622,7 @@ module Cosmos
         ScriptRunnerFrame.pause_on_error = (pause_on_error.checkState == Qt::Checked)
         ScriptRunnerFrame.monitor_limits = (monitor.checkState == Qt::Checked)
         ScriptRunnerFrame.pause_on_red = (pause_on_red.checkState == Qt::Checked)
+        @config.write_config
         dialog.accept
       end
       cancel = Qt::PushButton.new('Cancel')
@@ -669,6 +727,10 @@ module Cosmos
     def closeEvent(event)
       if active_script_runner_frame().prompt_if_running_on_close()
         if prompt_for_save_if_needed_on_close()
+          settings = Qt::Settings.new('Ball Aerospace', self.class.to_s)
+          recent_files = @file_open_recent.actions.collect {|action| action.text }
+          # Ignore the last 2 because of the separator and Clear Recent action
+          settings.setValue('recent_files', Qt::Variant.new(recent_files[0..-3]))
           shutdown_cmd_tlm()
           @tab_book.tabs.each_with_index do |tab, index|
             tab.stop_message_log
@@ -986,9 +1048,6 @@ module Cosmos
           options.disconnect_mode = false
 
           option_parser.separator "Script Runner Specific Options:"
-          option_parser.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
-            options.config_file = 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
@@ -1003,6 +1062,5 @@ module Cosmos
         super(option_parser, options)
       end
     end
-  end # class ScriptRunner
-
-end # module Cosmos
+  end
+end

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

@@ -16,12 +16,16 @@ module Cosmos
     # Processes the config file
     def initialize(filename)
       return unless filename
+      @filename = filename
       parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#script-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword
         when 'LINE_DELAY'
           parser.verify_num_parameters(1, 1, "#{keyword} <Delay in Seconds>")
           ScriptRunnerFrame.line_delay = params[0].to_f
+        when 'PAUSE_ON_ERROR'
+          parser.verify_num_parameters(1, 1, "#{keyword} <TRUE or FALSE>")
+          ScriptRunnerFrame.pause_on_error = ConfigParser.handle_true_false(params[0])
         when 'MONITOR_LIMITS'
           parser.verify_num_parameters(0, 0, keyword)
           ScriptRunnerFrame.monitor_limits = true
@@ -35,5 +39,15 @@ module Cosmos
         end
       end
     end
+
+    def write_config
+      @filename = File.join(Cosmos::USERPATH, 'config', 'tools', 'script_runner', 'script_runner.txt') unless @filename
+      File.open(@filename, 'w') do |file|
+        file.puts("LINE_DELAY #{ScriptRunnerFrame.line_delay}")
+        file.puts("PAUSE_ON_ERROR #{ScriptRunnerFrame.pause_on_error ? 'TRUE' : 'FALSE'}")
+        file.puts("MONITOR_LIMITS") if ScriptRunnerFrame.monitor_limits
+        file.puts("PAUSE_ON_RED") if ScriptRunnerFrame.pause_on_red
+      end
+    end
   end
 end

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

@@ -89,6 +89,9 @@ module Cosmos
     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)
 
+    INSTANCE_VARS = %w(__return_val close_on_complete error eval_error filename instrumented_script \
+      line_number line_offset saved_instance saved_run_thread text text_binding uncaught_exception)
+
     attr_accessor :use_instrumentation
     attr_accessor :change_callback
     attr_accessor :run_callback
@@ -569,10 +572,14 @@ module Cosmos
         return nil if @cancel_instrumentation
         instrumented_line = ''
         if instrumentable
-          # Skip the segment if it's empty. Note that the segment could have
-          # originally had comments but they were stripped in
+          # Add a newline if it's empty to ensure the instrumented code has
+          # the same number of lines as the original script. Note that the
+          # segment could have originally had comments but they were stripped in
           # ruby_lex_utils.remove_comments
-          next if segment.strip.empty?
+          if segment.strip.empty?
+            instrumented_text << "\n"
+            next
+          end
 
           # Create a variable to hold the segment's return value
           instrumented_line << "__return_val = nil; "
@@ -671,7 +678,7 @@ module Cosmos
     def exception_instrumentation(error, filename, line_number)
       if error.class == StopScript || error.class == SkipTestCase || !@use_instrumentation
         Kernel.raise error
-      else
+      elsif !error.eql?(@@error)
         line_number = line_number + @line_offset if @active_script.object_id == @script.object_id
         handle_exception(error, false, filename, line_number)
       end
@@ -962,6 +969,10 @@ module Cosmos
               end
 
               if @script_binding
+                # Check for accessing an instance variable or local
+                if debug_text =~ /^@\S+$/ || @script_binding.local_variables.include?(debug_text.to_sym)
+                  debug_text = "puts #{debug_text}" # Automatically add puts to print it
+                end
                 eval(debug_text, @script_binding, 'debug', 1)
               else
                 Object.class_eval(debug_text, 'debug', 1)
@@ -999,9 +1010,21 @@ module Cosmos
             @debug_text.setPlainText("")
           end
         end
-
         @debug_frame.addWidget(@debug_text)
 
+        @locals_button = Qt::PushButton.new('Locals')
+        @locals_button.connect(SIGNAL('clicked(bool)')) do
+          next unless @script_binding
+          @locals_button.setEnabled(false)
+          vars = @script_binding.local_variables.map(&:to_s)
+          puts "Locals: #{vars.reject {|x| INSTANCE_VARS.include?(x)}.sort.join(', ')}"
+          while @output_io.string[-1..-1] == "\n"
+            Qt::CoreApplication.processEvents()
+          end
+          @locals_button.setEnabled(true)
+        end
+        @debug_frame.addWidget(@locals_button)
+
         @bottom_frame.layout.addLayout(@debug_frame)
       end
     end
@@ -1375,7 +1398,13 @@ module Cosmos
           $stdout.add_stream(@output_io)
           $stderr.add_stream(@output_io)
 
-          scriptrunner_puts "Starting script: #{File.basename(@filename)}" unless close_on_complete
+          unless close_on_complete
+            scriptrunner_puts("Starting script: #{File.basename(@filename)}")
+            targets = get_disconnected_targets()
+            if targets
+              scriptrunner_puts("DISCONNECTED targets: #{targets.join(',')}")
+            end
+          end
           handle_output_io()
 
           # Start Limits Monitoring
@@ -1685,7 +1714,12 @@ module Cosmos
       if cached
         @active_script.setPlainText(cached.gsub("\r", ''))
       else
-        @active_script.setPlainText(File.read(filename).gsub("\r", ''))
+        if File.exist?(filename)
+          data = File.read(filename).gsub("\r", '')
+        else
+          data = ""
+        end
+        @active_script.setPlainText(data)
       end
       mark_breakpoints(filename)