cosmos 3.6.3 → 3.7.0

data/lib/cosmos/gui/line_graph/line_graph_drawing.rb

@@ -133,7 +133,7 @@ module Cosmos
       if label
         text = label.to_s
       else
-        text = convert_x_value_to_text(value, @max_x_characters)
+        text = convert_x_value_to_text(value)
       end
       left_widths << ((metrics.width(text) / 2) - LEFT_X_LABEL_WIDTH_ADJUST)
 
@@ -214,7 +214,7 @@ module Cosmos
       if label
         text = label.to_s
       else
-        text = convert_x_value_to_text(value, @max_x_characters)
+        text = convert_x_value_to_text(value)
       end
       metrics = Cosmos.getFontMetrics(@font)
       text_width  = metrics.width(text)
@@ -244,19 +244,23 @@ module Cosmos
     end # def draw_x_label_and_grid_line
 
     # Converts a x value into text with a max number of characters
-    def convert_x_value_to_text(value, max_characters)
-      if !@show_popup_x_y and @unix_epoch_x_values
-        if (value > 1 and value < 2147483647)
-          time = Time.at(value.to_f)
+    def convert_x_value_to_text(value, max_characters = @max_x_characters, full_date = false)
+      if !@show_popup_x_y && @unix_epoch_x_values
+        # Determine if the value is a time stamp and should be converted
+        if value > 1 && value < 2147483647
+          time = Time.at(value)
           time = time.utc if @utc_time
-          text = time.formatted(false) # no year
+          if full_date
+            time.formatted # full date with day, month, year
+          else
+            time.formatted(false) # just hour, minutes, seconds
+          end
         else
-          text = value.to_s
+          truncate_to_max(value.to_s, max_characters, value)
         end
       else
-        text = value.to_s
+        truncate_to_max(value.to_s, max_characters, value)
       end
-      truncate_to_max(text, max_characters, value)
     end
 
     # Converts a y value into text with a max number of characters
@@ -349,10 +353,46 @@ module Cosmos
       end
       legend_width += (GRAPH_SPACER * 2)
       legend_width *= 2 if @lines.axes == :BOTH
-      legend_graph_x = (self.width - legend_width) / 2
 
-      text_x = legend_graph_x + GRAPH_SPACER
-      text_y = self.height - metrics.height
+      if @legend_position == :right
+        legend_height = 0
+        if @show_legend && !@lines.empty?
+          text_y = (self.height/2) - 1 - (GRAPH_SPACER * 2)
+          text_height = metrics.height
+          if @lines.axes == :BOTH
+            left_count = 0
+            right_count = 0
+            @lines.legend.each do |text, color, axis|
+              if axis == :LEFT
+                left_count += 1
+              else
+                right_count += 1
+              end
+            end
+            if left_count < right_count
+              text_y += text_height * (right_count/2)
+            else
+              text_y += text_height * (left_count/2)
+            end
+          else
+            text_y += text_height * (@lines.size/2)
+          end
+          legend_height = self.height - text_y - GRAPH_SPACER
+        end
+
+        legend_graph_x = self.width - legend_width - GRAPH_SPACER*3
+
+        char_width   = metrics.width('W')
+        legend_graph_x -= (char_width + GRAPH_SPACER) if @right_y_axis_title
+
+        text_x = legend_graph_x + GRAPH_SPACER
+
+      else # @legend_position == :bottom or default
+        legend_graph_x = (self.width - legend_width) / 2
+
+        text_x = legend_graph_x + GRAPH_SPACER
+        text_y = self.height - metrics.height
+      end # @legend_position
       return [text_x, text_y, legend_width, metrics.height]
     end
 
@@ -462,9 +502,19 @@ module Cosmos
 
     def truncate_to_max(text, max_characters, value)
       if text.length > max_characters
+        # Transform the text into either decimal floating point or scientific
+        # notation, which ever results in a smaller string
         text = sprintf("%0.#{max_characters}g", value.to_f)
+        # If the value is still too big we need a smaller decimal
         if text.length > max_characters
-          text = sprintf("%0.#{max_characters - 5}g", value.to_f)
+          # Subtract 5 to get the correct number of characters
+          # For example: sprintf("%0.8g", 9123123123.123) => 9.1231231e+09
+          # We wanted an 8 character string but ended up with 13. We need to
+          # remove 5 of the decimal places so subtract 5.
+          #   sprintf("%0.3g", 9123123123.123) => 9.12e+09
+          precision = max_characters - 5
+          precision = 0 if precision < 0 # Protect against negative
+          text = sprintf("%0.#{precision}g", value.to_f)
         end
       end
       text

