cosmos 3.9.1 → 3.9.2

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb

@@ -16,18 +16,20 @@ module Cosmos
   class TlmExtractorConfig
 
     VALUE_TYPES = [:RAW, :CONVERTED, :FORMATTED, :WITH_UNITS]
+    COLUMN_MODES = [:NORMAL, :SHARE_ALL_COLUMNS, :SHARE_INDIV_COLUMNS, :FULL_COLUMN_NAMES]
     DEFAULT_UNIQUE_IGNORED = ['RECEIVED_TIMEFORMATTED', 'RECEIVED_TIMESECONDS']
     ITEM = 'ITEM'.freeze
     TEXT = 'TEXT'.freeze
 
     attr_accessor :matlab_header
     attr_accessor :fill_down
-    attr_accessor :share_columns
+    attr_reader :column_mode
     attr_accessor :unique_only
     attr_accessor :delimiter
     attr_accessor :downsample_seconds
     attr_accessor :print_filenames_to_output
     attr_reader :items
+    attr_reader :shared_indiv_columns
 
     attr_accessor :output_filename
     attr_accessor :input_filenames
@@ -38,18 +40,19 @@ module Cosmos
       @output_file = nil
       reset_settings()
       clear_items()
+      clear_shared_columns()
       restore(config_file) if config_file
     end
 
     def reset_settings
       @matlab_header = false
       @fill_down = false
-      @share_columns = false
       @unique_only = false
       @delimiter = "\t"
       @unique_ignored = DEFAULT_UNIQUE_IGNORED.clone
       @downsample_seconds = 0.0
       @print_filenames_to_output = true
+      set_column_mode(:NORMAL)
     end
 
     def clear_items
@@ -70,10 +73,12 @@ module Cosmos
 
       hash_index = item_name + ' ' + value_type.to_s
 
-      if @share_columns and @columns_hash[hash_index]
+      if @column_mode == :SHARE_ALL_COLUMNS and @columns_hash[hash_index]
+        column_index = @columns_hash[hash_index]
+      elsif @column_mode == :SHARE_INDIV_COLUMNS and @shared_indiv_columns.include?(hash_index) and @columns_hash[hash_index]
         column_index = @columns_hash[hash_index]
       else
-        @columns << [item_name, value_type, nil]
+        @columns << [item_name, value_type, nil, target_name, packet_name]
         column_index = @columns.length - 1
         @columns_hash[hash_index] = column_index
       end
@@ -84,22 +89,52 @@ module Cosmos
     end
 
     def add_text(column_name, text)
-      @columns << [column_name, nil, nil]
+      @columns << [column_name, nil, nil, nil, nil]
       @items << [TEXT, column_name, text, nil, nil]
       @text_items << [@columns.length - 1, text]
     end
 
+    def set_column_mode(mode)
+      raise "Unknown Column Mode: #{mode}" unless COLUMN_MODES.include?(mode)
+
+      @column_mode = mode
+      if @column_mode != :SHARE_INDIV_COLUMNS
+        clear_shared_columns()
+      end
+    end
+
+    def clear_shared_columns()
+      @shared_indiv_columns = []
+    end
+
+    def add_shared_column(item_name, value_type = :CONVERTED)
+      raise "Unknown Value Type: #{value_type}" unless VALUE_TYPES.include?(value_type)
+
+      shared_column_name = item_name + ' ' + value_type.to_s
+      @shared_indiv_columns << shared_column_name
+      @shared_indiv_columns.uniq!
+    end
+
     def column_names
-      row = Array.new(@columns.length + 2)
-      row[0] = 'TARGET'
-      row[1] = 'PACKET'
+      if @column_mode == :FULL_COLUMN_NAMES
+        col_offset = 0
+        row = Array.new(@columns.length)
+      else
+        col_offset = 2
+        row = Array.new(@columns.length + 2)
+        row[0] = 'TARGET'
+        row[1] = 'PACKET'
+      end
       index = 0
-      @columns.each do |column_name, column_value_type, item_data_type|
+      @columns.each do |column_name, column_value_type, item_data_type, target_name, packet_name|
+        if @column_mode == :FULL_COLUMN_NAMES and target_name and packet_name
+          column_name = [target_name, packet_name, column_name].join(' ')
+        end
         case column_value_type
         when :CONVERTED, nil
