cosmos 3.4.2 → 3.5.0

data/lib/cosmos/gui/utilities/script_module_gui.rb

@@ -9,9 +9,59 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos/script/script'
+require 'cosmos/gui/choosers/combobox_chooser'
 
 $cmd_tlm_gui_window = nil
 
+class Qt::Dialog
+  def exec(*args)
+    Cosmos.play_wav_file(Cosmos.data_path('message.wav')) if Cosmos::System.sound
+    method_missing(:exec, *args)
+  end
+end
+class Qt::MessageBox
+  def exec(*args)
+    Cosmos.play_wav_file(Cosmos.data_path('message.wav')) if Cosmos::System.sound
+    method_missing(:exec, *args)
+  end
+  def self.critical(parent, title, text,
+                    buttons = Qt::MessageBox::Ok,
+                    defaultButton = Qt::MessageBox::NoButton)
+    # Windows overrides critical dialogs with its own alert sound
+    Cosmos.play_wav_file(Cosmos.data_path('critical.wav')) if Cosmos::System.sound
+    super(parent,title,text,buttons,defaultButton)
+  end
+  def self.information(parent, title, text,
+                       buttons = Qt::MessageBox::Ok,
+                       defaultButton = Qt::MessageBox::NoButton)
+    Cosmos.play_wav_file(Cosmos.data_path('information.wav')) if Cosmos::System.sound
+    super(parent,title,text,buttons,defaultButton)
+  end
+  def self.question(parent, title, text,
+                    buttons = Qt::MessageBox::Ok,
+                    defaultButton = Qt::MessageBox::NoButton)
+    Cosmos.play_wav_file(Cosmos.data_path('question.wav')) if Cosmos::System.sound
+    super(parent,title,text,buttons,defaultButton)
+  end
+  def self.warning(parent, title, text,
+                   buttons = Qt::MessageBox::Ok,
+                   defaultButton = Qt::MessageBox::NoButton)
+    # Windows overrides warning dialogs with its own alert sound
+    Cosmos.play_wav_file(Cosmos.data_path('warning.wav')) if Cosmos::System.sound
+    super(parent,title,text,buttons,defaultButton)
+  end
+end
+
+class Qt::InputDialog
+  def self.getText(parent, title, label,
+                   mode = Qt::LineEdit::Normal,
+                   text = '', ok = 0, flags = 0,
+                   inputMethodHints = Qt::ImhNone)
+    Cosmos.play_wav_file(Cosmos.data_path('input.wav')) if Cosmos::System.sound
+    super(parent, title, label, mode, text, ok, flags, inputMethodHints)
+  end
+end
+
 module Cosmos
 
   # Cosmos script changes to handle hazardous commands and prompts
@@ -124,7 +174,7 @@ module Cosmos
 
     def prompt_message_box(string, buttons)
       loop do
-        answer_text = nil
+        result = nil
         Qt.execute_in_main_thread(true, 0.05) do
           window = nil
           window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
@@ -140,17 +190,113 @@ module Cosmos
           else
             Logger.info "User pressed '#{msg.clickedButton.text}' for '#{string}'"
           end
-          answer_text = msg.clickedButton.text
+          result = msg.clickedButton.text
           msg.dispose
         end
-        if answer_text == "Cancel"
+        if result == "Cancel"
+          prompt_for_script_abort()
+        else
+          return result
+        end
+      end
+    end
+
+    def prompt_vertical_message_box(string, buttons)
+      loop do
+        result = nil
+        Qt.execute_in_main_thread(true, 0.05) do
+          dialog = _build_dialog(string)
+
+          button_layout = Qt::VBoxLayout.new
+          button_layout.setContentsMargins(11,11,11,11)
+          buttons.each do |button_text|
+            button = Qt::PushButton.new(button_text)
+            button.connect(SIGNAL('clicked()')) do
+              result = button_text
+              dialog.accept()
+            end
+            button_layout.addWidget(button)
+          end
+          dialog.layout.addLayout(button_layout)
+          dialog.layout.addWidget(_build_dialog_buttons(dialog, false))
+          result = "Cancel" unless _exec_dialog(dialog, string, result)
+        end
+        if result == "Cancel"
           prompt_for_script_abort()
         else
-          return answer_text
+          return result
         end
       end
     end
 
