cosmos 3.1.2 → 3.2.0

data/lib/cosmos/gui/dialogs/tlm_details_dialog.rb

@@ -116,13 +116,6 @@ module Cosmos
     end
 
     def value_update_timeout
-      # Check to see that the server is still running. If the user shut down
-      # the underlying tool (like PacketViewer for example) the $cmd_tlm_server
-      # will be nil.
-      unless $cmd_tlm_server
-        @timer.stop
-        return
-      end
       begin
         # Gather updated values
         values, limits_states, limits_settings, limits_set = get_tlm_values(@item_array, VALUE_TYPES)

data/lib/cosmos/gui/line_graph/overview_graph.rb

@@ -111,12 +111,12 @@ module Cosmos
       temp_max = (@window_max_start + (x - @drag_start_x))
 
       # Only graph if the user hasn't dragged the window outside the graph
-      if temp_min >= 0 and temp_max <= @graph_right_x
+      if temp_min >= @graph_left_x and temp_max <= @graph_right_x
         #Now convert the graph coordinates back to the x values
         @window_min_x = scale_graph_to_value_x(temp_min)
         @window_max_x = scale_graph_to_value_x(temp_max)
       else # The user dragged outside the allowable area
-        if temp_min < 0
+        if temp_min < @graph_left_x
           @window_min_x = @x_min
           @window_max_x = @x_min + @window_size
         elsif temp_max > @graph_right_x
@@ -124,6 +124,8 @@ module Cosmos
           @window_min_x = @window_max_x - @window_size
         end
       end
+      @window_min_x = @x_min if @window_min_x < @x_min
+      @window_max_x = @x_max if @window_max_x > @x_max
       @redraw_needed = true
       graph()
     end
@@ -171,6 +173,8 @@ module Cosmos
       end
 
       # Update window size
+      @window_min_x = @x_min if @window_min_x < @x_min
+      @window_max_x = @x_max if @window_max_x > @x_max
       @window_size = @window_max_x - @window_min_x
 
       @redraw_needed = true
@@ -315,6 +319,8 @@ module Cosmos
         @window_min_x = center - @window_size / 2
         @window_max_x = center + @window_size / 2
       end
+      @window_min_x = @x_min if @window_min_x < @x_min
+      @window_max_x = @x_max if @window_max_x > @x_max
       @drag_window = true
       @redraw_needed = true
       graph()
@@ -346,6 +352,8 @@ module Cosmos
         @window_min_x = @x_max - @window_size
         @window_max_x = @x_max
       end
+      @window_min_x = @x_min if @window_min_x < @x_min
+      @window_max_x = @x_max if @window_max_x > @x_max
 
       @drag_window = true
       @redraw_needed = true
@@ -427,8 +435,10 @@ module Cosmos
         # The window lines are in terms of the graph x values so convert to the graph coordinate system
         @window_left_x = scale_value_to_graph_x(@window_min_x)
         @window_left_x = @graph_left_x if @window_left_x < @graph_left_x
+        @window_left_x = @graph_right_x if @window_left_x > @graph_right_x
         @window_right_x = scale_value_to_graph_x(@window_max_x)
         @window_right_x = @graph_right_x if @window_right_x > @graph_right_x
+        @window_right_x = @graph_left_x if @window_right_x < @graph_left_x
       else # If we're not dragging the window we want to adjust the window lines automatically
         @window_max_x = @x_max
 

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

@@ -21,7 +21,7 @@ module Cosmos
 
     @@qt_boolean = Qt::Boolean.new
 
-    def ask_string(question, allow_blank = false)
+    def ask_string(question, allow_blank = false, password = false)
       answer = ""
       loop do
         canceled = false
@@ -29,7 +29,11 @@ module Cosmos
           window = nil
           window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
           # Create a special mutable QT variable that can return what button was pressed
-          answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Normal, "", @@qt_boolean)
+          if password
+            answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Password, "", @@qt_boolean)
+          else
+            answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Normal, "", @@qt_boolean)
+          end
           # @@qt_boolean is nil if the user presses cancel in the dialog
           # Note that it is not actually nil, just the nil? method returns true
           canceled = @@qt_boolean.nil?
@@ -42,7 +46,11 @@ module Cosmos
         break if allow_blank or (not answer.nil? and answer.strip.length != 0)
       end
 