-          row[index + 2] = column_name
+          row[index + col_offset] = column_name
         else
-          row[index + 2] = (column_name + '(' + column_value_type.to_s + ')')
+          row[index + col_offset] = (column_name + '(' + column_value_type.to_s + ')')
         end
         index += 1
       end
@@ -132,7 +167,30 @@ module Cosmos
           when 'SHARE_COLUMNS'
             # Expect 0 parameters
             parser.verify_num_parameters(0, 0, "SHARE_COLUMNS")
-            @share_columns = true
+            set_column_mode(:SHARE_ALL_COLUMNS)
+
+          when 'SHARE_COLUMN'
+            # Expect 1 or 2 parameters
+            parser.verify_num_parameters(1, 2, "SHARE_COLUMN <Item Name> <Data Type (optional)>")
+            item_name = params[0].upcase
+            if params.length == 1
+              value_type = :CONVERTED
+            else
+              value_type = params[1].upcase
+              case value_type
+              when 'CONVERTED', 'RAW', 'FORMATTED', 'WITH_UNITS'
+                value_type = value_type.intern
+              else
+                raise "Unknown Value Type: #{value_type}"
+              end
+            end
+            set_column_mode(:SHARE_INDIV_COLUMNS)
+            add_shared_column(item_name, value_type)
+
+          when 'FULL_COLUMN_NAMES'
+            # Expect 0 parameters
+            parser.verify_num_parameters(0, 0, "FULL_COLUMN_NAMES")
+            set_column_mode(:FULL_COLUMN_NAMES)
 
           when 'UNIQUE_ONLY'
             # Expect 0 parameters
@@ -202,9 +260,17 @@ module Cosmos
           if !@print_filenames_to_output
             file.puts 'DONT_OUTPUT_FILENAMES'
           end
-          if @share_columns
+          if @column_mode == :SHARE_ALL_COLUMNS
             file.puts 'SHARE_COLUMNS'
           end
+          if @column_mode == :SHARE_INDIV_COLUMNS
+            @shared_indiv_columns.each do |shared_column|
+              file.puts "SHARE_COLUMN #{shared_column}"
+            end
+          end
+          if @column_mode == :FULL_COLUMN_NAMES
+            file.puts 'FULL_COLUMN_NAMES'
+          end
           if @unique_only
             file.puts 'UNIQUE_ONLY'
           end
@@ -312,13 +378,13 @@ module Cosmos
 
           # Add each packet item to the row
           packet_mapping.each do |column_index|
-            column_name, column_value_type, item_data_type = @columns[column_index]
+            column_name, column_value_type, item_data_type, target_name, packet_name = @columns[column_index]
 
             # Lookup item data type on first use
             unless item_data_type
               _, item = System.telemetry.packet_and_item(packet.target_name, packet.packet_name, column_name)
               item_data_type = item.data_type
-              @columns[column_index] = [column_name, column_value_type, item_data_type]
+              @columns[column_index] = [column_name, column_value_type, item_data_type, target_name, packet_name]
             end
 
             if item_data_type == :BLOCK
@@ -349,11 +415,15 @@ module Cosmos
 
           if !@unique_only or changed
             # Output the row
-            @output_file.print packet.target_name
-            @output_file.print @delimiter
-            @output_file.print packet.packet_name
-            row.each_with_index do |value, index|
+            if @column_mode != :FULL_COLUMN_NAMES
+              @output_file.print packet.target_name
               @output_file.print @delimiter
+              @output_file.print packet.packet_name
+            end
+            row.each_with_index do |value, index|
+              if @column_mode != :FULL_COLUMN_NAMES or index != 0
+                @output_file.print @delimiter
+              end
               @output_file.print value if value
             end
             @output_file.puts ""

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

@@ -32,6 +32,7 @@ module Cosmos
     DEFAULT_POINTS_SAVED = 1000000
     DEFAULT_POINTS_PLOTTED = 1000
     DEFAULT_REFRESH_RATE_HZ = 10.0
+    DEFAULT_CTS_TIMEOUT = 10.0
 
     # Gives access to the array of tabs defined by the configuration file
     attr_accessor :tabs
@@ -48,6 +49,9 @@ module Cosmos
     # Global Refresh Rate Hz Setting
     attr_accessor :refresh_rate_hz
 