+    def prompt_combo_box(string, options)
+      loop do
+        result = options[0]
+        Qt.execute_in_main_thread(true, 0.05) do
+          dialog = _build_dialog(string)
+          chooser = ComboboxChooser.new(dialog, "Select:", options)
+          chooser.setContentsMargins(11,11,11,11)
+          chooser.sel_command_callback = lambda { |value| result = value }
+          dialog.layout.addWidget(chooser)
+          dialog.layout.addWidget(_build_dialog_buttons(dialog))
+          result = "Cancel" unless _exec_dialog(dialog, string, result)
+        end
+        if result == "Cancel"
+          prompt_for_script_abort()
+        else
+          return result
+        end
+      end
+    end
+
+    def _build_dialog(message)
+      window = nil
+      window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
+      dialog = Qt::Dialog.new(window)
+      dialog.setWindowTitle("Message Box")
+      layout = Qt::VBoxLayout.new
+      layout.setContentsMargins(0,0,0,0)
+
+      label = Qt::Label.new(message)
+      label.setStyleSheet("background-color: white;")
+      label.setMargin(11)
+      layout.addWidget(label)
+      dialog.setLayout(layout)
+      dialog
+    end
+
+    def _exec_dialog(dialog, message, selection)
+      result = true
+      if dialog.exec() == Qt::Dialog::Accepted
+        Logger.info "User selected '#{selection}' for '#{message}'"
+      else
+        Logger.warn "User pressed 'Cancel' for '#{message}'"
+        result = false
+      end
+      dialog.dispose
+      result
+    end
+
+    def _build_dialog_buttons(dialog, ok_button = true)
+      button_layout = Qt::HBoxLayout.new
+      if ok_button
+        ok = Qt::PushButton.new("Ok")
+        ok.connect(SIGNAL('clicked()')) do
+          dialog.accept()
+        end
+        button_layout.addWidget(ok)
+      end
+      cancel = Qt::PushButton.new("Cancel")
+      cancel.connect(SIGNAL('clicked()')) do
+        dialog.reject()
+      end
+      button_layout.addWidget(cancel)
+
+      widget = Qt::Widget.new
+      widget.setLayout(button_layout)
+      widget
+    end
+
     def get_scriptrunner_log_message(title_text = "Script Message Log Text Entry", prompt_text = 'Enter text to log to the script message log')
       answer = ""
       canceled = false

data/lib/cosmos/io/json_drb.rb

@@ -290,7 +290,7 @@ module Cosmos
               request_data = JsonDRb.receive_message(my_socket, data)
               start_time = Time.now
               @request_count += 1
-            rescue Errno::ECONNRESET, Errno::ECONNABORTED
+            rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ENOTSOCK
               # Socket was closed
               break
             end

data/lib/cosmos/io/win32_serial_driver.rb

@@ -112,8 +112,7 @@ module Cosmos
 
       loop do
         loop do
-          # Read 1 byte
-          buffer = Win32.read_file(@handle, 1)
+          buffer = Win32.read_file(@handle, @read_max_length - data.length)
           data << buffer
           break if buffer.length <= 0 or data.length >= @read_max_length
         end
@@ -133,8 +132,7 @@ module Cosmos
       data = ''
 
       loop do
-        # Read 1 byte
-        buffer = Win32.read_file(@handle, 1)
+        buffer = Win32.read_file(@handle, @read_max_length - data.length)
         data << buffer
         break if buffer.length <= 0 or data.length >= @read_max_length
       end

data/lib/cosmos/packet_logs/ccsds_log_reader.rb

@@ -89,6 +89,7 @@ module Cosmos
         @file_header_length = 0
         @file.seek(0, IO::SEEK_SET)
         System.load_configuration(nil)
+        return true, nil # No configuration name supported so always return success
       else
         raise "Failed to read at least #{CCSDS_HEADER_LENGTH} bytes from packet log"
       end

data/lib/cosmos/packet_logs/packet_log_reader.rb

@@ -107,13 +107,16 @@ module Cosmos
     end
 
     # @param filename [String] The log filename to open
+    # @return [Boolean, Exception] Returns true if successfully changed to configuration specified in log,
+    #    otherwise returns false and potentially an Exception class if an error occurred.  If no error occurred
+    #    false indicates that the requested configuration was simply not found
     def open(filename)
       close()
       reset()
       @filename = filename
       @file = BufferedFile.open(@filename, 'rb')
       @bytes_read = 0
-      read_file_header()
+      return read_file_header()
     rescue => err
       close()
       raise err
@@ -253,29 +256,35 @@ module Cosmos
       packet
     end
 
+    # Should return if successfully switched to requested configuration
     def read_file_header
       header = @file.read(COSMOS2_HEADER_LENGTH)
       if header and header.length == COSMOS2_HEADER_LENGTH
         if header[COSMOS2_MARKER_RANGE] == COSMOS2_MARKER
           # Found COSMOS 2 File Header
           @log_type = header[COSMOS2_LOG_TYPE_RANGE].intern
