cosmos 4.2.4-java → 4.3.0-java

data/lib/cosmos/tools/cmd_sender/cmd_sender.rb

@@ -10,16 +10,16 @@
 
 require 'cosmos'
 Cosmos.catch_fatal_exception do
-  require 'cosmos/script'
   require 'cosmos/gui/qt_tool'
-  require 'cosmos/config/config_parser'
   require 'cosmos/gui/text/completion'
   require 'cosmos/gui/utilities/script_module_gui'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/dialogs/cmd_details_dialog'
+  require 'cosmos/gui/widgets/full_text_search_line_edit'
   require 'cosmos/tools/cmd_sender/cmd_sender_text_edit'
   require 'cosmos/tools/cmd_sender/cmd_param_table_item_delegate'
-  require 'cosmos/gui/widgets/full_text_search_line_edit'
+  require 'cosmos/config/config_parser'
+  require 'cosmos/script'
 end
 
 module Cosmos
@@ -27,7 +27,7 @@ module Cosmos
     module Script
       def prompt_for_script_abort
         window = get_cmd_tlm_gui_window()
-        window.statusBar.showMessage(tr("Hazardous command not sent"))
+        window.statusBar.showMessage("Hazardous command not sent")
         return true # Aborted - Don't retry
       end
     end
@@ -137,59 +137,59 @@ module Cosmos
       super()
       # File menu actions
       @send_raw_action = Qt::Action.new(Cosmos.get_icon('send_file.png'),
-                                        tr('&Send Raw'),
+                                        '&Send Raw',
                                         self)
-      @send_raw_action.shortcut  = Qt::KeySequence.new(tr('Ctrl+S'))
+      @send_raw_action.shortcut  = Qt::KeySequence.new('Ctrl+S')
       tip = 'Send raw data from a file'
       if @production
         tip += ' - Disabled in Production Mode'
         @send_raw_action.setEnabled(false)
       end
-      @send_raw_action.statusTip = tr(tip)
+      @send_raw_action.statusTip = tip
       connect(@send_raw_action, SIGNAL('triggered()'), self, SLOT('file_send_raw()'))
 
       # Mode menu actions
-      @ignore_range = Qt::Action.new(tr('&Ignore Range Checks'), self)
+      @ignore_range = Qt::Action.new('&Ignore Range Checks', self)
       tip = 'Ignore range checks when processing command'
       if @production
         tip += ' - Disabled in Production Mode'
         @ignore_range.setEnabled(false)
       end
-      @ignore_range.statusTip = tr(tip)
+      @ignore_range.statusTip = tip
       @ignore_range.setCheckable(true)
       @ignore_range.setChecked(false)
 
-      @states_in_hex = Qt::Action.new(tr('&Display State Values in Hex'), self)
-      @states_in_hex.statusTip = tr('Display states values in hex instead of decimal')
+      @states_in_hex = Qt::Action.new('&Display State Values in Hex', self)
+      @states_in_hex.statusTip = 'Display states values in hex instead of decimal'
       @states_in_hex.setCheckable(true)
       @states_in_hex.setChecked(false)
       connect(@states_in_hex, SIGNAL('toggled(bool)'), self, SLOT('menu_states_in_hex(bool)'))
 
-      @show_ignored = Qt::Action.new(tr('&Show Ignored Parameters'), self)
-      @show_ignored.statusTip = tr('Show ignored parameters which are normally hidden')
+      @show_ignored = Qt::Action.new('&Show Ignored Parameters', self)
+      @show_ignored.statusTip = 'Show ignored parameters which are normally hidden'
       @show_ignored.setCheckable(true)
       @show_ignored.setChecked(false)
       connect(@show_ignored, SIGNAL('toggled(bool)'), self, SLOT('update_cmd_params(bool)'))
 
-      @cmd_raw = Qt::Action.new(tr('Disable &Parameter Conversions'), self)
+      @cmd_raw = Qt::Action.new('Disable &Parameter Conversions', self)
       tip = 'Send the command without running write or state conversions'
       if @production
         tip += ' - Disabled in Production Mode'
         @cmd_raw.setEnabled(false)
       end
-      @cmd_raw.statusTip = tr(tip)
+      @cmd_raw.statusTip = tip
       @cmd_raw.setCheckable(true)
       @cmd_raw.setChecked(false)
     end
 
     # Create the File and Mode menus and initialize the help menu
     def initialize_menus
-      file_menu = menuBar.addMenu(tr('&File'))
+      file_menu = menuBar.addMenu('&File')
       file_menu.addAction(@send_raw_action)
       file_menu.addAction(@exit_action)
       file_menu.insertSeparator(@exit_action)
 