+    # Global CTS Timeout Setting
+    attr_accessor :cts_timeout
+
     # Plot types known by this tabbed plots definition
     attr_accessor :plot_types
 
@@ -75,6 +79,7 @@ module Cosmos
       @seconds_plotted = DEFAULT_SECONDS_PLOTTED
       @points_plotted = DEFAULT_POINTS_PLOTTED
       @refresh_rate_hz = DEFAULT_REFRESH_RATE_HZ
+      @cts_timeout = DEFAULT_CTS_TIMEOUT
       @packet_count = 0
       @configuration_errors = []
 
@@ -158,6 +163,14 @@ module Cosmos
                   @refresh_rate_hz = parameters[0].to_f
                   raise ArgumentError, "Invalid Refresh Rate Hz: #{@refresh_rate_hz}" if @refresh_rate_hz <= 0.0
 
+                when 'CTS_TIMEOUT'
+                  # Expect 1 parameter
+                  parser.verify_num_parameters(1, 1, "CTS_TIMEOUT <CTS Timeout in Seconds>")
+
+                  # Update CTS Timeout
+                  @cts_timeout = parameters[0].to_f
+                  raise ArgumentError, "Invalid CTS Timeout: #{@cts_timeout}" if @cts_timeout <= 0.0
+
                 else
                   # Handle unknown keywords
                   raise ArgumentError, "A TAB must be defined before using keyword: #{keyword}"
@@ -189,6 +202,7 @@ module Cosmos
         configuration << "POINTS_SAVED #{@points_saved}\n"
         configuration << "POINTS_PLOTTED #{@points_plotted}\n"
         configuration << "REFRESH_RATE_HZ #{@refresh_rate_hz}\n"
