cosmos 4.1.1-java → 4.2.0-java

data/lib/cosmos/system/target.rb

@@ -126,11 +126,15 @@ module Cosmos
           begin
             # Require absolute path to file in target lib folder.  Prevents name
             # conflicts at the require step
-            Cosmos.require_file(File.join(@dir, 'lib', parameters[0]), false)
+            Cosmos.disable_warnings do
+              Cosmos.require_file(File.join(@dir, 'lib', parameters[0]), false)
+            end
           rescue LoadError
             begin
               # If we couldn't load at the target/lib level check everywhere
-              Cosmos.require_file(parameters[0])
+              Cosmos.disable_warnings do
+                Cosmos.require_file(parameters[0])
+              end
             rescue Exception => err
               raise parser.error(err.message)
             end

data/lib/cosmos/tools/cmd_extractor/cmd_extractor.rb

@@ -14,6 +14,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/dialogs/packet_log_dialog'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/dialogs/progress_dialog'
+  require 'cosmos/gui/widgets/dart_meta_frame'
   require 'cosmos/gui/utilities/analyze_log'
 end
 
@@ -35,6 +36,11 @@ module Cosmos
       @packet_log_reader = System.default_packet_log_reader.new(*System.default_packet_log_reader_params)
       @time_start = nil
       @time_end = nil
+      @interface = Cosmos::TcpipClientInterface.new(
+        Cosmos::System.connect_hosts['DART_STREAM'],
+        Cosmos::System.ports['DART_STREAM'],
+        Cosmos::System.ports['DART_STREAM'],
+        10, 30, 'PREIDENTIFIED')
 
       Cosmos.load_cosmos_icon("cmd_extractor.png")
 
@@ -83,15 +89,46 @@ module Cosmos
     # Create the CmdExtractor application which primarily consists of a
     # {PacketLogFrame}
     def initialize_central_widget
+      @resize_timer = Qt::Timer.new
+      @resize_timer.connect(SIGNAL('timeout()')) { self.resize(self.width, self.minimumHeight) }
+
       @central_widget = Qt::Widget.new
       setCentralWidget(@central_widget)
       @top_layout = Qt::VBoxLayout.new(@central_widget)
 
+      # Data Source Selection
+      @data_source_layout = Qt::HBoxLayout.new()
+      label = Qt::Label.new("Data Source: ")
+      @data_source_layout.addWidget(label)
+      @log_file_radio = Qt::RadioButton.new("Log File", self)
+      @log_file_radio.setChecked(true)
+      @log_file_radio.connect(SIGNAL('clicked()')) do 
+        @packet_log_frame.show_log_fields(true)
+        @packet_log_frame.output_filename = ""
+        @dart_meta_frame.hide        
+        @resize_timer.start(100)
+      end
+      @data_source_layout.addWidget(@log_file_radio)
+      @dart_radio = Qt::RadioButton.new("DART Database", self)
+      @dart_radio.connect(SIGNAL('clicked()')) do 
+        @packet_log_frame.show_log_fields(false)
+        @packet_log_frame.output_filename = ""
+        @dart_meta_frame.show
+        @resize_timer.start(100)
+      end      
+      @data_source_layout.addWidget(@dart_radio)
+      @data_source_layout.addStretch()
+      @top_layout.addLayout(@data_source_layout)
+
       # Packet Log Frame
       @packet_log_frame = PacketLogFrame.new(self, @log_dir, System.default_packet_log_reader.new(*System.default_packet_log_reader_params), @input_filenames, @output_filename, true, true, true, Cosmos::CMD_FILE_PATTERN, Cosmos::TXT_FILE_PATTERN)
       @packet_log_frame.change_callback = method(:change_callback)
       @top_layout.addWidget(@packet_log_frame)
 
+      @dart_meta_frame = DartMetaFrame.new(self)
+      @dart_meta_frame.hide
+      @top_layout.addWidget(@dart_meta_frame)
+
       # Separator before buttons
       @sep2 = Qt::Frame.new(@central_widget)
       @sep2.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
@@ -99,8 +136,8 @@ module Cosmos
 
       # Process and Open Buttons
       @button_layout = Qt::HBoxLayout.new
-      @process_button = Qt::PushButton.new('&Process Files')
-      @process_button.connect(SIGNAL('clicked()')) { process_log_files() }
+      @process_button = Qt::PushButton.new('&Process Data')
+      @process_button.connect(SIGNAL('clicked()')) { process_data() }
       @button_layout.addWidget(@process_button)
 
       @open_button = Qt::PushButton.new('&Open in Text Editor')
