cosmos 4.2.4-java → 4.5.0-java

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

@@ -20,7 +20,7 @@ module Cosmos
     DART_REDUCTION_OPTIONS = [:NONE, :MINUTE, :HOUR, :DAY]
     DART_REDUCED_TYPES = [:AVG, :MIN, :MAX, :STDDEV]
     COLUMN_MODES = [:NORMAL, :SHARE_ALL_COLUMNS, :SHARE_INDIV_COLUMNS, :FULL_COLUMN_NAMES]
-    DEFAULT_UNIQUE_IGNORED = ['RECEIVED_TIMEFORMATTED', 'RECEIVED_TIMESECONDS']
+    DEFAULT_UNIQUE_IGNORED = ['PACKET_TIMEFORMATTED', 'PACKET_TIMESECONDS', 'RECEIVED_TIMEFORMATTED', 'RECEIVED_TIMESECONDS']
     ITEM = 'ITEM'.freeze
     TEXT = 'TEXT'.freeze
 
@@ -257,7 +257,7 @@ module Cosmos
                 else
                   raise "Unknown Dart Reduction: #{dart_reduction}"
                 end
-                
+
                 if params.length == 5
                   dart_reduced_type = :AVG
                 else
@@ -385,10 +385,7 @@ module Cosmos
 
       # Print column headings to output file
       @output_file.print "%" if @matlab_header
-      column_names().each do |column_name|
-        @output_file.print column_name
-        @output_file.print @delimiter
-      end
+      @output_file.print column_names.join(@delimiter)
       @output_file.puts ""
       @row_index += 1
     end
@@ -416,8 +413,8 @@ module Cosmos
               target_timestamp_mapping = @packet_timestamp_mapping[packet.target_name]
             end
             previous_timestamp = target_timestamp_mapping[packet.packet_name]
-            return if previous_timestamp and (packet.received_time - previous_timestamp) < @downsample_seconds
-            target_timestamp_mapping[packet.packet_name] = packet.received_time
+            return if previous_timestamp and (packet.packet_time - previous_timestamp) < @downsample_seconds
+            target_timestamp_mapping[packet.packet_name] = packet.packet_time
           end
 
           # Create a new row

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

@@ -10,11 +10,11 @@
 
 require 'cosmos'
 require 'cosmos/tools/tlm_extractor/tlm_extractor_config'
+require 'cosmos/dart/lib/dart_constants'
 
 module Cosmos
-
+  # Process the settings selected in the TlmExtractor to ultimately produce the output file
   class TlmExtractorProcessor
-
     attr_accessor :packet_log_reader
 
     def initialize
@@ -31,7 +31,7 @@ module Cosmos
         configs[-1].output_filename = File.join(output_dir, batch_name.tr(' ', '_') + '_' + filename_no_extension.tr(' ', '_') + output_extension)
       end
       process(input_filenames, configs, time_start, time_end, &block)
-    end # def process_batch
+    end
 
     def process(input_filenames, configs, time_start = nil, time_end = nil)
       Cosmos.set_working_dir do
@@ -50,10 +50,10 @@ module Cosmos
           end
           yield input_file_index, packet_count, 1.0 if block_given?
         end
-      end # Cosmos.set_working_dir
+      end
     ensure
       configs.each { |config| config.close_output_file }
-    end # def process
+    end
 
     def process_dart_batch(batch_name, output_dir, output_extension, config_filenames, time_start = nil, time_end = nil, meta_filters = [], &block)
       configs = []
@@ -72,13 +72,13 @@ module Cosmos
         items = []
         configs.each { |config| config.mode = :dart; items.concat(config.normal_items); config.open_output_file }
         items.uniq!
- 
+
         time_start = Time.utc(1970, 1, 1) unless time_start
         time_end = Time.now unless time_end
 
         results = {}
         begin
-          server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
+          server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
 
           index = 0
           items.each do |item_type, target_name, packet_name, item_name, value_type, dart_reduction, dart_reduced_type|
@@ -96,21 +96,27 @@ module Cosmos
               request['reduction'] = dart_reduction.to_s
               request['cmd_tlm'] = 'TLM'
               request['offset'] = 0
