cosmos 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347fbd93cb872161d7b92e30d62926f518dd70c8
-  data.tar.gz: 135bbd4fd436113705cd4be89618e104112ac085
+  metadata.gz: 98b8a89318fe76b8b0a3dd2c5950e9cea1d59120
+  data.tar.gz: 0fdf696e10d06b9078a91383afce71bedfa943a1
 SHA512:
-  metadata.gz: fc8d30c9cda59b6f5fe8d29452ff72608aef066ce43304fd4b81b2694cda72c507dac9dcd3af451012850982ae57ba0d9e9bb4f2a368e5072b5b8a7da60cb770
-  data.tar.gz: 4c672f1f98fb0bda3da853f1b619465e8c7891796c7df99af4ebd1b6fa7db5220b63831de2c06233af3185cfc270547ad2831676b179d27e110a12e70600e6c8
+  metadata.gz: 44b8a6a65aa65b1aa1476a8a8f0b180e8684ae4b81d056d10e9fdb12cea1fd8209dd91f553ddc2de6cf5ee3de5219e430fdf6bd691a10c4f34d1c2d5d7393521
+  data.tar.gz: 6722a9c843f572a5b864142c0fe6965b0cbe1882f07442c173d6519ef48f9cef35f0bea7a52144680a0c88858212cac3a53243ff0c2d6054050735e7ae4b3996

data/.gitattributes

@@ -1,2 +1,3 @@
 # Declare files that will always have CRLF line endings on checkout.
 *.bat text eol=crlf
+autohotkey/procedures/collect.rb text eol=crlf

data/autohotkey/tools/OpenGLBuilderAHK

@@ -17,4 +17,8 @@ end
 
 # Clean up scene output
 File.delete('autohotkey/config/tools/opengl_builder/scene.txt')
+# Remove known exception file
+Dir["autohotkey/outputs/logs/*exception.txt"].each do |file|
+  File.delete file if File.read(file).include? "Unknown keyword THIS with parameters is just here to cause an error"
+end
 

data/autohotkey/tools/TlmViewerAHK2

@@ -16,3 +16,7 @@ autohotkey('TlmViewer2', 'tlm_viewer2.ahk') do
   Cosmos::TlmViewer.run
 end
 
+# Remove known exception file
+Dir["autohotkey/outputs/logs/*exception.txt"].each do |file|
+  File.delete file if File.read(file).include? "Unable to require this_widget due to cannot load such file -- this_widget"
+end

data/autohotkey/tools/TlmViewerAHK3

@@ -16,3 +16,8 @@ autohotkey('TlmViewer3') do
   Cosmos::TlmViewer.run
 end
 
+# Remove known exception file
+Dir["autohotkey/outputs/logs/*exception.txt"].each do |file|
+  File.delete file if File.read(file).include? "Error : Unknown keyword 'KEYWORD'"
+end
+

data/autohotkey/tools/TlmViewerAHK4

@@ -16,3 +16,7 @@ autohotkey('TlmViewer4', 'tlm_viewer4.ahk') do
   Cosmos::TlmViewer.run
 end
 
+# Remove known exception file
+Dir["autohotkey/outputs/logs/*exception.txt"].each do |file|
+  File.delete file if File.read(file).include? "NoMethodError : undefined method `columns' for nil:NilClass"
+end

data/autohotkey/tools/packet_viewer.ahk

@@ -132,40 +132,46 @@ Send {Enter}
 Sleep 2000
 
 Click right 380, 595 ; TEMP1 details
-Sleep 500
+Sleep 1000
 Send {Tab}{Enter}
 WinWaitActive TEMP1
+Sleep 1000
+; Leave this window open because we use it later
 
 WinActivate Packet Viewer
 WinWaitActive Packet Viewer
 Click right 380, 685 ; ARY details
-Sleep 500
+Sleep 1000
 Send {Tab}{Enter}
 WinWaitActive ARY
+Sleep 1000
+Send {Enter} ; Close the window
 
 WinActivate Packet Viewer
 WinWaitActive Packet Viewer
 Click right 380, 735 ; COLLECT_TYPE details
