cosmos 4.2.4-java → 4.3.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
@@ -416,8 +416,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_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)

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

@@ -36,7 +36,7 @@ module Cosmos
       @base_title = self.windowTitle
       Cosmos.load_cosmos_icon("tlm_grapher.png")
 
-      statusBar.showMessage(tr("")) # Show blank message to initialize status bar
+      statusBar.showMessage("") # Show blank message to initialize status bar
 
       initialize_actions()
       initialize_menus(options)
@@ -91,131 +91,131 @@ module Cosmos
       super()
 
       # File Menu Actions
-      @file_process = Qt::Action.new(tr('&Open Log'), self)
-      @file_process_keyseq = Qt::KeySequence.new(tr('Ctrl+O'))
+      @file_process = Qt::Action.new('&Open Log', self)
+      @file_process_keyseq = Qt::KeySequence.new('Ctrl+O')
       @file_process.shortcut = @file_process_keyseq
-      @file_process.statusTip = tr('Open Log File')
+      @file_process.statusTip = 'Open Log File'
       @file_process.connect(SIGNAL('triggered()')) { on_file_process_log() }
 
-      @file_dart = Qt::Action.new(tr('&Query DART Database'), self)
-      @file_dart_keyseq = Qt::KeySequence.new(tr('Ctrl+D'))
+      @file_dart = Qt::Action.new('&Query DART Database', self)
+      @file_dart_keyseq = Qt::KeySequence.new('Ctrl+D')
       @file_dart.shortcut = @file_dart_keyseq
-      @file_dart.statusTip = tr('Query DART Database')
+      @file_dart.statusTip = 'Query DART Database'
       @file_dart.connect(SIGNAL('triggered()')) { on_file_dart() }
 
-      @file_load = Qt::Action.new(Cosmos.get_icon('open.png'), tr('&Load Config'), self)
-      @file_load.statusTip = tr('Load Saved Configuration')
+      @file_load = Qt::Action.new(Cosmos.get_icon('open.png'), '&Load Config', self)
+      @file_load.statusTip = 'Load Saved Configuration'
       @file_load.connect(SIGNAL('triggered()')) { on_file_load_config() }
 
-      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), tr('&Save Config'), self)
-      @file_save_keyseq = Qt::KeySequence.new(tr('Ctrl+S'))
+      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), '&Save Config', self)
+      @file_save_keyseq = Qt::KeySequence.new('Ctrl+S')
       @file_save.shortcut = @file_save_keyseq
-      @file_save.statusTip = tr('Save Current Configuration')
+      @file_save.statusTip = 'Save Current Configuration'
       @file_save.connect(SIGNAL('triggered()')) { on_file_save_config() }
 
-      @file_screenshot = Qt::Action.new(Cosmos.get_icon('screenshot.png'), tr('Screensho&t'), self)
-      @file_screenshot.statusTip = tr('Screenshot of Application')
+      @file_screenshot = Qt::Action.new(Cosmos.get_icon('screenshot.png'), 'Screensho&t', self)
+      @file_screenshot.statusTip = 'Screenshot of Application'
       @file_screenshot.connect(SIGNAL('triggered()')) { on_file_screenshot() }
 
-      @replay_action = Qt::Action.new(tr('Toggle Replay Mode'), self)
-      @replay_action.statusTip = tr('Toggle Replay Mode')
+      @replay_action = Qt::Action.new('Toggle Replay Mode', self)
+      @replay_action.statusTip = 'Toggle Replay Mode'
       @replay_action.connect(SIGNAL('triggered()')) { toggle_replay_mode() }
 
       # Tab Menu Actions
-      @tab_add = Qt::Action.new(Cosmos.get_icon('add_tab.png'), tr('&Add Tab'), self)
-      @tab_add.statusTip = tr('Add New Tab')
+      @tab_add = Qt::Action.new(Cosmos.get_icon('add_tab.png'), '&Add Tab', self)
+      @tab_add.statusTip = 'Add New Tab'
       @tab_add.connect(SIGNAL('triggered()')) { on_tab_add() }
 
-      @tab_delete = Qt::Action.new(Cosmos.get_icon('delete_tab.png'), tr('&Delete Tab'), self)
-      @tab_delete.statusTip = tr('Delete Active Tab')
+      @tab_delete = Qt::Action.new(Cosmos.get_icon('delete_tab.png'), '&Delete Tab', self)
+      @tab_delete.statusTip = 'Delete Active Tab'
       @tab_delete.connect(SIGNAL('triggered()')) { on_tab_delete() }
 