-              request['limit'] = 10000
+              request['limit'] = DartConstants::MAX_DECOM_RESULTS
               if dart_reduction == :NONE
                 request['value_type'] = value_type.to_s
               else
                 request['value_type'] = value_type.to_s + "_#{dart_reduced_type}"
               end
               request['meta_filters'] = meta_filters if meta_filters.length > 0
-              result = server.query(request)
-              results[query_string] = result
+              results[query_string] = []
+              while true
+                result = server.query(request)
+                results[query_string].concat(result)
+                break if result.length < DartConstants::MAX_DECOM_RESULTS
+                yield(index.to_f / items.length, "  Total results: #{results[query_string].length}") if block_given?
+                request['offset'] += DartConstants::MAX_DECOM_RESULTS
+              end
               index += 1
-              yield(index.to_f / items.length, "  Received #{result.length} values") if block_given?
+              yield(index.to_f / items.length, "  Total results: #{results[query_string].length}") if block_given?
             rescue Exception => error
               yield(index.to_f / items.length, "Error querying #{query_string} : #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n") if block_given?
               return # Bail out because something bad happened
-            end          
+            end
           end
 
           configs.each { |config| config.process_dart(results) }
@@ -121,7 +127,5 @@ module Cosmos
     ensure
       configs.each { |config| config.close_output_file }
     end
-
-  end # class TlmExtractorProcessor
-
-end # module Cosmos
+  end
+end

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

@@ -47,7 +47,7 @@ module Cosmos
       # Chooser for x item
       x_item_names = @telemetry_chooser.item_names
       @x_item_name = ComboboxChooser.new(self, 'X Item:', x_item_names)
-      @x_item_name.set_current('RECEIVED_TIMESECONDS')
+      @x_item_name.set_current('PACKET_TIMESECONDS')
       @overall_frame.addWidget(@x_item_name)
 
       # Button to add data object
@@ -67,7 +67,7 @@ module Cosmos
       @telemetry_chooser.update
       x_item_names = @telemetry_chooser.item_names
       @x_item_name.update_items(x_item_names, false)
-      @x_item_name.set_current('RECEIVED_TIMESECONDS')
+      @x_item_name.set_current('PACKET_TIMESECONDS')
     end
 
     # Adds a data object when the add button is pressed
@@ -87,7 +87,7 @@ module Cosmos
     def packet_changed_callback(target_name = nil, packet_name = nil)
       x_item_names = @telemetry_chooser.item_names
       @x_item_name.update_items(x_item_names, false)
-      @x_item_name.set_current('RECEIVED_TIMESECONDS')
+      @x_item_name.set_current('PACKET_TIMESECONDS')
     end
 
   end # class XyDataObjectAdder

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

@@ -75,7 +75,7 @@ module Cosmos
       if data_object.time_item_name
         @time_item_name.set_current(data_object.time_item_name)
       else
-        @time_item_name.set_current('RECEIVED_TIMESECONDS')
+        @time_item_name.set_current('PACKET_TIMESECONDS')
       end
       local_layout.addWidget(@time_item_name)
 
@@ -197,11 +197,11 @@ module Cosmos
       dart_reductions = HousekeepingDataObject::DART_REDUCTIONS.map {|x| x.to_s}
       dart_reductions.delete(data_object.dart_reduction.to_s)
       dart_reductions.unshift(data_object.dart_reduction.to_s)
-      @dart_reduction.update_items(dart_reductions, false)      
+      @dart_reduction.update_items(dart_reductions, false)
       dart_reduced_types = HousekeepingDataObject::DART_REDUCED_TYPES.map {|x| x.to_s}
       dart_reduced_types.delete(data_object.dart_reduced_type.to_s)
       dart_reduced_types.unshift(data_object.dart_reduced_type.to_s)