-Sleep 500
+Sleep 1000
 Send {Tab}{Enter}
 WinWaitActive COLLECT_TYPE
+Sleep 1000
+Send {Enter} ; Close the window
 
 WinActivate TEMP1
 WinWaitActive TEMP1
-Sleep 5000
+Sleep 2000
 
 Run ruby.exe %A_ScriptDir%/ScriptRunner -w 600 -t 600
 Sleep 2000
 WinActivate Script Runner
-Sleep 500
+Sleep 1000
 Send set_limits("INST","HEALTH_STATUS","TEMP1",-110,-105,105,110,-100,100){ENTER}
 Send set_limits_set("CUSTOM"){ENTER}
-Sleep 500
+Sleep 1000
 Click 400, 88 ; Start
 
 WinActivate TEMP1
 WinWaitActive TEMP1
-Sleep 1000
+Sleep 3000
 
 WinActivate Script Runner
 WinWaitActive Script Runner

data/autohotkey/tools/script_runner2.ahk

@@ -13,6 +13,7 @@ Click 400 90 ; Start
 WinWaitActive Telemetry Viewer
 Sleep 6000
 WinActivate Script Runner
+WinWaitActive Script Runner
 Sleep 6000
 Click 400 90 ; Go
 Sleep 500
@@ -22,12 +23,15 @@ Click 400 90 ; Go
 Sleep 3000
 
 WinActivate Telemetry Viewer
+WinWaitActive Telemetry Viewer
 Sleep 1000
 Send ^q ; File Quit
 WinWaitActive Confirm
 Send {Enter}
+Sleep 500
 
 WinActivate Script Runner
+WinWaitActive Script Runner
 Sleep 2000
 Send ^q ; File Quit
 Sleep 500

data/cosmos.gemspec

@@ -78,7 +78,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'opengl', '>= 0.7', '< 0.10'
   s.add_runtime_dependency 'snmp', '~> 1'
   s.add_runtime_dependency 'rubyzip', '~> 1.1'
-  s.add_runtime_dependency 'qtbindings', '~> 4.8', '>= 4.8.5.2'
+  s.add_runtime_dependency 'qtbindings', '~> 4.8', '>= 4.8.6.2'
 
   # Development Dependencies
   s.add_development_dependency 'rspec', '~> 3'

data/data/crc.txt

@@ -53,7 +53,7 @@
 "lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0x18B1DB71
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0x688D3D3B
 "lib/cosmos/gui/qt_tool.rb" 0x840EF801
-"lib/cosmos/gui/utilities/script_module_gui.rb" 0x0FFA7712
+"lib/cosmos/gui/utilities/script_module_gui.rb" 0xBFDD40DD
 "lib/cosmos/gui/utilities/screenshot.rb" 0x65F75371
 "lib/cosmos/gui/widgets/full_text_search_line_edit.rb" 0x7AAF694C
 "lib/cosmos/gui/widgets/realtime_button_bar.rb" 0xEB0CE858
@@ -83,10 +83,10 @@
 "lib/cosmos/gui/opengl/texture_mapped_sphere.rb" 0x12D03C0E
 "lib/cosmos/gui/opengl/gl_viewport.rb" 0x49CAD811
 "lib/cosmos/gui/opengl/opengl.rb" 0xBE4A454D
-"lib/cosmos/gui/choosers/integer_chooser.rb" 0xCC73344D
+"lib/cosmos/gui/choosers/integer_chooser.rb" 0x0CCB26E3
 "lib/cosmos/gui/choosers/string_chooser.rb" 0x0A60837D
 "lib/cosmos/gui/choosers/file_chooser.rb" 0x575A4333
-"lib/cosmos/gui/choosers/telemetry_chooser.rb" 0x5E7D492D
+"lib/cosmos/gui/choosers/telemetry_chooser.rb" 0x26375593
 "lib/cosmos/gui/choosers/combobox_chooser.rb" 0xAD5383D5
 "lib/cosmos/gui/choosers/float_chooser.rb" 0x23B2FA77
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA
@@ -104,7 +104,7 @@
 "lib/cosmos/tools/replay/replay_server.rb" 0x307A7329
 "lib/cosmos/tools/replay/replay.rb" 0xE9D02C47
 "lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb" 0x2AA9C2F5