-      @tab_edit = Qt::Action.new(Cosmos.get_icon('edit_tab.png'), tr('&Edit Tab'), self)
-      @tab_edit.statusTip = tr('Edit Active Tab')
+      @tab_edit = Qt::Action.new(Cosmos.get_icon('edit_tab.png'), '&Edit Tab', self)
+      @tab_edit.statusTip = 'Edit Active Tab'
       @tab_edit.connect(SIGNAL('triggered()')) { on_tab_edit() }
 
-      @tab_screenshot = Qt::Action.new(Cosmos.get_icon('screenshot.png'), tr('&Screenshot Tab'), self)
-      @tab_screenshot.statusTip = tr('Screenshot of Active Tab')
+      @tab_screenshot = Qt::Action.new(Cosmos.get_icon('screenshot.png'), '&Screenshot Tab', self)
+      @tab_screenshot.statusTip = 'Screenshot of Active Tab'
       @tab_screenshot.connect(SIGNAL('triggered()')) { on_tab_screenshot() }
 
-      @tab_export = Qt::Action.new(tr('E&xport Tab Data Objects'), self)
-      @tab_export.statusTip = tr('Export Tab Data Object(s)')
+      @tab_export = Qt::Action.new('E&xport Tab Data Objects', self)
+      @tab_export.statusTip = 'Export Tab Data Object(s)'
       @tab_export.connect(SIGNAL('triggered()')) { on_tab_export() }
 
-      @tab_reset = Qt::Action.new(tr('&Reset Tab Data Objects'), self)
-      @tab_reset.statusTip = tr('Reset Tab Data Object(s)')
+      @tab_reset = Qt::Action.new('&Reset Tab Data Objects', self)
+      @tab_reset.statusTip = 'Reset Tab Data Object(s)'
       @tab_reset.connect(SIGNAL('triggered()')) { on_tab_reset() }
 
       # Plot Menu Actions
-      @plot_add = Qt::Action.new(Cosmos.get_icon('add_plot.png'), tr('&Add Plot'), self)
-      @plot_add.statusTip = tr('Add New Plot')
+      @plot_add = Qt::Action.new(Cosmos.get_icon('add_plot.png'), '&Add Plot', self)
+      @plot_add.statusTip = 'Add New Plot'
       @plot_add.connect(SIGNAL('triggered()')) { on_plot_add() }
 
-      @plot_delete = Qt::Action.new(Cosmos.get_icon('delete_plot.png'), tr('&Delete Plot'), self)
-      @plot_delete.statusTip = tr('Delete Selected Plot')
+      @plot_delete = Qt::Action.new(Cosmos.get_icon('delete_plot.png'), '&Delete Plot', self)
+      @plot_delete.statusTip = 'Delete Selected Plot'
       @plot_delete.connect(SIGNAL('triggered()')) { on_plot_delete() }
 
-      @plot_edit = Qt::Action.new(Cosmos.get_icon('edit_plot.png'), tr('&Edit Plot'), self)
-      @plot_edit.statusTip = tr('Edit Selected Plot')
+      @plot_edit = Qt::Action.new(Cosmos.get_icon('edit_plot.png'), '&Edit Plot', self)
+      @plot_edit.statusTip = 'Edit Selected Plot'
       @plot_edit.connect(SIGNAL('triggered()')) { on_plot_edit() }
 
-      @plot_screenshot = Qt::Action.new(Cosmos.get_icon('screenshot.png'), tr('&Screenshot Plot'), self)
-      @plot_screenshot.statusTip = tr('Screenshot Selected Plot')
+      @plot_screenshot = Qt::Action.new(Cosmos.get_icon('screenshot.png'), '&Screenshot Plot', self)
+      @plot_screenshot.statusTip = 'Screenshot Selected Plot'
       @plot_screenshot.connect(SIGNAL('triggered()')) { on_plot_screenshot() }
 
-      @plot_add_data = Qt::Action.new(Cosmos.get_icon('add_database.png'), tr('Add Data &Object'), self)
-      @plot_add_data.statusTip = tr('Add Data Object')
+      @plot_add_data = Qt::Action.new(Cosmos.get_icon('add_database.png'), 'Add Data &Object', self)
+      @plot_add_data.statusTip = 'Add Data Object'
       @plot_add_data.connect(SIGNAL('triggered()')) { on_data_object_add() }
 