-      Logger.info "User entered '#{answer}' for '#{question}'"
+      if password
+        Logger.info "User responded to '#{question}'"
+      else
+        Logger.info "User entered '#{answer}' for '#{question}'"
+      end
       return answer.to_s
     end
 

data/lib/cosmos/interfaces/interface.rb

@@ -81,6 +81,9 @@ module Cosmos
     #   (when used as a Router)
     attr_accessor :interfaces
 
+    # @return [Hash<option name, option values>] Hash of options supplied to interface/router
+    attr_accessor :options
+
     # Initialize default attribute values
     def initialize
       @name = self.class.to_s
@@ -104,6 +107,7 @@ module Cosmos
       @read_allowed = true
       @write_allowed = true
       @write_raw_allowed = true
+      @options = {}
     end
 
     # Connects the interface to its target(s). Must be implemented by a
@@ -198,6 +202,14 @@ module Cosmos
       # read_queue_size is the number of packets in the queue so don't copy
       # write_queue_size is the number of packets in the queue so don't copy
       other_interface.interfaces = self.interfaces.clone
+      other_interface.options = self.options.clone
+    end
+
+    # Set an interface or router specific option
+    # @param option_name name of the option
+    # @param option_values array of option values
+    def set_option(option_name, option_values)
+      @options[option_name.upcase] = option_values.clone
     end
 
     # This method is called by the CmdTlmServer after each read packet is

data/lib/cosmos/interfaces/stream_interface.rb

@@ -34,27 +34,7 @@ module Cosmos
       super()
 
       stream_protocol_class = stream_protocol_type.to_s.capitalize << 'StreamProtocol'
-      klass = stream_protocol_class.to_class
-      unless klass
-        begin
-          require stream_protocol_class.class_name_to_filename
-        # If the stream protocol doesn't exist require will throw a LoadError
-        rescue LoadError => err
-          msg = "Unable to require " \
-            "#{stream_protocol_class.class_name_to_filename} due to #{err.message}. " \
-            "Ensure #{stream_protocol_class.class_name_to_filename} "\
-            "is in the COSMOS lib directory."
-          Logger.instance.error msg
-          raise msg
-        # If the stream protocol exists but has problems we rescue those here
-        rescue => err
-          msg = "Unable to require " \
-            "#{stream_protocol_class.class_name_to_filename} due to #{err.message}."
-          Logger.instance.error msg
-          raise msg
-        end
-      end
-
+      klass = Cosmos.require_class(stream_protocol_class.class_name_to_filename)
       @stream_protocol = klass.new(*stream_protocol_args)
       @stream_protocol.interface = self
     end

data/lib/cosmos/interfaces/tcpip_server_interface.rb

@@ -149,6 +149,16 @@ module Cosmos
       @tcpip_server.stop_raw_logging
     end
 
+    # Supported Options
+    # LISTEN_ADDRESS - Ip address of the interface to accept connections on - Default: 0.0.0.0
+    # (see Interface#set_option)
+    def set_option(option_name, option_values)
+      super(option_name, option_values)
+      if option_name.upcase == 'LISTEN_ADDRESS'
+        @tcpip_server.listen_address = option_values[0]
+      end
+    end
+
   end # class TcpipServerInterface
 
 end # module Cosmos

data/lib/cosmos/io/json_drb_object.rb

@@ -33,7 +33,7 @@ module Cosmos
     # @param hostname [String] The name of the machine which has started
     #   the JSON service
     # @param port [Integer] The port number of the JSON service
-    def initialize(hostname, port)
+    def initialize(hostname, port, connect_timeout = 1.0)
       hostname = '127.0.0.1' if (hostname.to_s.upcase == 'LOCALHOST')
       begin
         @addr = Socket.pack_sockaddr_in(port, hostname)
@@ -50,11 +50,21 @@ module Cosmos
       @socket = nil
       @id = 0
       @request_in_progress = false
+      @connect_timeout = connect_timeout
+      @connect_timeout = @connect_timeout.to_f if @connect_timeout
+      @shutdown = false
     end
 
     # Disconnects from the JSON server
     def disconnect
-      @socket.close if @socket and !@socket.closed?
+      socket = @socket
+      socket.close if socket and !socket.closed?
+    end
+
+    # Permanently disconnects from the JSON server
+    def shutdown
+      @shutdown = true
+      disconnect()
     end
 
     # Forwards all method calls to the remote service.
