cosmos 3.6.2 → 3.6.3

data/lib/cosmos/script/scripting.rb

@@ -457,7 +457,7 @@ module Cosmos
       path = procedure_name if !path and File.exist?(procedure_name)
       path = procedure_name_with_extension if !path and procedure_name_with_extension and File.exist?(procedure_name_with_extension)
 
-      raise "Procedure not found : #{procedure_name}" unless path
+      raise LoadError, "Procedure not found -- #{procedure_name}" unless path
       path
     end
 
@@ -544,7 +544,7 @@ module Cosmos
         begin
           Kernel::load(path)
         rescue LoadError => error
-          raise RuntimeError.new("Error loading : #{procedure_name} : #{error.message}")
+          raise LoadError, "Error loading -- #{procedure_name}\n#{error.message}"
         end
       end
       # Return whether we had to load and instrument this file, i.e. it was not cached

data/lib/cosmos/script/tools.rb

@@ -37,10 +37,17 @@ module Cosmos
       rescue DRb::DRbConnError
         # No Listening Tlm Viewer - So Start One
         start_tlm_viewer
+        max_retries = 60
+        retry_count = 0
         begin
           yield tlm_viewer
           tlm_viewer.disconnect
         rescue DRb::DRbConnError
+          retry_count += 1
+          if retry_count < max_retries
+            canceled = cosmos_script_sleep(1)
+            retry unless canceled
+          end
           raise "Unable to Successfully Start Listening Telemetry Viewer: #{display_name} could not be #{action}"
         rescue Errno::ENOENT
           raise "Display Screen File: #{display_name}.txt does not exist"
@@ -61,7 +68,7 @@ module Cosmos
         cmd << 'w' if Kernel.is_windows? # Windows uses rubyw to avoid creating a DOS shell
         Cosmos.run_process("#{cmd} '#{File.join(Cosmos::USERPATH, 'tools', 'TlmViewer')}' --system #{system_file}")
       end
-      sleep(5)
+      cosmos_script_sleep(1)
     end
 
     #######################################

data/lib/cosmos/tools/data_viewer/data_viewer.rb

@@ -104,19 +104,25 @@ module Cosmos
       @search_find_keyseq = Qt::KeySequence.new(tr('Ctrl+F'))
       @search_find.shortcut  = @search_find_keyseq
       @search_find.statusTip = tr('Find text')
-      @search_find.connect(SIGNAL('triggered()')) { find() }
+      @search_find.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.show_find(self)
+      end
 
       @search_find_next = Qt::Action.new(tr('Find &Next'), self)
       @search_find_next_keyseq = Qt::KeySequence.new(tr('F3'))
       @search_find_next.shortcut  = @search_find_next_keyseq
       @search_find_next.statusTip = tr('Find next instance')
-      @search_find_next.connect(SIGNAL('triggered()')) { find_next() }
+      @search_find_next.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.find_next(self)
+      end
 
       @search_find_previous = Qt::Action.new(tr('Find &Previous'), self)
       @search_find_previous_keyseq = Qt::KeySequence.new(tr('Shift+F3'))
       @search_find_previous.shortcut  = @search_find_previous_keyseq
       @search_find_previous.statusTip = tr('Find previous instance')
-      @search_find_previous.connect(SIGNAL('triggered()')) { find_previous() }
+      @search_find_previous.connect(SIGNAL('triggered()')) do
+        FindReplaceDialog.find_previous(self)
+      end
 
       # Tab Menu Actions
       @delete_tab = Qt::Action.new(Cosmos.get_icon('delete_tab.png'), tr('&Delete Tab'), self)
@@ -179,21 +185,10 @@ module Cosmos
       end
     end
 
-    def find
-      current_component do |component|
-        FindReplaceDialog.show_find(component.text)
-      end
-    end
-
-    def find_next
-      current_component do |component|
-        FindReplaceDialog.find_next(component.text)
-      end
-    end
-
-    def find_previous
+    # Called by the FindReplaceDialog to get the text to search
+    def search_text
       current_component do |component|
-        FindReplaceDialog.find_previous(component.text)
+        component.text
       end
     end
 

data/lib/cosmos/tools/launcher/launcher_config.rb

