cosmos 4.1.1-java → 4.2.0-java

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

@@ -137,6 +137,7 @@ module Cosmos
         'replay_move_index',
         'get_screen_list',
         'get_screen_definition',
+        'get_saved_config',
       ]
       @tlm_viewer_config_filename = nil
       @tlm_viewer_config = nil
@@ -390,7 +391,7 @@ module Cosmos
         end
       else
         commands = System.commands.all
-        commands.each do |target_name, target_commands|
+        commands.each do |_, target_commands|
           target_commands.each do |packet_name, command|
             last_command = command if !last_command and command.received_time
             if command.received_time and command.received_time > last_command.received_time
@@ -825,7 +826,7 @@ module Cosmos
     end
 
     # (see Cosmos::Limits#overall_limits_state)
-    def get_overall_limits_state (ignored_items = nil)
+    def get_overall_limits_state(ignored_items = nil)
       return System.limits.overall_limits_state(ignored_items)
     end
 
@@ -1250,8 +1251,7 @@ module Cosmos
 
     # Get the list of packet loggers.
     #
-    # @param packet_logger_name [String] Name of the packet logger
-    # @return [<Array<String>] Array containing the names of all packet loggers
+    # @return [Array<String>] Array containing the names of all packet loggers
     def get_packet_loggers
       return CmdTlmServer.packet_logging.all.keys
     end
@@ -1566,6 +1566,21 @@ module Cosmos
       return screen_definition
     end
 
+    # Get a saved configuration zip file
+    def get_saved_config(configuration_name = nil)
+      configuration_name ||= System.initial_config.name if System.initial_config
+      if configuration_name
+        configuration = System.instance.find_configuration(configuration_name)
+        if configuration and File.exist?(configuration) and configuration[-4..-1] == ".zip"
+          filename = File.basename(configuration)
+          data = ''
+          File.open(configuration, 'rb') {|file| data = file.read}
+          return [filename, data]
+        end
+      end
+      return nil
+    end
+
     private
 
     def cmd_implementation(range_check, hazardous_check, raw, method_name, *args)

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

@@ -109,7 +109,7 @@ module Cosmos
     end
 
     # Set the meta callback
-    def self.meta_callback= (meta_callback)
+    def self.meta_callback=(meta_callback)
       @@meta_callback = meta_callback
     end
 
@@ -130,7 +130,8 @@ module Cosmos
       config_file = DEFAULT_CONFIG_FILE,
       production = false,
       disconnect = false,
-      mode = :CMD_TLM_SERVER)
+      mode = :CMD_TLM_SERVER,
+      replay_routers = false)
 
       @@instance = self
       @packet_logging = nil # Removes warnings
@@ -217,7 +218,7 @@ module Cosmos
           @routers.add_preidentified('PREIDENTIFIED_ROUTER', System.ports['CTS_PREIDENTIFIED'])
           @routers.add_cmd_preidentified('PREIDENTIFIED_CMD_ROUTER', System.ports['CTS_CMD_ROUTER'])
         else
-          @routers.all.clear
+          @routers.all.clear unless replay_routers
           @routers.add_preidentified('PREIDENTIFIED_ROUTER', System.ports['REPLAY_PREIDENTIFIED'])
           @routers.add_cmd_preidentified('PREIDENTIFIED_CMD_ROUTER', System.ports['REPLAY_CMD_ROUTER'])
         end
@@ -235,17 +236,17 @@ module Cosmos
     def stop
       # Break long pollers
       @limits_event_queues.dup.each do |id, data|
-        queue, queue_size = @limits_event_queues.delete(id)
+        queue, _ = @limits_event_queues.delete(id)
         queue << nil if queue
       end
 
       @server_message_queues.dup.each do |id, data|
-        queue, queue_size = @server_message_queues.delete(id)
+        queue, _ = @server_message_queues.delete(id)
         queue << nil if queue
       end
 
       @packet_data_queues.dup.each do |id, data|
-        queue, packets, queue_size = @packet_data_queues.delete(id)
+        queue, _, _ = @packet_data_queues.delete(id)
         queue << nil if queue
       end
 
@@ -268,7 +269,7 @@ module Cosmos
     end
 
     # Set a stop callback
-    def stop_callback= (stop_callback)
+    def stop_callback=(stop_callback)
       @stop_callback = stop_callback
     end
 
@@ -283,7 +284,7 @@ module Cosmos
     end
 
     # Set a reload callback
-    def reload_callback= (reload_callback)
+    def reload_callback=(reload_callback)
       @reload_callback = reload_callback
     end
 