-      mode_menu = menuBar.addMenu(tr('&Mode'))
+      mode_menu = menuBar.addMenu('&Mode')
       mode_menu.addAction(@ignore_range)
       mode_menu.addAction(@states_in_hex)
       mode_menu.addAction(@show_ignored)
@@ -244,14 +244,14 @@ module Cosmos
       @target_select = Qt::ComboBox.new
       @target_select.setMaxVisibleItems(6)
       connect(@target_select, SIGNAL('activated(const QString&)'), self, SLOT('target_changed(const QString&)'))
-      target_label = Qt::Label.new(tr("&Target:"))
+      target_label = Qt::Label.new("&Target:")
       target_label.setBuddy(@target_select)
 
       # Set the comamnd combobox selection
       @cmd_select = Qt::ComboBox.new
       @cmd_select.setMaxVisibleItems(20)
       connect(@cmd_select, SIGNAL('activated(const QString&)'), self, SLOT('cmd_changed(const QString&)'))
-      cmd_label = Qt::Label.new(tr("&Command:"))
+      cmd_label = Qt::Label.new("&Command:")
       cmd_label.setBuddy(@cmd_select)
 
       # Button to send command
@@ -273,7 +273,7 @@ module Cosmos
       top_layout.addWidget(sep1)
 
       # Command Description Label
-      dec_label = Qt::Label.new(tr("Description:"))
+      dec_label = Qt::Label.new("Description:")
       @description = Qt::Label.new('')
       @description.setWordWrap(true)
       desc_layout = Qt::HBoxLayout.new
@@ -287,7 +287,7 @@ module Cosmos
       top_layout.addWidget(sep2)
 
       # Parameters Label
-      param_label = Qt::Label.new(tr("Parameters:"))
+      param_label = Qt::Label.new("Parameters:")
       top_layout.addWidget(param_label)
 
       # Grid Layout for Parameters
@@ -362,13 +362,13 @@ module Cosmos
       interfaces.addItems(get_interface_names())
       interfaces.setMaxVisibleItems(30)
       layout.addWidget(interfaces, 0, 1)
-      int_label = Qt::Label.new(tr("&Interface:"))
+      int_label = Qt::Label.new("&Interface:")
       int_label.setBuddy(interfaces)
       layout.addWidget(int_label, 0, 0)
 
       file_line = Qt::LineEdit.new(@send_raw_dir)
       file_line.setMinimumSize(250, 0)
-      file_label = Qt::Label.new(tr("&Filename:"))
+      file_label = Qt::Label.new("&Filename:")
       file_label.setBuddy(file_line)
       get_file = Qt::PushButton.new("Select")
       file_layout = Qt::BoxLayout.new(Qt::Horizontal)
@@ -376,7 +376,7 @@ module Cosmos
       file_layout.addWidget(file_line)
       get_file.connect(SIGNAL('clicked()')) do
         Cosmos.set_working_dir do
-          file_line.text = Qt::FileDialog::getOpenFileName(self, "Select File", @send_raw_dir, tr("Binary Files (*.bin);;All Files (*)"))
+          file_line.text = Qt::FileDialog::getOpenFileName(self, "Select File", @send_raw_dir, "Binary Files (*.bin);;All Files (*)")
         end
       end
 
@@ -569,7 +569,7 @@ module Cosmos
       end
 
       # Clear Status Bar
-      statusBar.showMessage(tr(""))
+      statusBar.showMessage("")
 
       target_name = @target_select.text
       target = System.targets[target_name]
@@ -755,15 +755,15 @@ module Cosmos
         if target_name.length > 0 && packet_name.length > 0 && 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
             CmdDetailsDialog.new(nil, target_name, packet_name, item_name)
           end
           menu.addAction(details_action)
 
-          file_chooser_action = Qt::Action.new(tr("Insert Filename"), self)
-          file_chooser_action.statusTip = tr("Select a file and place its name into this parameter")
+          file_chooser_action = Qt::Action.new("Insert Filename", self)
+          file_chooser_action.statusTip = "Select a file and place its name into this parameter"
           file_chooser_action.connect(SIGNAL('triggered()')) do
             filename = Qt::FileDialog::getOpenFileName(self, "Insert Filename:", @file_dir, "All Files (*)")
             if filename && !filename.empty?

data/lib/cosmos/tools/cmd_sequence/cmd_sequence.rb

@@ -11,14 +11,15 @@
 require 'time'
 require 'cosmos'
 Cosmos.catch_fatal_exception do
