cosmos 4.2.4-java → 4.5.0-java

data/lib/cosmos/tools/opengl_builder/opengl_builder.rb

@@ -57,90 +57,90 @@ module Cosmos
       super()
 
       # File Menu
-      @file_open = Qt::Action.new(tr('&Open Scene'), self)
-      @file_open_key_seq = Qt::KeySequence.new(tr('Ctrl+O'))
+      @file_open = Qt::Action.new('&Open Scene', self)
+      @file_open_key_seq = Qt::KeySequence.new('Ctrl+O')
       @file_open.shortcut = @file_open_key_seq
-      @file_open.statusTip = tr('Open Scene File')
+      @file_open.statusTip = 'Open Scene File'
       @file_open.connect(SIGNAL('triggered()')) { file_open() }
 
-      @file_add_shape = Qt::Action.new(tr('&Add Shape'), self)
-      @file_add_shape_key_seq = Qt::KeySequence.new(tr('Ctrl+A'))
+      @file_add_shape = Qt::Action.new('&Add Shape', self)
+      @file_add_shape_key_seq = Qt::KeySequence.new('Ctrl+A')
       @file_add_shape.shortcut = @file_add_shape_key_seq
-      @file_add_shape.statusTip = tr('Add a Shape to the Scene')
+      @file_add_shape.statusTip = 'Add a Shape to the Scene'
       @file_add_shape.connect(SIGNAL('triggered()')) { file_add_shape() }
 
-      @file_export = Qt::Action.new(tr('&Export Scene'), self)
-      @file_export_key_seq = Qt::KeySequence.new(tr('Ctrl+X'))
+      @file_export = Qt::Action.new('&Export Scene', self)
+      @file_export_key_seq = Qt::KeySequence.new('Ctrl+X')
       @file_export.shortcut = @file_export_key_seq
-      @file_export.statusTip = tr('Export Scene to File')
+      @file_export.statusTip = 'Export Scene to File'
       @file_export.connect(SIGNAL('triggered()')) { file_export() }
 
       # View Menu
-      @view_perspective = Qt::Action.new(tr('&Perspective'), self)
-      @view_perspective_key_seq = Qt::KeySequence.new(tr('Ctrl+P'))
+      @view_perspective = Qt::Action.new('&Perspective', self)
+      @view_perspective_key_seq = Qt::KeySequence.new('Ctrl+P')
       @view_perspective.shortcut = @view_perspective_key_seq
-      @view_perspective.statusTip = tr('Perspective View')
+      @view_perspective.statusTip = 'Perspective View'
       @view_perspective.connect(SIGNAL('triggered()')) { view_perspective() }
 
-      @view_top = Qt::Action.new(tr('&Top'), self)
-      @view_top_key_seq = Qt::KeySequence.new(tr('Ctrl+T'))
+      @view_top = Qt::Action.new('&Top', self)
+      @view_top_key_seq = Qt::KeySequence.new('Ctrl+T')
       @view_top.shortcut = @view_top_key_seq
-      @view_top.statusTip = tr('View From Above')
+      @view_top.statusTip = 'View From Above'
       @view_top.connect(SIGNAL('triggered()')) { view_top() }
 
-      @view_bottom = Qt::Action.new(tr('&Bottom'), self)
-      @view_bottom_key_seq = Qt::KeySequence.new(tr('Ctrl+B'))
+      @view_bottom = Qt::Action.new('&Bottom', self)
+      @view_bottom_key_seq = Qt::KeySequence.new('Ctrl+B')
       @view_bottom.shortcut = @view_bottom_key_seq
-      @view_bottom.statusTip = tr('View From Below')
+      @view_bottom.statusTip = 'View From Below'
       @view_bottom.connect(SIGNAL('triggered()')) { view_bottom() }
 
-      @view_front = Qt::Action.new(tr('&Front'), self)
-      @view_front_key_seq = Qt::KeySequence.new(tr('Ctrl+F'))
+      @view_front = Qt::Action.new('&Front', self)
+      @view_front_key_seq = Qt::KeySequence.new('Ctrl+F')
       @view_front.shortcut = @view_front_key_seq