@@ -151,7 +151,7 @@ module Cosmos
         if spec_name_split.length > 1 and spec_name_split[0] == 'cosmos'
           # Filter to just tools and not targets
           if File.exist?(File.join(spec.gem_dir, 'tools'))
-            Dir[File.join(spec.gem_dir, 'tools', '*')].each do |filename|
+            Dir[File.join(spec.gem_dir, 'tools', '*')].sort.each do |filename|
               if File.extname(filename) == ''
                 @items << [:TOOL, File.basename(filename), format_shell_command(parser, "LAUNCH_GEM #{File.basename(filename)}"), true, File.basename(filename).class_name_to_filename(false) + '.png', nil]
               end

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

@@ -160,7 +160,7 @@ module Cosmos
       @search_find.shortcut  = @search_find_keyseq
       @search_find.statusTip = tr('Find text')
       @search_find.connect(SIGNAL('triggered()')) do
-        FindReplaceDialog.show_find(active_script_runner_frame().script)
+        FindReplaceDialog.show_find(self)
       end
 
       @search_find_next = Qt::Action.new(tr('Find &Next'), self)
@@ -168,7 +168,7 @@ module Cosmos
       @search_find_next.shortcut  = @search_find_next_keyseq
       @search_find_next.statusTip = tr('Find next instance')
       @search_find_next.connect(SIGNAL('triggered()')) do
-        FindReplaceDialog.find_next(active_script_runner_frame().script)
+        FindReplaceDialog.find_next(self)
       end
 
       @search_find_previous = Qt::Action.new(tr('Find &Previous'), self)
@@ -176,7 +176,7 @@ module Cosmos
       @search_find_previous.shortcut  = @search_find_previous_keyseq
       @search_find_previous.statusTip = tr('Find previous instance')
       @search_find_previous.connect(SIGNAL('triggered()')) do
-        FindReplaceDialog.find_previous(active_script_runner_frame().script)
+        FindReplaceDialog.find_previous(self)
       end
 
       @search_replace = Qt::Action.new(tr('&Replace'), self)
@@ -184,7 +184,7 @@ module Cosmos
       @search_replace.shortcut  = @search_replace_keyseq
       @search_replace.statusTip = tr('Replace')
       @search_replace.connect(SIGNAL('triggered()')) do
-        FindReplaceDialog.show_replace(active_script_runner_frame().script)
+        FindReplaceDialog.show_replace(self)
       end
 
       # Script Actions
@@ -614,6 +614,11 @@ module Cosmos
     # Callbacks
     ###########################################
 
+    # Called by the FindReplaceDialog to get the text to search
+    def search_text
+      active_script_runner_frame().script
+    end
+
     def undo_available(bool)
       update_title()
     end

data/lib/cosmos/tools/table_manager/table_manager.rb

@@ -890,7 +890,9 @@ module Cosmos
 
       case item_def.display_type
         when :STATE
-          gui_table.setItem(table_row, table_column, Qt::TableWidgetItem.new(table_def.read(item_def.name)))
+          item = Qt::TableWidgetItem.new
+          item.setData(Qt::DisplayRole, Qt::Variant.new(table_def.read(item_def.name)))
+          gui_table.setItem(table_row, table_column, item)
           if item_def.editable
             gui_table.item(table_row, table_column).setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable)
           else

data/lib/cosmos/tools/tlm_grapher/plot_editors/linegraph_plot_editor.rb

@@ -20,6 +20,7 @@ module Cosmos
 
   # Widget which lays out the options for editing a plot
   class LinegraphPlotEditor < PlotEditor
+    UTC = 'UTC' # Used in combobox and matcher logic
 
     def initialize(parent, plot = nil)
       super(parent, plot)
@@ -92,13 +93,21 @@ module Cosmos
       @manual_y_grid_line_scale = FloatChooser.new(self, 'Manual Y Grid Line Scale:', manual_y_grid_line_scale.to_s)
       @layout.addWidget(@manual_y_grid_line_scale)
 
-      # Combobox Chooser
       choices = ['TRUE', 'FALSE']
       choices.delete(@plot.unix_epoch_x_values.to_s.upcase)
       choices.unshift(@plot.unix_epoch_x_values.to_s.upcase)
       @unix_epoch_x_values = ComboboxChooser.new(self, 'Unix Epoch X Values:', choices)
       @layout.addWidget(@unix_epoch_x_values)
 
