cosmos 4.2.4-java → 4.3.0-java

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

@@ -11,8 +11,10 @@
 require 'cosmos'
 require 'cosmos/gui/qt'
 require 'cosmos/gui/qt_tool'
+require 'cosmos/gui/utilities/classification_banner'
 require 'cosmos/script'
 require 'cosmos/tools/tlm_viewer/widgets'
+require 'tempfile'
 
 module Cosmos
 
@@ -23,6 +25,8 @@ module Cosmos
 
     attr_accessor :full_name, :width, :height, :window, :replay_flag
 
+    include ClassificationBanner
+
     class Widgets
       # Flag to indicate all screens should close
       @@closing_all = false
@@ -33,10 +37,12 @@ module Cosmos
         @@closing_all = value
       end
 
-      def initialize(screen, mode)
+      def initialize(screen, mode, local_binding = nil)
         @screen = screen
         # The telemetry viewer mode. Must be :REALTIME or basically anything else?
         @mode = mode
+        # Local binding to evaluate LOCAL target
+        @local_binding = local_binding
         # Hash of only the named widgets identifed by the NAMED_WIDGET keyword
         @named = {}
         # Array of all widgets which take a value
@@ -84,7 +90,7 @@ module Cosmos
 
       def add_widget(klass, parameters, widget, widget_name, substitute, original_target_name, force_substitute)
         # Add to item or non_item widgets
-        if klass.takes_value?
+        if klass.takes_value? and substitute != 'LOCAL' and parameters[0] != 'LOCAL'
           if substitute and (original_target_name == parameters[0].upcase or force_substitute)
             @items << [substitute, parameters[1], parameters[2]]
           else
@@ -113,7 +119,7 @@ module Cosmos
         @value_thread = Thread.new do
           begin
             while(true)
-              break if @@closing_all
+              break if @@closing_all or !@alive
               time = Time.now.sys
 
               if !@item.empty?
@@ -137,7 +143,7 @@ module Cosmos
                     @limits_set = limits_set
                   end
                 rescue DRb::DRbConnError
-                  break if @@closing_all
+                  break if @@closing_all or !@alive
                   break if @value_sleeper.sleep(1)
                   next
                 end
@@ -145,7 +151,7 @@ module Cosmos
 
               Qt.execute_in_main_thread {update_gui()} if @alive and (@mode == :REALTIME)
               delta = Time.now.sys - time
-              break if @@closing_all
+              break if @@closing_all or !@alive
               if @polling_period - delta > 0
                 break if @value_sleeper.sleep(@polling_period - delta)
               else
@@ -178,7 +184,27 @@ module Cosmos
 
             # Update non_item widgets
             @non_item.each do |widget|
-              widget.update_widget
+              if widget.class.takes_value?
+                # LOCAL value
+                eval_binding = @local_binding
+                begin
+                  eval_binding = ScriptRunnerFrame.instance.script_binding
+                  @local_binding = eval_binding
+                rescue Exception
+                  # Fall back on @local_binding
+                end
+
+                begin
+                  widget.limits_state = nil
+                  widget.value = eval_binding.eval(widget.item_name)
+                rescue Exception
+                  # Bad local variable or binding no longer valid
+                  widget.limits_state = :STALE
+                  widget.value = widget.value
+                end
+              else
+                widget.update_widget
+              end
             end
           end
         rescue Exception => error
@@ -190,7 +216,7 @@ module Cosmos
 
       def shutdown
         @alive = false
-        Cosmos.kill_thread(self, @value_thread)
+        Cosmos.kill_thread(self, @value_thread, 2, 0.1, 2)
 
         # Shutdown All Widgets
         widgets().each do |widget|
@@ -203,7 +229,7 @@ module Cosmos
       end
     end
 