@@ -367,7 +368,7 @@ module Cosmos
           queues_to_drop.each do |id|
             # Remove the queue to stop servicing it.  Nil is added to unblock any client threads
             # that might otherwise be left blocking forever for something on the queue
-            queue, queue_size = @limits_event_queues.delete(id)
+            queue, _ = @limits_event_queues.delete(id)
             queue << nil if queue
           end
         end
@@ -409,7 +410,7 @@ module Cosmos
       @@instance.limits_event_queue_mutex.synchronize do
         # Remove the queue to stop servicing it.  Nil is added to unblock any client threads
         # that might otherwise be left blocking forever for something on the queue
-        queue, queue_size = @@instance.limits_event_queues.delete(id)
+        queue, _ = @@instance.limits_event_queues.delete(id)
         queue << nil if queue
       end
     end
@@ -470,7 +471,7 @@ module Cosmos
           queues_to_drop.each do |id|
             # Remove the queue to stop servicing it.  Nil is added to unblock any client threads
             # that might otherwise be left blocking forever for something on the queue
-            queue, packets, queue_size = @packet_data_queues.delete(id)
+            queue, _, _ = @packet_data_queues.delete(id)
             queue << nil if queue
           end
         end
@@ -542,7 +543,7 @@ module Cosmos
       @@instance.packet_data_queue_mutex.synchronize do
         # Remove the queue to stop servicing it.  Nil is added to unblock any client threads
         # that might otherwise be left blocking forever for something on the queue
-        queue, packets, queue_size = @@instance.packet_data_queues.delete(id)
+        queue, _, _ = @@instance.packet_data_queues.delete(id)
         queue << nil if queue
       end
       return nil
@@ -605,7 +606,7 @@ module Cosmos
           queues_to_drop.each do |id|
             # Remove the queue to stop servicing it.  Nil is added to unblock any client threads
             # that might otherwise be left blocking forever for something on the queue
-            queue, queue_size = @server_message_queues.delete(id)
+            queue, _ = @server_message_queues.delete(id)
             queue << nil if queue
           end
         end
@@ -644,7 +645,7 @@ module Cosmos
       @@instance.server_message_queue_mutex.synchronize do
         # Remove the queue to stop servicing it.  Nil is added to unblock any client threads
         # that might otherwise be left blocking forever for something on the queue
-        queue, queue_size = @@instance.server_message_queues.delete(id)
+        queue, _ = @@instance.server_message_queues.delete(id)
         queue << nil if queue
       end
     end

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

@@ -123,6 +123,7 @@ module Cosmos
       end
       @production = options.production
       @no_prompt = options.no_prompt
+      @replay_routers = options.replay_routers
       @message_log = nil
       @output_sleeper = Sleeper.new
       @first_output = 0
@@ -147,7 +148,7 @@ module Cosmos
 
       if !CmdTlmServer.instance or @mode == :CMD_TLM_SERVER
         CmdTlmServer.meta_callback = method(:meta_callback)
-        cts = CmdTlmServer.new(@options.config_file, @production, false, @mode)
+        cts = CmdTlmServer.new(@options.config_file, @production, false, @mode, @replay_routers)
         CmdTlmServerGui.configure_signal_handlers()
         cts.stop_callback = method(:stop_callback)
         cts.reload_callback = method(:reload)
@@ -508,7 +509,7 @@ module Cosmos
       CmdTlmServer.instance.stop_callback = nil
       CmdTlmServer.instance.stop
       System.reset
-      cts = CmdTlmServer.new(@options.config_file, @options.production, false, @mode)
+      cts = CmdTlmServer.new(@options.config_file, @options.production, false, @mode, @options.replay_routers)
 
       # Signal catching needs to be repeated here because Puma interferes
       ["TERM", "INT"].each {|sig| Signal.trap(sig) {exit}}
@@ -557,7 +558,7 @@ module Cosmos
           else
             @mode = :CMD_TLM_SERVER
           end
-          cts = CmdTlmServer.new(options.config_file, options.production, false, @mode)
+          cts = CmdTlmServer.new(options.config_file, options.production, false, @mode, options.replay_routers)
 
           # Signal catching needs to be repeated here because Puma interferes
           ["TERM", "INT"].each {|sig| Signal.trap(sig) {exit}}
@@ -616,12 +617,7 @@ module Cosmos
           options.production = false
           options.no_prompt = false
           options.no_gui = false
-          if self.name == "Cosmos::Replay"
-            options.replay = true
-            options.title = "Replay"
-          else
-            options.replay = false
-          end
+          options.replay_routers = false
 
           option_parser.separator "CTS Specific Options:"
           option_parser.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