-"lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0x4CC8203A
+"lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0xDA3CEF74
 "lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb" 0x7779DCEC
 "lib/cosmos/tools/tlm_extractor/text_item_chooser.rb" 0x587768C6
 "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0xA1C38662
@@ -137,10 +137,10 @@
 "lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0xCE30B8BE
 "lib/cosmos/tools/cmd_sender/cmd_sender_item_delegate.rb" 0x8297CC9D
 "lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb" 0xB192AF6E
-"lib/cosmos/tools/test_runner/test_runner_chooser.rb" 0x182F00C6
+"lib/cosmos/tools/test_runner/test_runner_chooser.rb" 0xB2BC3115
 "lib/cosmos/tools/test_runner/results_writer.rb" 0x25101A48
-"lib/cosmos/tools/test_runner/test_runner.rb" 0x22470AF1
-"lib/cosmos/tools/test_runner/test.rb" 0xD2BE7F1C
+"lib/cosmos/tools/test_runner/test_runner.rb" 0xA498E23D
+"lib/cosmos/tools/test_runner/test.rb" 0x27942572
 "lib/cosmos/tools/tlm_grapher/plots/xy_plot.rb" 0x98F7712F
 "lib/cosmos/tools/tlm_grapher/plots/singlexy_plot.rb" 0xA01649EC
 "lib/cosmos/tools/tlm_grapher/plots/linegraph_plot.rb" 0xF0F6A243
@@ -158,7 +158,7 @@
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tab.rb" 0xD0AC7888
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb" 0x08E6FA35
 "lib/cosmos/tools/tlm_grapher/tlm_grapher.rb" 0xBBFC2272
-"lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb" 0x3D4DB4F2
+"lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb" 0xB0994B7A
 "lib/cosmos/tools/tlm_grapher/plot_editors/plot_editor.rb" 0x0C92BBB8
 "lib/cosmos/tools/tlm_grapher/plot_editors/xy_plot_editor.rb" 0x724D9469
 "lib/cosmos/tools/tlm_grapher/plot_editors/singlexy_plot_editor.rb" 0xA9B7CD4C
@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x1D2090F6
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x23E689C5
+"lib/cosmos/version.rb" 0x2945A487
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D

data/lib/cosmos/gui/choosers/integer_chooser.rb

@@ -37,7 +37,7 @@ module Cosmos
       if minimum_value or maximum_value
         validator = Qt::IntValidator.new(@integer_value)
         validator.setBottom(minimum_value) if minimum_value
-        validator.setTop(minimum_value) if maximum_value
+        validator.setTop(maximum_value) if maximum_value
         @integer_value.setValidator(validator)
       end
       @callback_in_progress = false

data/lib/cosmos/gui/choosers/telemetry_chooser.rb

@@ -102,6 +102,7 @@ module Cosmos
       @packet_layout.addWidget(@packet_combobox)
       @overall_frame.addLayout(@packet_layout)
 
+      @item_combobox = nil
       if choose_item
         # Item Selection
         @item_layout = Qt::HBoxLayout.new
@@ -142,7 +143,7 @@ module Cosmos
       current_packet_name = packet_name()
       current_item_name = item_name()
       update_targets()
-      if current_target_name and current_packet_name and current_item_name
+      if current_target_name and current_packet_name and (current_item_name or !@item_combobox)
         begin
           set_item(current_target_name, current_packet_name, current_item_name)
         rescue Exception
@@ -168,7 +169,11 @@ module Cosmos
 
     # Returns the selected item name
     def item_name
-      @item_combobox.text
+      if @item_combobox
+        @item_combobox.text
+      else
+        nil
+      end
     end
 
     # Returns the list of all target names in the target combobox
@@ -188,7 +193,9 @@ module Cosmos
     # Returns the list of all item names in the item combobox
     def item_names
       item_names_array = []
-      @item_combobox.each {|item_text, item_data| item_names_array << item_text}
+      if @item_combobox
+        @item_combobox.each {|item_text, item_data| item_names_array << item_text}
+      end
       item_names_array
     end
 