-    def initialize(full_name, filename, notify_on_close = nil, mode = :REALTIME, x_pos = nil, y_pos = nil, original_target_name = nil, substitute = nil, force_substitute = false, single_screen = false)
+    def initialize(full_name, filename_or_screen_def, notify_on_close = nil, mode = :REALTIME, x_pos = nil, y_pos = nil, original_target_name = nil, substitute = nil, force_substitute = false, single_screen = false, local_binding = nil)
       super(nil)
       # The full name of the widget which goes in the title
       @full_name = full_name
@@ -224,15 +250,20 @@ module Cosmos
       # displayed as a stand alone screen and not launched as a part of the
       # regular TlmViewer application
       @single_screen = single_screen
+      # Binding for use with LOCAL LOCAL
+      @local_binding = local_binding
 
       # Read the application wide stylesheet if it exists
       app_style = File.join(Cosmos::USERPATH, 'config', 'tools', 'application.css')
       setStyleSheet(File.read(app_style)) if File.exist? app_style
 
       @replay_flag = nil
-      @widgets = Widgets.new(self, mode)
-      @window = process(filename)
+      @widgets = Widgets.new(self, mode, @local_binding)
+      @window = process(filename_or_screen_def)
       @@open_screens << self if @window
+
+      # Add a banner based on system configuration
+      add_classification_banner
     end
 
     def widgets
@@ -247,7 +278,7 @@ module Cosmos
       @widgets.mode
     end
 
-    def process(filename)
+    def process(filename_or_screen_def)
       layout_stack = []
       layout_stack[0] = nil
 
@@ -256,6 +287,16 @@ module Cosmos
       global_settings = {}
       global_subsettings = {}
 
+      if File.exist?(filename_or_screen_def) or !filename_or_screen_def.to_s.index("SCREEN")
+        tempfile = false
+        filename = filename_or_screen_def
+      else
+        tempfile = Tempfile.new('screen')
+        tempfile.write(filename_or_screen_def)
+        tempfile.close
+        filename = tempfile.path
+      end
+
       begin
         parser = ConfigParser.new("http://cosmosrb.com/docs/screens/")
         parser.instance_variable_set(:@original_target_name, @original_target_name)
@@ -322,6 +363,8 @@ module Cosmos
               klass = Cosmos.require_class(parameters[0].to_s.downcase + '_widget')
               global_subsettings[klass] ||= []
               global_subsettings[klass] << [parameters[1]].concat(parameters[2..-1])
+            when 'STAY_ON_TOP'
+              setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint)
             else
               current_widget = process_widget(parser, keyword, parameters, layout_stack, global_settings, global_subsettings)
             end # case keyword
@@ -336,6 +379,8 @@ module Cosmos
         end
         shutdown()
         return nil
+      ensure
+        tempfile.unlink if tempfile
       end
 
       unless @widgets.invalid.empty?
@@ -387,10 +432,14 @@ module Cosmos
         parser.verify_num_parameters(3, nil, "#{keyword} <Target Name> <Packet Name> <Item Name> <Widget Settings... (optional)>")
         begin
           if @substitute and (@original_target_name == parameters[0].upcase or @force_substitute)
-            System.telemetry.packet_and_item(@substitute, parameters[1], parameters[2])
+            if @substitute != 'LOCAL' or parameters[1] != 'LOCAL'
+              System.telemetry.packet_and_item(@substitute, parameters[1], parameters[2])
+            end
             widget = klass.new(layout_stack[-1], @substitute, *parameters[1..(parameters.length - 1)])
           else
-            System.telemetry.packet_and_item(*parameters[0..2])
+            if parameters[0] != 'LOCAL' or parameters[1] != 'LOCAL'
+              System.telemetry.packet_and_item(*parameters[0..2])
+            end
             widget = klass.new(layout_stack[-1], *parameters)
           end
         rescue => err
@@ -470,6 +519,8 @@ module Cosmos
       end
 
       self.dispose
+
+      @window = nil
     end
 
     def get_named_widget(widget_name)
@@ -488,6 +539,15 @@ module Cosmos
       @widgets.graceful_kill
     end
 
+    def close
+      Qt.execute_in_main_thread(true) do
+        if @window
+          super()
+          @window = nil
+        end
+      end
+    end
+
     def self.open_screens
       @@open_screens
     end

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

@@ -10,14 +10,14 @@
 
 require 'cosmos'
 Cosmos.catch_fatal_exception do
-  require 'cosmos/script'
-  require 'cosmos/tools/tlm_viewer/screen'
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/dialogs/splash'
   require 'cosmos/gui/dialogs/progress_dialog'
   require 'cosmos/gui/dialogs/select_dialog'
   require 'cosmos/gui/widgets/full_text_search_line_edit'
   require 'cosmos/tools/tlm_viewer/tlm_viewer_config'
+  require 'cosmos/tools/tlm_viewer/screen'
+  require 'cosmos/script'
   require 'find'
   require 'fileutils'
 end
@@ -164,32 +164,32 @@ module Cosmos
       super()
 
       # File actions
-      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), tr('&Save Configuration'), self)
-      @file_save_keyseq = Qt::KeySequence.new(tr('Ctrl+S'))
+      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), '&Save Configuration', self)
+      @file_save_keyseq = Qt::KeySequence.new('Ctrl+S')
       @file_save.shortcut = @file_save_keyseq
-      @file_save.statusTip = tr('Save all screen positions')
+      @file_save.statusTip = 'Save all screen positions'
       @file_save.connect(SIGNAL('triggered()')) { file_save() }
 
-      @file_generate = Qt::Action.new(tr('&Generate Screens'), self)
-      @file_generate_keyseq = Qt::KeySequence.new(tr('Ctrl+G'))
+      @file_generate = Qt::Action.new('&Generate Screens', self)
+      @file_generate_keyseq = Qt::KeySequence.new('Ctrl+G')
       @file_generate.shortcut = @file_generate_keyseq
-      @file_generate.statusTip = tr('Generate screen definition files')
+      @file_generate.statusTip = 'Generate screen definition files'
       @file_generate.connect(SIGNAL('triggered()')) { file_generate() }
 
-      @file_audit = Qt::Action.new(tr('Audi&t Screens vs Tlm'), self)
-      @file_audit_keyseq = Qt::KeySequence.new(tr('Ctrl+T'))
+      @file_audit = Qt::Action.new('Audi&t Screens vs Tlm', self)
+      @file_audit_keyseq = Qt::KeySequence.new('Ctrl+T')
       @file_audit.shortcut = @file_audit_keyseq
-      @file_audit.statusTip = tr('Create a report listing which telemetry points are not on screens')
+      @file_audit.statusTip = 'Create a report listing which telemetry points are not on screens'
       @file_audit.connect(SIGNAL('triggered()')) { file_audit() }
 
-      @replay_action = Qt::Action.new(tr('Toggle Replay Mode'), self)
-      @replay_action.statusTip = tr('Toggle Replay Mode')
+      @replay_action = Qt::Action.new('Toggle Replay Mode', self)
+      @replay_action.statusTip = 'Toggle Replay Mode'
       @replay_action.connect(SIGNAL('triggered()')) { toggle_replay_mode() }
     end
 
     def initialize_menus(options)
       # File Menu
-      @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu = menuBar.addMenu('&File')
       @file_menu.addAction(@file_save)
       @file_menu.addAction(@file_generate)
       @file_menu.addAction(@file_audit)
@@ -552,7 +552,7 @@ module Cosmos
 
           option_parser.separator "Telemetry Viewer Specific Options:"
           option_parser.on("-c", "--config FILE", "Use the specified config file") { |arg| options.config_file = arg }
-          option_parser.on("-s", "--screen FILE", "Start up the specified screen") { |arg| options.screen = arg }
+          option_parser.on("-s", "--screen SCREEN_NAME", "Start up the specified screen") { |arg| options.screen = arg }
           option_parser.on("-n", "--nolisten", "Don't listen for requests") do
             options.listen = false
             options.title << ' : Not Listening'

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

@@ -4,6 +4,7 @@ require 'cosmos/tools/tlm_viewer/widgets/block_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/button_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/backgroundbutton_widget.rb'
 require 'cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb'
+require 'cosmos/tools/tlm_viewer/widgets/canvasellipse_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'

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

@@ -0,0 +1,40 @@
+# encoding: ascii-8bit
+
+# Copyright 2018 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 CanvasellipseWidget
+    include Widget
+
+    def initialize(parent_layout, center_x, center_y, width, height, color = 'black', line_width = 1, fill = false)
+      super()
+      @center_x = center_x.to_i
+      @center_y = center_y.to_i
+      @width = width.to_i
+      @height = height.to_i
+      @line_width = line_width.to_i
+      @fill = ConfigParser::handle_true_false(fill)
+      @color = Cosmos::getColor(color)
+      @pen = Cosmos.getPen(color)
+      parent_layout.add_repaint(self)
+    end
+
+    def paint(painter)
+      painter.save
+      @pen.setWidth(@line_width)
+      painter.setPen(@pen)
+      painter.setBrush(@color) if @fill
+      painter.drawEllipse(@center_x, @center_y, @width, @height)
+      painter.restore
+    end
+
+  end
+end

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

@@ -19,7 +19,7 @@ module Cosmos
   # This class creates a graph of the supplied data value versus time.
   class TimegraphWidget < LinegraphWidget
 
-    def initialize(parent_layout, target_name, packet_name, item_name, num_samples = 100, width = 300, height = 200, point_size = 5, time_item_name = 'RECEIVED_TIMESECONDS', value_type = :CONVERTED)
+    def initialize(parent_layout, target_name, packet_name, item_name, num_samples = 100, width = 300, height = 200, point_size = 5, time_item_name = 'PACKET_TIMESECONDS', value_type = :CONVERTED)
       super(parent_layout, target_name, packet_name, item_name, num_samples, width, height, value_type)
       @time_item_name = time_item_name.to_s
       @time = []

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

@@ -41,7 +41,12 @@ module Cosmos
       @item_name = ConfigParser.handle_nil(item_name)
       @item = nil
       if @item_name
-        @packet, @item = System.telemetry.packet_and_item(@target_name, @packet_name, @item_name)
+        if @target_name == 'LOCAL' and @packet_name == 'LOCAL'
+          @packet = nil
+          @item = nil
+        else
+          @packet, @item = System.telemetry.packet_and_item(@target_name, @packet_name, @item_name)
+        end
       end
       if value_type
         @value_type = value_type.to_s.upcase.to_sym

data/lib/cosmos/top_level.rb

@@ -186,6 +186,19 @@ module Cosmos
     user_path = File.join(Cosmos::USERPATH, partial_path)
     return user_path if File.exist?(user_path)
 
+    # Check cosmos extensions
+    begin
+      Bundler.load.specs.each do |spec|
+        spec_name_split = spec.name.split('-')
+        if spec_name_split.length > 1 and spec_name_split[0] == 'cosmos'
+          filename = File.join(spec.gem_dir, partial_path)
+          return filename if File.exist? filename
+        end
+      end
+    rescue Bundler::GemfileNotFound
+      # No Gemfile - so no gem based extensions
+    end
+
     # Then look relative to the calling file
     if Pathname.new(calling_file).absolute?
       current_dir = File.dirname(calling_file)
@@ -572,7 +585,7 @@ module Cosmos
   # @param try_gui [Boolean] Whether to try and create a GUI exception popup
   def self.handle_critical_exception(error, try_gui = true)
     Logger.error "Critical Exception! #{error.formatted}"
-    if defined? ExceptionDialog and !ExceptionDialog.dialog_open?
+    if defined? ExceptionDialog and !ExceptionDialog.dialog_open? and $qApp
       log_file = self.write_exception_file(error)
       if try_gui
         Qt.execute_in_main_thread(true) {|| ExceptionDialog.new(nil, error, '', false, false, log_file)}

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.2.4'
+COSMOS_VERSION = '4.3.0'
 module Cosmos
   module Version
     MAJOR = '4'
-    MINOR = '2'
-    PATCH = '4'
-    BUILD = '4c60966285c2f7a5a050bfec88cb081b8662fac9'
+    MINOR = '3'
+    PATCH = '0'
+    BUILD = '3588276d89cb9d934e0e51ad8c6e2426fc5dafb5'
   end
-  VERSION = '4.2.4'
+  VERSION = '4.3.0'
 end

data/lib/cosmos/win32/excel.rb

@@ -9,42 +9,78 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'win32ole'
+require 'fileutils'
 
 module Cosmos
-
-  #
-  # This class will take an Excel spreadsheet and build an easily manipulated spreadsheet in ruby
-  #
+  # Open an Excel spreadsheet and build an easily manipulated spreadsheet in ruby
   class ExcelSpreadsheet
-
     attr_reader :worksheets
 
+    # Class to allow easy manipulation to the data in an Excel worksheet
     class ExcelWorksheet
-
       attr_reader :name, :num_rows, :num_columns, :data
 
-      def initialize (worksheet)
+      # @param worksheet [WIN32OLE] The underlying Excel worksheet object
+      def initialize(worksheet)
         @name = worksheet.name
         @num_rows = worksheet.UsedRange.rows.count
         @num_columns = worksheet.UsedRange.columns.count
 
-        #Get Excel Data from Worksheet
+        # Get Excel Data from Worksheet
         @data = worksheet.UsedRange.value
+
+        # Build a lookup table based on the first column
+        @lkup = {}
+        @data.each do |row|
+          @lkup[row[0]] = row[1..-1]
+        end
       end
 
+      def keys
+        @lkup.keys
+      end
+
+      # Access the lookup values by string or the raw data by index
+      #
+      # @param index [String|Integer] Name of the first column or index
+      # @return [ExcelWorksheet] The data in that row
+      def [](index)
+        if index.is_a? String
+          @lkup[index]
+        else
+          @data[index]
+        end
+      end
     end
 
-    def initialize (filename)
+    # @param filename [String] Name of the Excel file to open
+    # @param archive [true|String] If true, create an archive file in the
+    #   default system LOGS directory. If an absolute path, create the
+    #   archive file in the specified path.
+    def initialize(filename, archive: nil)
+      if archive
+        time = Time.now.sys
+        timestamp = sprintf("%04u_%02u_%02u_%02u_%02u_%02u", time.year, time.month, time.mday, time.hour, time.min, time.sec)
+        # If archive is true we use the system LOGS path
+        if archive == true
+          archive = Cosmos::System.paths['LOGS']
+        end
+        archive = File.join(archive, "#{timestamp}_#{File.basename(filename)}")
+        FileUtils.cp filename, archive
+        File.chmod(0444, archive) # Mark read-only
+      end
+
       excel = WIN32OLE.new('excel.application')
       excel.visible = false
       wb = excel.workbooks.open(filename)
 
       @worksheets = []
-
+      @lkup = {}
       count = wb.worksheets.count
       count.times do |index|
         ws = wb.worksheets(index + 1)
         @worksheets << ExcelWorksheet.new(ws)
+        @lkup[ws.name] = @worksheets[-1]
       end
 
       excel.DisplayAlerts = false
@@ -53,6 +89,22 @@ module Cosmos
       GC.start
     end
 
+    # @return [Array<String>] Array of all the worksheet names
+    def keys
+      @lkup.keys
+    end
+
+    # Access a worksheet by passing in the name or index
+    #
+    # @param index [String|Integer] Name of the worksheet or index
+    # @return [ExcelWorksheet] The worksheet object
+    def [](index)
+      if index.is_a? String
+        @lkup[index]
+      else
+        @worksheets[index]
+      end
+    end
   end
 
   module ExcelColumnConstants
@@ -62,5 +114,4 @@ module Cosmos
       index += 1
     end
   end
-
-end # module Cosmos
+end