@@ -134,41 +171,138 @@ module Cosmos
       AnalyzeLog.execute(self, @packet_log_frame)
     end
 
-    def process_log_files
+    def process_data
       @cancel = false
-      begin
-        @packet_log_reader = @packet_log_frame.packet_log_reader
-        @input_filenames = @packet_log_frame.filenames.sort
-        @time_start = @packet_log_frame.time_start
-        @time_end = @packet_log_frame.time_end
-        @output_filename = @packet_log_frame.output_filename
-        include_raw = @include_raw.isChecked
-        return unless pre_process_tests()
-
-        ProgressDialog.execute(self, # parent
-                               'Log File Progress', # title
-                               600, # width, height
-                               300) do |progress_dialog|
-          progress_dialog.cancel_callback = method(:cancel_callback)
-          progress_dialog.enable_cancel_button
-
-          begin
-            Cosmos.set_working_dir do
-              File.open(@output_filename, 'w') do |output_file|
-                process_files(output_file, include_raw, progress_dialog)
+      @time_start = @packet_log_frame.time_start
+      @time_end = @packet_log_frame.time_end
+      @packet_log_reader = @packet_log_frame.packet_log_reader
+      @input_filenames = @packet_log_frame.filenames.sort      
+      @output_filename = @packet_log_frame.output_filename
+      @output_filename = nil if @output_filename.strip.empty?
+      @meta_filters = @dart_meta_frame.meta_filters
+
+      return unless pre_process_tests()
+
+      include_raw = @include_raw.isChecked      
+      if @log_file_radio.isChecked
+        begin
+          ProgressDialog.execute(self, # parent
+                                'Log File Progress', # title
+                                600, # width, height
+                                300) do |progress_dialog|
+            progress_dialog.cancel_callback = method(:cancel_callback)
+            progress_dialog.enable_cancel_button
+
+            begin
+              Cosmos.set_working_dir do
+                File.open(@output_filename, 'w') do |output_file|
+                  process_files(output_file, include_raw, progress_dialog)
+                end
+              end
+            ensure
+              progress_dialog.complete
+              Qt.execute_in_main_thread(true) do
+                @open_button.setEnabled(true)
               end
-            end
-          ensure
-            progress_dialog.complete
-            Qt.execute_in_main_thread(true) do
-              @open_button.setEnabled(true)
             end
           end
+        rescue => error
+          Qt::MessageBox.critical(self, 'Error!', "Error Processing Log File(s)\n#{error.formatted}")
         end