@@ -66,70 +76,79 @@ module Cosmos
     #   protocol a DRb::DRbConnError exception is raised.
     def method_missing(method_name, *method_params)
       @mutex.synchronize do
-        first_try = true
-        loop do
-          if !@socket or @socket.closed? or @request_in_progress
-            if @request_in_progress
-              @socket.close if @socket and !@socket.closed?
-              @socket = nil
-              @request_in_progress = false
-            end
+        raise DRb::DRbConnError, "Shutdown" if @shutdown
+        if !@socket or @socket.closed? or @request_in_progress
+          if @request_in_progress
+            disconnect()
+            @socket = nil
+            @request_in_progress = false
+          end
+          begin
+            addr = Socket.pack_sockaddr_in(@port, @hostname)
+            @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+            @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
             begin
-              @socket = TCPSocket.new(@hostname, @port)
-              @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-            rescue => e
-              raise DRb::DRbConnError, e.message
+              @socket.connect_nonblock(addr)
+            rescue IO::WaitWritable
+              begin
+                _, sockets, _ = IO.select(nil, [@socket], nil, @connect_timeout) # wait 3-way handshake completion
+              rescue Errno::ENOTSOCK
+                disconnect()
+                @socket = nil
+                raise "Connect canceled"
+              end
+              if sockets and !sockets.empty?
+                begin
+                  @socket.connect_nonblock(addr) # check connection failure
+                rescue Errno::EISCONN
+                end
+              else
+                disconnect()
+                @socket = nil
+                raise "Connect timeout"
+              end
             end
+          rescue => e
+            raise DRb::DRbConnError, e.message
           end
+        end
 
-          request = JsonRpcRequest.new(method_name, method_params, @id)
-          @id += 1
+        request = JsonRpcRequest.new(method_name, method_params, @id)
+        @id += 1
 
-          request_data = request.to_json(:allow_nan => true)
-          begin
-            @request_in_progress = true
-            STDOUT.puts "Request:\n" if JsonDRb.debug?
-            STDOUT.puts request_data if JsonDRb.debug?
-            JsonDRb.send_data(@socket, request_data)
-            response_data = JsonDRb.receive_message(@socket, '')
-            STDOUT.puts "\nResponse:\n" if JsonDRb.debug?
-            STDOUT.puts response_data if JsonDRb.debug?
-            @request_in_progress = false
-          rescue => e
-            @socket.close if @socket and !@socket.closed?
-            @socket = nil
-            if first_try
-              first_try = false
-              next
-            else
-              raise DRb::DRbConnError, e.message, e.backtrace
-            end
-          end
+        request_data = request.to_json(:allow_nan => true)
+        begin
+          @request_in_progress = true
+          STDOUT.puts "Request:\n" if JsonDRb.debug?
+          STDOUT.puts request_data if JsonDRb.debug?
+          JsonDRb.send_data(@socket, request_data)
+          response_data = JsonDRb.receive_message(@socket, '')
+          STDOUT.puts "\nResponse:\n" if JsonDRb.debug?
+          STDOUT.puts response_data if JsonDRb.debug?
+          @request_in_progress = false
+        rescue => e
+          disconnect()
+          @socket = nil
+          raise DRb::DRbConnError, e.message, e.backtrace
+        end
 
-          if response_data
-            response = JsonRpcResponse.from_json(response_data)
-            if JsonRpcErrorResponse === response
-              if response.error.data
-                raise Exception.from_hash(response.error.data)
-              else
-                raise "JsonDRb Error (#{response.error.code}): #{response.error.message}"
-              end
+        if response_data
+          response = JsonRpcResponse.from_json(response_data)
+          if JsonRpcErrorResponse === response
+            if response.error.data
+              raise Exception.from_hash(response.error.data)
             else
-              return response.result
+              raise "JsonDRb Error (#{response.error.code}): #{response.error.message}"
             end
           else
-            # Socket was closed by server
-            @socket.close if @socket and !@socket.closed?
-            @socket = nil
-            if first_try
-              first_try = false
-              next
-            else
-              # Socket already closed by receive_message
-              raise DRb::DRbConnError, "Socket closed by server"
-            end
+            return response.result
           end
-        end # loop
+        else
+          # Socket was closed by server
+          disconnect()
+          @socket = nil
+          raise DRb::DRbConnError, "Socket closed by server"
+        end
       end
     end
   end

data/lib/cosmos/io/tcpip_server.rb

