cosmos 3.3.3 → 3.4.0

data/lib/cosmos/tools/cmd_tlm_server/api.rb

@@ -420,9 +420,12 @@ module Cosmos
     # their target and packet names.
     #
     # @param (see Cosmos::Telemetry#values_and_limits_states)
-    # @return [Array<String, Object, Array, Symbol|nil>] Array consisting of
-    #   \[item name, item value, item limits settings, item limits state] where the item limits
-    #   state can be one of {Cosmos::Limits::LIMITS_STATES}
+    # @return [Array< Array<Object>, Array<Symbol>, Array<Array<Numeric>>, String>]
+    #   Array consisting of an Array of item values, an Array of item limits state
+    #   given as symbols such as :RED, :YELLOW, :STALE, an Array of Arrays including
+    #   the limits setting such as red low, yellow low, yellow high, red high and
+    #   optionally green low and high, and the overall limits state which is
+    #   one of {Cosmos::Limits::LIMITS_STATES}.
     def get_tlm_values(item_array, value_types = :CONVERTED)
       if !item_array.is_a?(Array) || (!item_array[0].is_a?(Array) and !item_array.empty?)
         raise ArgumentError, "item_array must be nested array: [['TGT','PKT','ITEM'],...]"

data/lib/cosmos/tools/cmd_tlm_server/connections.rb

@@ -81,7 +81,6 @@ module Cosmos
       connection = @connections[connection_name.upcase]
       raise "Unknown #{@keyword}: #{connection_name}" unless connection
 
-      connection.disconnect
       stop_thread(connection)
       Logger.info "Disconnected from #{@keyword} #{connection_name.upcase}"
     end

data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb

@@ -50,7 +50,7 @@ module Cosmos
       interfaces.all.each do |interface_name, interface|
         button = @interfaces_table[name].cellWidget(row,1)
         state = @interfaces_table[name].item(row,2)
-        if interface.connected?
+        if interface.connected? and interface.thread
           button.setText('Disconnect')
           button.setDisabled(true) if interface.disable_disconnect
           state.setText('true')
@@ -58,7 +58,12 @@ module Cosmos
         elsif interface.thread
           button.text = 'Cancel Connect'
           button.setDisabled(false)
-          state.text = 'attempting'
+          state.setText('attempting')
+          state.textColor = Cosmos::RED
+        elsif interface.connected?
+          button.setText('Error')
+          button.setDisabled(false)
+          state.setText('error')
           state.textColor = Cosmos::RED
         else
           button.setText('Connect')
@@ -137,12 +142,14 @@ module Cosmos
     end
 
     def create_button(name, interface, interface_name)
-      if interface.connected?
+      if interface.connected? and interface.thread
         button_text = 'Disconnect'
-      elsif interface.thread.nil?
-        button_text = 'Connect'
-      else
+      elsif interface.thread
         button_text = 'Cancel Connect'
+      elsif interface.connected?
+        button_text = 'Error'
+      else
+        button_text = 'Connect'
       end
       button = Qt::PushButton.new(button_text)
       if name == ROUTERS
@@ -172,12 +179,15 @@ module Cosmos
 
     def create_state(interface)
       state = Qt::TableWidgetItem.new
-      if interface.connected?
+      if interface.connected? and interface.thread
         state.setText('true')
         state.textColor = Cosmos::GREEN
       elsif interface.thread
         state.setText('attempting')
         state.textColor = Cosmos::YELLOW
+      elsif interface.connected?
+        state.setText('error')
+        state.textColor = Cosmos::RED
       else
         state.setText('false')
         state.textColor = Cosmos::BLACK

data/lib/cosmos/tools/cmd_tlm_server/interface_thread.rb

@@ -46,6 +46,7 @@ module Cosmos
       @thread_sleeper = Sleeper.new
       @connection_failed_messages = []
       @connection_lost_messages = []
+      @mutex = Mutex.new
     end
 
     # Create and start the Ruby thread that will encapsulate the interface.
@@ -58,9 +59,14 @@ module Cosmos
         begin
           Logger.info "Starting packet reading for #{@interface.name}"
           while true
+            break if @cancel_thread
             unless @interface.connected?
               begin
-                connect()
+                @mutex.synchronize do
+                  # We need to make sure connect is not called after stop() has been called
+                  connect() unless @cancel_thread
+                end
+                break if @cancel_thread
               rescue Exception => connect_error
                 handle_connection_failed(connect_error)
                 if @cancel_thread
@@ -102,14 +108,19 @@ module Cosmos
             Cosmos.handle_fatal_exception(error)
           end
         end
