cosmos 3.8.2 → 3.8.3

data/install/tools/OpenGLBuilder.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/PacketViewer.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/Replay.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/ScriptRunner.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/TableManager.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/TestRunner.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/TlmExtractor.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/TlmGrapher.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/TlmViewer.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 
-IF NOT EXIST %~dp0ToolLaunch.bat (
-  echo %~dp0ToolLaunch.bat does not exist
+IF NOT EXIST "%~dp0ToolLaunch.bat" (
+  echo "%~dp0ToolLaunch.bat" does not exist
   pause
   exit /b
 )
 
-call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*
+call "%~dp0ToolLaunch.bat" rubyw.exe %~n0 %*

data/install/tools/ToolLaunch.bat

@@ -10,8 +10,8 @@ IF NOT EXIST !TOOL! (
   exit /b
 )
 
-IF NOT EXIST %~dp0tool_launch.rb (
-  echo %~dp0tool_launch.rb does not exist
+IF NOT EXIST "%~dp0tool_launch.rb" (
+  echo "%~dp0tool_launch.rb" does not exist
   pause
   exit /b
 )
@@ -42,11 +42,9 @@ goto loop
 
 IF EXIST "!DESTINATION_DIR!Vendor\Ruby" (
   :: Convert DESTINATION_DIR to absolute path
-  echo !DESTINATION_DIR!
   pushd !DESTINATION_DIR!
   SET "DESTINATION_DIR=!CD!\"
   popd
-  echo !DESTINATION_DIR!
 
   :: Set environmental variables
   for /f "delims=" %%a in ('dir "!DESTINATION_DIR!Vendor\Ruby\lib\ruby\gems\2*" /on /ad /b') do set RUBY_ABI=%%a
@@ -63,8 +61,7 @@ IF EXIST "!DESTINATION_DIR!Vendor\Ruby" (
   SET RUBYLIB=
 
   :: Run tool using Installer Ruby
-  ECHO !GEM_HOME!
-  ECHO Starting tool using installer ruby in !DESTINATION_DIR!
+  ECHO Starting tool using installer ruby in "!DESTINATION_DIR!"
   START "COSMOS" "!DESTINATION_DIR!Vendor\Ruby\bin\!RUBYEXE!" "!TOOL!" !PARAMS!
 ) else (
   :: Use System Ruby and Environment

data/lib/cosmos/config/config_parser.rb

@@ -149,8 +149,16 @@ module Cosmos
     def render(template_name, options = {})
       b = binding
       if options[:locals]
-        options[:locals].each do |key, value|
-          eval("#{key} = #{value}", b)
+        if RUBY_VERSION.split('.')[0..1].join.to_i >= 21
+          options[:locals].each {|key, value| b.local_variable_set(key, value) }
+        else
+          options[:locals].each do |key, value|
+            if value.is_a? String
+              b.eval("#{key} = '#{value}'")
+            else
+              b.eval("#{key} = #{value}")
+            end
+          end
         end
       end
       # Assume the file is there. If not we raise a pretty obvious error

data/lib/cosmos/gui/qt_tool.rb

@@ -62,6 +62,11 @@ module Cosmos
       @about_action = Qt::Action.new(Cosmos.get_icon('help.png'), tr('&About'), self)
       @about_action.statusTip = tr('About the application')
       connect(@about_action, SIGNAL('triggered()'), self, SLOT('about()'))
+      @documentation_action = Qt::Action.new(tr('&Documentation'), self)
+      @documentation_action.statusTip = tr('COSMOS Online Documentation')
+      self.connect(@documentation_action, SIGNAL('triggered()')) do
+        Qt::DesktopServices.openUrl(Qt::Url.new("http://cosmosrb.com"))
+      end
     end
 
     # Creates the Help menu and adds the @about_action to it. Thus this MUST be
@@ -69,6 +74,7 @@ module Cosmos
     def initialize_help_menu
       @help_menu = menuBar().addMenu(tr('&Help'))
       @help_menu.addAction(@about_action)
+      @help_menu.addAction(@documentation_action)
     end
 
     # This should be called after the tool has been completely laid out and all

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

@@ -15,6 +15,14 @@ module Cosmos
 
     # Take a screenshot of the given window
     def self.screenshot_window (window, filename)
+      if !Kernel.is_windows?()
+        # Delay for one second to allow any dialogs to fully clear first
+        start_time = Time.now
+        while ((Time.now - start_time) < 1.0)
+          Qt::CoreApplication.processEvents(Qt::EventLoop::AllEvents, 1000)
+        end
+      end
+
       # Create a Pixmap to save the screenshot into
       pixmap = Qt::Pixmap::grabWindow(window.winId())
       pixmap.save(filename)

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

@@ -194,8 +194,14 @@ module Cosmos
           msg = Qt::MessageBox.new(window)
           msg.setText(string)
           msg.setWindowTitle("Message Box")
-          buttons.each {|text| msg.addButton(text, Qt::MessageBox::AcceptRole)}
-          msg.addButton("Cancel", Qt::MessageBox::RejectRole)
+          # Check if the last parameter is false which means they don't want
+          # the Cancel button to be displayed
+          if buttons[-1] == false
+            buttons[0..-2].each {|text| msg.addButton(text, Qt::MessageBox::AcceptRole)}
+          else
+            buttons.each {|text| msg.addButton(text, Qt::MessageBox::AcceptRole)}
+            msg.addButton("Cancel", Qt::MessageBox::RejectRole)
+          end
           msg.exec()
           if msg.clickedButton.text == "Cancel"
             Logger.warn "User pressed 'Cancel' for '#{string}'"
@@ -219,9 +225,18 @@ module Cosmos
         Qt.execute_in_main_thread(true, 0.05) do
           dialog = _build_dialog(string)
 
+          # Check if the last parameter is false which means they don't want
+          # the Cancel button to be displayed
+          if buttons[-1] == false
+            cancel = false
+            display_buttons = buttons[0..-2]
+          else
+            cancel = true
+            display_buttons = buttons
+          end
           button_layout = Qt::VBoxLayout.new
           button_layout.setContentsMargins(11,11,11,11)
-          buttons.each do |button_text|
+          display_buttons.each do |button_text|
             button = Qt::PushButton.new(button_text)
             button.connect(SIGNAL('clicked()')) do
               result = button_text
@@ -230,7 +245,7 @@ module Cosmos
             button_layout.addWidget(button)
           end
           dialog.layout.addLayout(button_layout)
-          dialog.layout.addWidget(_build_dialog_buttons(dialog, false))
+          dialog.layout.addWidget(_build_dialog_buttons(dialog, false, cancel))
           result = "Cancel" unless _exec_dialog(dialog, string, result)
         end
         if result == "Cancel"
@@ -246,11 +261,20 @@ module Cosmos
         result = options[0]
         Qt.execute_in_main_thread(true, 0.05) do
           dialog = _build_dialog(string)
-          chooser = ComboboxChooser.new(dialog, "Select:", options)
+          # Check if the last parameter is false which means they don't want
+          # the Cancel button to be displayed
+          if options[-1] == false
+            cancel = false
+            display_options = options[0..-2]
+          else
+            cancel = true
+            display_options = options
+          end
+          chooser = ComboboxChooser.new(dialog, "Select:", display_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))
+          dialog.layout.addWidget(_build_dialog_buttons(dialog, true, cancel))
           result = "Cancel" unless _exec_dialog(dialog, string, result)
         end
         if result == "Cancel"
@@ -287,7 +311,7 @@ module Cosmos
       result
     end
 
-    def _build_dialog_buttons(dialog, ok_button = true)
+    def _build_dialog_buttons(dialog, ok_button = true, cancel_button = true)
       button_layout = Qt::HBoxLayout.new
       if ok_button
         ok = Qt::PushButton.new("Ok")
@@ -296,11 +320,13 @@ module Cosmos
         end
         button_layout.addWidget(ok)
       end
-      cancel = Qt::PushButton.new("Cancel")
-      cancel.connect(SIGNAL('clicked()')) do
-        dialog.reject()
+      if cancel_button
+        cancel = Qt::PushButton.new("Cancel")
+        cancel.connect(SIGNAL('clicked()')) do
+          dialog.reject()
+        end
+        button_layout.addWidget(cancel)
       end
-      button_layout.addWidget(cancel)
 
       widget = Qt::Widget.new
       widget.setLayout(button_layout)

data/lib/cosmos/interfaces/cmd_tlm_server_interface.rb

@@ -59,7 +59,7 @@ module Cosmos
         end
       end
 
-      while true
+      while connected?
         begin
           event = CmdTlmServer.instance.get_limits_event(@limit_id)
           if event
@@ -89,8 +89,8 @@ module Cosmos
           break
         end
       end
-      # Block forever
-      Thread.stop
+
+      return nil
     end
 
     # Write a packet to the CmdTlmServer to change various settings.

data/lib/cosmos/interfaces/udp_interface.rb

@@ -79,6 +79,7 @@ module Cosmos
                                          @ttl,
                                          @bind_address) if @write_dest_port
       @read_socket = UdpReadSocket.new(@read_port, @hostname, @interface_address, @bind_address) if @read_port
+      @thread_sleeper = nil
     end
 
     # @return [Boolean] Whether the active ports (read and/or write) have
@@ -100,6 +101,8 @@ module Cosmos
       @write_socket = nil
       Cosmos.close_socket(@read_socket)
       @read_socket = nil
+      @thread_sleeper.cancel if @thread_sleeper
+      @thread_sleeper = nil
     end
 
     # If the read port was given, the read_socket is read and the data returned
@@ -113,7 +116,7 @@ module Cosmos
           @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
         rescue IOError
           # Disconnected
-          Thread.stop
+          return nil
         end
 
         @bytes_read += data.length
@@ -122,7 +125,11 @@ module Cosmos
         return Packet.new(nil, nil, :BIG_ENDIAN, nil, data)
       else
         # Write only interface so stop the thread which calls read
-        Thread.stop
+        @thread_sleeper = Sleeper.new
+        while connected?()
+          @thread_sleeper.sleep(1000000)
+        end
+        return nil
       end
     end
 

data/lib/cosmos/packet_logs/packet_log_reader.rb

@@ -148,6 +148,7 @@ module Cosmos
         packet.set_received_time_fast(received_time)
       end
 
+      packet.received_count += 1
       packet
     rescue => err
       close()

data/lib/cosmos/packets/commands.rb

@@ -125,7 +125,9 @@ module Cosmos
     # @param range_checking [Boolean] Whether to perform range checking on the
     #   passed in parameters.
     # @param raw [Boolean] Indicates whether or not to run conversions on command parameters
-    def build_cmd(target_name, packet_name, params = {}, range_checking = true, raw = false)
+    # @param check_required_params [Boolean] Indicates whether or not to check
+    #   that the required command parameters are present
+    def build_cmd(target_name, packet_name, params = {}, range_checking = true, raw = false, check_required_params = true)
       target_upcase = target_name.to_s.upcase
       packet_upcase = packet_name.to_s.upcase
 
@@ -135,50 +137,11 @@ module Cosmos
       # Set time, parameters, and restore defaults
       command.received_time = Time.now
       command.given_values = params
-      command.restore_defaults
+      command.restore_defaults(command.buffer(false), params.keys)
       command.raw = raw
 
-      # Set any parameters
-      given_item_names = []
-      params.each do |item_name, value|
-        item_upcase = item_name.to_s.upcase
-        item = command.get_item(item_upcase)
-        range_check_value = value
-
-        # Convert from state to value if possible
-        if item.states and item.states[value.to_s.upcase]
-          range_check_value = item.states[value.to_s.upcase]
-        end
-
-        if range_checking
-          range = item.range
-          if range
-            # Perform Range Check on command parameter
-            if not range.include?(range_check_value)
-              range_check_value = "'#{range_check_value}'" if String === range_check_value
-              raise "Command parameter '#{target_upcase} #{packet_upcase} #{item_upcase}' = #{range_check_value} not in valid range of #{range.first} to #{range.last}"
-            end
-          end
-        end
-
-        # Update parameter in command
-        if raw
-          command.write(item_upcase, value, :RAW)
-        else
-          command.write(item_upcase, value, :CONVERTED)
-        end
-
-        given_item_names << item_upcase
-      end # cmd_params.each
-
-      # Script Runner could call this command with only some parameters
-      # so make sure any required parameters were actually passed in.
-      item_defs = command.items
-      item_defs.each do |item_name, item_def|
-        if item_def.required and not given_item_names.include? item_name
-          raise "Required command parameter '#{target_upcase} #{packet_upcase} #{item_name}' not given"
-        end
-      end
+      given_item_names = set_parameters(command, params, range_checking)
+      check_required_params(command, given_item_names) if check_required_params
 
       return command
     end
@@ -227,39 +190,10 @@ module Cosmos
     # are set. Thus any given parameter values are first applied to the command
     # and then checked for hazardous states.
     #
-    # @param target_name (see #packet)
-    # @param packet_name (see #packet)
-    # @param params (see #build_cmd)
-    def cmd_hazardous?(target_name, packet_name, params = {})
-      target_upcase = target_name.to_s.upcase
-      packet_upcase = packet_name.to_s.upcase
-
-      # Lookup the command
-      command = packet(target_upcase, packet_upcase)
-
-      # Overall command hazardous check
+    # @param command [Packet] The command to check for hazardous
+    def cmd_pkt_hazardous?(command)
       return [true, command.hazardous_description] if command.hazardous
 
-      # Create a light weight copy of command
-      command = command.clone()
-      # Set given command parameters and restore defaults
-      command.given_values = params
-      command.restore_defaults()
-
-      # Set any parameters
-      params.each do |item_name, value|
-        item_upcase = item_name.to_s.upcase
-        item = command.get_item(item_upcase)
-
-        if item.states
-          state_value = item.states[value.to_s.upcase]
-          value = state_value if state_value
-        end
-
-        # Update parameter in command
-        command.write(item_upcase, value)
-      end
-
       # Check each item for hazardous states
       item_defs = command.items
       item_defs.each do |item_name, item_def|
@@ -276,6 +210,20 @@ module Cosmos
       return [false, nil]
     end
 
+    # Returns whether the given command is hazardous. Commands are hazardous
+    # if they are marked hazardous overall or if any of their hardardous states
+    # are set. Thus any given parameter values are first applied to the command
+    # and then checked for hazardous states.
+    #
+    # @param target_name (see #packet)
+    # @param packet_name (see #packet)
+    # @param params (see #build_cmd)
+    def cmd_hazardous?(target_name, packet_name, params = {})
+      # Build a command without range checking, perform conversions, and don't
+      # check required parameters since we're not actually using the command.
+      cmd_pkt_hazardous?(build_cmd(target_name, packet_name, params, false, false, false))
+    end
+
     def clear_counters
       @config.commands.each do |target_name, target_packets|
         target_packets.each do |packet_name, packet|
@@ -288,6 +236,54 @@ module Cosmos
       @config.commands
     end
 
+    protected
+
+    def set_parameters(command, params, range_checking)
+      given_item_names = []
+      params.each do |item_name, value|
+        item_upcase = item_name.to_s.upcase
+        item = command.get_item(item_upcase)
+        range_check_value = value
+
+        # Convert from state to value if possible
+        if item.states and item.states[value.to_s.upcase]
+          range_check_value = item.states[value.to_s.upcase]
+        end
+
+        if range_checking
+          range = item.range
+          if range
+            # Perform Range Check on command parameter
+            if not range.include?(range_check_value)
+              range_check_value = "'#{range_check_value}'" if String === range_check_value
+              raise "Command parameter '#{command.target_name} #{command.packet_name} #{item_upcase}' = #{range_check_value} not in valid range of #{range.first} to #{range.last}"
+            end
+          end
+        end
+
+        # Update parameter in command
+        if command.raw
+          command.write(item_upcase, value, :RAW)
+        else
+          command.write(item_upcase, value, :CONVERTED)
+        end
+
+        given_item_names << item_upcase
+      end
+      given_item_names
+    end
+
+    def check_required_params(command, given_item_names)
+      # Script Runner could call this command with only some parameters
+      # so make sure any required parameters were actually passed in.
+      item_defs = command.items
+      item_defs.each do |item_name, item_def|
+        if item_def.required and not given_item_names.include? item_name
+          raise "Required command parameter '#{command.target_name} #{command.packet_name} #{item_name}' not given"
+        end
+      end
+    end
+
   end # class Commands
 
 end # module Cosmos