@@ -229,17 +236,19 @@ module Cosmos
       set_packet(target_name, packet_name)
 
       # Select desired item
-      index = 0
-      found = false
-      @item_combobox.each do |item_text, item_data|
-        if item_name.upcase == item_text.upcase
-          found = true
-          break
+      if @item_combobox
+        index = 0
+        found = false
+        @item_combobox.each do |item_text, item_data|
+          if item_name.upcase == item_text.upcase
+            found = true
+            break
+          end
+          index += 1
         end
-        index += 1
+        Kernel.raise "TelemetryChooser unknown item_name #{item_name}" unless found
+        @item_combobox.setCurrentIndex(index)
       end
-      Kernel.raise "TelemetryChooser unknown item_name #{item_name}" unless found
-      @item_combobox.setCurrentIndex(index)
     end
 
     protected
@@ -297,16 +306,18 @@ module Cosmos
     # Updates the item names based on a change
     def update_items
       return unless target_name() and packet_name()
-      @item_combobox.clearItems()
-      item_names = System.telemetry.item_names(target_name(), packet_name())
-      item_names.sort!
-      item_names.each do |name|
-        @item_combobox.addItem(name)
-      end
-      if item_names.length > 20
-        @item_combobox.setMaxVisibleItems(20)
-      else
-        @item_combobox.setMaxVisibleItems(item_names.length)
+      if @item_combobox
+        @item_combobox.clearItems()
+        item_names = System.telemetry.item_names(target_name(), packet_name())
+        item_names.sort!
+        item_names.each do |name|
+          @item_combobox.addItem(name)
+        end
+        if item_names.length > 20
+          @item_combobox.setMaxVisibleItems(20)
+        else
+          @item_combobox.setMaxVisibleItems(item_names.length)
+        end
       end
     end
 

data/lib/cosmos/gui/utilities/script_module_gui.rb

@@ -61,13 +61,13 @@ module Cosmos
       return answer.to_s
     end
 
-    def prompt_dialog_box(title, message, icon = Qt::MessageBox::NoIcon)
+    def prompt_dialog_box(title, message)
       result = nil
       Qt.execute_in_main_thread(true, 0.05) do
         window = nil
         window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
         msg = Qt::MessageBox.new(window)
-        msg.setIcon(icon)
+        msg.setIcon(Qt::MessageBox::Warning)
         msg.setText(message)
         msg.setWindowTitle(title)
         msg.setStandardButtons(Qt::MessageBox::Yes | Qt::MessageBox::No)
@@ -89,7 +89,7 @@ module Cosmos
       message = "Warning: Command #{target_name} #{cmd_name} is Hazardous. "
       message << "\n#{hazardous_description}\n" if hazardous_description
       message << "Send?"
-      return prompt_dialog_box('Hazardous Command', message, Qt::MessageBox::Warning)
+      return prompt_dialog_box('Hazardous Command', message)
     end
 
     def prompt_for_script_abort

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

@@ -31,7 +31,7 @@ module Cosmos
       @total = 1
     end
 
-    def total= (new_total)
+    def total=(new_total)
       if new_total <= 0
         @total = 1
       else
@@ -141,12 +141,12 @@ module Cosmos
     end
 
     # Run a specific test case
-    def run_test_case (test_case)
+    def run_test_case(test_case)
       TestStatus.instance.status = "#{self.class} : #{test_case}"
       run_function(self, test_case)
     end
 
-    def run_function (object, method_name)
+    def run_function(object, method_name)
       # Convert to a symbol to use as a method_name
       method_name = method_name.to_s.intern unless method_name.class == Symbol
 
@@ -265,7 +265,7 @@ module Cosmos
       num_tests
     end
 
-    def self.puts (string)
+    def self.puts(string)
       $stdout.puts string
       if @@current_test_result
         @@current_test_result.message ||= ''
@@ -284,7 +284,7 @@ module Cosmos
       @plans = []
     end
 
-    def <=> (other_test_suite)
+    def <=>(other_test_suite)
       self.name <=> other_test_suite.name
     end
 
