cosmos 3.9.2 → 4.0.0

data/lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb

@@ -1041,7 +1041,7 @@ module Cosmos
 
       type_list.each do |data_object_type|
         begin
-          filename = data_object_type.to_s.downcase + '_data_object_adder'
+          filename = data_object_type.to_s.downcase + '_data_object_adder.rb'
           @data_object_adders << Cosmos.require_class(filename).new(self, @adder_orientation)
           layout.addWidget(@data_object_adders[-1])
           @data_object_adders[-1].add_data_object_callback = method(:adder_add_data_object)

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb

@@ -9,7 +9,7 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos'
-require 'cosmos/ext/tabbed_plots_config'
+require 'cosmos/ext/tabbed_plots_config' if RUBY_ENGINE == 'ruby' and !ENV['COSMOS_NO_EXT']
 require 'cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tab'
 require 'cosmos/tools/tlm_grapher/plots/plot'
 require 'cosmos/tools/tlm_grapher/plots/linegraph_plot'
@@ -85,7 +85,7 @@ module Cosmos
 
       if File.exist?(filename.to_s)
         # Loop over each line of the configuration file
-        parser = ConfigParser.new
+        parser = ConfigParser.new("http://cosmosrb.com/docs/grapher/")
         parser.parse_file(filename) do |keyword, parameters|
           begin
             # Handle each keyword
@@ -405,8 +405,15 @@ module Cosmos
 
     protected
 
-    # Optimization method to move each call to C code
-    # def process_packet_in_each_data_object(data_objects, packet, packet_count)
+    if RUBY_ENGINE != 'ruby' or ENV['COSMOS_NO_EXT']
+      # Optimization method to move each call to C code
+      def process_packet_in_each_data_object(data_objects, packet, packet_count)
+        data_objects.each do |data_object|
+          data_object.process_packet(packet, packet_count)
+        end
+        return nil
+      end
+    end
 
     # Build (or rebuild) the mapping between packets and data objects that process them
     # Note: This is an optimization to prevent looping through all the data objects

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_plot_editor.rb

@@ -52,7 +52,7 @@ module Cosmos
       end
       @editor_layout = Qt::VBoxLayout.new
       @layout.addLayout(@editor_layout)
-      @editor = Cosmos.require_class(plot_type + '_plot_editor').new(self, plot)
+      @editor = Cosmos.require_class(plot_type + '_plot_editor.rb').new(self, plot)
       @editor_layout.addWidget(@editor)
 
       # Separator before buttons
@@ -92,7 +92,7 @@ module Cosmos
     def handle_plot_type_change
       plot_type = @combobox.currentText.downcase
       @editor.dispose
-      @editor = Cosmos.require_class(plot_type.capitalize + '_plot_editor').new(self)
+      @editor = Cosmos.require_class(plot_type.capitalize + '_plot_editor.rb').new(self)
       @editor_layout.addWidget(@editor)
     end
 

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_realtime_thread.rb

@@ -19,7 +19,7 @@ module Cosmos
 
     # Create a new TabbedPlotsRealtimeThread
     def initialize(tabbed_plots_config, connection_success_callback = nil, connection_failed_callback = nil, connection_lost_callback = nil, fatal_exception_callback = nil)