-      @view_front.statusTip = tr('View From Front')
+      @view_front.statusTip = 'View From Front'
       @view_front.connect(SIGNAL('triggered()')) { view_front() }
 
-      @view_back = Qt::Action.new(tr('Bac&k'), self)
-      @view_back_key_seq = Qt::KeySequence.new(tr('Ctrl+W'))
+      @view_back = Qt::Action.new('Bac&k', self)
+      @view_back_key_seq = Qt::KeySequence.new('Ctrl+W')
       @view_back.shortcut = @view_back_key_seq
-      @view_back.statusTip = tr('View From Back')
+      @view_back.statusTip = 'View From Back'
       @view_back.connect(SIGNAL('triggered()')) { view_back() }
 
-      @view_left = Qt::Action.new(tr('&Left'), self)
-      @view_left_key_seq = Qt::KeySequence.new(tr('Ctrl+L'))
+      @view_left = Qt::Action.new('&Left', self)
+      @view_left_key_seq = Qt::KeySequence.new('Ctrl+L')
       @view_left.shortcut = @view_left_key_seq
-      @view_left.statusTip = tr('View From Left')
+      @view_left.statusTip = 'View From Left'
       @view_left.connect(SIGNAL('triggered()')) { view_left() }
 
-      @view_right = Qt::Action.new(tr('&Right'), self)
-      @view_right_key_seq = Qt::KeySequence.new(tr('Ctrl+R'))
+      @view_right = Qt::Action.new('&Right', self)
+      @view_right_key_seq = Qt::KeySequence.new('Ctrl+R')
       @view_right.shortcut = @view_right_key_seq
-      @view_right.statusTip = tr('View From Right')
+      @view_right.statusTip = 'View From Right'
       @view_right.connect(SIGNAL('triggered()')) { view_right() }
 
       # Show Menu
-      @show_scene = Qt::Action.new(tr('Show &Scene'), self)
-      @show_scene_key_seq = Qt::KeySequence.new(tr('Ctrl+S'))
+      @show_scene = Qt::Action.new('Show &Scene', self)
+      @show_scene_key_seq = Qt::KeySequence.new('Ctrl+S')
       @show_scene.shortcut = @show_scene_key_seq
-      @show_scene.statusTip = tr('Show the Normal Scene')
+      @show_scene.statusTip = 'Show the Normal Scene'
       @show_scene.connect(SIGNAL('triggered()')) { show_scene() }
 
-      @show_earth = Qt::Action.new(tr('Show &Earth'), self)
-      @show_earth_key_seq = Qt::KeySequence.new(tr('Ctrl+E'))
+      @show_earth = Qt::Action.new('Show &Earth', self)
+      @show_earth_key_seq = Qt::KeySequence.new('Ctrl+E')
       @show_earth.shortcut = @show_earth_key_seq
-      @show_earth.statusTip = tr('Show the Earth')
+      @show_earth.statusTip = 'Show the Earth'
       @show_earth.connect(SIGNAL('triggered()')) { show_earth() }
 
-      @show_moon = Qt::Action.new(tr('Show &Moon'), self)
-      @show_moon_key_seq = Qt::KeySequence.new(tr('Ctrl+M'))
+      @show_moon = Qt::Action.new('Show &Moon', self)
+      @show_moon_key_seq = Qt::KeySequence.new('Ctrl+M')
       @show_moon.shortcut = @show_moon_key_seq
-      @show_moon.statusTip = tr('Show the Moon')
+      @show_moon.statusTip = 'Show the Moon'
       @show_moon.connect(SIGNAL('triggered()')) { show_moon() }
     end
 
     def initialize_menus
       # File Menu
-      @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu = menuBar.addMenu('&File')
       @file_menu.addAction(@file_open)
       @file_menu.addAction(@file_add_shape)
       @file_menu.addAction(@file_export)