-      rescue => error
-        Qt::MessageBox.critical(self, 'Error!', "Error Processing Log File(s)\n#{error.formatted}")
+      else
+        begin
+          ProgressDialog.execute(self, # parent
+                                'Log File Progress', # title
+                                600, # width, height
+                                300, 
+                                true, # Overall progress, no step progress 
+                                false) do |progress_dialog|
+            progress_dialog.cancel_callback = method(:cancel_callback)
+            progress_dialog.enable_cancel_button
+
+            begin
+              Cosmos.set_working_dir do
+                File.open(@output_filename, 'w') do |output_file|
+
+                  @interface.disconnect
+                  request_packet = Cosmos::Packet.new('DART', 'DART')
+                  request_packet.define_item('REQUEST', 0, 0, :BLOCK)
+                  
+                  @time_start ||= Time.utc(1970, 1, 1)
+                  @time_end ||= Time.now
+                  @time_delta = @time_end - @time_start
+                  request = {}
+                  request['start_time_sec'] = @time_start.tv_sec
+                  request['start_time_usec'] = @time_start.tv_usec
+                  request['end_time_sec'] = @time_end.tv_sec
+                  request['end_time_usec'] = @time_end.tv_usec
+                  request['cmd_tlm'] = 'CMD'
+                  request['meta_filters'] = @meta_filters unless @meta_filters.empty?
+                  request_packet.write('REQUEST', JSON.dump(request))
+                
+                  progress_dialog.append_text("Connecting to DART Database...")
+                  @interface.connect
+                  progress_dialog.append_text("Sending DART Database Query...")
+                  @interface.write(request_packet)
+                  progress_dialog.append_text("Receiving Packets...")
+
+                  first = true
+                  while true
+                    break if @cancel
+                    packet = @interface.read
+                    unless packet
+                      progress_dialog.append_text("Done!")
+                      progress_dialog.set_overall_progress(1.0)
+                      @interface.disconnect
+                      break
+                    end
+
+                    # Switch to correct configuration from SYSTEM META when needed
+                    if packet.target_name == 'SYSTEM'.freeze and packet.packet_name == 'META'.freeze
+                      meta_packet = System.commands.packet('SYSTEM', 'META')
+                      meta_packet.buffer = packet.buffer                                  
+                      Cosmos::System.load_configuration(meta_packet.read('CONFIG'))
+                    elsif first
+                      first = false
+                      @time_start = packet.received_time
+                      @time_delta = @time_end - @time_start
+                    end
+
+                    defined_packet = System.commands.packet(packet.target_name, packet.packet_name)
+                    defined_packet.buffer = packet.buffer
+                    defined_packet.received_time = packet.received_time
+
+                    output_file.puts "#{defined_packet.target_name} #{defined_packet.packet_name}"
+                    output_file.puts "  RECEIVED_TIMEFORMATTED: #{defined_packet.received_time.formatted}"
+                    output_file.puts defined_packet.formatted(:WITH_UNITS, 2)
+                    if include_raw or !defined_packet.identified? or !defined_packet.defined?
+                      output_file.puts "  RAW PACKET DATA (#{defined_packet.length} bytes):"
+                      output_file.puts defined_packet.buffer.formatted(1, 16, ' ', 4)
+                    end
+                    output_file.puts
+
+                    progress = ((@time_delta - (@time_end - defined_packet.received_time)).to_f / @time_delta.to_f)
+                    progress_dialog.set_overall_progress(progress) if !@cancel
+                  end
+            
+                end
+              end
+
+            ensure
+              progress_dialog.append_text("Canceled!") if @cancel
+              progress_dialog.complete
+              Qt.execute_in_main_thread(true) do
+                @open_button.setEnabled(true)
+              end
+            end
+          end            
+        rescue => error
+          Qt::MessageBox.critical(self, 'Error!', "Error Querying DART Database\n#{error.formatted}")
+        ensure
+          @interface.disconnect
+        end          
       end
-    end # def process_log_files
+    end # def process_data
 
     def open_button
       Cosmos.open_in_text_editor(@output_filename)
@@ -224,14 +358,21 @@ module Cosmos
     ###############################################################################
 
     def pre_process_tests
-      unless @input_filenames and @input_filenames[0]
-        Qt::MessageBox.critical(self, 'Error', 'Please select at least 1 input file')
-        return false
+      if @log_file_radio.isChecked
+        unless @input_filenames and @input_filenames[0]
+          Qt::MessageBox.critical(self, 'Error', 'Please select at least 1 input file')
+          return false
+        end
       end
 
       unless @output_filename
-        Qt::MessageBox.critical(self, 'Error', 'No Output File Selected')
-        return false
+        if @log_file_radio.isChecked
+          Qt::MessageBox.critical(self, 'Error', 'No Output File Selected')
+          return false
+        else
+          @packet_log_frame.output_filename = File.join(System.paths['LOGS'], File.build_timestamped_filename(['cmd_extractor', 'dart']))
+          @output_filename = @packet_log_frame.output_filename
+        end
       end
 
       if File.exist?(@output_filename)

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

@@ -12,9 +12,10 @@ module Cosmos
   class CmdParamTableItemDelegate < Qt::StyledItemDelegate
     MANUALLY = "MANUALLY ENTERED"
 
-    def initialize(table, widgets)
+    def initialize(table, widgets, production = false)
       @table = table
       @widgets = widgets
+      @production = production
       super(table)
     end
 
@@ -24,7 +25,7 @@ module Cosmos
         combo = Qt::ComboBox.new(parent)
         sorted_states = packet_item.states.sort {|a, b| a[1] <=> b[1]}
         items = sorted_states.map {|state_name, state_value| state_name}
-        items << MANUALLY
+        items << MANUALLY unless @production
         combo.addItems(items)
         combo.setCurrentText(@table.item(index.row, index.column).text.to_s)
         combo.setMaxVisibleItems(6)

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

@@ -49,7 +49,7 @@ module Cosmos
     slots 'context_menu(const QPoint&)'
     slots 'click_callback(QTableWidgetItem*)'
 
-    MANUALLY = "MANUALLY ENTERED"
+    MANUALLY = CmdParamTableItemDelegate::MANUALLY
 
     # @return [Integer] Number of commands sent
     def self.send_count
