cosmos 3.6.3 → 3.7.0

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

@@ -0,0 +1,108 @@
+# 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/limits_widget'
+
+module Cosmos
+
+  class LimitscolumnWidget < LimitsWidget
+
+    def initialize(parent_layout, target_name, packet_name, item_name, value_type = :CONVERTED, width = 30, height = 100)
+      super(parent_layout, target_name, packet_name, item_name, value_type, width, height)
+    end
+
+    def LimitscolumnWidget.takes_value?
+      return true
+    end
+
+    def paint_implementation(dc)
+      limits = get_limits()
+      return unless limits
+
+      widths = calculate_widths(limits, @bar_height)
+
+      # Set starting points
+      x_pos = @x_pad
+      y_pos = @y_pad
+
+      # Draw RED_LOW bar
+      dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.red_low, 'red')
+      dc.addRectColor(x_pos, y_pos, @bar_width, widths.red_low)
+      y_pos += widths.red_low
+
+      # Draw YELLOW_LOW bar
+      dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.yellow_low, 'yellow')
+      dc.addRectColor(x_pos, y_pos, @bar_width, widths.yellow_low)
+      y_pos += widths.yellow_low
+
+      if widths.green_high
+        # Draw GREEN_LOW bar
+        dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.green_low, 'lime')
+        dc.addRectColor(x_pos, y_pos, @bar_width, widths.green_low)
+        y_pos += widths.green_low
+
+        # Draw BLUE bar
+        dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.blue, 'dodgerblue')
+        dc.addRectColor(x_pos, y_pos, @bar_width, widths.blue)
+        y_pos += widths.blue
+
+        # Draw GREEN_HIGH bar
+        dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.green_high, 'lime')
+        dc.addRectColor(x_pos, y_pos, @bar_width, widths.green_high)
+        y_pos += widths.green_high
+      else
+        # Draw GREEN bar
+        dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.green, 'lime')
+        dc.addRectColor(x_pos, y_pos, @bar_width, widths.green)
+        y_pos += widths.green
+      end
+
+      # Draw YELLOW_HIGH bar
+      dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.yellow_high, 'yellow')
+      dc.addRectColor(x_pos, y_pos, @bar_width, widths.yellow_high)
+      y_pos += widths.yellow_high
+
+      # Draw RED_HIGH bar
+      dc.addRectColorFill(x_pos, y_pos, @bar_width, widths.red_high, 'red')
+      dc.addRectColor(x_pos, y_pos, @bar_width, widths.red_high)
+      y_pos += widths.red_high
+
+      # Draw line at current value
+      red_low = limits[0]
+      red_high = limits[3]
+      @bar_scale = (red_high - red_low) / 0.8
+      @low_value = red_low - 0.1 * @bar_scale
+      @high_value = red_high + 0.1 * @bar_scale
+
+      @line_pos = @height - (@y_pad + (@value - @low_value) / @bar_scale * @bar_height).to_i
+      if @line_pos < @y_pad
+        @line_pos = @y_pad
+      end
+      if @line_pos > @y_pad + @bar_height
+        @line_pos = @bar_height + @y_pad
+      end
+
+      dc.addLineColor(@x_pad - 3, @line_pos, @x_pad + @bar_width + 3, @line_pos)
+
+      # Draw triangle next to current value line
+      top_triangle = Qt::Polygon.new(3)
+      top_triangle.setPoint(0, @x_pad + @bar_width, @line_pos)
+      top_triangle.setPoint(1, @x_pad + @bar_width + 5, @line_pos + 5)
+      top_triangle.setPoint(2, @x_pad + @bar_width + 5, @line_pos - 5)
+      dc.setBrush(Cosmos::BLACK)
+      dc.drawPolygon(top_triangle)
+      top_triangle.dispose
+
+      # Additional drawing for subclasses
+      additional_drawing(dc)
+    end
+  end
+
+end # module Cosmos

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

@@ -0,0 +1,57 @@
+# 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/limitscolumn_widget'
+
+module Cosmos
+
+  class RangecolumnWidget < LimitscolumnWidget
+
+    def initialize(parent_layout, target_name, packet_name, item_name, low_value, high_value, value_type = :CONVERTED, width = 30, height = 100)
+      super(parent_layout, target_name, packet_name, item_name, value_type, width, height)
+      @low_value = low_value.to_s.convert_to_value
+      @high_value = high_value.to_s.convert_to_value
+    end
+
+    def paint_implementation(dc)
+      # Fill the rectangle with white
+      dc.addRectColorFill(@x_pad, @y_pad, @width - @x_pad - @x_pad, @height - @y_pad - @y_pad, "white")
+
+      # Draw line at current value
+      @bar_scale = @high_value - @low_value
+
+      @line_pos = @height - (@y_pad + (@value - @low_value) / @bar_scale * @bar_height).to_i
+      if @line_pos < @y_pad
+        @line_pos = @y_pad
+      end
+      if @line_pos > @y_pad + @bar_height
+        @line_pos = @bar_height + @y_pad
+      end
+
+      dc.addLineColor(@x_pad - 3, @line_pos, @x_pad + @bar_width + 3, @line_pos)
+
+      # Draw triangle above current value line
+      top_triangle = Qt::Polygon.new(3)
+      top_triangle.setPoint(0, @x_pad + @bar_width, @line_pos)
+      top_triangle.setPoint(1, @x_pad + @bar_width + 5, @line_pos + 5)
+      top_triangle.setPoint(2, @x_pad + @bar_width + 5, @line_pos - 5)
+      dc.setBrush(Cosmos::BLACK)
+      dc.drawPolygon(top_triangle)
+
+      # Draw overall border
+      dc.addRectColor(@x_pad, @y_pad, @width - @x_pad - @x_pad, @height - @y_pad - @y_pad)
+
+      #Additional drawing for subclasses
+      additional_drawing(dc)
+    end
+
+  end
+
+end # module Cosmos

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

@@ -0,0 +1,37 @@
+# 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'
+require 'cosmos/tools/tlm_viewer/widgets/multi_widget'
+require 'cosmos/tools/tlm_viewer/widgets/value_widget'
+require 'cosmos/tools/tlm_viewer/widgets/limitscolumn_widget'
+
+module Cosmos
+
+  class ValuelimitscolumnWidget < Qt::Widget
+    include Widget
+    include MultiWidget
+
+    def initialize (parent_layout, target_name, packet_name, item_name, value_type = :WITH_UNITS, characters = 8)
+      super(target_name, packet_name, item_name, value_type)
+      setLayout(Qt::VBoxLayout.new())
+      layout.setSpacing(1)
+      layout.setContentsMargins(0,0,0,0)
+      @widgets << LimitscolumnWidget.new(layout, target_name, packet_name, item_name, value_type)
+      @widgets << ValueWidget.new(layout, target_name, packet_name, item_name, value_type, characters)
+      parent_layout.addWidget(self) if parent_layout
+    end
+
+    def self.takes_value?
+      return true
+    end
+  end
+
+end # module Cosmos

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

@@ -0,0 +1,37 @@
+# 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'
+require 'cosmos/tools/tlm_viewer/widgets/multi_widget'
+require 'cosmos/tools/tlm_viewer/widgets/value_widget'
+require 'cosmos/tools/tlm_viewer/widgets/rangecolumn_widget'
+
+module Cosmos
+
+  class ValuerangecolumnWidget < Qt::Widget
+    include Widget
+    include MultiWidget
+
+    def initialize(parent_layout, target_name, packet_name, item_name, low_value, high_value, value_type = :WITH_UNITS, characters = 8, width = 30, height = 100)
+      super(target_name, packet_name, item_name, value_type)
+      setLayout(Qt::VBoxLayout.new())
+      layout.setSpacing(1)
+      layout.setContentsMargins(0,0,0,0)
+      @widgets << RangecolumnWidget.new(layout, target_name, packet_name, item_name, low_value, high_value, value_type, width, height)
+      @widgets << ValueWidget.new(layout, target_name, packet_name, item_name, value_type, characters)
+      parent_layout.addWidget(self) if parent_layout
+    end
+
+    def self.takes_value?
+      return true
+    end
+  end
+
+end # module Cosmos

data/lib/cosmos/version.rb

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

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -444,15 +444,44 @@ module Cosmos
 
       context "with BACKGROUND_TASK" do
         it "creates a background task" do
+          background_task_no_args_file = File.join(Cosmos::USERPATH,'lib','cts_config_test_background_task_no_args.rb')
+          File.open(background_task_no_args_file,'w') do |file|
+            file.puts "require 'cosmos'"
+            file.puts "require 'cosmos/tools/cmd_tlm_server/background_task'"
+            file.puts "module Cosmos"
+            file.puts "  class CtsConfigTestBackgroundTaskNoArgs < BackgroundTask"
+            file.puts "    def initialize()"
+            file.puts "      super()"
+            file.puts "    end"
+            file.puts "  end"
+            file.puts "end"
+          end
+          
+          background_task_args_file = File.join(Cosmos::USERPATH,'lib','cts_config_test_background_task_args.rb')
+          File.open(background_task_args_file,'w') do |file|
+            file.puts "require 'cosmos'"
+            file.puts "require 'cosmos/tools/cmd_tlm_server/background_task'"
+            file.puts "module Cosmos"
+            file.puts "  class CtsConfigTestBackgroundTaskArgs < BackgroundTask"
+            file.puts "    def initialize(param1, param2, param3)"
+            file.puts "      super()"
+            file.puts "    end"
+            file.puts "  end"
+            file.puts "end"
+          end
+          
           tf = Tempfile.new('unittest')
-          tf.puts 'BACKGROUND_TASK cts_config_test_interface.rb'
-          tf.puts 'BACKGROUND_TASK cts_config_test_interface.rb false'
+          tf.puts 'BACKGROUND_TASK cts_config_test_background_task_no_args.rb'
+          tf.puts 'BACKGROUND_TASK cts_config_test_background_task_args.rb 1 2 3'
           tf.close
           config = CmdTlmServerConfig.new(tf.path)
           expect(config.background_tasks.length).to eql 2
-          expect(config.background_tasks[0]).to be_a CtsConfigTestInterface
-          expect(config.background_tasks[1]).to be_a CtsConfigTestInterface
+          expect(config.background_tasks[0]).to be_a CtsConfigTestBackgroundTaskNoArgs
+          expect(config.background_tasks[1]).to be_a CtsConfigTestBackgroundTaskArgs
           tf.unlink
+          
+          File.delete background_task_no_args_file
+          File.delete background_task_args_file
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.7.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -759,6 +759,7 @@ files:
 - demo/config/targets/INST/screens/ground.txt
 - demo/config/targets/INST/screens/hs.txt
 - demo/config/targets/INST/screens/latest.txt
+- demo/config/targets/INST/screens/limits.txt
 - demo/config/targets/INST/screens/other.txt
 - demo/config/targets/INST/screens/tabs.txt
 - demo/config/targets/INST/target.txt
@@ -1432,6 +1433,7 @@ files:
 - lib/cosmos/tools/tlm_viewer/widgets/block_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/button_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvas_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvaslabel_widget.rb
@@ -1453,15 +1455,21 @@ files:
 - lib/cosmos/tools/tlm_viewer/widgets/labelvalue_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/labelvaluedesc_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitsbar_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitscolumn_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/labelvaluerangebar_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/labelvaluerangecolumn_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/layout_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/limits_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/limitscolor_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/limitscolumn_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/linegraph_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/matrixbycolumns_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/multi_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/progressbar_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/radiobutton_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/rangecolumn_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/screenshotbutton_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/scrollwindow_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb
@@ -1475,7 +1483,9 @@ files:
 - lib/cosmos/tools/tlm_viewer/widgets/trendlimitsbar_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/value_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/valuelimitsbar_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/valuelimitscolumn_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/valuerangebar_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/valuerangecolumn_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/vertical_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/verticalbox_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/widget.rb