@@ -636,6 +632,16 @@ module Cosmos
           option_parser.on(nil, "--no-gui", "Run the server without a GUI") do |arg|
             options.no_gui = true
           end
+
+          if self.name == "Cosmos::Replay"
+            options.replay = true
+            options.title = "Replay"
+            option_parser.on(nil, "--routers", "Enable All Routers") do |arg|
+              options.replay_routers = true
+            end
+          else
+            options.replay = false
+          end          
         end
 
         super(option_parser, options)

data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb

@@ -13,7 +13,6 @@ require 'cosmos/gui/qt'
 require 'cosmos/gui/dialogs/interface_raw_dialog'
 
 module Cosmos
-
   # Implements the interfaces and routers tabs in the Command and Telemetry Server GUI
   class InterfacesTab
     INTERFACES = 'Interfaces'
@@ -39,22 +38,16 @@ module Cosmos
     end
 
     # Create the interfaces tab and add it to the tab_widget
-    #
-    # @param tab_widget [Qt::TabWidget] The tab widget to add the tab to
     def populate_interfaces
       populate(CmdTlmServer.interfaces)
     end
 
     # Create the routers tab and add it to the tab_widget
-    #
-    # @param tab_widget [Qt::TabWidget] The tab widget to add the tab to
     def populate_routers
       populate(CmdTlmServer.routers)
     end
 
     # Update the interfaces or routers tab
-    #
-    # @param name [String] Must be Interfaces or Routers
     def update
       if @name == ROUTERS
         interfaces = CmdTlmServer.routers
@@ -219,6 +212,5 @@ module Cosmos
       state.setTextAlignment(Qt::AlignCenter)
       state
     end
-
   end
-end # module Cosmos
+end

data/lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb

@@ -12,10 +12,8 @@ require 'cosmos'
 require 'cosmos/gui/qt'
 
 module Cosmos
-
   # Implements the logging tab in the Command and Telemetry Server GUI
   class LoggingTab
-
     def initialize(production, tab_widget)
       @production = production
       @widget = nil
@@ -33,8 +31,6 @@ module Cosmos
     end
 
     # Create the logging tab and add it to the tab_widget
-    #
-    # @param tab_widget [Qt::TabWidget] The tab widget to add the tab to
     def populate
       reset()
       @widget = Qt::Widget.new
@@ -181,6 +177,5 @@ module Cosmos
       end
       layout.addWidget(Qt::Label.new(Qt::Object.tr("Note: Buffered IO operations cause file size to not reflect total logged data size until the log file is closed.")))
     end
-
   end
-end # module Cosmos
+end

data/lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb

@@ -13,7 +13,6 @@ require 'cosmos/gui/qt'
 require 'cosmos/gui/dialogs/cmd_tlm_raw_dialog'
 
 module Cosmos
-
   # Implements the packets tab in the Command and Telemetry Server GUI
   class PacketsTab
     COMMANDS = "Commands"
@@ -157,6 +156,5 @@ module Cosmos
         table.setItem(row, 4, table_widget)
       end
     end
-
   end
-end # module Cosmos
+end

data/lib/cosmos/tools/cmd_tlm_server/gui/replay_tab.rb

@@ -12,13 +12,12 @@ require 'cosmos'
 require 'cosmos/gui/qt'
 require 'cosmos/gui/choosers/string_chooser'
 require 'cosmos/gui/dialogs/packet_log_dialog'
+require 'cosmos/gui/dialogs/dart_dialog'
 require 'cosmos/gui/dialogs/progress_dialog'
 
 module Cosmos
-
   # Implements the replay tab in the Command and Telemetry Server GUI
   class ReplayTab
-
     attr_accessor :widget
 
     def initialize(tab_widget)
@@ -39,11 +38,12 @@ module Cosmos
     end
 
     # Create the targets tab and add it to the tab_widget
-    #
-    # @param tab_widget [Qt::TabWidget] The tab widget to add the tab to
     def populate
       return if @widget
 
+      @resize_timer = Qt::Timer.new
+      @resize_timer.connect(SIGNAL('timeout()')) { @widget.resize(@widget.width, @widget.minimumHeight) }
+
       @widget = Qt::Widget.new
 
       layout = Qt::VBoxLayout.new(@widget)
@@ -58,6 +58,44 @@ module Cosmos
       @log_layout.setContentsMargins(0,0,0,0)
       @log_widget.setLayout(@log_layout)
 