-      @plot_edit_data = Qt::Action.new(Cosmos.get_icon('edit_database.png'), tr('Edit &Plot Data Objects'), self)
-      @plot_edit_data.statusTip = tr('Edit Plot Data Object(s)')
+      @plot_edit_data = Qt::Action.new(Cosmos.get_icon('edit_database.png'), 'Edit &Plot Data Objects', self)
+      @plot_edit_data.statusTip = 'Edit Plot Data Object(s)'
       @plot_edit_data.connect(SIGNAL('triggered()')) { on_plot_data_object_edit() }
 
-      @plot_export = Qt::Action.new(tr('E&xport Plot Data Objects'), self)
-      @plot_export.statusTip = tr('Export Plot Data Object(s)')
+      @plot_export = Qt::Action.new('E&xport Plot Data Objects', self)
+      @plot_export.statusTip = 'Export Plot Data Object(s)'
       @plot_export.connect(SIGNAL('triggered()')) { on_plot_export() }
 
-      @plot_reset = Qt::Action.new(tr('&Reset Plot Data Objects'), self)
-      @plot_reset.statusTip = tr('Reset Plot Data Object(s)')
+      @plot_reset = Qt::Action.new('&Reset Plot Data Objects', self)
+      @plot_reset.statusTip = 'Reset Plot Data Object(s)'
       @plot_reset.connect(SIGNAL('triggered()')) { on_plot_reset() }
 
       # Data Object Menu
-      @data_add = Qt::Action.new(Cosmos.get_icon('add_database.png'), tr('&Add Data Object'), self)
-      @data_add.statusTip = tr('Add Data Object')
+      @data_add = Qt::Action.new(Cosmos.get_icon('add_database.png'), '&Add Data Object', self)
+      @data_add.statusTip = 'Add Data Object'
       @data_add.connect(SIGNAL('triggered()')) { on_data_object_add() }
 
-      @data_delete = Qt::Action.new(Cosmos.get_icon('delete_database.png'), tr('&Delete Data Object'), self)
-      @data_delete.statusTip = tr('Delete Selected Data Object(s)')
+      @data_delete = Qt::Action.new(Cosmos.get_icon('delete_database.png'), '&Delete Data Object', self)
+      @data_delete.statusTip = 'Delete Selected Data Object(s)'
       @data_delete.connect(SIGNAL('triggered()')) { on_data_object_delete() }
 
-      @data_edit = Qt::Action.new(Cosmos.get_icon('edit_database.png'), tr('&Edit Data Object'), self)
-      @data_edit.statusTip = tr('Edit Selected Data Object(s)')
+      @data_edit = Qt::Action.new(Cosmos.get_icon('edit_database.png'), '&Edit Data Object', self)
+      @data_edit.statusTip = 'Edit Selected Data Object(s)'
       @data_edit.connect(SIGNAL('triggered()')) { on_data_object_edit() }
 
-      @data_duplicate = Qt::Action.new(tr('Du&plicate Data Object'), self)
-      @data_duplicate.statusTip = tr('Duplicate Selected Data Object(s)')
+      @data_duplicate = Qt::Action.new('Du&plicate Data Object', self)
+      @data_duplicate.statusTip = 'Duplicate Selected Data Object(s)'
       @data_duplicate.connect(SIGNAL('triggered()')) { on_data_object_duplicate() }
 
-      @data_export = Qt::Action.new(tr('E&xport Data Object'), self)
-      @data_export.statusTip = tr('Export Selected Data Object(s)')
+      @data_export = Qt::Action.new('E&xport Data Object', self)
+      @data_export.statusTip = 'Export Selected Data Object(s)'
       @data_export.connect(SIGNAL('triggered()')) { on_data_object_export() }
 
-      @data_export_all = Qt::Action.new(tr('Expor&t All Data Objects'), self)
-      @data_export_all.statusTip = tr('Export All Data Objects')
+      @data_export_all = Qt::Action.new('Expor&t All Data Objects', self)
+      @data_export_all.statusTip = 'Export All Data Objects'
       @data_export_all.connect(SIGNAL('triggered()')) { on_data_object_export_all() }
 
-      @data_reset = Qt::Action.new(tr('&Reset Data Object'), self)
-      @data_reset.statusTip = tr('Reset Selected Data Object(s)')
+      @data_reset = Qt::Action.new('&Reset Data Object', self)
+      @data_reset.statusTip = 'Reset Selected Data Object(s)'
       @data_reset.connect(SIGNAL('triggered()')) { on_data_object_reset() }
 