-      interface = TcpipClientInterface.new('localhost', nil, System.ports['CTS_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
+      interface = TcpipClientInterface.new(System.connect_hosts['CTS_PREIDENTIFIED'], nil, System.ports['CTS_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
       super(interface)
 
       @queue = Queue.new

data/lib/cosmos/tools/tlm_grapher/tlm_grapher.rb

@@ -74,9 +74,25 @@ module Cosmos
     def handle_items
       plot_index = 0
       @items.each do |target_name, packet_name, item_name|
+        target_name.upcase!
+        packet_name.upcase!
+        item_name.upcase!
+        # Check to see if the item name is followed by an array index,
+        # notated by square brackets around an integer; i.e. ARRAY_ITEM[1]
+        if (item_name =~ /\[\d+\]$/)
+          # We found an array index.
+          # The $` special variable is the string before the regex match, i.e. ARRAY_ITEM
+          item_name = $`
+          # The $& special variable is the string matched by the regex, i.e. [1].
+          # Strip off the brackets and then convert the array index to an integer.
+          item_array_index = $&.gsub(/[\[\]]/, "").to_i
+        else
+          item_array_index = nil
+        end
         # Default configuration has one plot so don't add plot for first item
         data_object = HousekeepingDataObject.new
         data_object.set_item(target_name, packet_name, item_name)
+        data_object.item_array_index = item_array_index
         @tabbed_plots_config.add_data_object(0, 0, data_object)
         plot_index += 1
       end

data/lib/cosmos/tools/tlm_viewer/screen.rb

@@ -114,35 +114,37 @@ module Cosmos
           begin
             while(true)
               break if @@closing_all
-              time = Time.now
-
-              begin
-                # Gather item values for value widgets
-                if @mode == :REALTIME
-                  values, limits_states, limits_settings, limits_set = get_tlm_values(@items, @value_types)
-                  index = 0
-                  @items.each do |target_name, packet_name, item_name|
-                    begin
-                      System.limits.set(target_name, packet_name, item_name, limits_settings[index][0], limits_settings[index][1], limits_settings[index][2], limits_settings[index][3], limits_settings[index][4], limits_settings[index][5], limits_set) if limits_settings[index]
-                    rescue
-                      # This can fail if we missed setting the DEFAULT limits set earlier - Oh well
+              time = Time.now.sys
+
+              if !@item.empty?
+                begin
+                  # Gather item values for value widgets
+                  if @mode == :REALTIME
+                    values, limits_states, limits_settings, limits_set = get_tlm_values(@items, @value_types)
+                    index = 0
+                    @items.each do |target_name, packet_name, item_name|
+                      begin
+                        System.limits.set(target_name, packet_name, item_name, limits_settings[index][0], limits_settings[index][1], limits_settings[index][2], limits_settings[index][3], limits_settings[index][4], limits_settings[index][5], limits_set) if limits_settings[index]
+                      rescue
+                        # This can fail if we missed setting the DEFAULT limits set earlier - Oh well
+                      end
+                      index += 1
                     end
-                    index += 1
                   end
+                  @mutex.synchronize do
+                    @values = values
+                    @limits_states = limits_states
+                    @limits_set = limits_set
+                  end
+                rescue DRb::DRbConnError
+                  break if @@closing_all
+                  break if @value_sleeper.sleep(1)
+                  next
                 end
-                @mutex.synchronize do
-                  @values = values
-                  @limits_states = limits_states
-                  @limits_set = limits_set
-                end
-              rescue DRb::DRbConnError
-                break if @@closing_all
-                break if @value_sleeper.sleep(1)
-                next
               end
 
               Qt.execute_in_main_thread {update_gui()} if @alive and (@mode == :REALTIME)
-              delta = Time.now - time
+              delta = Time.now.sys - time
               break if @@closing_all
               if @polling_period - delta > 0
                 break if @value_sleeper.sleep(@polling_period - delta)
@@ -161,14 +163,16 @@ module Cosmos
       def update_gui
         begin
           if @alive
-            # Handle change in limits set
-            update_limits_set()
-
-            # Update widgets with values and limits_states
-            @mutex.synchronize do
-              (0..(@values.length - 1)).each do |index|
-                @item[index].limits_state = @limits_states[index]
-                @item[index].value = @values[index]
+            if !@item.empty?
+              # Handle change in limits set
+              update_limits_set()
+
+              # Update widgets with values and limits_states
+              @mutex.synchronize do
+                (0..(@values.length - 1)).each do |index|
+                  @item[index].limits_state = @limits_states[index]
+                  @item[index].value = @values[index]
+                end
               end
             end
 
@@ -252,7 +256,7 @@ module Cosmos
       global_subsettings = {}
 
       begin
-        parser = ConfigParser.new
+        parser = ConfigParser.new("http://cosmosrb.com/docs/screens/")
         parser.parse_file(filename) do |keyword, parameters|
 
           if keyword

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

@@ -125,15 +125,14 @@ module Cosmos
           # Start DRb with access control
           @json_drb = JsonDRb.new
           port = System.ports['TLMVIEWER_API']
-          acl = ACL.new(['allow', '127.0.0.1'], ACL::ALLOW_DENY)
-          @json_drb.acl = acl
+          @json_drb.acl = System.acl
           whitelist = [
             'display',
             'clear',
             'clear_all']
           @json_drb.method_whitelist = whitelist
           begin
-            @json_drb.start_service "localhost", port, self
+            @json_drb.start_service System.listen_hosts['TLMVIEWER_API'], port, self
           rescue Exception
             raise FatalError.new("Error starting JsonDRb on port #{port}.\nPerhaps a Telemetry Viewer is already running?")
           end
@@ -199,70 +198,76 @@ module Cosmos
     end
 
     def initialize_central_widget(options)
-      # Create the central widget
-      @central_widget = Qt::Widget.new
-      setCentralWidget(@central_widget)
-      @top_layout = Qt::VBoxLayout.new
+      central_widget = Qt::Widget.new
+      setCentralWidget(central_widget)
+      top_layout = Qt::VBoxLayout.new
 
-      # Create Search box
-      @search_layout = Qt::HBoxLayout.new
       @search_box = FullTextSearchLineEdit.new(self)
-      @search_box.setStyleSheet("padding-right: 20px;padding-left: 5px;background: url(#{File.join(Cosmos::PATH, 'data', 'search-14.png')});background-position: right;background-repeat: no-repeat;")
-      @search_layout.addWidget(@search_box)
-      @top_layout.addLayout(@search_layout)
+      top_layout.addWidget(@search_box)
 
       # Create Screen Drop Down Lists
-      @selection_pane = Qt::HBoxLayout.new
-      @top_layout.addLayout(@selection_pane)
-      @column_widgets = []
-      @tlm_viewer_config.columns.each_with_index do |target_screen_infos, column_index|
-        @column_widgets[column_index] = {}
-        if column_index != 0
-          # Separator before editor
-          @column_widgets[column_index][:sep1] = Qt::Frame.new(@central_widget)
-          @column_widgets[column_index][:sep1].setFrameStyle(Qt::Frame::VLine | Qt::Frame::Sunken)
-          @selection_pane.addWidget(@column_widgets[column_index][:sep1])
+      selection_pane = Qt::HBoxLayout.new
+      top_layout.addLayout(selection_pane)
+
+      column_widgets = []
+      @tlm_viewer_config.columns.each_with_index do |target_screen_infos, col|
+        if col != 0 # Don't add separator for the first column
+          separator = Qt::Frame.new(central_widget)
+          separator.setFrameStyle(Qt::Frame::VLine | Qt::Frame::Sunken)
+          selection_pane.addWidget(separator)
         end
-        @column_widgets[column_index][:grid] = Qt::GridLayout.new
-        @selection_pane.addLayout(@column_widgets[column_index][:grid])
+        grid = Qt::GridLayout.new
+        selection_pane.addLayout(grid)
         row = 0
-        @column_widgets[column_index][:rows] = []
         target_screen_infos.each do |target_name, screen_infos|
-          @column_widgets[column_index][:rows][row] = {}
+          grid.addWidget(Qt::Label.new("#{target_name}:"), row, 0)
 
-          # Create Label for Category
-          @column_widgets[column_index][:rows][row][:label] = Qt::Label.new("#{target_name}:")
-          @column_widgets[column_index][:grid].addWidget(@column_widgets[column_index][:rows][row][:label], row, 0)
-
-          # Create Drop Down Menu for Category
-          @column_widgets[column_index][:rows][row][:screen_select] = Qt::ComboBox.new
-          @variants = []
+          # Create drop down of screens for this target
+          combo = Qt::ComboBox.new
           screen_infos.each do |screen_name, screen_info|
-            @variants <<  Qt::Variant.new(screen_info.full_name)
-            @column_widgets[column_index][:rows][row][:screen_select].addItem(screen_info.name, @variants[-1])
+            # Store both the screen name (for display) and the screen filename
+            # (for the edit button) in a variant we can access in button handlers
+            combo.addItem(screen_info.name,
+                          Qt::Variant.new("#{screen_info.full_name};#{screen_info.filename}"))
           end
           if screen_infos.length >= 20
-            @column_widgets[column_index][:rows][row][:screen_select].setMaxVisibleItems(20)
+            combo.setMaxVisibleItems(20)
           else
-            @column_widgets[column_index][:rows][row][:screen_select].setMaxVisibleItems(screen_infos.length)
-          end
-          my_row = row
-          handler = lambda do
-            screen_full_name = @column_widgets[column_index][:rows][my_row][:screen_select].itemData(@column_widgets[column_index][:rows][my_row][:screen_select].currentIndex)
-            display(screen_full_name.value)
+            combo.setMaxVisibleItems(screen_infos.length)
           end
-          @column_widgets[column_index][:rows][row][:screen_select].connect(SIGNAL('activated(int)')) { handler.call }
-          @column_widgets[column_index][:grid].addWidget(@column_widgets[column_index][:rows][row][:screen_select], row, 1)
 
-          @column_widgets[column_index][:rows][row][:show_screen] = Qt::PushButton.new("Show Screen")
-          @column_widgets[column_index][:rows][row][:show_screen].connect(SIGNAL('clicked(bool)')) { handler.call }
-          @column_widgets[column_index][:grid].addWidget(@column_widgets[column_index][:rows][row][:show_screen], row, 2)
+          # Create an anonymous method to display the screen which we can
+          # attach to both the combobox activated signal and the button press
+          display_handler = lambda do
+            # Access the variant we created for this screen name
+            string = combo.itemData(combo.currentIndex)
+            # The first part of the variant before the semicolon is the screen name
+            display(string.value.split(';')[0])
+          end
+          combo.connect(SIGNAL('activated(int)')) { display_handler.call }
+          grid.addWidget(combo, row, 1)
+
+          show_button =  Qt::PushButton.new("Show Screen")
+          show_button.connect(SIGNAL('clicked(bool)')) { display_handler.call }
+          grid.addWidget(show_button, row, 2)
+
+          unless options.production
+            edit_button = Qt::PushButton.new(Cosmos.get_icon('edit.png'), '')
+            edit_button.setFixedSize(24, 24)
+            edit_button.connect(SIGNAL('clicked(bool)')) do
+              # Access the variant we created for this screen name
+              string = combo.itemData(combo.currentIndex)
+              # The second part of the variant after the semicolon is the screen filename
+              Cosmos.open_in_text_editor(string.value.split(';')[1])
+            end
+            grid.addWidget(edit_button, row, 3)
+          end
 
           row += 1
         end
       end
 
-      @central_widget.setLayout(@top_layout)
+      central_widget.setLayout(top_layout)
     end
 
     # Handles saving the current configuration to a file
@@ -288,7 +293,7 @@ module Cosmos
         filename << '.txt' if File.extname(filename).empty?
         @tlm_viewer_config.save(filename)
       end
-    end # def on_file_save_config
+    end
 
     def generate_target(target_name)
       target = System.targets[target_name]
@@ -377,7 +382,7 @@ module Cosmos
             output_filename = File.join(System.paths['LOGS'],
                                         File.build_timestamped_filename(['screen','audit'], '.txt'))
             File.open(output_filename, 'w') do |file|
-              file.puts "Telemetry Viewer audit created on #{Time.now.formatted}.\n"
+              file.puts "Telemetry Viewer audit created on #{Time.now.sys.formatted}.\n"
               if all_telemetry.empty?
                 msg = "\nAll telemetry points accounted for in screens."
                 progress.append_text(msg)
@@ -516,6 +521,7 @@ module Cosmos
           options.listen = true
           options.config_file = nil
           options.restore_size = false
+          options.production = false
 
           option_parser.separator "Telemetry Viewer Specific Options:"
           option_parser.on("-c", "--config FILE", "Use the specified config file") { |arg| options.config_file = arg }
@@ -524,6 +530,9 @@ module Cosmos
             options.listen = false
             options.title << ' : Not Listening'
           end
+          option_parser.on("-p", "--production", "Run TlmServer in production mode which disables the edit buttons.") do |arg|
+            options.production = true
+          end
           option_parser.parse!(ARGV)
         end
 

data/lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb

@@ -54,7 +54,7 @@ module Cosmos
         @items = []
         @invalid_items = []
         begin
-          parser = ConfigParser.new
+          parser = ConfigParser.new("http://cosmosrb.com/docs/screens/")
           parser.parse_file(@filename) do |keyword, parameters|
             if keyword
               case keyword
@@ -115,7 +115,7 @@ module Cosmos
       @current_screens = nil
       @current_screen_info = nil
       @current_group = nil
-      parser = ConfigParser.new
+      parser = ConfigParser.new("http://cosmosrb.com/docs/screens/")
       parser.parse_file(filename) do |keyword, parameters|
         case keyword
 

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

@@ -42,6 +42,7 @@ require 'cosmos/tools/tlm_viewer/widgets/rangecolumn_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/screenshotbutton_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/scrollwindow_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/spacer_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/tabbook_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/tabitem_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/textbox_widget.rb'

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

@@ -54,6 +54,7 @@ module Cosmos
       # if the item should be drawn on the canvas as "on" or "off".
       begin
         @item_settings.each_with_index do |item,index|
+          next if @values[index].to_f.nan? || @values[index].to_f.infinite?
           eval_string << " " << item[0].to_s << " (" << @values[index].to_s << " " << item[1].to_s << " " << item[2].to_s << ")"
         end
         on = eval(eval_string)

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

@@ -20,20 +20,38 @@ module Cosmos
     include Widget
     include MultiWidget
 
-    def initialize(parent_layout, target_name, packet_name, item_name, value_type = :WITH_UNITS, characters = 12)
+    def initialize(parent_layout, target_name, packet_name, item_name, value_type = :WITH_UNITS, characters = 12, align = 'split')
       super(target_name, packet_name, item_name, value_type)
       setLayout(Qt::HBoxLayout.new)
       layout.setSpacing(0)
       layout.setContentsMargins(0,0,0,0)
+      layout.addStretch(1) if align.downcase == 'right' || align.downcase == 'center'
       @widgets << LabelWidget.new(layout, item_name.to_s + ':')
-      layout.addStretch(1)
+      layout.addStretch(1) if align.downcase == 'split'
       @widgets << ValueWidget.new(layout, target_name, packet_name, item_name, value_type, characters.to_i)
+      layout.addStretch(1) if align.downcase == 'left' || align.downcase == 'center'
       parent_layout.addWidget(self) if parent_layout
     end
 
     def self.takes_value?
       return true
     end
-  end
 
-end # module Cosmos
+    # Normally the user would have to use SUBSETTING to set the label and
+    # value parts of this widget. Since this widget is so common we overrides
+    # set_setting so it's easier to set some of the more common things.
+    def set_setting(setting_name, setting_values)
+      case setting_name.upcase
+      # Only apply TEXTALIGN to the value widget by default. It makes the label
+      # look weird when doing LEFT align which is the most common.
+      when 'TEXTALIGN'
+        @widgets[1].set_setting(setting_name, setting_values)
+      when 'TEXTCOLOR' # Apply this to both widgets automatically
+        @widgets[0].set_setting(setting_name, setting_values)
+        @widgets[1].set_setting(setting_name, setting_values)
+      else
+        super(setting_name, setting_values)
+      end
+    end
+  end
+end

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

@@ -42,6 +42,15 @@ module Cosmos
         @column = 0
       end
     end
+
+    def addItem(item_to_add)
+      super(item_to_add, @row, @column)
+      @column += 1
+      if @column >= @num_columns
+        @row += 1
+        @column = 0
+      end
+    end
   end
 
 end # module Cosmos