@@ -148,7 +148,7 @@ module Cosmos
       @file_menu.addAction(@exit_action)
 
       # View Menu
-      @view_menu = menuBar.addMenu(tr('&View'))
+      @view_menu = menuBar.addMenu('&View')
       @view_menu.addAction(@view_perspective)
       @view_menu.addAction(@view_top)
       @view_menu.addAction(@view_bottom)
@@ -158,7 +158,7 @@ module Cosmos
       @view_menu.addAction(@view_right)
 
       # Show Menu
-      @show_menu = menuBar.addMenu(tr('&Show'))
+      @show_menu = menuBar.addMenu('&Show')
       @show_menu.addAction(@show_scene)
       @show_menu.addAction(@show_earth)
       @show_menu.addAction(@show_moon)

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

@@ -10,7 +10,6 @@
 
 require 'cosmos'
 Cosmos.catch_fatal_exception do
-  require 'cosmos/script'
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/dialogs/tlm_details_dialog'
   require 'cosmos/gui/dialogs/tlm_edit_dialog'
@@ -18,6 +17,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/dialogs/exception_dialog'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/widgets/full_text_search_line_edit'
+  require 'cosmos/script'
 end
 
 module Cosmos
@@ -74,6 +74,7 @@ module Cosmos
               update_tlm_items(item_name)
             end
           end
+          toggle_replay_mode() if options.replay
         end
 
         # Unconfigure CosmosConfig to interact with splash screen
@@ -85,60 +86,54 @@ module Cosmos
       super()
 
       @edit_action = Qt::Action.new(Cosmos.get_icon('edit.png'),
-                                    tr('&Edit Definition'),
+                                    '&Edit Definition',
                                     self)
-      @edit_keyseq = Qt::KeySequence.new(tr('Ctrl+E'))
+      @edit_keyseq = Qt::KeySequence.new('Ctrl+E')
       @edit_action.shortcut = @edit_keyseq
-      @edit_action.statusTip = tr('Open packet definition in a editor')
+      @edit_action.statusTip = 'Open packet definition in a editor'
       @edit_action.connect(SIGNAL('triggered()')) { edit_definition }
 
-      @reset_action = Qt::Action.new(tr('&Reset'), self)
-      @reset_keyseq = Qt::KeySequence.new(tr('Ctrl+R'))
+      @reset_action = Qt::Action.new('&Reset', self)
+      @reset_keyseq = Qt::KeySequence.new('Ctrl+R')
       @reset_action.shortcut = @reset_keyseq
-      @reset_action.statusTip = tr('Reset Connection')
+      @reset_action.statusTip = 'Reset Connection'
       connect(@reset_action, SIGNAL('triggered()'), self, SLOT('update_all()'))
 
-      @option_action = Qt::Action.new(tr('O&ptions'), self)
-      @option_action.statusTip = tr('Application Options')
+      @option_action = Qt::Action.new('O&ptions', self)
+      @option_action.statusTip = 'Application Options'
       connect(@option_action, SIGNAL('triggered()'), self, SLOT('file_options()'))
 
-      @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() }
 
-      @color_blind_action = Qt::Action.new(tr('Color&blind Mode'), self)
-      @color_blind_keyseq = Qt::KeySequence.new(tr('Ctrl+B'))
+      @color_blind_action = Qt::Action.new('Color&blind Mode', self)
+      @color_blind_keyseq = Qt::KeySequence.new('Ctrl+B')
       @color_blind_action.shortcut  = @color_blind_keyseq
-      @color_blind_action.statusTip = tr('Enable text representation of colors in the values')
+      @color_blind_action.statusTip = 'Enable text representation of colors in the values'
       @color_blind_action.setCheckable(true)
       @color_blind_action.connect(SIGNAL('triggered()')) do
         @colorblind = @color_blind_action.isChecked
       end
 
-      @hide_ignored_action = Qt::Action.new(tr('&Hide Ignored Items'), self)
-      @hide_ignored_keyseq = Qt::KeySequence.new(tr('Ctrl+H'))
+      @hide_ignored_action = Qt::Action.new('&Hide Ignored Items', self)
+      @hide_ignored_keyseq = Qt::KeySequence.new('Ctrl+H')
       @hide_ignored_action.shortcut  = @hide_ignored_keyseq