+        Logger.info "Stopped packet reading for #{@interface.name}"
       end  # Thread.new
     end # def start
 
     # Disconnect from the interface and stop the thread
     def stop
-      @cancel_thread = true
-      @thread_sleeper.cancel
-      @interface.disconnect
+      @mutex.synchronize do
+        # Need to make sure that @cancel_thread is set and the interface disconnected within
+        # mutex to ensure that connect() is not called when we want to stop()
+        @cancel_thread = true
+        @thread_sleeper.cancel
+        @interface.disconnect
+      end
       Cosmos.kill_thread(self, @thread) if @thread != Thread.current
     end
 

data/lib/cosmos/tools/handbook_creator/handbook_creator.rb

@@ -18,8 +18,8 @@ end
 
 module Cosmos
 
-  # Creates command and telemetry handbooks from the COSMOS definitions in both
-  # HTML and PDF format.
+  # Creates command and telemetry handbooks from the COSMOS definitions in
+  # both HTML and PDF format.
   class HandbookCreator < QtTool
 
     def initialize (options)
@@ -42,11 +42,18 @@ module Cosmos
 
     def initialize_actions
       super()
+      @hide_ignored_action = Qt::Action.new(tr('&Hide Ignored Items'), self)
+      @hide_ignored_keyseq = Qt::KeySequence.new(tr('Ctrl+H'))
+      @hide_ignored_action.shortcut  = @hide_ignored_keyseq
+      @hide_ignored_action.statusTip = tr('Do not include ignored items in command and telemetry handbooks')
+      @hide_ignored_action.setCheckable(true)
+      @hide_ignored_action.setChecked(false)
     end
 
     def initialize_menus
       # File Menu
       @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu.addAction(@hide_ignored_action)
       @file_menu.addAction(@exit_action)
 
       # Help Menu
@@ -54,11 +61,11 @@ module Cosmos
       initialize_help_menu()
     end
 
-    def create_pdfs(both = false)
+    def create_pdfs(both, hide_ignored)
       success = false
       ProgressDialog.execute(self, 'PDF Creation Progress', 700, 600, true, false, true, true, false) do |progress_dialog|
         begin
-          success = @config.create_pdf(progress_dialog)
+          success = @config.create_pdf(hide_ignored, progress_dialog)
           if success
             msg = "\n\n"
             msg << "HTML and " if both
@@ -88,7 +95,7 @@ module Cosmos
       @html_button.setStyleSheet("text-align:left")
       @html_button.connect(SIGNAL('clicked()')) do
         begin
-          @config.create_html
+          @config.create_html(@hide_ignored_action.isChecked)
           Qt::MessageBox.information(self, 'Done', 'HTML Handbooks created successfully')
         rescue Exception => err
           Cosmos.handle_critical_exception(err)
@@ -99,7 +106,7 @@ module Cosmos
       @pdf_button = Qt::PushButton.new(Cosmos.get_icon('pdf-32.png'), 'Create PDF Handbooks')
       @pdf_button.setStyleSheet("text-align:left")
       @pdf_button.connect(SIGNAL('clicked()')) do
-        create_pdfs()
+        create_pdfs(false, @hide_ignored_action.isChecked)
       end
       @top_layout.addWidget(@pdf_button)
 
@@ -107,8 +114,8 @@ module Cosmos
       @html_pdf_button.setStyleSheet("text-align:left")
       @html_pdf_button.connect(SIGNAL('clicked()')) do
         begin
-          @config.create_html
-          create_pdfs(true)
+          @config.create_html(@hide_ignored_action.isChecked)
+          create_pdfs(true, @hide_ignored_action.isChecked)
         rescue Exception => err
           Cosmos.handle_critical_exception(err)
         end

data/lib/cosmos/tools/handbook_creator/handbook_creator_config.rb

@@ -65,7 +65,8 @@ module Cosmos
         @sections << section
       end
 
-      def create_html
+      def create_html(hide_ignored)
+        @hide_ignored = hide_ignored
         Cosmos.set_working_dir do
           if @type == :TARGETS
             target_names = @target_names
@@ -77,7 +78,8 @@ module Cosmos
         end
       end
 
-      def create_pdf(progress_dialog = nil)
+      def create_pdf(hide_ignored, progress_dialog = nil)
+        @hide_ignored = hide_ignored
         if @pdf
           if progress_dialog
             Qt.execute_in_main_thread(true) do
@@ -169,19 +171,45 @@ module Cosmos
           if section.output != :ALL
             next unless section.output == output
           end
-          packets = []
-          packets = build_packets(System.commands, target_names) if section.type == :CMD
-          packets = build_packets(System.telemetry, target_names) if section.type == :TLM
+          packets = build_packets(section.type, target_names)
+          ignored = build_ignored(section.type, target_names)
           if target_pages