+      # If utc_time is already selected show it first
+      if @plot.utc_time
+        choices = [UTC, 'Local']
+      else
+        choices = ['Local', UTC]
+      end
+      @time_format_chooser = ComboboxChooser.new(self, 'Time Format:', choices)
+      @layout.addWidget(@time_format_chooser)
+
       setLayout(@layout)
     end # def initialize
 
@@ -173,6 +182,7 @@ module Cosmos
         plot.manual_y_grid_line_scale = nil
       end
       plot.unix_epoch_x_values = ConfigParser.handle_true_false(@unix_epoch_x_values.string)
+      plot.utc_time = (@time_format_chooser.string == UTC)
       plot
     end
 

data/lib/cosmos/tools/tlm_grapher/plot_gui_objects/linegraph_plot_gui_object.rb

@@ -77,6 +77,7 @@ module Cosmos
       self.manual_x_grid_line_scale = @plot.manual_x_grid_line_scale
       self.manual_y_grid_line_scale = @plot.manual_y_grid_line_scale
       self.unix_epoch_x_values = @plot.unix_epoch_x_values
+      self.utc_time = @plot.utc_time
 
       # Update horizontal lines
       self.clear_horizontal_lines

data/lib/cosmos/tools/tlm_grapher/plots/linegraph_plot.rb

@@ -61,6 +61,9 @@ module Cosmos
     # Interpret x values as unix epoch timestamps
     attr_accessor :unix_epoch_x_values
 
+    # Display x values as UTC time
+    attr_accessor :utc_time
+
     def initialize
       super()
       @title = nil
@@ -78,6 +81,7 @@ module Cosmos
       @manual_x_grid_line_scale = nil
       @manual_y_grid_line_scale = nil
       @unix_epoch_x_values = true
+      @utc_time = false
     end # def initialize
 
     # Handles plot specific keywords
@@ -165,6 +169,9 @@ module Cosmos
         parser.verify_num_parameters(1, 1, "UNIX_EPOCH_X_VALUES <TRUE or FALSE>")
         @unix_epoch_x_values = ConfigParser.handle_true_false(parameters[0])
 
+      when 'UTC_TIME'
+        @utc_time = true
+
       else
         # Unknown keywords are passed to parent data object
         super(parser, keyword, parameters)
@@ -193,6 +200,7 @@ module Cosmos
       string << "    MANUAL_X_GRID_LINE_SCALE #{@manual_x_grid_line_scale}\n" if @manual_x_grid_line_scale
       string << "    MANUAL_Y_GRID_LINE_SCALE #{@manual_y_grid_line_scale}\n" if @manual_y_grid_line_scale
       string << "    UNIX_EPOCH_X_VALUES #{@unix_epoch_x_values.to_s.upcase}\n"
+      string << "    UTC_TIME\n" if @utc_time
       string
     end # def plot_configuration_string
 

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.6.2'
+COSMOS_VERSION = '3.6.3'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '6'
-    PATCH = '2'
-    BUILD = 'fcb3c8cec14487f39b0465f850a61b9ea13355cc'
+    PATCH = '3'
+    BUILD = '94a14746a45a58b2382cb17b0984f2ec5fd265af'
   end
-  VERSION = '3.6.2'
+  VERSION = '3.6.3'
 end

data/spec/core_ext/array_spec.rb

@@ -120,6 +120,35 @@ describe Array do
     it "finds the range of values containing both" do
       expect(Array.new([0,1,1,2,2,3]).range_containing(1,2)).to eql (1..4)
       expect(Array.new([0,1,1,2,2,3]).range_containing(1,1)).to eql (1..2)