-      @hide_ignored_action.statusTip = tr('Toggle showing and hiding ignored items')
+      @hide_ignored_action.statusTip = 'Toggle showing and hiding ignored items'
       @hide_ignored_action.setCheckable(true)
       @hide_ignored_action.setChecked(false)
-      @hide_ignored_action.connect(SIGNAL('triggered()')) do
-        if @hide_ignored_action.isChecked
-          @ignored_rows.each {|row| @table.setRowHidden(row, true) }
-        else
-          @ignored_rows.each {|row| @table.setRowHidden(row, false) }
-        end
-      end
+      @hide_ignored_action.connect(SIGNAL('triggered()')) { hide_ignored() }
 
-      @derived_last_action = Qt::Action.new(tr('&Display Derived Last'), self)
-      @derived_last_keyseq = Qt::KeySequence.new(tr('Ctrl+D'))
+      @derived_last_action = Qt::Action.new('&Display Derived Last', self)
+      @derived_last_keyseq = Qt::KeySequence.new('Ctrl+D')
       @derived_last_action.shortcut  = @derived_last_keyseq
-      @derived_last_action.statusTip = tr('Display derived telemetry items last')
+      @derived_last_action.statusTip = 'Display derived telemetry items last'
       @derived_last_action.setCheckable(true)
       @derived_last_action.setChecked(false)
       @derived_last_action.connect(SIGNAL('triggered()')) { update_tlm_items() }
 
-      @formatted_tlm_units_action = Qt::Action.new(tr('Formatted Telemetry With &Units'), self)
-      @formatted_tlm_units_action.statusTip = tr('Formatted Telemetry with Units')
+      @formatted_tlm_units_action = Qt::Action.new('Formatted Telemetry With &Units', self)
+      @formatted_tlm_units_action.statusTip = 'Formatted Telemetry with Units'
       @formatted_tlm_units_action.setCheckable(true)
       @formatted_tlm_units_action.setChecked(true)
       @formatted_tlm_units_action.connect(SIGNAL('triggered()')) do
@@ -146,24 +141,24 @@ module Cosmos
         self.window_title = "COSMOS Packet Viewer : Formatted Telemetry with Units"
       end
 
-      @formatted_tlm_action = Qt::Action.new(tr('&Formatted Telemetry'), self)
-      @formatted_tlm_action.statusTip = tr('Formatted Telemetry')
+      @formatted_tlm_action = Qt::Action.new('&Formatted Telemetry', self)
+      @formatted_tlm_action.statusTip = 'Formatted Telemetry'
       @formatted_tlm_action.setCheckable(true)
       @formatted_tlm_action.connect(SIGNAL('triggered()')) do
         @mode = :FORMATTED
         self.window_title = "COSMOS Packet Viewer : Formatted Telemetry"
       end
 
-      @normal_tlm_action = Qt::Action.new(tr('Normal &Converted Telemetry'), self)
-      @normal_tlm_action.statusTip = tr('Normal Converted Telemetry')
+      @normal_tlm_action = Qt::Action.new('Normal &Converted Telemetry', self)
+      @normal_tlm_action.statusTip = 'Normal Converted Telemetry'
       @normal_tlm_action.setCheckable(true)
       @normal_tlm_action.connect(SIGNAL('triggered()')) do
         @mode = :CONVERTED
         self.window_title = "COSMOS Packet Viewer : Coverted Telemetry"
       end
 
-      @raw_tlm_action = Qt::Action.new(tr('&Raw Telemetry'), self)
-      @raw_tlm_action.statusTip = tr('Raw Unprocessed Telemetry')
+      @raw_tlm_action = Qt::Action.new('&Raw Telemetry', self)
+      @raw_tlm_action.statusTip = 'Raw Unprocessed Telemetry'
       @raw_tlm_action.setCheckable(true)
       @raw_tlm_action.connect(SIGNAL('triggered()')) do
         @mode = :RAW