data/lib/cosmos/gui/line_graph/line_graph_popups.rb

@@ -43,10 +43,11 @@ module Cosmos
         graph_x = scale_value_to_graph_x(x)
         graph_y = scale_value_to_graph_y(y, axis)
 
-        x_text = convert_x_value_to_text(x_text.to_f, @max_x_characters)
         if @left_button_pressed
+          x_text = convert_x_value_to_text(x, 25, true) unless x_text
           popup_text = "(#{item}) #{x_text}, #{y_text}"
         else
+          x_text = convert_x_value_to_text(x) unless x_text
           popup_text = "#{x_text}, #{y_text}"
         end
 

data/lib/cosmos/gui/line_graph/line_graph_scaling.rb

@@ -26,7 +26,12 @@ module Cosmos
       end
 
       # Determine number of pixels to the right side of graph
-      @graph_right_x = self.width - 6 * GRAPH_SPACER
+      if @show_legend and !@lines.empty? and @legend_position == :right
+        legend_x, legend_y, legend_width, legend_height = get_legend_position()
+      else
+        legend_width = 0
+      end
+      @graph_right_x = self.width - legend_width - 8 * GRAPH_SPACER
       if @right_y_axis_title
         @graph_right_x -= (metrics.width('W') + GRAPH_SPACER)
       end
@@ -48,8 +53,9 @@ module Cosmos
         x_axis_title_height = 0
       end
       x_axis_label_height = metrics.height + GRAPH_SPACER
+
       legend_height = 0
-      if @show_legend && !@lines.empty?
+      if @show_legend and !@lines.empty? and @legend_position == :bottom
         text_y = self.height - 1 - (GRAPH_SPACER * 2)
         text_height = metrics.height
         if @lines.axes == :BOTH
@@ -315,7 +321,7 @@ module Cosmos
       end
     end # def build_x_grid_lines
 
-    # Calculate the x gride lines for the graph
+    # Calculate the x grid lines for the graph
     def calculate_x_grid_lines
       if @manual_x_grid_line_scale
         # With manual grid lines, draw them all regardless of whether it will look nice

data/lib/cosmos/gui/line_graph/line_graph_script.rb

@@ -9,18 +9,73 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos'
-require 'cosmos/gui/qt_tool'
-require 'cosmos/gui/line_graph/line_graph_dialog'
+Qt.execute_in_main_thread do
+  require 'cosmos/gui/qt_tool'
+  require 'cosmos/gui/line_graph/line_graph_dialog'
+end
+
+# Create a new graph object and populate
+# plot (x, y, legend, [y,legend], [y,legend], ... , [opts])
+#   x           - default => [0...y_array.length]
+#   y           - Y data array to plot
+#   legend      - Line Legend to describe Y data
+#   args        - Additional y , legend pairs to plot
+#   opts        - Hash options at the end of the argument list
+#    :width => 400    - default => 800
+#    :height => 300   - default => 600
+#    :x => 100        - default => -1 # Place centered in current screen
+#    :y => 100        - default => -1 # Place centered in current screen
+#    :winTitle => "Graph 1" - default => "Graph"
+def plot (x = nil, y = nil, legend = "Line 1", *args)
+  my_opts = {:width => 800, :height => 600, :x => -1, :y => -1, :winTitle => "Graph"}
+
+  # Get the Hash options parameters from the end of the list of arguments
+  arg_idx = -1
+  while (args[arg_idx].is_a?(Hash)) do
+    my_opts.merge!(args[arg_idx])
+    arg_idx -= 1
+  end
+
+  if y
+    raise "Legend [0] must be a string" unless legend.kind_of? String
+    raise "Y [0] must be an array" unless y.kind_of? Array
+  end
+
+  # Split out the arguments for the other y arrays & legends
+  y_array = args[0..arg_idx].values_at(* args[0..arg_idx].each_index.select {|i| i.even?})
+  legend_array = args[0..arg_idx].values_at(* args[0..arg_idx].each_index.select {|i| i.odd?})
+
+  raise "Legend Argument List and Y Argument List not the same size" unless legend_array.length == y_array.length
+  (0...y_array.length).each do |i|
+    if y_array[i]
+      raise "Legend [#{i+1}] must be a string" unless legend_array[i].kind_of? String
+      raise "Y [#{i+1}] must be an array" unless y_array[i].kind_of? Array
+    end
+  end
 
-def plot(x, y1, y2 = nil)
+  my_line_graph = ''
   Qt.execute_in_main_thread do
-    a = Cosmos::LineGraphDialog.new('Graph')
-    a.line_graph.add_line('Data 1', y1, x, nil, nil, nil, nil, 'red')
-    if y2
-      a.line_graph.add_line('Data 2', y2, x, nil, nil, nil, nil, 'blue')
+    a = Cosmos::LineGraphDialog.new(my_opts[:winTitle], my_opts[:width], my_opts[:height])
+    if y
+      a.line_graph.add_line(legend, y, x, nil, nil, nil, nil, 'auto')
     end
+    
+    (0...y_array.length).each do |i|
+      if y_array[i]
+        a.line_graph.add_line(legend_array[i], y_array[i], x, nil, nil, nil, nil, 'auto')
+      end
+    end
+
     a.raise
-    a.exec
-    a.dispose
+    a.show
+
+    my_line_graph = a.line_graph
+
+    # Move the window
+    if my_opts[:x] >= 0 && my_opts[:y] >= 0
+      a.move(my_opts[:x],my_opts[:y])
+    end
   end
+  return my_line_graph
 end
+

data/lib/cosmos/gui/line_graph/lines.rb

@@ -41,6 +41,11 @@ module Cosmos
       @lines.empty?
     end
 
+    # @return [Integer] Number of lines that are present
+    def num_lines
+      return @lines.length
+    end
+
     # @return [Boolean] true if there are lines on the left y axis
     def left_y_axis?
       !left().empty?
@@ -77,8 +82,8 @@ module Cosmos
         index = x_values.nearest_index(x_value, ordered_x_values)
         if (x_values[index] - x_value).abs < value_delta
           if y_values[index] >= min and y_values[index] <= max
-            x_text = get_display_text(x_values[index], x_states, x_labels[index])
-            y_text = get_display_text(y_values[index], y_states, y_labels[index])
+            x_text = get_display_text(x_values, x_states, x_labels, index)
+            y_text = get_display_text(y_values, y_states, y_labels, index)
             result << [x_values[index], y_values[index], x_text, y_text, item, color, axis]
           end
         end
@@ -130,16 +135,25 @@ module Cosmos
         @lines.each do |x_values, y_values, x_labels, y_labels, x_states, y_states, color|
           maximum, maximum_index = x_values.max_with_index
           line_max_values << maximum
-          line_max_labels << x_labels[maximum_index]
           minimum, minimum_index = x_values.min_with_index
           line_min_values << minimum
-          line_min_labels << x_labels[minimum_index]
+
+          # If there are labels then use them directly
+          if x_labels
+            line_max_labels << x_labels[maximum_index]
+            line_min_labels << x_labels[minimum_index]
+          else # Put in max and min as place holders
+            line_max_labels << maximum
+            line_min_labels << minimum
+          end
         end
         x_max, x_max_index = line_max_values.max_with_index
         x_min, x_min_index = line_min_values.min_with_index
         x_max_label        = line_max_labels[x_max_index]
+        # If the label equals the max it was a placeholder so set to nil
         x_max_label        = nil if x_max_label == x_max
         x_min_label        = line_min_labels[x_min_index]
+        # If the label equals the min it was a placeholder so set to nil
         x_min_label        = nil if x_min_label == x_min
 
         if x_min == x_max
@@ -155,14 +169,13 @@ module Cosmos
       return [x_min, x_max, x_min_label, x_max_label]
     end
 
-    def get_display_text(key, states, label)
-      text = label
+    def get_display_text(keys, states, labels, index)
+      text = nil
+      text = labels[index] if labels
       if states
-        text = states.key(key)
+        text = states.key(keys[index])
         if text
-          text = "#{text} (#{key})"
-        else
-          text = label
+          text = "#{text} (#{keys[index]})"
         end
       end
       return text
@@ -266,7 +279,7 @@ module Cosmos
         x = (1..(y.length)).to_a_to_f
       end
       y_labels = y                         unless y_labels
-      x_labels = x                         unless x_labels
+      # x_labels are only set if the formatted time item is used
       y_states = y_states.clone            if y_states
       x_states = x_states.clone            if x_states
 

data/lib/cosmos/interfaces/udp_interface.rb

@@ -28,6 +28,7 @@ module Cosmos
     #   routers allowed before dropping the packet.
     # @param write_timeout [Integer] Seconds to wait before aborting writes
     # @param read_timeout [Integer] Seconds to wait before aborting reads