@@ -298,35 +298,35 @@ module Cosmos
     end
 
     # Add a test to the suite
-    def add_test (test_class)
+    def add_test(test_class)
       test_class = Object.const_get(test_class.to_s.intern) unless test_class.class == Class
       @tests[test_class] = test_class.new unless @tests[test_class]
       @plans << [:TEST, test_class, nil]
     end
 
     # Add a test case to the suite
-    def add_test_case (test_class, test_case)
+    def add_test_case(test_class, test_case)
       test_class = Object.const_get(test_class.to_s.intern) unless test_class.class == Class
       @tests[test_class] = test_class.new unless @tests[test_class]
       @plans << [:TEST_CASE, test_class, test_case]
     end
 
     # Add a test setup to the suite
-    def add_test_setup (test_class)
+    def add_test_setup(test_class)
       test_class = Object.const_get(test_class.to_s.intern) unless test_class.class == Class
       @tests[test_class] = test_class.new unless @tests[test_class]
       @plans << [:TEST_SETUP, test_class, nil]
     end
 
     # Add a test teardown to the suite
-    def add_test_teardown (test_class)
+    def add_test_teardown(test_class)
       test_class = Object.const_get(test_class.to_s.intern) unless test_class.class == Class
       @tests[test_class] = test_class.new unless @tests[test_class]
       @plans << [:TEST_TEARDOWN, test_class, nil]
     end
 
     # Run all the tests
-    def run (&block)
+    def run(&block)
       TestStatus.instance.total = get_num_tests()
       results = []
 
@@ -374,7 +374,7 @@ module Cosmos
     end
 
     # Run a specific test
-    def run_test (test_class, internal = false, &block)
+    def run_test(test_class, internal = false, &block)
       # Determine if this test_class is in the plan and the number of tests associated with this test_class
       in_plan = false
       num_tests = 0
@@ -426,12 +426,12 @@ module Cosmos
     end
 
     # Run a specific test case
-    def run_test_case (test_class, test_case, internal = false)
+    def run_test_case(test_class, test_case, internal = false)
       TestStatus.instance.total = 1 unless internal
       @tests[test_class].run_test_case(test_case)
     end
 
-    def run_setup (internal = false)
+    def run_setup(internal = false)
       result = nil
       if self.class.method_defined?(:setup) and @tests.length > 0
         TestStatus.instance.total = 1 unless internal
@@ -441,7 +441,7 @@ module Cosmos
       result
     end
 
-    def run_teardown (internal = false)
+    def run_teardown(internal = false)
       result = nil
       if self.class.method_defined?(:teardown) and @tests.length > 0
         TestStatus.instance.total = 1 unless internal
@@ -451,12 +451,12 @@ module Cosmos
       result
     end
 
-    def run_test_setup (test_class, internal = false)
+    def run_test_setup(test_class, internal = false)
       TestStatus.instance.total = 1 unless internal
       @tests[test_class].run_setup
     end
 
-    def run_test_teardown (test_class, internal = false)
+    def run_test_teardown(test_class, internal = false)
       TestStatus.instance.total = 1 unless internal
       @tests[test_class].run_teardown
     end

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

@@ -72,6 +72,12 @@ module Cosmos
       Splash.execute(self) do |splash|
         ConfigParser.splash = splash
         process_config(options.config_file)
+        if options.test_suite
+          Qt.execute_in_main_thread do
+            # Start the test and don't warn the user about their options
+            handle_start(options.test_suite, options.test_group, options.test_case, false)
+          end
+        end
         ConfigParser.splash = nil
       end
 
@@ -422,9 +428,11 @@ module Cosmos
     # Callbacks
     ###########################################
 
-    def generic_handler(test_suite, test = nil, test_case = nil)
-      return unless continue_without_pausing_on_errors?
-      return unless continue_loop_testing?()
+    def generic_handler(test_suite, test = nil, test_case = nil, warnings = true)
+      if warnings
+        return unless continue_without_pausing_on_errors?
+        return unless continue_loop_testing?()
+      end
 
       # TODO: This can take a while depending on the number of tests and their
       # complexity. Consider making a progress bar for this.