+      # 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", @widget)
+      @log_file_radio.setChecked(true)
+      @log_file_radio.connect(SIGNAL('clicked()')) do 
+        @stream_selection.hide
+        @log_file_selection.show
+        @op.setTitle("Playback Control: Log File")
+        @move_start.setEnabled(false)
+        @step_back.setEnabled(false)
+        @reverse_play.setEnabled(false)
+        @stop.setEnabled(false)
+        @play.setEnabled(false)
+        @step_forward.setEnabled(false)
+        @move_end.setEnabled(false)        
+        @resize_timer.start(100)
+      end
+      @data_source_layout.addWidget(@log_file_radio)
+      @dart_radio = Qt::RadioButton.new("DART Database", @widget)
+      @dart_radio.connect(SIGNAL('clicked()')) do 
+        @log_file_selection.hide
+        @stream_selection.show
+        @op.setTitle("Playback Control: DART Database")
+        @move_start.setEnabled(false)
+        @step_back.setEnabled(false)
+        @reverse_play.setEnabled(false)
+        @stop.setEnabled(false)
+        @play.setEnabled(false)
+        @step_forward.setEnabled(false)
+        @move_end.setEnabled(false)            
+        @resize_timer.start(100)
+      end      
+      @data_source_layout.addWidget(@dart_radio)
+      @data_source_layout.addStretch()
+      @log_layout.addLayout(@data_source_layout)
+
       # Create the log file GUI
       @log_file_selection = Qt::GroupBox.new("Log File Selection")
       @log_select = Qt::HBoxLayout.new(@log_file_selection)
@@ -70,8 +108,18 @@ module Cosmos
 
       @log_open.connect(SIGNAL('clicked()')) { select_log_file() }
 
+      # Create the streaming GUI
+      @stream_selection = Qt::GroupBox.new("Stream Selection")
+      @stream_select = Qt::HBoxLayout.new(@stream_selection)
+      @stream_open = Qt::PushButton.new("Select Stream...")
+      @stream_select.addWidget(@stream_open)
+      @log_layout.addWidget(@stream_selection)
+      @stream_selection.hide
+
+      @stream_open.connect(SIGNAL('clicked()')) { select_stream() }
+
       # Create the operation buttons GUI
-      @op = Qt::GroupBox.new("Playback Control")
+      @op = Qt::GroupBox.new("Playback Control: Log File")
       @op_layout = Qt::VBoxLayout.new(@op)
       @op_button_layout = Qt::HBoxLayout.new
       @move_start = Qt::PushButton.new(Cosmos.get_icon('skip_to_start-26.png'), '')
@@ -104,6 +152,13 @@ module Cosmos
       @move_end.connect(SIGNAL('clicked()')) { CmdTlmServer.replay_backend.move_end() }
       @op_button_layout.addWidget(@move_end)
       @op_layout.addLayout(@op_button_layout)
+      @move_start.setEnabled(false)
+      @step_back.setEnabled(false)
+      @reverse_play.setEnabled(false)
+      @stop.setEnabled(false)
+      @play.setEnabled(false)
+      @step_forward.setEnabled(false)
+      @move_end.setEnabled(false)
 
       # Speed Selection
       @playback_delay = nil
@@ -144,7 +199,7 @@ module Cosmos
       @op_layout.addLayout(@speed_layout)
       @log_layout.addWidget(@op)
 
-      @file_pos = Qt::GroupBox.new("File Position")
+      @file_pos = Qt::GroupBox.new("Time")
       @file_pos_layout = Qt::VBoxLayout.new(@file_pos)
       @slider = Qt::Slider.new(Qt::Horizontal)
       @slider.setRange(0, 10000)
@@ -235,8 +290,30 @@ module Cosmos
       case packet_log_dialog.exec
       when Qt::Dialog::Accepted
         CmdTlmServer.replay_backend.select_file(packet_log_dialog.filenames[0], packet_log_dialog.packet_log_reader)
+        @move_start.setEnabled(true)
+        @step_back.setEnabled(true)
+        @reverse_play.setEnabled(true)
+        @stop.setEnabled(true)
+        @play.setEnabled(true)
+        @step_forward.setEnabled(true)
+        @move_end.setEnabled(true)
       end
     end
 
+    def select_stream
+      dart_dialog = DartDialog.new(@widget, 'Select Stream', true)
+      case dart_dialog.exec
+      when Qt::Dialog::Accepted
+        CmdTlmServer.replay_backend.select_stream(dart_dialog.time_start, dart_dialog.time_end, dart_dialog.meta_filters)
+        @log_name.text = ""
+        @move_start.setEnabled(true)
+        @step_back.setEnabled(false)
+        @reverse_play.setEnabled(true)
+        @stop.setEnabled(true)
+        @play.setEnabled(true)
+        @step_forward.setEnabled(false)
+        @move_end.setEnabled(true)
+      end
+    end
   end
-end # module Cosmos
+end