+          raise "Unknown log type #{@log_type}" unless [:CMD, :TLM].include? @log_type
           @configuration_name = header[COSMOS2_CONFIGURATION_NAME_RANGE]
           @hostname = header[COSMOS2_HOSTNAME_RANGE].strip
           @file_header_length = COSMOS2_HEADER_LENGTH
-          System.load_configuration(@configuration_name)
+          new_config_name, error = System.load_configuration(@configuration_name)
+          return true, error if new_config_name == @configuration_name
+          return false, error # Did not successfully change to requested configuration name
         elsif header[COSMOS1_MARKER_RANGE] == COSMOS1_MARKER
           # Found COSMOS 1 File Header
           @log_type = header[COSMOS1_LOG_TYPE_RANGE].upcase.intern
+          raise "Unknown log type #{@log_type}" unless [:CMD, :TLM].include? @log_type
           @configuration_name = header[COSMOS1_CONFIGURATION_NAME_RANGE]
           @hostname = nil
           @file_header_length = COSMOS1_HEADER_LENGTH
           # Move back to beginning of first packet
           @file.seek(COSMOS1_HEADER_LENGTH, IO::SEEK_SET)
-          System.load_configuration(@configuration_name)
+          new_config_name, error = System.load_configuration(@configuration_name)
+          return true, error if new_config_name == @configuration_name
+          return false, error # Did not successfully change to requested configuration name
         else
           raise "COSMOS file header not found on packet log"
         end
-        raise "Unknown log type #{@log_type}" unless [:CMD, :TLM].include? @log_type
       else
         raise "Failed to read at least #{COSMOS2_HEADER_LENGTH} bytes from packet log"
       end

data/lib/cosmos/packets/limits.rb

@@ -249,9 +249,12 @@ module Cosmos
       return packet
     end
 
-    def includes_item?(array, target_name, packet_name, item_name)
-      array.each do |array_target_name, array_packet_name, array_item_name|
-        if ((array_target_name == target_name) && (array_packet_name == packet_name) && (array_item_name == item_name))
+    def includes_item?(ignored_items, target_name, packet_name, item_name)
+      ignored_items.each do |array_target_name, array_packet_name, array_item_name|
+        if ((array_target_name == target_name) &&
+            (array_packet_name == packet_name) &&
+            # If the item name is nil we're ignoring an entire packet
+            (array_item_name == item_name || array_item_name.nil?))
           return true
         end
       end

data/lib/cosmos/packets/telemetry.rb

@@ -244,13 +244,43 @@ module Cosmos
 
     # Iterates through all the telemetry packets and marks them stale if they
     # haven't been received for over the System.staleness_seconds value.
+    #
+    # @return [Array(Packet)] Array of the stale packets
     def check_stale
+      stale = []
       time = Time.now
       @config.telemetry.each do |target_name, target_packets|
         target_packets.each do |packet_name, packet|
-          packet.set_stale if packet.received_time and (!packet.stale) and (time - packet.received_time > System.staleness_seconds)
+          if packet.received_time and (!packet.stale) and (time - packet.received_time > System.staleness_seconds)
+            packet.set_stale
+            stale << packet
+          end
+        end
+      end
+      stale
+    end
+
+    # @param with_limits_only [Boolean] Return only the stale packets
+    #   that have limits items and thus affect the overall limits
+    #   state of the system
+    # @param target [String] Target name or nil for all targets
+    # @return [Array(Packet)] Array of the stale packets
+    def stale(with_limits_only = false, target = nil)
+      if target && !target_names.include?(target)
+        raise "Telemetry target '#{target.upcase}' does not exist"
+      end
+      stale = []
+      @config.telemetry.each do |target_name, target_packets|
+        next if (target && target != target_name)
+        next if target_name == 'UNKNOWN'
+        target_packets.each do |packet_name, packet|
+          if packet.stale
+            next if (with_limits_only && packet.limits_items.empty?)
+            stale << packet
+          end
         end
       end
+      stale
     end
 
     # Clears the received_count value on every packet in every target
@@ -308,8 +338,9 @@ module Cosmos
       strings
     end
 
-    # @return [Hash<String=>Packet>] Hash of all the telemetry packets
-    #   keyed by the packet name.
+    # @return [Hash{String=>Hash{String=>Packet}}] Hash of all the telemetry
+    #   packets keyed by the target name. The value is another hash keyed by the
+    #   packet name returning the packet.
     def all
       @config.telemetry
     end

data/lib/cosmos/processors/new_packet_log_processor.rb

@@ -24,7 +24,7 @@ module Cosmos
     #
     # See Processor#call
     def call(packet, buffer)
-      if CmdTlmServer.instance
+      if CmdTlmServer.instance and $0 !~ /Replay/
         CmdTlmServer.instance.start_logging(@packet_log_writer_name)
       end
     end