@@ -70,17 +70,7 @@ module Cosmos
       @read_timeout = @read_timeout.to_f if @read_timeout
 
       stream_protocol_class = stream_protocol_type.to_s.capitalize << 'StreamProtocol'
-      @stream_protocol_class = stream_protocol_class.to_class
-      unless @stream_protocol_class
-        begin
-          require "cosmos/streams/#{stream_protocol_class.class_name_to_filename}"
-          @stream_protocol_class = stream_protocol_class.to_class
-        rescue LoadError => err
-          Logger.instance.error "Unable to require #{stream_protocol_class.class_name_to_filename} due to #{err.message}. Ensure #{stream_protocol_class.class_name_to_filename} is in the COSMOS lib directory."
-          raise "Unable to require #{stream_protocol_class.class_name_to_filename} due to #{err.message}. Ensure #{stream_protocol_class.class_name_to_filename} is in the COSMOS lib directory."
-        end
-      end
-
+      @stream_protocol_class = Cosmos.require_class(stream_protocol_class.class_name_to_filename)
       @stream_protocol_args = stream_protocol_args
 
       @listen_sockets = []

data/lib/cosmos/packet_logs.rb

@@ -4,3 +4,4 @@ require 'cosmos/packet_logs/packet_log_writer'
 require 'cosmos/packet_logs/meta_packet_log_writer'
 require 'cosmos/packet_logs/packet_log_writer_pair'
 require 'cosmos/packet_logs/packet_log_reader'
+require 'cosmos/packet_logs/ccsds_log_reader'

data/lib/cosmos/packet_logs/ccsds_log_reader.rb

@@ -0,0 +1,103 @@
+# 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/packet_logs/packet_log_reader'
+require 'cosmos/ccsds/ccsds_packet'
+
+module Cosmos
+
+  # Reads a CCSDS packet log of either commands or telemetry.
+  class CcsdsLogReader < PacketLogReader
+
+    # Length of the header on a CCSDS source packet
+    CCSDS_HEADER_LENGTH = 6
+
+    # Create a new log file reader
+    def initialize
+      super()
+      @ccsds_header = CcsdsPacket.new(nil, nil, false)
+    end
+
+    # Read a packet from the log file
+    #
+    # @param identify_and_define (see #each)
+    # @return [Packet]
+    def read(identify_and_define = true)
+      # Read the CCSDS packet header
+      header = @file.read(CCSDS_HEADER_LENGTH)
+      return nil unless header and header.length == CCSDS_HEADER_LENGTH
+      @ccsds_header.buffer = header
+
+      # Extract the length field
+      length = @ccsds_header.read('CcsdsLength') + 1
+
+      # Read the remainder of the packet data
+      data = @file.read(length)
+      return nil unless data and data.length == length
+
+      # Combine into the full packet data
+      packet_data = header << data
+
+      # Determine packet time and set it as received time
+      received_time = determine_received_time(packet_data)
+
+      # Build the actual Packet object
+      if identify_and_define
+        packet = identify_and_define_packet_data(nil, nil, received_time, packet_data)
+      else
+        # Build Packet
+        packet = Packet.new(nil, nil, :BIG_ENDIAN, nil, packet_data)
+        packet.set_received_time_fast(received_time)
+      end
+
+      # Return the packet
+      packet
+    rescue => err
+      close()
+      raise err
+    end
+
+    protected
+
+    # TODO : Add code here or in subclass to derive received time from the packet timestamp
+    # CCSDS timestamp formats and even the presence of a timestamp vary
+    def determine_received_time(packet_data)
+      nil
+    end
+
+    def read_file_header
+      # Read the first CCSDS packet header
+      header = @file.read(CCSDS_HEADER_LENGTH)
+
+      if header and header.length == CCSDS_HEADER_LENGTH
+        @ccsds_header.buffer = header
+        packet_type = @ccsds_header.read('CcsdsType')
+        if packet_type == CcsdsPacket::TELEMETRY
+          @log_type = :TLM
+        else
+          @log_type = :CMD
+        end
+        @configuration_name = nil
+        @hostname = nil
+        @file_header_length = 0
+        @file.seek(0, IO::SEEK_SET)
+        System.load_configuration(nil)
+      else
+        raise "Failed to read at least #{CCSDS_HEADER_LENGTH} bytes from packet log"
+      end
+    end
+
+    def seek_to_time(time)
+      # Not supported
+    end
+
+  end # class CcsdsLogReader
+
+end # module Cosmos