@@ -180,7 +175,7 @@ module Cosmos
 
     def initialize_menus
       # File Menu
-      file_menu = menuBar.addMenu(tr('&File'))
+      file_menu = menuBar.addMenu('&File')
       file_menu.addAction(@edit_action)
       file_menu.addAction(@reset_action)
       file_menu.addAction(@option_action)
@@ -189,11 +184,11 @@ module Cosmos
       file_menu.addAction(@exit_action)
 
       # View Menu
-      view_menu = menuBar.addMenu(tr('&View'))
+      view_menu = menuBar.addMenu('&View')
       view_menu.addAction(@color_blind_action)
       view_menu.addAction(@hide_ignored_action)
       view_menu.addAction(@derived_last_action)
-      view_menu.addSeparator.setText(tr('Formatting'));
+      view_menu.addSeparator.setText('Formatting')
       view_menu.addAction(@formatted_tlm_units_action)
       view_menu.addAction(@formatted_tlm_action)
       view_menu.addAction(@normal_tlm_action)
@@ -224,7 +219,7 @@ module Cosmos
         update_packets()
         update_tlm_items()
       end
-      target_label = Qt::Label.new(tr("&Target:"))
+      target_label = Qt::Label.new("&Target:")
       target_label.setBuddy(@target_select)
 
       # Set the command combobox selection
@@ -233,7 +228,7 @@ module Cosmos
       @packet_select.connect(SIGNAL('activated(const QString&)')) do
         update_tlm_items()
       end
-      cmd_label = Qt::Label.new(tr("&Packet:"))
+      cmd_label = Qt::Label.new("&Packet:")
       cmd_label.setBuddy(@packet_select)
 
       # Mnemonic Search Box
@@ -254,7 +249,7 @@ module Cosmos
       top_layout.addWidget(sep1)
 
       # Telemetry Description Label
-      dec_label = Qt::Label.new(tr("Description:"))
+      dec_label = Qt::Label.new("Description:")
       @description = Qt::Label.new('')
       desc_layout = Qt::HBoxLayout.new
       desc_layout.addWidget(dec_label)
@@ -271,7 +266,7 @@ module Cosmos
     end
 
     def file_options