@@ -86,6 +86,7 @@ module Cosmos
 
       @file_dir = System.paths['LOGS']
       @message_log = MessageLog.new('cmdsender')
+      @production = options.production
       @send_raw_dir = nil
       @@send_count = 0
       @@param_widgets = []
@@ -123,12 +124,22 @@ module Cosmos
                                         tr('&Send Raw'),
                                         self)
       @send_raw_action.shortcut  = Qt::KeySequence.new(tr('Ctrl+S'))
-      @send_raw_action.statusTip = tr('Send raw data from a file')
+      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)
       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.statusTip = tr('Ignore range checks when processing command')
+      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.setCheckable(true)
       @ignore_range.setChecked(false)
 
@@ -145,7 +156,12 @@ module Cosmos
       connect(@show_ignored, SIGNAL('toggled(bool)'), self, SLOT('update_cmd_params(bool)'))
 
       @cmd_raw = Qt::Action.new(tr('Disable &Parameter Conversions'), self)
-      @cmd_raw.statusTip = tr('Send the command without running write or state conversions')
+      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.setCheckable(true)
       @cmd_raw.setChecked(false)
     end
@@ -573,7 +589,7 @@ module Cosmos
             @@table.setHorizontalHeaderLabels(['Name', '         Value or State         ', '         ', 'Units', 'Description'])
             @@table.horizontalHeader.setStretchLastSection(true)
             @@table.verticalHeader.setVisible(false)
-            @@table.setItemDelegate(CmdParamTableItemDelegate.new(@@table, @@param_widgets))
+            @@table.setItemDelegate(CmdParamTableItemDelegate.new(@@table, @@param_widgets, @production))
             @@table.setContextMenuPolicy(Qt::CustomContextMenu)
             @@table.verticalHeader.setResizeMode(Qt::HeaderView::ResizeToContents)
             @@table.setEditTriggers(Qt::AbstractItemView::DoubleClicked | Qt::AbstractItemView::SelectedClicked | Qt::AbstractItemView::AnyKeyPressed)
@@ -596,6 +612,8 @@ module Cosmos
             else
               if default_state
                 value_item = Qt::TableWidgetItem.new(default_state.to_s)
+              elsif @production
+                value_item = Qt::TableWidgetItem.new(packet_item.states.keys[0])
               else
                 value_item = Qt::TableWidgetItem.new(MANUALLY)
               end
@@ -619,13 +637,17 @@ module Cosmos
               end
             end
             state_value_item.setTextAlignment(Qt::AlignRight | Qt::AlignVCenter)
-            state_value_item.setFlags(Qt::NoItemFlags | Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable)
+            if @production
+              state_value_item.setFlags(Qt::NoItemFlags)
+            else
+              state_value_item.setFlags(Qt::NoItemFlags | Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable)
+            end
             @@table.setItem(row, 2, state_value_item)
 
-            # If the parameter is required set the combobox to MANUAL and
+            # If the parameter is required clear the combobox and
             # clear the value field so they have to choose something
             if packet_item.required && !old_params[packet_item.name]
-              value_item.setText(MANUALLY)
+              value_item.setText('')
               state_value_item.setText('')
             end
           else
@@ -755,6 +777,7 @@ module Cosmos
           options.width = 600
           options.height = 425
           options.title = 'Command Sender'
+          options.production = false
           option_parser.separator "Command Sender Specific Options:"
           option_parser.on("-p", "--packet 'TARGET_NAME PACKET_NAME'", "Start with the specified command selected") do |arg|
             split = arg.split
@@ -764,6 +787,9 @@ module Cosmos
             end
             options.packet = split
           end
+          option_parser.on(nil, "--production", "Run in production mode which disables the ability to manually enter data.") do |arg|
+            options.production = true
+          end
         end
 
         super(option_parser, options)

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

@@ -339,49 +339,104 @@ module Cosmos
     # are actually going to the server.
     # @param config_file [String] cmd_tlm_server.txt configuration file to
     #   process when creating the disconnected server