data/lib/cosmos/script/commands.rb

@@ -161,6 +161,24 @@ module Cosmos
       return $cmd_tlm_server.get_cmd_hazardous(target_name, cmd_name, cmd_params)
     end
 
-  end
-end
+    # Returns a value from the specified command
+    def get_cmd_value(target_name, command_name, parameter_name, value_type = :CONVERTED)
+      return $cmd_tlm_server.get_cmd_value(target_name, command_name, parameter_name, value_type)
+    end
+
+    # Returns the time the most recent command was sent
+    def get_cmd_time(target_name = nil, command_name = nil)
+      results = $cmd_tlm_server.get_cmd_time(target_name, command_name)
+      if Array === results
+        if results[2] and results[3]
+          results[2] = Time.at(results[2], results[3])
+        end
+        results.delete_at(3)
+      end
+      results
+    end
+
+  end # module Script
+
+end # module Cosmos
 

data/lib/cosmos/script/extract.rb

@@ -86,12 +86,20 @@ module Cosmos
     end
 
     def extract_fields_from_set_tlm_text(text)
-      split_string = text.split
-      raise "ERROR: Set Telemetry Item must be specified as 'TargetName PacketName ItemName = Value' : #{text}" if split_string.length != 5
+      error_msg = "ERROR: Set Telemetry Item must be specified as 'TargetName PacketName ItemName = Value' : #{text}"
+      # We have to handle these cases:
+      # set_tlm("TGT PKT ITEM='new item'")
+      # set_tlm("TGT PKT ITEM = 'new item'")
+      # set_tlm("TGT PKT ITEM= 'new item'")
+      # set_tlm("TGT PKT ITEM ='new item'")
+      split_string = text.split('=')
+      raise error_msg if split_string.length < 2 || split_string[1].strip.empty?
+      split_string = split_string[0].strip.split << split_string[1..-1].join('=').strip
+      raise error_msg if split_string.length != 4 # Ensure tgt,pkt,item,value
       target_name = split_string[0]
       packet_name = split_string[1]
       item_name = split_string[2]
-      value = split_string[4].convert_to_value
+      value = split_string[3].strip.convert_to_value
       value = value.remove_quotes if String === value
       return [target_name, packet_name, item_name, value]
     end

data/lib/cosmos/script/limits.rb

@@ -37,6 +37,10 @@ module Cosmos
       return $cmd_tlm_server.disable_limits(*args)
     end
 
+    def get_stale(with_limits_only = false, target_name = nil)
+      return $cmd_tlm_server.get_stale(with_limits_only, target_name)
+    end
+
     def get_limits(target_name, packet_name, item_name, limits_set = nil)
       results = $cmd_tlm_server.get_limits(target_name, packet_name, item_name, limits_set)
       results[0] = results[0].to_s.intern if results[0]
@@ -96,6 +100,8 @@ module Cosmos
           result[1][4] = result[1][4].to_s.intern if result[1][4]
         elsif result[0] == :LIMITS_SETTINGS
           result[1][3] = result[1][3].to_s.intern if result[1][3]
+        elsif result[0] == :STALE_PACKET
+          # Nothing extra to do
         else
           result[1] = result[1].to_s.intern
         end

data/lib/cosmos/script/scripting.rb

@@ -19,15 +19,7 @@ module Cosmos
     include Extract
 
     def play_wav_file(wav_filename)
-      if defined? Qt
-        Qt.execute_in_main_thread(true) do
-          if Qt::CoreApplication.instance and Qt::Sound.isAvailable
-            Cosmos.set_working_dir do
-              Qt::Sound.play(wav_filename.to_s)
-            end
-          end
-        end
-      end
+      Cosmos.play_wav_file(wav_filename)
     end
 
     def status_bar(message)
@@ -69,6 +61,14 @@ module Cosmos
       prompt_message_box(string, buttons)
     end
 
+    def vertical_message_box(string, *buttons)
+      prompt_vertical_message_box(string, buttons)
+    end
+
+    def combo_box(string, *options)
+      prompt_combo_box(string, options)
+    end
+
     # Creates a string with the parameters upcased
     def _upcase(target_name, packet_name, item_name)
       "#{target_name.upcase} #{packet_name.upcase} #{item_name.upcase}"
@@ -884,6 +884,14 @@ module Cosmos
       gets.chomp
     end
 
+    def prompt_vertical_message_box(string, options)
+      prompt_message_box(string, options)
+    end
+
+    def prompt_combo_box(string, options)
+      prompt_message_box(string, options)
+    end
+
   end # module Script
 
 end # module Cosmos