-            section.create(file, target_names[0] + ' ' + section.title.to_s, packets)
+            section.create(file, target_names[0] + ' ' + section.title.to_s, packets, ignored)
           else
-            section.create(file, section.title.to_s, packets)
+            section.create(file, section.title.to_s, packets, ignored)
           end
         end
       end
 
-      def build_packets(packet_accessor, target_names)
+      def build_ignored(type, target_names)
+        ignored = {}
+        target_names = System.targets.keys if target_names.empty?
+        target_names.each do |name|
+          if @hide_ignored
+            if type == :CMD
+              ignored[name] = System.targets[name].ignored_parameters
+            elsif type == :TLM
+              ignored[name] = System.targets[name].ignored_items
+            end
+          else
+            # If we're not ignoring items the hash contains an empty array
+            ignored[name] = []
+          end
+        end
+        ignored
+      end
+
+      def build_packets(type, target_names)
         packets = []
+        case type
+        when :CMD
+          packet_accessor = System.commands
+        when :TLM
+          packet_accessor = System.telemetry
+        else
+          # Return the empty array because there are no packets
+          return packets
+        end
         if target_names.empty?
           packet_accessor.all.sort.each do |target_name, target_packets|
             target_packets.sort.each do |packet_name, packet|
@@ -221,7 +249,7 @@ module Cosmos
         @type = type
       end
 
-      def create(file, title, packets = [])
+      def create(file, title, packets = [], ignored = {})
         file.puts ERB.new(File.read(@filename)).result(binding)
       end
 
@@ -235,15 +263,15 @@ module Cosmos
       process_file(filename)
     end
 
-    def create_html
-      @pages.each {|page| page.create_html}
+    def create_html(hide_ignored)
+      @pages.each {|page| page.create_html(hide_ignored)}
     end
 
-    def create_pdf(progress_dialog = nil)
+    def create_pdf(hide_ignored, progress_dialog = nil)
       begin
         @pages.each_with_index do |page, index|
           progress_dialog.set_overall_progress(index.to_f / @pages.length.to_f) if progress_dialog
-          page.create_pdf(progress_dialog)
+          page.create_pdf(hide_ignored, progress_dialog)
         end
         progress_dialog.set_overall_progress(1.0) if progress_dialog
       rescue Exception => err

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

@@ -98,6 +98,20 @@ module Cosmos
         @colorblind = @color_blind_action.isChecked
       end
 
+      @hide_ignored_action = Qt::Action.new(tr('&Hide Ignored Items'), self)
+      @hide_ignored_keyseq = Qt::KeySequence.new(tr('Ctrl+H'))
+      @hide_ignored_action.shortcut  = @hide_ignored_keyseq
+      @hide_ignored_action.statusTip = tr('Toggle showing and hiding ignored items')
+      @hide_ignored_action.setCheckable(true)
+      @hide_ignored_action.setChecked(false)
+      @hide_ignored_action.connect(SIGNAL('triggered()')) do
+        if @hide_ignored_action.isChecked
+          @ignored_rows.each {|row| @table.setRowHidden(row, true) }
+        else
+          @ignored_rows.each {|row| @table.setRowHidden(row, false) }
+        end
+      end
+
       @formatted_tlm_units_action = Qt::Action.new(tr('Formatted Telemetry With &Units'), self)
       @formatted_tlm_units_keyseq = Qt::KeySequence.new(tr('Ctrl+U'))
       @formatted_tlm_units_action.shortcut  = @formatted_tlm_units_keyseq
@@ -158,6 +172,7 @@ module Cosmos
       # View Menu
       view_menu = menuBar.addMenu(tr('&View'))
       view_menu.addAction(@color_blind_action)
+      view_menu.addAction(@hide_ignored_action)
       view_menu.addSeparator.setText(tr('Formatting'));
       view_menu.addAction(@formatted_tlm_units_action)
       view_menu.addAction(@formatted_tlm_action)
@@ -187,7 +202,7 @@ module Cosmos
       target_label = Qt::Label.new(tr("&Target:"))
       target_label.setBuddy(@target_select)
 
-      # Set the comamnd combobox selection
+      # Set the command combobox selection
       @packet_select = Qt::ComboBox.new
       @packet_select.setMaxVisibleItems(20)
       @packet_select.connect(SIGNAL('activated(const QString&)')) do
@@ -327,7 +342,9 @@ module Cosmos
 
       row = 0
       featured_item = nil
+      @ignored_rows = []
       tlm_items.each do |tlm_name, states, description|