-    def toggle_disconnect(config_file)
-      if get_cmd_tlm_disconnect
-        set_cmd_tlm_disconnect(false)
-        self.setPalette(Cosmos::DEFAULT_PALETTE)
-      else
-        dialog = Qt::Dialog.new(self, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
-        dialog.setWindowTitle(tr("Server Config File"))
-        dialog_layout = Qt::VBoxLayout.new
+    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_layout = Qt::VBoxLayout.new
+      dialog_layout.addWidget(Qt::Label.new("Targets checked will be disconnected."))
+
+      all_targets = {}
+      set_clear_layout = Qt::HBoxLayout.new
+      check_all = Qt::PushButton.new("Check All")
+      check_all.setAutoDefault(false)
+      check_all.setDefault(false)
+      check_all.connect(SIGNAL('clicked()')) do
+        all_targets.each do |target, checkbox|
+          checkbox.setChecked(true)
+        end
+      end
+      set_clear_layout.addWidget(check_all)
+      clear_all = Qt::PushButton.new("Clear All")
+      clear_all.connect(SIGNAL('clicked()')) do
+        all_targets.each do |target, checkbox|
+          checkbox.setChecked(false)
+        end
+      end
+      set_clear_layout.addWidget(clear_all)
+      dialog_layout.addLayout(set_clear_layout)
+
+      scroll = Qt::ScrollArea.new
+      target_widget = Qt::Widget.new
+      scroll.setWidget(target_widget)
+      target_layout = Qt::VBoxLayout.new(target_widget)
+      target_layout.setSizeConstraint(Qt::Layout::SetMinAndMaxSize)
+      scroll.setSizePolicy(Qt::SizePolicy::Preferred, Qt::SizePolicy::Expanding)
+      scroll.setWidgetResizable(true)
+
+      existing = get_disconnected_targets()
+      System.targets.keys.each do |target|
+        check_layout = Qt::HBoxLayout.new
+        check_label = Qt::CheckboxLabel.new(target)
+        checkbox = Qt::CheckBox.new
+        all_targets[target] = checkbox
+        if existing
+          checkbox.setChecked(existing && existing.include?(target))
+        else
+          checkbox.setChecked(true)
+        end
+        check_label.setCheckbox(checkbox)
+        check_layout.addWidget(checkbox)
+        check_layout.addWidget(check_label)
+        check_layout.addStretch
+        target_layout.addLayout(check_layout)
+      end
+      dialog_layout.addWidget(scroll)
 
+      if ask_for_config_file
         chooser = FileChooser.new(self, "Config File", config_file, 'Select',
                                   File.dirname(config_file))
         chooser.callback = lambda do |filename|
           chooser.filename = filename
         end
         dialog_layout.addWidget(chooser)
+      end
 
-        button_layout = Qt::HBoxLayout.new
-        ok = Qt::PushButton.new("Ok")
-        ok.setDefault(true)
-        ok.connect(SIGNAL('clicked()')) do
-          dialog.accept()
-        end
-        button_layout.addWidget(ok)
-        cancel = Qt::PushButton.new("Cancel")
-        cancel.connect(SIGNAL('clicked()')) do
-          dialog.reject()
+      button_layout = Qt::HBoxLayout.new
+      ok = Qt::PushButton.new("Ok")
+      ok.setAutoDefault(true)
+      ok.setDefault(true)
+      targets = []
+      ok.connect(SIGNAL('clicked()')) do
+        all_targets.each do |target, checkbox|
+          targets << target if checkbox.isChecked
         end
-        button_layout.addWidget(cancel)
-        dialog_layout.addLayout(button_layout)
+        dialog.accept()
+      end
+      button_layout.addWidget(ok)
+      cancel = Qt::PushButton.new("Cancel")
+      cancel.connect(SIGNAL('clicked()')) do
+        dialog.reject()
+      end
+      button_layout.addWidget(cancel)
+      dialog_layout.addLayout(button_layout)
 
-        dialog.setLayout(dialog_layout)
-        if dialog.exec == Qt::Dialog::Accepted
+      dialog.setLayout(dialog_layout)
+      if dialog.exec == Qt::Dialog::Accepted
+        if targets.empty?
+          clear_disconnected_targets()
+          statusBar.showMessage("")
+        else
           config_file = chooser.filename
-          self.setPalette(Qt::Palette.new(Cosmos.getColor(170, 57, 57)))
+          statusBar.showMessage("Targets disconnected: #{targets.join(" ")}")
           Splash.execute(self) do |splash|
             ConfigParser.splash = splash
             splash.message = "Initializing Command and Telemetry Server"
-            set_cmd_tlm_disconnect(true, config_file)
+            set_disconnected_targets(targets, config_file)
             ConfigParser.splash = nil
           end
         end
-        dialog.dispose
       end
+      dialog.dispose
       config_file
     end