+      expect(Array.new([0,1,2,3,4,5]).range_containing(1,4)).to eql (1..4)
+    end
+
+    it "creates an empty range at the beginning of the array if the values both too small" do
+      expect(Array.new([0,1,1,2,2,3]).range_containing(-2,-1)).to eql (0..0)
+    end
+
+    it "creates an empty range at the end of the array if the values are both too large" do
+      expect(Array.new([0,1,1,2,2,3]).range_containing(4,5)).to eql (5..5)
+    end
+  end
+
+  describe "range_within" do
+    it "complains if start < end" do
+      expect { Array.new().range_within(2,1) }.to raise_error(RuntimeError, "end_value: 1 must be greater than start_value: 2")
+    end
+
+    it "finds the range of values within both" do
+      expect(Array.new([0,1,1,2,2,3]).range_within(1,2)).to eql (2..3)
+      expect(Array.new([0,1,1,2,2,3]).range_within(1,1)).to eql (1..2)
+      expect(Array.new([0,1,2,3,4,5]).range_within(1,4)).to eql (1..4)
+    end
+
+    it "creates an empty range at the beginning of the array if the values both too small" do
+      expect(Array.new([0,1,1,2,2,3]).range_within(-2,-1)).to eql (0..0)
+    end
+
+    it "creates an empty range at the end of the array if the values are both too large" do
+      expect(Array.new([0,1,1,2,2,3]).range_within(4,5)).to eql (5..5)
     end
   end
 
@@ -163,7 +192,7 @@ describe Array do
   end
 
   describe "histogram" do
-    it "groups elements" do
+    it "groups numeric elements" do
       myData1 = [1, 7, 4, 3, 4, 2, 7, 0, 8, 3, 4]
       myData2 = [1, 2, 3]
       myData3 = [2, 4, 8]
@@ -181,6 +210,38 @@ describe Array do
       expect(myData3.histogram(7, true)[2][2]).to eql 1
       expect(myData3.histogram(25, true)[20][2]).to eql 0
     end
+
+    it "sorts by a given block" do
+      myData1 = [1, 7, 4, 3, 4, 2, 7, 0, 8, 3, 4]
+      histogram = myData1.histogram(nil, true) do |val1, val2|
+        val2[0] <=> val1[0]
+      end
+      expect(myData1.histogram(nil, true)).to eql histogram.reverse
+    end
+
+    it "groups non-numeric elements" do
+      myData1 = ['b', 'h', 'e', 'd', 'e', 'c', 'h', 'a', 'i', 'd', 'e']
+      myData2 = ['b', 'c', 'd']
+      myData3 = ['c', 'e', 'i']
+
+      expect(myData1.histogram()).to eql [['a','a',1],['b','b',1],['c','c',1],['d','d',2],['e','e',3],['h','h',2],['i','i',1]]
+      expect(myData2.histogram()).to eql [["b", "b", 1], ["c", "c", 1], ["d", "d", 1]]
+      expect(myData3.histogram()).to eql [["c", "c", 1], ["e", "e", 1], ["i", "i", 1]]
+
+      # Even though we request 9 we only get 7 because that's all the unique values we have
+      expect(myData1.histogram(9, false).length).to eql 7
+      expect(myData1.histogram(1, false).length).to eql 1
+      expect(myData1.histogram(7, false)[0][2]).to eql 1
+      expect(myData1.histogram(7, false)[4][2]).to eql 3
+      expect(myData1.histogram(3, false)[0][2]).to eql 3
+      # Even though we request 5 we only get 3 because that's all the unique values we have
+      expect(myData2.histogram(5, false).length).to eql 3
+      expect(myData2.histogram(3, false)[2][2]).to eql 1
+      expect(myData2.histogram(3, false)[1][2]).to eql 1
+      # Even though we request 7 we only get 3 because that's all the unique values we have
+      expect(myData3.histogram(7, false).length).to eql 3
+      expect(myData3.histogram(3, false)[2][2]).to eql 1
+    end
   end
 end
 

data/spec/core_ext/matrix_spec.rb

@@ -10,6 +10,7 @@
 
 require 'spec_helper'
 require 'cosmos/core_ext/matrix'
+require 'ostruct'
 
 describe Matrix do
 
@@ -62,5 +63,65 @@ describe Matrix do
       expect(Matrix[[1,2],[4,5],[7,8]].trace).to eql 6.0
     end
   end