+        @ignored_rows << row if System.targets[target_name].ignored_items.include?(tlm_name)
         item = Qt::TableWidgetItem.new(tr("#{tlm_name}:"))
         item.setTextAlignment(Qt::AlignRight)
         item.setFlags(Qt::NoItemFlags | Qt::ItemIsSelectable)

data/lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb

@@ -40,7 +40,7 @@ module Cosmos
       painter.drawLine(@x1, @y1, @x2, @y2)
       painter.drawLine(@x1, @y1, @x2, @y2)
       if (@connector == true)
-        painter.setBrush(Cosmos.getBrush(@color))
+        painter.setBrush(@color)
         painter.drawEllipse(@point, @width, @width)
       end
       painter.restore

data/lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb

@@ -51,7 +51,7 @@ module Cosmos
       painter.setPen(pen)
       painter.drawLine(@x1, @y1, @x2, @y2)
       if (@connector == true)
-        painter.setBrush(Cosmos.getBrush(color))
+        painter.setBrush(color)
         painter.drawEllipse(@point, @width, @width)
       end
       painter.restore

data/lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb

@@ -159,7 +159,7 @@ module Cosmos
         top_triangle.setPoint(0, @line_pos, @y_pad - 1)
         top_triangle.setPoint(1, @line_pos-5, @y_pad - 6)
         top_triangle.setPoint(2, @line_pos+5, @y_pad - 6)
-        dc.setBrush(Cosmos.getBrush(Cosmos::BLACK))
+        dc.setBrush(Cosmos::BLACK)
         dc.drawPolygon(top_triangle)
         top_triangle.dispose
 

data/lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb

@@ -42,7 +42,7 @@ module Cosmos
       top_triangle.setPoint(0, @line_pos, @y_pad - 1)
       top_triangle.setPoint(1, @line_pos-5, @y_pad - 6)
       top_triangle.setPoint(2, @line_pos+5, @y_pad - 6)
-      dc.setBrush(Cosmos.getBrush(Cosmos::BLACK))
+      dc.setBrush(Cosmos::BLACK)
       dc.drawPolygon(top_triangle)
 
       # Draw overall border

data/lib/cosmos/top_level.rb

@@ -27,7 +27,7 @@ class HazardousError < StandardError
   attr_accessor :hazardous_description
 end
 
-# The COSMOS (COmprehensive SysteM Operations Suite) system is almost
+# The Ball Aerospace COSMOS system is almost
 # wholly contained within the Cosmos module. COSMOS also extends some of the
 # core Ruby classes to add additional functionality as well as creates
 # additional QT GUI classes under the {Qt} module.

data/lib/cosmos/utilities/ruby_lex_utils.rb

@@ -175,7 +175,7 @@ class RubyLexUtils
     @lex.set_input(@lex_io)
     while token = @lex.token
       if BLOCK_BEGINNING_TOKENS.include?(token.class)
-        return token.class
+        return true
       end
     end
     return false

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.3.3'
+COSMOS_VERSION = '3.4.0'
 module Cosmos
   module Version
     MAJOR = '3'
-    MINOR = '3'
-    PATCH = '3'
-    BUILD = '0c7720497e1ce22a447e7e6d571db7b4c0ffd886'
+    MINOR = '4'
+    PATCH = '0'
+    BUILD = '9a5a2f777b1122ed55b49caf2febf113a223eeaa'
   end
-  VERSION = '3.3.3'
+  VERSION = '3.4.0'
 end

data/spec/gui/line_graph/line_clip_spec.rb

@@ -39,11 +39,11 @@ module Cosmos
       end
 
       it "indicates the first point was not clipped" do
-        expect(@clipped_line[4]).to be_falsey
+        expect(@clipped_line[4]).to be false
       end
 
       it "indicates the second point was not clipped" do
-        expect(@clipped_line[5]).to be_falsey
+        expect(@clipped_line[5]).to be false
       end
     end
 
@@ -59,11 +59,11 @@ module Cosmos
       end
 
       it "indicates the first point was clipped" do
-        expect(@clipped_line[4]).to be_truthy
+        expect(@clipped_line[4]).to be true
       end
 
       it "indicates the second point was not clipped" do
-        expect(@clipped_line[5]).to be_falsey
+        expect(@clipped_line[5]).to be false
       end
     end
 
@@ -79,11 +79,11 @@ module Cosmos
       end
 
       it "indicates the first point was not clipped" do
-        expect(@clipped_line[4]).to be_falsey
+        expect(@clipped_line[4]).to be false
       end
 
       it "indicates the second point was clipped" do
-        expect(@clipped_line[5]).to be_truthy
+        expect(@clipped_line[5]).to be true
       end
     end