@@ -439,8 +447,8 @@ module Cosmos
       end
     end
 
-    def handle_start(test_suite, test = nil, test_case = nil)
-      generic_handler(test_suite, test, test_case) do
+    def handle_start(test_suite, test = nil, test_case = nil, warnings = true)
+      generic_handler(test_suite, test, test_case, warnings) do
         if test_case
           @script_runner_frame.set_text("TestRunner.start(#{test_suite}, #{test}, '#{test_case}')", "#{test_suite}_#{test}_#{test_case}")
         elsif test
@@ -514,10 +522,12 @@ module Cosmos
     end
 
     def handle_error(script_runner_frame)
-      if @continue_test_case_after_error.isChecked()
-        script_runner_frame.enable_retry()
-      else
-        script_runner_frame.disable_retry()
+      Qt.execute_in_main_thread(true) do
+        if @@settings['Continue Test Case after Error']
+          script_runner_frame.enable_retry()
+        else
+          script_runner_frame.disable_retry()
+        end
       end
     end
 
@@ -1152,6 +1162,23 @@ module Cosmos
           option_parser.on("-s", "--server FILE", "Use the specified server configuration file for disconnect mode") do |arg|
             options.server_config_file = arg
           end
+          option_parser.on("--suite SUITE", "Start the specified test suite.") do |arg|
+            options.test_suite = arg
+          end
+          option_parser.on("--group GROUP", "Start the specified test group. Requires the --suite option.") do |arg|
+            unless options.test_suite
+              puts option_parser
+              exit
+            end
+            options.test_group = arg
+          end
+          option_parser.on("--case CASE", "Start the specified test case. Requires the --suite and --group options.") do |arg|
+            unless options.test_suite && options.test_group
+              puts option_parser
+              exit
+            end
+            options.test_case = arg
+          end
         end
 
         super(option_parser, options)

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

@@ -12,10 +12,13 @@ require 'cosmos'
 
 module Cosmos
 
-  # TestRunnerChooser class
-  #
-  # This class implements the TestRunnerChooser
-  #
+  # Qt Widget used by the Cosmos::TestRunner application.
+  # It constructs a list of Test Suites, Test Groups, and
+  # Test Cases in combo box choosers. All combo boxes are folowed by
+  # Start buttons and Suites and Groups also have Setup and Teardown
+  # buttons. When a new Test Suite is choosen the Test Group and
+  # Test Case combo boxes update. When a Test Group is changed the
+  # Test Case combo box is updated.
   class TestRunnerChooser < Qt::Widget
 
     # Width of the button in the Combobox

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

@@ -510,7 +510,9 @@ module Cosmos
         @input_filenames = @packet_log_frame.filenames.sort
         @batch_filenames = []
         output_extension = '.txt'
+        batch_name = nil
         if @batch_mode_check.checked?
+          batch_name = @batch_name_entry.text
           @batch_filenames_entry.each {|list_item| @batch_filenames << list_item.text}
           if @packet_log_frame.output_filename_filter == Cosmos::CSV_FILE_PATTERN
             output_extension = '.csv'
@@ -539,7 +541,7 @@ module Cosmos
               process_args = [@input_filenames, [@tlm_extractor_config], @packet_log_frame.time_start, @packet_log_frame.time_end]
             else
               process_method = :process_batch
-              process_args = [@batch_name_entry.text, @input_filenames, @log_dir, output_extension, @batch_filenames, @packet_log_frame.time_start, @packet_log_frame.time_end]
+              process_args = [batch_name, @input_filenames, @log_dir, output_extension, @batch_filenames, @packet_log_frame.time_start, @packet_log_frame.time_end]
             end
 
             @tlm_extractor_processor.send(process_method, *process_args) do |input_file_index, packet_count, file_progress|

data/lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb

@@ -269,10 +269,13 @@ module Cosmos
 
     # Returns the index of the current tab or nil if no tabs exist
     def current_tab_index
+      tab_index = -1
       unless @tabbed_plots_config.tabs.empty?