-      @polling_rate = Qt::InputDialog.getDouble(self, tr("Options"), tr("Polling Rate (sec):"),
+      @polling_rate = Qt::InputDialog.getDouble(self, "Options", "Polling Rate (sec):",
                                                 @polling_rate, 0, 1000, 1, nil)
     end
 
@@ -284,6 +279,14 @@ module Cosmos
       end
     end
 
+    def hide_ignored
+      if @hide_ignored_action.isChecked
+        @ignored_rows.each {|row| @table.setRowHidden(row, true) }
+      else
+        @ignored_rows.each {|row| @table.setRowHidden(row, false) }
+      end
+    end
+
     def edit_definition
       # Grab all the cmd_tlm_files and processes them in reverse sort order
       # because typically we'll have cmd.txt and tlm.txt and we want to process
@@ -417,11 +420,11 @@ module Cosmos
         featured_row = row if featured_item_name == tlm_name
         @ignored_rows << row if System.targets[target_name].ignored_items.include?(tlm_name)
         tlm_name = "*#{tlm_name}" if derived
-        item = Qt::TableWidgetItem.new(tr("#{tlm_name}:"))
+        item = Qt::TableWidgetItem.new("#{tlm_name}:")
         item.setTextAlignment(Qt::AlignRight)
         item.setFlags(Qt::NoItemFlags | Qt::ItemIsSelectable)
         @table.setItem(row, 0, item)
-        item = Qt::TableWidgetItem.new(tr("0.0"))
+        item = Qt::TableWidgetItem.new("0.0")
         item.setTextAlignment(Qt::AlignRight)
         item.setFlags(Qt::NoItemFlags | Qt::ItemIsSelectable | Qt::ItemIsEnabled)
         @table.setItem(row, 1, item)
@@ -430,6 +433,7 @@ module Cosmos
         @descriptions[row][1] = description
         row += 1
       end
+      hide_ignored()
 
       @table.resizeColumnsToContents()
       @table.resizeRowsToContents()
@@ -465,14 +469,14 @@ module Cosmos
               tlm_items = get_tlm_packet(target_name || '', packet_name || '', @mode)
             rescue DRb::DRbConnError => error
               Qt.execute_in_main_thread(true) do
-                statusBar.showMessage(tr("Error Connecting to Command and Telemetry Server"))
+                statusBar.showMessage("Error Connecting to Command and Telemetry Server")
               end
               tlm_items = nil
               update_needed = false
             rescue RuntimeError => error
               Qt.execute_in_main_thread(true) do
                 Cosmos.handle_critical_exception(error)
-                statusBar.showMessage(tr("Packet #{target_name} #{packet_name} Error: #{error}"))
+                statusBar.showMessage("Packet #{target_name} #{packet_name} Error: #{error}")
               end
               tlm_items = nil
               update_needed = true
@@ -551,7 +555,7 @@ module Cosmos
     end
 
     def mouse_over(row, col)
-      statusBar.showMessage(tr(@descriptions[row][col]))
+      statusBar.showMessage(@descriptions[row][col])
     end
 
     def context_menu(point)
@@ -564,27 +568,27 @@ module Cosmos
         if target_name.length > 0 and packet_name.length > 0 and item_name.length > 0
           menu = Qt::Menu.new()
 
-          details_action = Qt::Action.new(tr("Details #{target_name} #{packet_name} #{item_name}"), self)
-          details_action.statusTip = tr("Popup details about #{target_name} #{packet_name} #{item_name}")
+          details_action = Qt::Action.new("Details #{target_name} #{packet_name} #{item_name}", self)
+          details_action.statusTip = "Popup details about #{target_name} #{packet_name} #{item_name}"
           details_action.connect(SIGNAL('triggered()')) do
             TlmDetailsDialog.new(nil, target_name, packet_name, item_name)
             @table.clearSelection
           end
           menu.addAction(details_action)
 
-          edit_action = Qt::Action.new(tr("Edit #{target_name} #{packet_name} #{item_name}"), self)
-          edit_action.statusTip = tr("Edit Settings for #{target_name} #{packet_name} #{item_name}")
+          edit_action = Qt::Action.new("Edit #{target_name} #{packet_name} #{item_name}", self)
+          edit_action.statusTip = "Edit Settings for #{target_name} #{packet_name} #{item_name}"
           edit_action.connect(SIGNAL('triggered()')) do
             TlmEditDialog.new(self, target_name, packet_name, item_name)
             @table.clearSelection
           end
           menu.addAction(edit_action)
 
-          graph_action = Qt::Action.new(tr("Graph #{target_name} #{packet_name} #{item_name}"), self)
-          graph_action.statusTip = tr("Create a new COSMOS graph of #{target_name} #{packet_name} #{item_name}")
+          graph_action = Qt::Action.new("Graph #{target_name} #{packet_name} #{item_name}", self)
+          graph_action.statusTip = "Create a new COSMOS graph of #{target_name} #{packet_name} #{item_name}"
           graph_action.connect(SIGNAL('triggered()')) do
             @table.clearSelection
-            TlmGraphDialog.new(self, target_name, packet_name, item_name)
+            TlmGraphDialog.new(self, target_name, packet_name, item_name, get_replay_mode())
           end
           menu.addAction(graph_action)
 
@@ -625,12 +629,13 @@ module Cosmos
                            "Set the polling rate to PERIOD (unit seconds)") do |arg|
             options.rate = Float(arg)
           end
+          options.replay = false
+          option_parser.on("--replay", "Start Packet Viewer in Replay mode") do
+            options.replay = true
+          end
         end
-
         super(option_parser, options)
       end
     end
-
-  end # class PacketViewer
-
-end # module Cosmos
+  end
+end