+
+  describe "cfromq" do
+    it "calculates the rotational matrix from the quaternion" do
+      quaternion = OpenStruct.new
+      quaternion.w = 1
+      quaternion.x = 0
+      quaternion.y = 0
+      quaternion.z = 0
+      expect(Matrix.cfromq(quaternion)).to eql Matrix[[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]]
+
+      quaternion.w = Math.sqrt(0.5)
+      quaternion.x = Math.sqrt(0.5)
+      quaternion.y = 0
+      quaternion.z = 0
+      matrix = Matrix.cfromq(quaternion)
+      expect(matrix[0]).to eql [1.0, 0.0, 0.0]
+      expect(matrix[1][0]).to eql 0.0
+      expect(matrix[1][1]).to be_within(1e-10).of(0.0)
+      expect(matrix[1][2]).to be_within(1e-10).of(1.0)
+      expect(matrix[2][0]).to eql 0.0
+      expect(matrix[2][1]).to be_within(1e-10).of(-1.0)
+      expect(matrix[2][2]).to be_within(1e-10).of(0.0)
+    end
+  end
+
+  describe "trans4" do
+    it "translates the matrix by x,y,z" do
+      matrix = Matrix[[4,4,4,4],[3,3,3,3],[2,2,2,2],[1,1,1,1]]
+      expect(matrix.trans4(1,1,1)).to eql Matrix[[4,4,4,4],[3,3,3,3],[2,2,2,2],[10,10,10,10]]
+    end
+  end
+
+  describe "scale4" do
+    it "scales the matrix by x,y,z" do
+      matrix = Matrix[[5,5,5,5],[4,4,4,4],[3,3,3,3],[2,2,2,2]]
+      expect(matrix.scale4(2,4,6)).to eql Matrix[[10,10,10,10],[16,16,16,16],[18,18,18,18],[2,2,2,2]]
+    end
+  end
+
+  describe "rot4" do
+    it "rotates the matrix about the quaternion" do
+      matrix = Matrix[[4,4,4,4],[3,3,3,3],[2,2,2,2],[1,1,1,1]]
+      quaternion = OpenStruct.new
+      quaternion.w = Math.sqrt(0.5)
+      quaternion.x = Math.sqrt(0.5)
+      quaternion.y = 0
+      quaternion.z = 0
+      matrix = matrix.rot4(quaternion)
+      expect(matrix[0]).to eql [4.0, 4.0, 4.0, 4.0]
+      expect(matrix[1][0]).to be_within(1e-10).of(2.0)
+      expect(matrix[1][1]).to be_within(1e-10).of(2.0)
+      expect(matrix[1][2]).to be_within(1e-10).of(2.0)
+      expect(matrix[1][3]).to be_within(1e-10).of(2.0)
+      expect(matrix[2][0]).to be_within(1e-10).of(-3.0)
+      expect(matrix[2][1]).to be_within(1e-10).of(-3.0)
+      expect(matrix[2][2]).to be_within(1e-10).of(-3.0)
+      expect(matrix[2][3]).to be_within(1e-10).of(-3.0)
+      expect(matrix[3]).to eql [1.0, 1.0, 1.0, 1.0]
+    end
+  end
 end
 

data/spec/interfaces/linc_interface_spec.rb

@@ -243,15 +243,6 @@ module Cosmos
 
         @i.read
       end
-
-      it "handles response overflows" do
-        @handshake = System.telemetry.packet("INST","HANDSHAKE")
-        @handshake.write("GSE_HDR_ID", 1001)
-        @handshake.write("ORIGIN", 0)
-        allow_any_instance_of(LengthStreamProtocol).to receive(:read).and_return(@handshake)
-        100.times { @i.read }
-        expect { @i.read }.to raise_error
-      end
     end
 
   end

data/spec/script/script_spec.rb

@@ -9,7 +9,6 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'spec_helper'
-require 'cosmos'
 require 'cosmos/script'
 require 'tempfile'
 
@@ -25,8 +24,6 @@ module Cosmos
         file.puts 'TARGET INST'
       end
       System.class_eval('@@instance = nil')
-
-      require 'cosmos/script'
     end
 
     after(:all) do
@@ -35,6 +32,13 @@ module Cosmos
     end
 
     describe "require cosmos/script.rb" do
+      it "should require cosmos/script/script" do
+        save = $0
+        $0 = "Test"
+        expect { load 'cosmos/script.rb' }.to_not raise_error()
+        $0 = save
+      end
+
       it "should raise when inside CmdTlmServer" do
         save = $0
         $0 = "CmdTlmServer"