-  require 'cosmos/script'
-  require 'cosmos/config/config_parser'
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/utilities/script_module_gui'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/widgets/realtime_button_bar'
   require 'cosmos/gui/choosers/file_chooser'
+  require 'cosmos/config/config_parser'
   require 'cosmos/tools/cmd_sequence/sequence_list'
+  require 'cosmos/gui/widgets/full_text_search_line_edit'
+  require 'cosmos/script'
 end
 
 module Cosmos
@@ -85,6 +86,20 @@ module Cosmos
           @target_select.setCurrentText(options.packet[0]) if options.packet
           update_commands()
           @cmd_select.setCurrentText(options.packet[1]) if options.packet
+
+          # Handle searching entries
+          @search_box.completion_list = System.commands.all_packet_strings(true, splash)
+          @search_box.callback = lambda do |cmd|
+            split_cmd = cmd.split(" ")
+            if split_cmd.length == 2
+              target_name = split_cmd[0].upcase
+              @target_select.setCurrentText(target_name)
+              update_commands()
+              command_name = split_cmd[1]
+              @cmd_select.setCurrentText(command_name)
+              add_command()
+            end
+          end
         end
         # Unconfigure CosmosConfig to interact with splash screen
         ConfigParser.splash = nil
@@ -96,59 +111,59 @@ module Cosmos
     def initialize_actions
       super()
 
-      @file_new = Qt::Action.new(Cosmos.get_icon('file.png'), tr('&New'), self)
-      @file_new_keyseq = Qt::KeySequence.new(tr('Ctrl+N'))
+      @file_new = Qt::Action.new(Cosmos.get_icon('file.png'), '&New', self)
+      @file_new_keyseq = Qt::KeySequence.new('Ctrl+N')
       @file_new.shortcut  = @file_new_keyseq
-      @file_new.statusTip = tr('Start a new sequence')
+      @file_new.statusTip = 'Start a new sequence'
       @file_new.connect(SIGNAL('triggered()')) { file_new() }
 
-      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), tr('&Save'), self)
-      @file_save_keyseq = Qt::KeySequence.new(tr('Ctrl+S'))
+      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), '&Save', self)
+      @file_save_keyseq = Qt::KeySequence.new('Ctrl+S')
       @file_save.shortcut  = @file_save_keyseq
-      @file_save.statusTip = tr('Save the sequence')
+      @file_save.statusTip = 'Save the sequence'
       @file_save.connect(SIGNAL('triggered()')) { file_save(false) }
 
-      @file_save_as = Qt::Action.new(Cosmos.get_icon('save_as.png'), tr('Save &As'), self)
-      @file_save_as.statusTip = tr('Save the sequence')
+      @file_save_as = Qt::Action.new(Cosmos.get_icon('save_as.png'), 'Save &As', self)
+      @file_save_as.statusTip = 'Save the sequence'
       @file_save_as.connect(SIGNAL('triggered()')) { file_save(true) }
 
-      @file_export = Qt::Action.new(tr('&Export Sequence'), self)
-      @file_export.shortcut = Qt::KeySequence.new(tr('Ctrl+E'))
-      @file_export.statusTip = tr('Export the current sequence to a custom binary format')
+      @file_export = Qt::Action.new('&Export Sequence', self)
+      @file_export.shortcut = Qt::KeySequence.new('Ctrl+E')
+      @file_export.statusTip = 'Export the current sequence to a custom binary format'
       @file_export.connect(SIGNAL('triggered()')) { file_export() }
 
-      @show_ignored = Qt::Action.new(tr('&Show Ignored Parameters'), self)
-      @show_ignored.statusTip = tr('Show ignored parameters which are normally hidden')
+      @show_ignored = Qt::Action.new('&Show Ignored Parameters', self)
+      @show_ignored.statusTip = 'Show ignored parameters which are normally hidden'
       @show_ignored.setCheckable(true)
       @show_ignored.setChecked(false)
       @show_ignored.connect(SIGNAL('toggled(bool)')) do |bool|
         @sequence_list.map {|item| item.show_ignored(bool) }
       end
 
-      @states_in_hex = Qt::Action.new(tr('&Display State Values in Hex'), self)
-      @states_in_hex.statusTip = tr('Display states values in hex instead of decimal')
+      @states_in_hex = Qt::Action.new('&Display State Values in Hex', self)
+      @states_in_hex.statusTip = 'Display states values in hex instead of decimal'
       @states_in_hex.setCheckable(true)
       @states_in_hex.setChecked(false)
       @states_in_hex.connect(SIGNAL('toggled(bool)')) do |bool|
         @sequence_list.map {|item| item.states_in_hex(bool) }
       end
 