+        configuration << "CTS_TIMEOUT #{@cts_timeout}\n"
         @tabs.each do |tab|
           configuration << "\n"
           configuration << tab.configuration_string

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, 10.0, 'PREIDENTIFIED')
+      interface = TcpipClientInterface.new('localhost', nil, System.ports['CTS_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
       super(interface)
 
       @queue = Queue.new

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

@@ -221,6 +221,10 @@ module Cosmos
       # regular TlmViewer application
       @single_screen = single_screen
 
+      # Read the application wide stylesheet if it exists
+      app_style = File.join(Cosmos::USERPATH, 'config', 'tools', 'application.css')
+      setStyleSheet(File.read(app_style)) if File.exist? app_style
+
       @widgets = Widgets.new(self, mode)
       @window = process(filename)
       @@open_screens << self if @window
@@ -254,10 +258,15 @@ module Cosmos
           if keyword
             case keyword
             when 'SCREEN'
-              parser.verify_num_parameters(3, 3, "#{keyword} <Width or AUTO> <Height or AUTO> <Polling Period>")
+              parser.verify_num_parameters(3, 4, "#{keyword} <Width or AUTO> <Height or AUTO> <Polling Period> <FIXED>")
               @width = parameters[0].to_i
               @height = parameters[1].to_i
               @widgets.polling_period = parameters[2].to_f
+              if parameters.length == 4
+                @fixed = true
+              else
+                @fixed = false
+              end
 
               setWindowTitle(@full_name)
               top_widget = Qt::Widget.new()
@@ -329,6 +338,10 @@ module Cosmos
       elsif @width > 0 and height <= 0
         resize(@width, self.height)
       end
+      if @fixed
+        setWindowFlags(windowFlags() | Qt::MSWindowsFixedSizeDialogHint)
+        setFixedSize(self.width, self.height)
+      end
 
       if @x_pos or @y_pos
         x = @x_pos || 0
@@ -482,5 +495,4 @@ module Cosmos
     end
 
   end
-
-end # module Cosmos
+end

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

@@ -34,6 +34,10 @@ module Cosmos
       def clear(display_name)
         TlmViewer.instance.clear(display_name)
       end
+
+      def clear_all(target = nil)
+        TlmViewer.instance.clear_all(target)
+      end
     end
   end
 end
@@ -93,18 +97,11 @@ module Cosmos
       setMinimumWidth(300)
       @@instance = self
 
-      # Get Params from Config File
-      if options.config_file
-        filename = File.join(::Cosmos::USERPATH, 'config', 'tools', 'tlm_viewer', options.config_file)
-      else
-        filename = File.join(::Cosmos::USERPATH, 'config', 'tools', 'tlm_viewer', 'tlm_viewer.txt')
-      end
-
       Splash.execute(self, true) do |splash|
         ConfigParser.splash = splash
         splash.message = "Starting TlmViewer"
         System.telemetry
-        @tlm_viewer_config = self.class.load_config(filename)
+        @tlm_viewer_config = self.class.load_config(options.config_file)
         ConfigParser.splash = nil
       end
 
@@ -132,7 +129,8 @@ module Cosmos
           @json_drb.acl = acl
           whitelist = [
             'display',
-            'clear']
+            'clear',
+            'clear_all']
           @json_drb.method_whitelist = whitelist
           begin
             @json_drb.start_service "localhost", port, self
@@ -483,10 +481,23 @@ module Cosmos
 
     # Close the specified screen
     def clear(screen_full_name)
-      # Find the specified screen
-      screen_info = find_screen_info(screen_full_name)
+      close_screen(find_screen_info(screen_full_name))
+    end
+
+    # Close all screens
+    def clear_all(target_name = nil)
+      if target_name
+        screens = @tlm_viewer_config.screen_infos.values.select do |screen_info|
+          screen_info.target_name == target_name.upcase
+        end
+        raise "Unknown screen target: #{target_name.upcase}" if screens.length == 0
+        screens.each { |screen_info| close_screen(screen_info) }
+      else
+        Qt.execute_in_main_thread(true) { Screen.close_all_screens(self) }
+      end
+    end
 
-      # Close the screen
+    def close_screen(screen_info)
       Qt.execute_in_main_thread(true) do
         begin
           screen_info.screen.window.close if screen_info.screen

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.9.1'
+COSMOS_VERSION = '3.9.2'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '9'
-    PATCH = '1'
-    BUILD = '0d2d495007138d6145a42b4cba9176f3e606640d'
+    PATCH = '2'
+    BUILD = '82298a42b756edd3783b51c2d7d17535b6ab8f1a'
   end
-  VERSION = '3.9.1'
+  VERSION = '3.9.2'
 end

data/spec/packets/packet_item_limits_spec.rb

@@ -84,11 +84,25 @@ module Cosmos
       end
 
       it "complains about persistence_setting = nil" do
-        expect { @l.persistence_setting = nil}.to raise_error(ArgumentError, "persistence_setting must be a Fixnum but is a NilClass")
+        if 0.class == Integer
+          # Ruby version >= 2.4.0
+          expect { @l.persistence_setting = nil}.to raise_error(ArgumentError, "persistence_setting must be an Integer but is a NilClass")
+        else
+          # Ruby version < 2.4.0
+          expect { @l.persistence_setting = nil}.to raise_error(ArgumentError, "persistence_setting must be a Fixnum but is a NilClass")
+        end
       end
 
-      it "complains about persistence_setting that aren't Fixnum" do
-        expect { @l.persistence_setting = 5.5}.to raise_error(ArgumentError, "persistence_setting must be a Fixnum but is a Float")
+      if 0.class == Integer
+      # Ruby version >= 2.4.0
+        it "complains about persistence_setting that aren't Integer" do
+          expect { @l.persistence_setting = 5.5}.to raise_error(ArgumentError, "persistence_setting must be an Integer but is a Float")
+        end
+      else
+        # Ruby version < 2.4.0
+        it "complains about persistence_setting that aren't Fixnum" do
+          expect { @l.persistence_setting = 5.5}.to raise_error(ArgumentError, "persistence_setting must be a Fixnum but is a Float")
+        end
       end
     end
 
@@ -100,11 +114,24 @@ module Cosmos
       end
 
       it "complains about persistence_count = nil" do
-        expect { @l.persistence_count = nil}.to raise_error(ArgumentError, "persistence_count must be a Fixnum but is a NilClass")
+        if 0.class == Integer
+          # Ruby version >= 2.4.0
+          expect { @l.persistence_count = nil}.to raise_error(ArgumentError, "persistence_count must be an Integer but is a NilClass")
+        else
+          # Ruby version < 2.4.0
+          expect { @l.persistence_count = nil}.to raise_error(ArgumentError, "persistence_count must be a Fixnum but is a NilClass")
+        end
       end
 
-      it "complains about persistence_count that aren't Fixnum" do
-        expect { @l.persistence_count = 5.5}.to raise_error(ArgumentError, "persistence_count must be a Fixnum but is a Float")
+      if 0.class == Integer
+        it "complains about persistence_count that aren't Integer" do
+          expect { @l.persistence_count = 5.5}.to raise_error(ArgumentError, "persistence_count must be an Integer but is a Float")
+        end
+      else
+        # Ruby version < 2.4.0
+        it "complains about persistence_count that aren't Fixnum" do
+          expect { @l.persistence_count = 5.5}.to raise_error(ArgumentError, "persistence_count must be a Fixnum but is a Float")
+        end
       end
     end
 

data/spec/packets/packet_item_spec.rb

@@ -32,7 +32,7 @@ module Cosmos
       end
 
       it "complains about non String format_strings" do
-        expect { @pi.format_string = 5 }.to raise_error(ArgumentError, "#{@pi.name}: format_string must be a String but is a Fixnum")
+        expect { @pi.format_string = 5.1 }.to raise_error(ArgumentError, "#{@pi.name}: format_string must be a String but is a Float")
       end
 
       it "complains about badly formatted format_strings" do
@@ -130,7 +130,7 @@ module Cosmos
       end
 
       it "complains about description that aren't Strings" do
-        expect { @pi.description = 5}.to raise_error(ArgumentError, "#{@pi.name}: description must be a String but is a Fixnum")
+        expect { @pi.description = 5.1}.to raise_error(ArgumentError, "#{@pi.name}: description must be a String but is a Float")
       end
     end
 
@@ -147,7 +147,7 @@ module Cosmos
       end
 
       it "complains about units_full that aren't Strings" do
-        expect { @pi.units_full = 5}.to raise_error(ArgumentError, "#{@pi.name}: units_full must be a String but is a Fixnum")
+        expect { @pi.units_full = 5.1}.to raise_error(ArgumentError, "#{@pi.name}: units_full must be a String but is a Float")
       end
     end
 
@@ -164,7 +164,7 @@ module Cosmos
       end
 
       it "complains about units that aren't Strings" do
-        expect { @pi.units = 5}.to raise_error(ArgumentError, "#{@pi.name}: units must be a String but is a Fixnum")
+        expect { @pi.units = 5.1}.to raise_error(ArgumentError, "#{@pi.name}: units must be a String but is a Float")
       end
     end
 
@@ -193,8 +193,8 @@ module Cosmos
     describe "check_default_and_range_data_types" do
       it "complains about default not matching data_type" do
         pi = PacketItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, 16)