-      @data_reset_all = Qt::Action.new(tr('Re&set All Data Objects'), self)
-      @data_reset_all.statusTip = tr('Reset All Data Objects')
+      @data_reset_all = Qt::Action.new('Re&set All Data Objects', self)
+      @data_reset_all.statusTip = 'Reset All Data Objects'
       @data_reset_all.connect(SIGNAL('triggered()')) { on_data_object_reset_all() }
     end
 
     def initialize_menus(options)
       # File Menu
-      @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu = menuBar.addMenu('&File')
       @file_menu.addAction(@file_process)
       @file_menu.addAction(@file_dart)
       @file_menu.addSeparator()
@@ -228,7 +228,7 @@ module Cosmos
       @file_menu.addSeparator()
       @file_menu.addAction(@exit_action)
 
-      @tab_menu = menuBar.addMenu(tr('&Tab'))
+      @tab_menu = menuBar.addMenu('&Tab')
       @tab_menu.addAction(@tab_add)
       @tab_menu.addAction(@tab_delete)
       @tab_menu.addAction(@tab_edit)
@@ -238,7 +238,7 @@ module Cosmos
       @tab_menu.addSeparator()
       @tab_menu.addAction(@tab_reset)
 
-      @plot_menu = menuBar.addMenu(tr('&Plot'))
+      @plot_menu = menuBar.addMenu('&Plot')
       @plot_menu.addAction(@plot_add)
       @plot_menu.addAction(@plot_delete)
       @plot_menu.addAction(@plot_edit)
@@ -251,7 +251,7 @@ module Cosmos
       @plot_menu.addSeparator()
       @plot_menu.addAction(@plot_reset)
 
-      @data_menu = menuBar.addMenu(tr('&Data Object'))
+      @data_menu = menuBar.addMenu('&Data Object')
       @data_menu.addAction(@data_add)
       @data_menu.addAction(@data_delete)
       @data_menu.addAction(@data_edit)
@@ -285,7 +285,7 @@ module Cosmos
       @replay_flag = Qt::Label.new("Replay Mode")
       @replay_flag.setStyleSheet("background:green;color:white;padding:5px;font-weight:bold;height:30px;")
       @right_frame.addWidget(@replay_flag)
-      @replay_flag.hide      
+      @replay_flag.hide
       @right_widget.setLayout(@right_frame)
       @splitter.addWidget(@right_widget)
       @splitter.setStretchFactor(0,0) # Set the left side stretch factor to 0
@@ -363,7 +363,7 @@ module Cosmos
 
       if !File.exist?(@config_filename)
         # Warn if the configuration file did not exist
-        statusBar.showMessage(tr("Configuration File does not exist: #{@config_filename}. Using default configuration."))
+        statusBar.showMessage("Configuration File does not exist: #{@config_filename}. Using default configuration.")
       end
       update_window_title()
     end # def load_configuration
@@ -397,9 +397,9 @@ module Cosmos
           begin
             yield filename
             @screenshot_dir = File.dirname(filename)
-            statusBar.showMessage(tr("Screenshot saved to: #{filename}"))
+            statusBar.showMessage("Screenshot saved to: #{filename}")
           rescue Exception => error