-      @expand_action = Qt::Action.new(tr('&Expand All'), self)
-      @expand_action.statusTip = tr('Expand all currently visible commands')
+      @expand_action = Qt::Action.new('&Expand All', self)
+      @expand_action.statusTip = 'Expand all currently visible commands'
       @expand_action.connect(SIGNAL('triggered()')) do
         @sequence_list.map {|item| item.expand }
       end
 
-      @collapse_action = Qt::Action.new(tr('&Collapse All'), self)
-      @collapse_action.statusTip = tr('Collapse all currently visible commands')
+      @collapse_action = Qt::Action.new('&Collapse All', self)
+      @collapse_action.statusTip = 'Collapse all currently visible commands'
       @collapse_action.connect(SIGNAL('triggered()')) do
         @sequence_list.map {|item| item.collapse }
       end
 
-      @script_disconnect = Qt::Action.new(Cosmos.get_icon('disconnected.png'), tr('&Toggle Disconnect'), self)
-      @script_disconnect_keyseq = Qt::KeySequence.new(tr('Ctrl+T'))
+      @script_disconnect = Qt::Action.new(Cosmos.get_icon('disconnected.png'), '&Toggle Disconnect', self)
+      @script_disconnect_keyseq = Qt::KeySequence.new('Ctrl+T')
       @script_disconnect.shortcut  = @script_disconnect_keyseq
-      @script_disconnect.statusTip = tr('Toggle disconnect from the server')
+      @script_disconnect.statusTip = 'Toggle disconnect from the server'
       @script_disconnect.connect(SIGNAL('triggered()')) do
         @server_config_file ||= CmdTlmServer::DEFAULT_CONFIG_FILE
         @server_config_file = toggle_disconnect(@server_config_file)
@@ -157,15 +172,15 @@ module Cosmos
 
     # Create the application menus and assign the actions
     def initialize_menus
-      file_menu = menuBar.addMenu(tr('&File'))
+      file_menu = menuBar.addMenu('&File')
       file_menu.addAction(@file_new)
 
       open_action = Qt::Action.new(self)
-      open_action.shortcut = Qt::KeySequence.new(tr('Ctrl+O'))
+      open_action.shortcut = Qt::KeySequence.new('Ctrl+O')
       open_action.connect(SIGNAL('triggered()')) { file_open(@sequence_dir) }
       self.addAction(open_action)
 
-      file_open = file_menu.addMenu(tr('&Open'))
+      file_open = file_menu.addMenu('&Open')
       file_open.setIcon(Cosmos.get_icon('open.png'))
       target_dirs_action(file_open, System.paths['SEQUENCES'], 'sequences', method(:file_open))
 
@@ -178,7 +193,7 @@ module Cosmos
       file_menu.addSeparator()
       file_menu.addAction(@exit_action)
 
-      action_menu = menuBar.addMenu(tr('&Actions'))
+      action_menu = menuBar.addMenu('&Actions')
       action_menu.addAction(@show_ignored)
       action_menu.addAction(@states_in_hex)
       action_menu.addSeparator()
@@ -205,27 +220,25 @@ module Cosmos
       @realtime_button_bar.state = 'Stopped'
       central_layout.addWidget(@realtime_button_bar)
 
+      # Mnemonic Search Box
+      @search_box = FullTextSearchLineEdit.new(self)
+      central_layout.addWidget(@search_box)
+
       @target_select = Qt::ComboBox.new
       @target_select.setMaxVisibleItems(6)
       @target_select.connect(SIGNAL('activated(const QString&)')) do |target|
         target_changed()
       end
-      target_label = Qt::Label.new(tr("&Target:"))
+      target_label = Qt::Label.new("&Target:")
       target_label.setBuddy(@target_select)
 
       @cmd_select = Qt::ComboBox.new
       @cmd_select.setMaxVisibleItems(20)
-      cmd_label = Qt::Label.new(tr("&Command:"))
+      cmd_label = Qt::Label.new("&Command:")
       cmd_label.setBuddy(@cmd_select)
 
       add = Qt::PushButton.new("Add")
-      add.connect(SIGNAL('clicked()')) do
-        command = System.commands.packet(@target_select.text, @cmd_select.text).dup
-        command.restore_defaults
-        item = @sequence_list.add(command)
-        item.show_ignored(@show_ignored.isChecked())
-        item.states_in_hex(@states_in_hex.isChecked())
-      end
+      add.connect(SIGNAL('clicked()')) { add_command() }
 
       # Layout the target and command selection with Add button
       select_layout = Qt::HBoxLayout.new
@@ -264,10 +277,22 @@ module Cosmos
       splitter.setStretchFactor(1,0)
     end
 
+    def add_command
+      command = System.commands.packet(@target_select.text, @cmd_select.text).dup
+      command.restore_defaults
+      item = @sequence_list.add(command)
+      item.show_ignored(@show_ignored.isChecked())
+      item.states_in_hex(@states_in_hex.isChecked())
+    end
+
     # Export the sequence list into a custom binary format
     def file_export
       return if @sequence_list.empty? || @exporter.nil?
-      @exporter.export(@filename, @sequence_dir, @sequence_list)
+      begin
+        @exporter.export(@filename, @sequence_dir, @sequence_list)
+      rescue => error
+        ExceptionDialog.new(self, error, 'Export Error', false)
+      end
     end
 
     # Clears the sequence list
@@ -341,7 +366,7 @@ module Cosmos
     #   process when creating the disconnected server
     def toggle_disconnect(config_file, ask_for_config_file = true)
       dialog = Qt::Dialog.new(self, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
-      dialog.setWindowTitle(tr("Disconnect Settings"))
+      dialog.setWindowTitle("Disconnect Settings")
       dialog_layout = Qt::VBoxLayout.new
       dialog_layout.addWidget(Qt::Label.new("Targets checked will be disconnected."))
 
@@ -431,7 +456,7 @@ module Cosmos
           Splash.execute(self) do |splash|
             ConfigParser.splash = splash
             splash.message = "Initializing Command and Telemetry Server"
-            set_disconnected_targets(targets, config_file)
+            set_disconnected_targets(targets, targets.length == all_targets.length, config_file)
             ConfigParser.splash = nil
           end
         end

data/lib/cosmos/tools/cmd_sequence/sequence_item.rb

@@ -246,7 +246,7 @@ module Cosmos
       @parameters = Qt::Widget.new
       parameters_layout = Qt::VBoxLayout.new
       # Command Description Label
-      dec_label = Qt::Label.new(tr("Description:"))
+      dec_label = Qt::Label.new("Description:")
       description = Qt::Label.new(@command.description)
       description.setWordWrap(true)
       desc_layout = Qt::HBoxLayout.new
@@ -254,7 +254,7 @@ module Cosmos
       desc_layout.addWidget(description, 1)
       parameters_layout.addLayout(desc_layout)
 
-      param_label = Qt::Label.new(tr("Parameters:"))
+      param_label = Qt::Label.new("Parameters:")
       parameters_layout.addWidget(param_label)
       @table_layout = Qt::VBoxLayout.new
       parameters_layout.addLayout(@table_layout, 500)
@@ -456,15 +456,15 @@ module Cosmos
         if target_name.length > 0 && packet_name.length > 0 && 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
             CmdDetailsDialog.new(nil, target_name, packet_name, item_name)
           end
           menu.addAction(details_action)
 
-          file_chooser_action = Qt::Action.new(tr("Insert Filename"), self)
-          file_chooser_action.statusTip = tr("Select a file and place its name into this parameter")
+          file_chooser_action = Qt::Action.new("Insert Filename", self)
+          file_chooser_action.statusTip = "Select a file and place its name into this parameter"
           file_chooser_action.connect(SIGNAL('triggered()')) do
               filename = Qt::FileDialog::getOpenFileName(self, "Insert Filename:", @file_dir, "All Files (*)")
               if filename && !filename.empty?

data/lib/cosmos/tools/cmd_tlm_server/api.rb

@@ -349,7 +349,20 @@ module Cosmos
     def get_cmd_value(target_name, command_name, parameter_name, value_type = :CONVERTED)
       packet = System.commands.packet(target_name, command_name)
       # Virtually support RECEIVED_TIMEFORMATTED, RECEIVED_TIMESECONDS, RECEIVED_COUNT
+      # Also PACKET_TIMEFORMATTED and PACKET_TIMESECONDS
       case parameter_name.to_s.upcase
+      when 'PACKET_TIMEFORMATTED'
+        if packet.packet_time
+          return packet.packet_time.formatted
+        else
+          return 'No Packet Time'
+        end
+      when 'PACKET_TIMESECONDS'
+        if packet.packet_time
+          return packet.packet_time.to_f
+        else
+          return 0.0
+        end
       when 'RECEIVED_TIMEFORMATTED'
         if packet.received_time
           return packet.received_time.formatted