-        pi.default = 1
-        expect { pi.check_default_and_range_data_types }.to raise_error(ArgumentError, "TEST: default must be an Array but is a Fixnum")
+        pi.default = 1.1
+        expect { pi.check_default_and_range_data_types }.to raise_error(ArgumentError, "TEST: default must be an Array but is a Float")
         pi = PacketItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, 16)
         pi.default = []
         expect { pi.check_default_and_range_data_types }.to_not raise_error
@@ -214,8 +214,8 @@ module Cosmos
         pi.default = 5.5
         expect { pi.check_default_and_range_data_types  }.to_not raise_error
         pi = PacketItem.new("test", 0, 32, :STRING, :BIG_ENDIAN, nil)
-        pi.default = 5
-        expect { pi.check_default_and_range_data_types }.to raise_error(ArgumentError, "TEST: default must be a String but is a Fixnum")
+        pi.default = 5.1
+        expect { pi.check_default_and_range_data_types }.to raise_error(ArgumentError, "TEST: default must be a String but is a Float")
         pi = PacketItem.new("test", 0, 32, :STRING, :BIG_ENDIAN, nil)
         pi.default = ''
         expect { pi.check_default_and_range_data_types }.to_not raise_error
@@ -258,7 +258,7 @@ module Cosmos
       end
 
       it "complains about ranges that aren't Ranges" do
-        expect { @pi.range = 5}.to raise_error(ArgumentError, "#{@pi.name}: range must be a Range but is a Fixnum")
+        expect { @pi.range = 5.1}.to raise_error(ArgumentError, "#{@pi.name}: range must be a Range but is a Float")
       end
     end