-      @dart_reduced_type.update_items(dart_reduced_types, false)  
+      @dart_reduced_type.update_items(dart_reduced_types, false)
 
       packet, item = System.telemetry.packet_and_item(data_object.target_name,
                                                       data_object.packet_name,
@@ -211,7 +211,7 @@ module Cosmos
         @item_array_index.show
       else
         @array_item = false
-        @item_array_index.hide 
+        @item_array_index.hide
       end
 
     end
@@ -227,11 +227,11 @@ module Cosmos
       dart_reductions = HousekeepingDataObject::DART_REDUCTIONS.map {|x| x.to_s}
       dart_reductions.delete(data_object.dart_reduction.to_s)
       dart_reductions.unshift(data_object.dart_reduction.to_s)
-      @dart_reduction.update_items(dart_reductions, false)      
+      @dart_reduction.update_items(dart_reductions, false)
       dart_reduced_types = HousekeepingDataObject::DART_REDUCED_TYPES.map {|x| x.to_s}
       dart_reduced_types.delete(data_object.dart_reduced_type.to_s)
       dart_reduced_types.unshift(data_object.dart_reduced_type.to_s)
-      @dart_reduced_type.update_items(dart_reduced_types, false)  
+      @dart_reduced_type.update_items(dart_reduced_types, false)
 
       packet, item = System.telemetry.packet_and_item(data_object.target_name,
                                                       data_object.packet_name,
@@ -241,7 +241,7 @@ module Cosmos
         @item_array_index.show
       else
         @array_item = false
-        @item_array_index.hide 
+        @item_array_index.hide
       end
     end
 

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

@@ -39,9 +39,9 @@ module Cosmos
         packet = System.telemetry.first_non_hidden
         data_object.target_name = packet.target_name
         data_object.packet_name = packet.packet_name
-        data_object.y_item_name = 'RECEIVED_TIMESECONDS'
-        data_object.x_item_name = 'RECEIVED_TIMESECONDS'
-        data_object.time_item_name = 'RECEIVED_TIMESECONDS'
+        data_object.y_item_name = 'PACKET_TIMESECONDS'
+        data_object.x_item_name = 'PACKET_TIMESECONDS'
+        data_object.time_item_name = 'PACKET_TIMESECONDS'
       end
       super(data_object)
 
@@ -123,7 +123,7 @@ module Cosmos
       data_object.y_value_type = @y_value_type.symbol
       data_object.x_value_type = @x_value_type.symbol
       data_object.dart_reduction = @dart_reduction.symbol
-      data_object.dart_reduced_type = @dart_reduced_type.symbol      
+      data_object.dart_reduced_type = @dart_reduced_type.symbol
       data_object
     end
 
@@ -158,11 +158,11 @@ module Cosmos
       dart_reductions = HousekeepingDataObject::DART_REDUCTIONS.map {|x| x.to_s}
       dart_reductions.delete(data_object.dart_reduction.to_s)
       dart_reductions.unshift(data_object.dart_reduction.to_s)
-      @dart_reduction.update_items(dart_reductions, false)      
+      @dart_reduction.update_items(dart_reductions, false)
       dart_reduced_types = HousekeepingDataObject::DART_REDUCED_TYPES.map {|x| x.to_s}
       dart_reduced_types.delete(data_object.dart_reduced_type.to_s)
       dart_reduced_types.unshift(data_object.dart_reduced_type.to_s)
-      @dart_reduced_type.update_items(dart_reduced_types, false)        
+      @dart_reduced_type.update_items(dart_reduced_types, false)
     end
 
     # Handles the y item name changing
@@ -178,11 +178,11 @@ module Cosmos
       dart_reductions = HousekeepingDataObject::DART_REDUCTIONS.map {|x| x.to_s}
       dart_reductions.delete(data_object.dart_reduction.to_s)
       dart_reductions.unshift(data_object.dart_reduction.to_s)
-      @dart_reduction.update_items(dart_reductions, false)      
+      @dart_reduction.update_items(dart_reductions, false)
       dart_reduced_types = HousekeepingDataObject::DART_REDUCED_TYPES.map {|x| x.to_s}
       dart_reduced_types.delete(data_object.dart_reduced_type.to_s)
       dart_reduced_types.unshift(data_object.dart_reduced_type.to_s)
-      @dart_reduced_type.update_items(dart_reduced_types, false)        
+      @dart_reduced_type.update_items(dart_reduced_types, false)
     end
 
     # Handles the x item name changing
@@ -197,11 +197,11 @@ module Cosmos
         dart_reductions = XyDataObject::DART_REDUCTIONS.map {|x| x.to_s}
         dart_reductions.delete(data_object.dart_reduction.to_s)
         dart_reductions.unshift(data_object.dart_reduction.to_s)
-        @dart_reduction.update_items(dart_reductions, false)      
+        @dart_reduction.update_items(dart_reductions, false)
         dart_reduced_types = XyDataObject::DART_REDUCED_TYPES.map {|x| x.to_s}
         dart_reduced_types.delete(data_object.dart_reduced_type.to_s)
         dart_reduced_types.unshift(data_object.dart_reduced_type.to_s)
-        @dart_reduced_type.update_items(dart_reduced_types, false)          
+        @dart_reduced_type.update_items(dart_reduced_types, false)
       end
     end
 

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

@@ -255,8 +255,15 @@ module Cosmos
 
         case @analysis
         when :NONE
-          @x_values << x_value
-          @y_values << (y_value + @y_offset)
+          # Support out of order x_values with no analysis
+          if @x_values.empty? or @x_values[-1] <= x_value or !@x_values.respond_to? :bsearch_index
+            @x_values << x_value
+            @y_values << y_value + @y_offset
+          else
+            loc = @x_values.bsearch_index{|x| x > x_value}
+            @x_values.insert(loc, x_value)
+            @y_values.insert(loc, y_value + @y_offset)
+          end
           @plot.redraw_needed = true
 
         when :DIFFERENCE, :ALLAN_DEV
@@ -429,7 +436,7 @@ module Cosmos
         @value_type = :CONVERTED unless during_configuration
       end
 
-      @time_item_name = 'RECEIVED_TIMESECONDS' unless @time_item_name
+      @time_item_name = 'PACKET_TIMESECONDS' unless @time_item_name
 
       # Update limits lines
       self.show_limits_lines = @show_limits_lines

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

@@ -99,7 +99,7 @@ module Cosmos
       string << "      X_VALUE_TYPE #{@x_value_type}\n"
       string << "      Y_VALUE_TYPE #{@y_value_type}\n"
       string << "      DART_REDUCTION #{@dart_reduction}\n"
-      string << "      DART_REDUCED_TYPE #{@dart_reduced_type}\n"      
+      string << "      DART_REDUCED_TYPE #{@dart_reduced_type}\n"
       string
     end # def configuration_string
 
@@ -184,7 +184,7 @@ module Cosmos
           else
             raise ArgumentError, "Unknown DART_REDUCTION value: #{dart_reduction}"
           end
-  
+
         when 'DART_REDUCED_TYPE'
           # Expect 1 parameter
           parser.verify_num_parameters(1, 1, "DART_REDUCED_TYPE <AVG, MIN, MAX, STDDEV>")
@@ -193,7 +193,7 @@ module Cosmos
             @dart_reduced_type = dart_reduced_type
           else
             raise ArgumentError, "Unknown DART_REDUCED_TYPE value: #{dart_reduced_type}"
-          end     
+          end
 
       else
         # Unknown keywords are passed to parent data object
@@ -263,7 +263,7 @@ module Cosmos
         prune_to_max_points_saved()
       rescue Exception => error
         handle_process_exception(error, "#{@target_name} #{@packet_name} #{@x_item_name} or #{@y_item_name}")
-      end      
+      end
     end
 
     # Returns the name of this data object
@@ -305,7 +305,7 @@ module Cosmos
       data_object.x_value_type = @x_value_type
       data_object.y_value_type = @y_value_type
       data_object.dart_reduction = @dart_reduction
-      data_object.dart_reduced_type = @dart_reduced_type      
+      data_object.dart_reduced_type = @dart_reduced_type
       data_object
     end
 
@@ -351,7 +351,7 @@ module Cosmos
         @y_value_type = :CONVERTED unless @during_configuration
       end
 
-      @time_item_name = 'RECEIVED_TIMESECONDS' if !@time_item_name
+      @time_item_name = 'PACKET_TIMESECONDS' if !@time_item_name
     end
 
     # Sets time item

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

@@ -324,9 +324,9 @@ module Cosmos
         end
         if plot
           @tabbed_plots_config.add_plot(tab_index, plot)
-          @status_bar.showMessage(tr("Add Plot Succeeded"))
+          @status_bar.showMessage("Add Plot Succeeded")
         else
-          @status_bar.showMessage(tr("Add Plot Canceled"))
+          @status_bar.showMessage("Add Plot Canceled")
           return false
         end
 
@@ -399,7 +399,7 @@ module Cosmos
         tab.gui_layout = layout
         #~ tab.gui_layout.connect(SEL_RIGHTBUTTONRELEASE, method(:handle_plot_right_button_release))
 
-        @status_bar.showMessage(tr("Plot Deleted"))
+        @status_bar.showMessage("Plot Deleted")
         @config_modified_callback.call() if @config_modified_callback
       else
         Qt::MessageBox.information(self, 'Information', 'Please select a plot')
@@ -434,11 +434,11 @@ module Cosmos
         plot_editor.dispose
         if plot
           plot.gui_object.update(true)
-          @status_bar.showMessage(tr("Plot Edited"))
+          @status_bar.showMessage("Plot Edited")
           edited = true
           @config_modified_callback.call() if @config_modified_callback
         else
-          @status_bar.showMessage(tr("Plot Edit Canceled"))
+          @status_bar.showMessage("Plot Edit Canceled")
         end
       end
 
@@ -548,7 +548,7 @@ module Cosmos
         data_object = data_object_editor.execute
         data_object_editor.dispose
         unless data_object
-          @status_bar.showMessage(tr("Add Data Object Canceled"))
+          @status_bar.showMessage("Add Data Object Canceled")
           return false
         end
       end
@@ -566,7 +566,7 @@ module Cosmos
       # Update data object list
       fill_data_object_list_for_plot(@tabbed_plots_config.tabs[tab_index].plots[plot_index])
 
-      @status_bar.showMessage(tr("Add Data Object Succeeded"))
+      @status_bar.showMessage("Add Data Object Succeeded")
       @config_modified_callback.call() if @config_modified_callback
       return true
     end # def add_data_object
@@ -618,11 +618,11 @@ module Cosmos
           data_object_editor.dispose
           if data_object
             @tabbed_plots_config.edit_data_object(tab_index, plot_index, data_object_idx, data_object)
-            @status_bar.showMessage(tr("Data Object(s) Edited"))
+            @status_bar.showMessage("Data Object(s) Edited")
             edited = true
             @config_modified_callback.call() if @config_modified_callback
           else
-            @status_bar.showMessage(tr("Edit Data Object Canceled"))
+            @status_bar.showMessage("Edit Data Object Canceled")
           end
         end
 
@@ -651,7 +651,7 @@ module Cosmos
           data_object = @tabbed_plots_config.duplicate_data_object(tab_index, plot_index, data_object_idx)
           data_object.color = get_free_color(@tabbed_plots_config.tabs[tab_index]) unless data_object.assigned_color
         end
-        @status_bar.showMessage(tr("Data Object(s) Duplicated"))
+        @status_bar.showMessage("Data Object(s) Duplicated")
 
         plot.gui_object.update(true)
         fill_data_object_list_for_plot(@tabbed_plots_config.tabs[tab_index].plots[plot_index])
@@ -701,7 +701,7 @@ module Cosmos
           @tabbed_plots_config.reset_data_objects(tab_index, plot_index, data_object_idx)
         end
         redraw_plots(true, true)
-        @status_bar.showMessage(tr("Data Object(s) Reset"))
+        @status_bar.showMessage("Data Object(s) Reset")
       end
     end
 
@@ -954,9 +954,9 @@ module Cosmos
                                             "Are you sure you want to delete the selected data objects?",
                                             Qt::MessageBox::Yes | Qt::MessageBox::No, Qt::MessageBox::No)
             if result == Qt::MessageBox::No
-              otp.status_bar.showMessage(tr("Data Object Deletion Canceled"))
+              otp.status_bar.showMessage("Data Object Deletion Canceled")
             else
-              otp.status_bar.showMessage(tr("Data Object Deleted"))
+              otp.status_bar.showMessage("Data Object Deleted")
               otp.delete_data_object()
             end
             otp.resume() unless paused
@@ -973,7 +973,7 @@ module Cosmos
               self,
               SLOT('data_object_context_menu(const QPoint&)'))
       @data_object_list.connect(SIGNAL('itemClicked(QListWidgetItem*)')) do
-        @status_bar.showMessage(tr("Drag and drop to reorder. Items are drawn in order from top to bottom."))
+        @status_bar.showMessage("Drag and drop to reorder. Items are drawn in order from top to bottom.")
       end
       @data_object_list.addItemColor('No Plot Selected')
       @tabbed_plots_left_frame.addWidget(@data_object_list)