-            statusBar.showMessage(tr("Screenshot creation failed"))
+            statusBar.showMessage("Screenshot creation failed")
             Qt::MessageBox.warning(
               self,
               "Screenshot Creation Error",
@@ -426,9 +426,9 @@ module Cosmos
             dialog.complete
           end
           @export_dir = File.dirname(filename)
-          statusBar.showMessage(tr("Exported to #{filename}"))
+          statusBar.showMessage("Exported to #{filename}")
         rescue Exception => error
-          statusBar.showMessage(tr("Export Failed"))
+          statusBar.showMessage("Export Failed")
           Qt::MessageBox.warning(
             self,
             "Export Error",
@@ -449,9 +449,9 @@ module Cosmos
         yield
         @config_modified = true if delete
         update_window_title() if delete
-        statusBar.showMessage(tr("#{action.capitalize} #{item} successful"))
+        statusBar.showMessage("#{action.capitalize} #{item} successful")
       else
-        statusBar.showMessage(tr("#{action.capitalize} #{item} canceled"))
+        statusBar.showMessage("#{action.capitalize} #{item} canceled")
       end
     end
     def reset(item)
@@ -642,7 +642,7 @@ module Cosmos
       running = @realtime_thread ? true : false
       handle_stop()
       System.telemetry.reset
-      @tabbed_plots.reset_all_data_objects      
+      @tabbed_plots.reset_all_data_objects
       @replay_mode = !@replay_mode
       if @replay_mode
         @replay_flag.show
@@ -673,7 +673,7 @@ module Cosmos
       paused = @tabbed_plots.paused?
       @tabbed_plots.pause
       @tabbed_plots.add_tab
-      statusBar.showMessage(tr("Tab Added"))
+      statusBar.showMessage("Tab Added")
       @config_modified = true
       update_window_title()
       @tabbed_plots.resume unless paused
@@ -693,7 +693,7 @@ module Cosmos
       tab_selected? do
         edited = @tabbed_plots.edit_tab
         if edited
-          statusBar.showMessage(tr("Tab Edited"))
+          statusBar.showMessage("Tab Edited")
           @config_modified = true
           update_window_title()
         end
@@ -979,7 +979,7 @@ module Cosmos
       if @realtime_thread
         # Resume plotting in case it was paused
         @tabbed_plots.resume
-        statusBar.showMessage(tr("Plot Updates Resumed"))
+        statusBar.showMessage("Plot Updates Resumed")
         @realtime_button_bar.state = 'Running'
       else
         System.load_configuration
@@ -992,7 +992,7 @@ module Cosmos
 
         # Startup realtime thread
         @realtime_button_bar.state = 'Connecting'
-        statusBar.showMessage(tr("Connecting to COSMOS Server"))
+        statusBar.showMessage("Connecting to COSMOS Server")
         @realtime_thread = TabbedPlotsRealtimeThread.new(@tabbed_plots_config, method(:realtime_thread_connection_success_callback), method(:realtime_thread_connection_failed_callback), method(:realtime_thread_connection_lost_callback), method(:realtime_thread_fatal_exception_callback), @replay_mode)
       end
     end # def handle_start
@@ -1002,7 +1002,7 @@ module Cosmos
       if @realtime_thread
         # Pause plotting
         @tabbed_plots.pause
-        statusBar.showMessage(tr("Plot Updates Paused - Still Collecting Data in the Background"))
+        statusBar.showMessage("Plot Updates Paused - Still Collecting Data in the Background")
         @realtime_button_bar.state = 'Paused'
       else
         # Do Nothing
@@ -1017,7 +1017,7 @@ module Cosmos
         @realtime_thread.kill
         @realtime_thread = nil
         @realtime_button_bar.state = 'Stopped'
-        statusBar.showMessage(tr("Disconnection from COSMOS Server Successful"))
+        statusBar.showMessage("Disconnection from COSMOS Server Successful")
       else
         # Do Nothing
       end
@@ -1032,7 +1032,7 @@ module Cosmos
     def realtime_thread_connection_success_callback
       # Notify user of connection success
       Qt.execute_in_main_thread(true) do
-        statusBar.showMessage(tr("Connection to COSMOS Server Successful"))
+        statusBar.showMessage("Connection to COSMOS Server Successful")
         if @tabbed_plots.paused?
           @realtime_button_bar.state = 'Paused'
         else
@@ -1045,7 +1045,7 @@ module Cosmos
     def realtime_thread_connection_failed_callback(error)
       # Notify user connection failed
       Qt.execute_in_main_thread(true) do
-        statusBar.showMessage(tr("Connection to COSMOS Server Failed : #{error.class} : #{error.message}"))
+        statusBar.showMessage("Connection to COSMOS Server Failed : #{error.class} : #{error.message}")
         @realtime_button_bar.state = 'Connecting'
       end
     end # def realtime_thread_connection_failed_callback
@@ -1055,12 +1055,12 @@ module Cosmos
       # Notify user of connection lost
       if error
         Qt.execute_in_main_thread(true) do
-          statusBar.showMessage(tr("Connection to COSMOS Server Lost : #{error.class} : #{error.message}"))
+          statusBar.showMessage("Connection to COSMOS Server Lost : #{error.class} : #{error.message}")
           @realtime_button_bar.state = 'Connecting'
         end
       else
         Qt.execute_in_main_thread(true) do
-          statusBar.showMessage(tr("Connection to COSMOS Server Lost"))
+          statusBar.showMessage("Connection to COSMOS Server Lost")
           @realtime_button_bar.state = 'Connecting'
         end
       end