cosmos 4.4.0-java → 4.4.1-java

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

@@ -191,6 +191,7 @@ module Cosmos
 
       # File actions
       @file_reload = Qt::Action.new('&Reload Configuration', self)
+      @file_reload.shortcut = Qt::KeySequence.new('Ctrl+Shift+R')
       @file_reload.statusTip = 'Reload configuraton and reset'
       @file_reload.connect(SIGNAL('triggered()')) do
         CmdTlmServer.instance.reload()

data/lib/cosmos/tools/config_editor/config_editor.rb

@@ -14,6 +14,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/dialogs/progress_dialog'
   require 'cosmos/gui/dialogs/scroll_text_dialog'
   require 'cosmos/tools/config_editor/config_editor_frame'
+  require 'cosmos/tools/config_editor/system_config_dialog'
 end
 
 module Cosmos
@@ -72,6 +73,12 @@ module Cosmos
         ["tlm_viewer", "/config/tools/tlm_viewer/tlm_viewer.txt"],
     }
 
+    # Class instance variable to store all the parsed metadata
+    @meta = {}
+    class << self
+      attr_reader :meta
+    end
+
     def initialize(options)
       # All code before super is executed twice in RubyQt Based classes
       super(options) # MUST BE FIRST
@@ -86,8 +93,27 @@ module Cosmos
       initialize_central_widget()
       complete_initialize()
 
+      # Process all the configuration yaml files up front
+      # If they passed in a filename we need to wait for all meta files to be processed
+      wait = options.filename ? true : false
+      Splash.execute(self, wait) do |splash|
+        count = 1.0
+        CONFIGURATION_FILES.each do |key, vals|
+          type = vals[0]
+          next unless type
+          splash.message = "Processing #{type}.yaml"
+          splash.progress = count / CONFIGURATION_FILES.length
+          begin
+            ConfigEditor.meta[key] = @file_meta = MetaConfigParser.load("#{type}.yaml")
+          rescue => error
+            Kernel.raise $! if error.is_a? Psych::SyntaxError
+          end
+          count += 1.0
+        end
+      end
+
       if options.filename
-        file_open(options.filename)
+        file_open(File.expand_path(options.filename))
       else
         create_tab()
       end
@@ -227,9 +253,13 @@ module Cosmos
         update_cursor()
       end
 
-      @create_target = Qt::Action.new('&Create Target', self)
+      @create_target = Qt::Action.new('Create &Target', self)
       @create_target.statusTip = 'Create a new COSMOS target'
       @create_target.connect(SIGNAL('triggered()')) { create_target() }
+
+      @create_system_config = Qt::Action.new('Create New &System Config', self)
+      @create_system_config.statusTip = 'Create a new system configuration'
+      @create_system_config.connect(SIGNAL('triggered()')) { SystemConfigDialog.new(self) }
     end
 
     def initialize_menus
@@ -294,6 +324,7 @@ module Cosmos
 
       # Actions Menu
       actions_menu = menuBar.addMenu('&Actions')
+      actions_menu.addAction(@create_system_config)
       actions_menu.addAction(@create_target)
 
       # Help Menu

data/lib/cosmos/tools/config_editor/config_editor_frame.rb

@@ -28,6 +28,10 @@ module Cosmos
     def focusInEvent(event)
       emit focus_in
     end
+
+    def wheelEvent(event)
+      event.ignore()
+    end
   end
 
   class ConfigEditorFrame < Qt::Widget
@@ -290,17 +294,10 @@ module Cosmos
       end
       emit file_type_changed # Tell ConfigEditor about the file type
       load_meta_data()
-      display_keyword_help()
     end
 
     def load_meta_data
-      begin
-        type = ConfigEditor::CONFIGURATION_FILES[@file_type][0]
-        @file_meta = MetaConfigParser.load("#{type}.yaml")
-      rescue => error
-        Kernel.raise $! if error.is_a? Psych::SyntaxError
-        @file_meta = nil
-      end
+      @file_meta = ConfigEditor.meta[@file_type]
       display_keyword_help()
     end
 
@@ -565,7 +562,8 @@ module Cosmos
             if attribute_value.is_a? Hash
               # If the value is a Hash then we have parameter specific
               # parameters embedded in this parameter we have to parse
-              value_widget = Qt::ComboBox.new()
+              value_widget = FocusComboBox.new()
+              value_widget.setFocusPolicy(Qt::StrongFocus)
               value_widget.addItem(current_value) unless attribute_value.keys.include?(current_value)
               value_widget.addItems(attribute_value.keys)
               value_widget.setCurrentText(current_value)
@@ -581,6 +579,7 @@ module Cosmos
               end
             elsif attribute_value.is_a? Array # Just a bunch of strings
               value_widget = FocusComboBox.new()
+              value_widget.setFocusPolicy(Qt::StrongFocus)
               value_widget.addItems(attribute_value)
               if required && current_value.nil?
                 value_widget.setStyleSheet("border: 1px solid red")

data/lib/cosmos/tools/config_editor/system_config_dialog.rb

@@ -0,0 +1,158 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+require 'cosmos'
+require 'cosmos/gui/qt'
+
+module Cosmos
+  # Creates a dialog asking to create a new system configuration.
+  class SystemConfigDialog < Qt::Dialog
+    def initialize(parent)
+      super(parent) # MUST BE FIRST
+      @parent = parent
+      Cosmos.load_cosmos_icon
+
+      self.window_title = 'Create System Configuration'
+      layout = Qt::VBoxLayout.new
+      self.layout = layout
+
+      description = Qt::Label.new("Creating a new COSMOS system configuration allows you to reuse "\
+        "an existing COSMOS configuration but include different targets and/or change configuration details.")
+      description.setWordWrap(true)
+      layout.addWidget(description)
+
+      select = Qt::Label.new("Select an existing system.txt file to base the new configuration on:")
+      select.setWordWrap(true)
+      layout.addWidget(select)
+      @system_combo = Qt::ComboBox.new
+      Dir[File.join(::Cosmos::USERPATH, 'config', 'system', '*.txt')].each do |system|
+        @system_combo.addItem(File.basename(system))
+      end
+      layout.addWidget(@system_combo)
+      layout.addSpacing(10)
+  
+      name_label = Qt::Label.new("Enter a name for the new system configuration that is descriptive "\
+        " but relatively short. For example, 'EMI', 'SW Test', etc:")
+      name_label.setWordWrap(true)
+      layout.addWidget(name_label)
+      @system_name = Qt::LineEdit.new
+      layout.addWidget(@system_name)
+      layout.addSpacing(10)
+
+      info = Qt::Label.new("This action will create a new COSMOS system.txt, "\
+        "cmd_tlm_server.txt, launcher.txt, and Windows Batch file appended with the specified name. "\
+        "For example, system_emi.txt, system_sw_test.txt, launcher_emi.txt, launcher_sw_test.txt, etc.")
+      info.setWordWrap(true)
+      layout.addWidget(info)
+
+      ok_button = Qt::PushButton.new('Ok')
+      connect(ok_button, SIGNAL('clicked()'), self, SLOT('accept()'))
+      cancel_button = Qt::PushButton.new('Cancel')
+      connect(cancel_button, SIGNAL('clicked()'), self, SLOT('reject()'))
+
+      hlayout = Qt::HBoxLayout.new
+      hlayout.addWidget(ok_button, 0, Qt::AlignLeft)
+      hlayout.addWidget(cancel_button, 0, Qt::AlignRight)
+      layout.addLayout(hlayout)
+
+      resize(500, 300)
+
+      self.show()
+      self.raise()
+      if self.exec() == Qt::Dialog::Accepted
+        build_system_config()
+      end
+      self.dispose()
+    end
+
+    def build_system_config
+      new_suffix = @system_name.text.downcase.gsub(' ','_')
+      existing_system = @system_combo.text
+      # Look for system_xxx.txt where we find the 'xxx' as the existing suffix
+      if existing = existing_system.scan(/.*?_(.*)\.txt/)[0]
+        existing_suffix = existing[0]
+      else
+        existing_suffix = nil
+      end
+
+      # First determine all the new files and make sure they don't already exist
+      new_system = File.join(Cosmos::USERPATH, 'config', 'system', "system_#{new_suffix}.txt")
+      return if file_exist?(new_system)
+      cmd_tlm_server_path = File.join('config', 'tools', 'cmd_tlm_server')
+      new_cmd_tlm_server = File.join(Cosmos::USERPATH, cmd_tlm_server_path, "cmd_tlm_server_#{new_suffix}.txt")
+      return if file_exist?(new_cmd_tlm_server)
+      launcher_path = File.join('config', 'tools', 'launcher')
+      new_launcher = File.join(Cosmos::USERPATH, launcher_path, "launcher_#{new_suffix}.txt")
+      return if file_exist?(new_launcher)
+      new_batch = File.join(Cosmos::USERPATH, "Launcher#{@system_name.text.gsub(' ','')}.bat")
+      return if file_exist?(new_batch)
+
+      # Create the new system.txt. We know the existing exists so simply copy it.
+      File.open(new_system, 'w') do |file|
+        file.puts File.read(File.join(::Cosmos::USERPATH, 'config', 'system', existing_system))
+      end
+
+      # Create the new cmd_tlm_server config and update the TITLE
+      data = get_config_contents(existing_suffix, cmd_tlm_server_path, 'cmd_tlm_server')
+      data.sub!(/\s*TITLE.*/, "TITLE 'COSMOS Command and Telemetry Server - #{@system_name.text} Configuration'")
+      File.open(new_cmd_tlm_server, 'w') {|file| file.puts data }
+
+      # Create the new launcher config and update the TITLE and Server LAUNCH commands
+      data = get_config_contents(existing_suffix, launcher_path, 'launcher')
+      data.sub!(/\s*TITLE.*/, "TITLE 'Launcher - #{@system_name.text} Configuration'")
+      data.gsub!(/LAUNCH\s+(\w+)/, "LAUNCH \\1 --system system_#{new_suffix}.txt")
+      # Convert all --config to -c to make it easier to replace in the next step
+      data.gsub!(/(.*LAUNCH\s+CmdTlmServer.*)(--config)(.*)/, "\\1-c\\3")
+      data.gsub!(/(.*LAUNCH\s+CmdTlmServer.*)-c\s+(\w+)(.*)/, "\\1-c cmd_tlm_server_#{new_suffix}\\3")
+      File.open(new_launcher, 'w') {|file| file.puts data }
+      
+      File.open(new_batch, 'w') do |file|
+        file.puts "call tools\\Launcher.bat --config launcher_#{new_suffix}.txt --system system_#{new_suffix}.txt"
+      end
+
+      @parent.file_open(new_batch)
+      @parent.file_open(new_launcher)
+      @parent.file_open(new_cmd_tlm_server)
+      @parent.file_open(new_system)
+      Qt::MessageBox.information(self, "System Config Creation Success",
+        "The new system configuration was successfully created.\n\n"\
+        "The newly created files have been opened for further customization.")
+      end
+
+    def file_exist?(path)
+      if File.exist?(path)
+        Qt::MessageBox.warning(self, "Config file exists!", "#{path} already exists!")
+        return true
+      else
+        return false
+      end
+    end
+
+    def get_config_contents(existing_suffix, base_path, file_name)
+      contents = ''
+      if existing_suffix
+        existing_file = File.join(Cosmos::USERPATH, base_path, "#{file_name}_#{existing_suffix}.txt")
+        if File.exist?(existing_file)
+          contents = File.read(existing_file)
+        end
+      else
+        # Otherwise see if there is a basic one we can copy
+        basic_config = File.join(Cosmos::USERPATH, base_path, "#{file_name}.txt")
+        if File.exist?(basic_config)
+          contents = File.read(basic_config)
+        else
+          # Otherwise use the install config
+          contents = File.read(File.join(Cosmos::PATH, 'install', base_path, "#{file_name}.txt"))
+        end
+      end
+      return contents
+    end
+  end
+end

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -594,12 +594,12 @@ module Cosmos
             "ScriptRunnerFrame.instance.pre_line_instrumentation('#{filename}', #{line_no}); "
 
           # Add the actual line
-          instrumented_line << "__return_val = "
+          instrumented_line << "__return_val = begin; "
           instrumented_line << segment
           instrumented_line.chomp!
 
           # Add postline instrumentation
-          instrumented_line << "; ScriptRunnerFrame.instance.post_line_instrumentation('#{filename}', #{line_no}); "
+          instrumented_line << " end; ScriptRunnerFrame.instance.post_line_instrumentation('#{filename}', #{line_no}); "
 
           # Complete begin block to catch exceptions
           unless inside_begin

data/lib/cosmos/tools/test_runner/test.rb

@@ -126,7 +126,7 @@ module Cosmos
       if result
         results << result
         yield result if block_given?
-        raise StopScript if result.stopped
+        raise StopScript if (results[-1].exceptions and @@abort_on_exception) or results[-1].stopped
       end
 
       # Run each test case
@@ -141,7 +141,7 @@ module Cosmos
       if result
         results << result
         yield result if block_given?
-        raise StopScript if result.stopped
+        raise StopScript if (results[-1].exceptions and @@abort_on_exception) or results[-1].stopped
       end
 
       results
@@ -387,17 +387,20 @@ module Cosmos
           result = run_test_case(test_class, test_case, true)
           results << result
           yield result if block_given?
+          raise StopScript if (result.exceptions and test_class.abort_on_exception) or result.stopped
         when :TEST_SETUP
           result = run_test_setup(test_class, true)
           if result
             results << result
             yield result if block_given?
+            raise StopScript if (result.exceptions and test_class.abort_on_exception) or result.stopped
           end
         when :TEST_TEARDOWN
           result = run_test_teardown(test_class, true)
           if result
             results << result
             yield result if block_given?
+            raise StopScript if (result.exceptions and test_class.abort_on_exception) or result.stopped
           end
         end
       end

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -652,7 +652,7 @@ module Cosmos
       ScriptRunnerFrame.instance = @script_runner_frame
       build = false
       @utilities.each do |utility|
-        if require_utility(utility)
+        if load_utility(utility)
           build = true
         end
       end
@@ -999,7 +999,7 @@ module Cosmos
         when 'LOAD_UTILITY', 'REQUIRE_UTILITY'
           parser.verify_num_parameters(1, 1, "LOAD_UTILITY <filename>")
           begin
-            require_utility params[0]
+            load_utility(params[0])
             @utilities << params[0]
           rescue Exception => err
             require_errors << "<b>#{params[0]}</b>:\n#{err.formatted}\n"

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb

@@ -10,11 +10,11 @@
 
 require 'cosmos'
 require 'cosmos/tools/tlm_extractor/tlm_extractor_config'
+require 'cosmos/dart/lib/dart_constants'
 
 module Cosmos
-
+  # Process the settings selected in the TlmExtractor to ultimately produce the output file
   class TlmExtractorProcessor
-
     attr_accessor :packet_log_reader
 
     def initialize
@@ -31,7 +31,7 @@ module Cosmos
         configs[-1].output_filename = File.join(output_dir, batch_name.tr(' ', '_') + '_' + filename_no_extension.tr(' ', '_') + output_extension)
       end
       process(input_filenames, configs, time_start, time_end, &block)
-    end # def process_batch
+    end
 
     def process(input_filenames, configs, time_start = nil, time_end = nil)
       Cosmos.set_working_dir do
@@ -50,10 +50,10 @@ module Cosmos
           end
           yield input_file_index, packet_count, 1.0 if block_given?
         end
-      end # Cosmos.set_working_dir
+      end
     ensure
       configs.each { |config| config.close_output_file }
-    end # def process
+    end
 
     def process_dart_batch(batch_name, output_dir, output_extension, config_filenames, time_start = nil, time_end = nil, meta_filters = [], &block)
       configs = []
@@ -96,17 +96,23 @@ module Cosmos
               request['reduction'] = dart_reduction.to_s
               request['cmd_tlm'] = 'TLM'
               request['offset'] = 0
-              request['limit'] = 10000
+              request['limit'] = DartConstants::MAX_DECOM_RESULTS
               if dart_reduction == :NONE
                 request['value_type'] = value_type.to_s
               else
                 request['value_type'] = value_type.to_s + "_#{dart_reduced_type}"
               end
               request['meta_filters'] = meta_filters if meta_filters.length > 0
-              result = server.query(request)
-              results[query_string] = result
+              results[query_string] = []
+              while true
+                result = server.query(request)
+                results[query_string].concat(result)
+                break if result.length < DartConstants::MAX_DECOM_RESULTS
+                yield(index.to_f / items.length, "  Total results: #{results[query_string].length}") if block_given?
+                request['offset'] += DartConstants::MAX_DECOM_RESULTS
+              end
               index += 1
-              yield(index.to_f / items.length, "  Received #{result.length} values") if block_given?
+              yield(index.to_f / items.length, "  Total results: #{results[query_string].length}") if block_given?
             rescue Exception => error
               yield(index.to_f / items.length, "Error querying #{query_string} : #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n") if block_given?
               return # Bail out because something bad happened
@@ -121,7 +127,5 @@ module Cosmos
     ensure
       configs.each { |config| config.close_output_file }
     end
-
-  end # class TlmExtractorProcessor
-
-end # module Cosmos
+  end
+end

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

@@ -11,9 +11,9 @@
 require 'cosmos'
 require 'cosmos/gui/qt'
 require 'cosmos/io/json_drb_object'
+require 'cosmos/dart/lib/dart_constants'
 
 module Cosmos
-
   # Thread used to gather telemetry from DART and process it using a TabbedPlotsDefinition
   class TabbedPlotsDartThread
     # Array of exceptions that occurred
@@ -67,23 +67,29 @@ module Cosmos
               request['reduction'] = dart_reduction.to_s
               request['cmd_tlm'] = 'TLM'
               request['offset'] = 0
-              request['limit'] = 10000
+              request['limit'] = DartConstants::MAX_DECOM_RESULTS
               if dart_reduction == :NONE
                 request['value_type'] = value_type.to_s
               else
                 request['value_type'] = value_type.to_s + "_#{dart_reduced_type}"
               end
               request['meta_filters'] = meta_filters unless meta_filters.empty?
-              query_result = server.query(request)
-              result = query_result
-              if array_index
-                result = []
-                query_result.each do |qr|
-                  result << [qr[0][array_index], qr[1], qr[2], qr[3], qr[4]]
+              results[query_string] = []
+              while true
+                query_result = server.query(request)
+                result = query_result
+                if array_index
+                  result = []
+                  query_result.each do |qr|
+                    result << [qr[0][array_index], qr[1], qr[2], qr[3], qr[4]]
+                  end
                 end
+                results[query_string].concat(result)
+                break if query_result.length < DartConstants::MAX_DECOM_RESULTS
+                progress_dialog.append_text("  Total results: #{results[query_string].length}") if progress_dialog
+                request['offset'] += DartConstants::MAX_DECOM_RESULTS
               end
-              results[query_string] = result
-              progress_dialog.append_text("  Received #{result.length} values") if progress_dialog
+              progress_dialog.append_text("  Total results: #{results[query_string].length}") if progress_dialog
               progress_dialog.set_step_progress((index + 1).to_f / required_queries.length) if progress_dialog
             rescue Exception => error
               @errors << error
@@ -134,7 +140,7 @@ module Cosmos
           @done = true
         end
       end
-    end # def initialize
+    end
 
     # Indicates if processing is complete
     def done?
@@ -149,12 +155,10 @@ module Cosmos
       @thread = nil
       @done = true
       return true, false
-    end # def kill
+    end
 
     def graceful_kill
       # Just to remove warnings
     end
-
-  end # class TabbedPlotsLogfileThread
-
-end # module Cosmos
+  end
+end