+    # @param bind_address [String] Address to bind UDP ports to
     def initialize(hostname,
                    write_dest_port,
                    read_port,
@@ -35,7 +36,8 @@ module Cosmos
                    interface_address = nil,
                    ttl = 128, # default for Windows
                    write_timeout = 10.0,
-                   read_timeout = nil)
+                   read_timeout = nil,
+                   bind_address = "0.0.0.0")
       super()
 
       @hostname = ConfigParser.handle_nil(hostname)
@@ -57,6 +59,8 @@ module Cosmos
       @write_timeout = @write_timeout.to_f if @write_timeout
       @read_timeout = ConfigParser.handle_nil(read_timeout)
       @read_timeout = @read_timeout.to_f if @read_timeout
+      @bind_address = ConfigParser.handle_nil(interface_address)
+      @bind_address = '127.0.0.1' if @bind_address and @bind_address.upcase == 'LOCALHOST'
       @write_socket = nil
       @read_socket = nil
       @read_allowed = false unless @read_port
@@ -72,8 +76,9 @@ module Cosmos
                                          @write_dest_port,
                                          @write_src_port,
                                          @interface_address,
-                                         @ttl) if @write_dest_port
-      @read_socket = UdpReadSocket.new(@read_port,@hostname,@interface_address) if @read_port
+                                         @ttl,
+                                         @bind_address) if @write_dest_port
+      @read_socket = UdpReadSocket.new(@read_port, @hostname, @interface_address, @bind_address) if @read_port
     end
 
     # @return [Boolean] Whether the active ports (read and/or write) have

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

@@ -240,7 +240,7 @@ module Cosmos
             parser.verify_num_parameters(1, nil, usage)
             background_task = Cosmos.require_class(params[0])
             if params[1]
-              @background_tasks << background_task.new(params[1..-1])
+              @background_tasks << background_task.new(*params[1..-1])
             else
               @background_tasks << background_task.new
             end

data/lib/cosmos/tools/tlm_viewer/widgets.rb

@@ -1,8 +1,8 @@
 # encoding: ascii-8bit
-
 require 'cosmos/tools/tlm_viewer/widgets/array_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/block_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/button_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/canvaslabelvalue_widget.rb'
@@ -23,17 +23,22 @@ require 'cosmos/tools/tlm_viewer/widgets/labelprogressbar_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/labeltrendlimitsbar_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/labelvaluedesc_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/labelvaluelimitsbar_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/labelvaluelimitscolumn_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/labelvaluerangebar_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/labelvaluerangecolumn_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/labelvalue_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/label_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/layout_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/limitscolumn_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/limitscolor_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/linegraph_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/matrixbycolumns_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/multi_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/progressbar_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/radiobutton_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/rangecolumn_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/screenshotbutton_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/scrollwindow_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb'
@@ -47,7 +52,9 @@ require 'cosmos/tools/tlm_viewer/widgets/trendbar_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/trendlimitsbar_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/value_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/valuelimitsbar_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/valuelimitscolumn_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/valuerangebar_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/valuerangecolumn_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/verticalbox_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/vertical_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/widget.rb'

data/lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb

@@ -0,0 +1,79 @@
+# 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/tools/tlm_viewer/widgets/widget'
+
+module Cosmos
+
+  class CanvasdotWidget
+    include Widget
+    
+    def initialize(parent_layout, x, y, color='black', width=3)
+      super()
+      if is_numeric?(x)
+        @x = x.to_i
+      else
+        @x = x.to_s
+      end
+    
+      if is_numeric?(y)
+        @y = y.to_i
+      else
+        @y = y.to_s
+      end
+    
+      @point = Qt::Point.new(0, 0)
+      update_point
+    
+      @width = width.to_i
+      @color = Cosmos::getColor(color)
+      parent_layout.add_repaint(self)
+    end # initialize
+    
+    def update_point
+      if is_numeric?(@x)
+        @point.x = @x
+      else
+        @point.x = eval_str(@x)
+      end
+      
+      if is_numeric?(@y)
+        @point.y = @y
+      else
+        @point.y = eval_str(@y)
+      end
+    end # update_point
+  
+    def is_numeric?(obj) 
+      obj.to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true
+    end
+
+    def paint(painter)
+      painter.save
+      painter.setBrush(@color)
+      painter.drawEllipse(@point, @width, @width)
+      painter.restore
+    end
+  
+    def eval_str(string_to_eval)
+      @screen.instance_eval(string_to_eval)
+    end
+  
+    def update_widget
+      update_point
+    end
+
+    def dispose
+      super()
+      @point.dispose
+    end
+  end # CanvasdotWidget
+
+end # module Cosmos