-        tab_index = @tab_book.currentIndex
-        return tab_index if tab_index >= 0
+        Qt.execute_in_main_thread(true) do
+          tab_index = @tab_book.currentIndex
+        end
       end
+      return tab_index if tab_index >= 0
       nil
     end # def current_tab_index
 
@@ -444,14 +447,16 @@ module Cosmos
 
     # Exports data objects on a plot - defaults to selected plot on the current tab
     def export_plot(filename, progress, tab_index = nil, plot_index = nil)
-      # Select the current tab by default
-      tab_index = current_tab_index() unless tab_index
+      Qt.execute_in_main_thread(true) do
+        # Select the current tab by default
+        tab_index = current_tab_index() unless tab_index
 
-      # Select selected plot by default
-      plot_index = selected_plot_index(tab_index) if tab_index and not plot_index
-      unless plot_index
-        Qt::MessageBox.information(self, 'Information', 'Please select a plot')
-        return
+        # Select selected plot by default
+        plot_index = selected_plot_index(tab_index) if tab_index and not plot_index
+        unless plot_index
+          Qt::MessageBox.information(self, 'Information', 'Please select a plot')
+          return
+        end
       end
 
       export_data_objects(filename, progress, tab_index, plot_index)
@@ -486,12 +491,18 @@ module Cosmos
       # Select the current tab by default
       tab_index = current_tab_index() unless tab_index
 
+      plot_index = nil
       if tab_index
-        @tabbed_plots_config.tabs[tab_index].plots.each_with_index do |plot, index|
-          return index if plot.gui_object.selected?
+        Qt.execute_in_main_thread(true) do
+          @tabbed_plots_config.tabs[tab_index].plots.each_with_index do |plot, index|
+            if plot.gui_object.selected?
+              plot_index = index
+              break
+            end
+          end
         end
       end
-      nil
+      return plot_index
     end # def selected_plot_index
 
     # Indicates if the plot has any data objects
@@ -703,9 +714,11 @@ module Cosmos
     def selected_data_object_indexes
       selected = []
       index = 0
-      @data_object_list.each do |list_item|
-        selected << index if list_item.selected? and @data_object_list.item(index).text != 'No Plot Selected'
-        index += 1
+      Qt.execute_in_main_thread(true) do
+        @data_object_list.each do |list_item|
+          selected << index if list_item.selected? and @data_object_list.item(index).text != 'No Plot Selected'
+          index += 1
+        end
       end
       selected
     end # def selected_data_object_indexes

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.4.1'
+COSMOS_VERSION = '3.4.2'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '4'
-    PATCH = '1'
-    BUILD = '2ce089801e159a76caad0b207042e289c6ab3367'
+    PATCH = '2'
+    BUILD = 'd7b8067e652f11393629c9e8e1708cb846c5d233'
   end
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

data/run_gui_tests.bat

@@ -17,6 +17,8 @@ call bundle exec ruby autohotkey\tools\TestRunnerAHK -w 800 -t 800
 call bundle exec ruby autohotkey\tools\TestRunnerAHK2 -w 800 -t 800 -c test_runner2.txt
 call bundle exec ruby autohotkey\tools\TestRunnerAHK3 -w 800 -t 800 -c test_runner3.txt
 call bundle exec ruby autohotkey\tools\TestRunnerAHK4 -w 800 -t 800 -c test_runner4.txt
+call bundle exec ruby autohotkey\tools\TestRunnerAHK5 -w 800 -t 800 --suite ExampleTestSuite --group ExampleTest --case test_3xx
+call bundle exec ruby autohotkey\tools\TestRunnerAHK6 --group ExampleTest --case test_3xx
 call bundle exec ruby autohotkey\tools\TlmGrapherAHK -w 800 -t 800
 call bundle exec ruby autohotkey\tools\TlmGrapherAHK2 -s -c test2.txt -w 1200 -t 800
 call bundle exec ruby autohotkey\tools\TlmGrapherAHK3 -i 'INST HEALTH_STATUS TEMP1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,7 +216,7 @@ dependencies:
         version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.5.2
+        version: 4.8.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
         version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.5.2
+        version: 4.8.6.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement