cosmos 4.2.4-java → 4.3.0-java

data/lib/cosmos/gui/dialogs/exception_list_dialog.rb

@@ -36,7 +36,7 @@ module Cosmos
       @list = Qt::ListWidget.new
       @exception_list.each_with_index do |exception, index|
         string = "#{index + 1}. #{exception.class} : #{exception.message}"
-        Qt::ListWidgetItem.new(tr(string), @list)
+        Qt::ListWidgetItem.new(string, @list)
       end
       layout.addWidget(@list)
       @list.connect(SIGNAL('itemSelectionChanged ()')) do

data/lib/cosmos/gui/dialogs/find_replace_dialog.rb

@@ -103,9 +103,9 @@ module Cosmos
     def create_input_layout
       input_layout = Qt::FormLayout.new
       @find_box = Qt::LineEdit.new
-      input_layout.addRow(tr("Fi&nd what:"), @find_box)
+      input_layout.addRow("Fi&nd what:", @find_box)
       @replace_box = Qt::LineEdit.new
-      replace_label = Qt::Label.new(tr("Re&place with:"))
+      replace_label = Qt::Label.new("Re&place with:")
       replace_label.setBuddy(@replace_box)
       @replace_items << replace_label
       input_layout.addRow(replace_label, @replace_box)
@@ -141,7 +141,7 @@ module Cosmos
       direction_layout.addWidget(@up)
       direction_layout.addWidget(down)
       direction_layout.addStretch
-      direction = Qt::GroupBox.new(tr("Direction"))
+      direction = Qt::GroupBox.new("Direction")
       direction.setLayout(direction_layout)
       direction
     end

data/lib/cosmos/gui/dialogs/interface_raw_dialog.rb

@@ -43,14 +43,14 @@ module Cosmos
         top_layout = Qt::HBoxLayout.new
         text_layout = Qt::VBoxLayout.new
 
-        title_label = Qt::Label.new(tr(title))
+        title_label = Qt::Label.new(title)
         text_layout.addWidget(title_label)
         @read_raw_data_time = Qt::Label.new("Read Raw Data Time: ")
         text_layout.addWidget(@read_raw_data_time)
         top_layout.addLayout(text_layout)
         top_layout.addStretch(1)
 
-        button = Qt::PushButton.new(tr("Pause"))
+        button = Qt::PushButton.new("Pause")
         top_layout.addWidget(button)
         button.connect(SIGNAL('clicked()')) do
           if button.text == "Pause"

data/lib/cosmos/gui/dialogs/set_tlm_dialog.rb

@@ -20,7 +20,7 @@ module Cosmos
   # are written back into the packet.
   class SetTlmDialog < Qt::Dialog
     # @return [Array<String>] Items which should not be displayed in the dialog
-    IGNORED_ITEMS = ['RECEIVED_TIMESECONDS', 'RECEIVED_TIMEFORMATTED', 'RECEIVED_COUNT', 'PKTID', 'CONFIG']
+    IGNORED_ITEMS = ['PACKET_TIMESECONDS', 'PACKET_TIMEFORMATTED', 'RECEIVED_TIMESECONDS', 'RECEIVED_TIMEFORMATTED', 'RECEIVED_COUNT', 'PKTID', 'CONFIG']
 
     # @return [String] Errors encountered when trying to set the values back
     #   into the packet

data/lib/cosmos/gui/dialogs/tlm_details_dialog.rb

@@ -50,15 +50,15 @@ module Cosmos
         setWindowTitle("#{@target_name} #{@packet_name} #{@item_name} Details")
 
         layout = Qt::VBoxLayout.new
-        layout.addWidget(Qt::Label.new(tr("#{target_name} #{packet_name} #{item_name}")))
+        layout.addWidget(Qt::Label.new("#{target_name} #{packet_name} #{item_name}"))
 
         # Display the item values
-        item_values = Qt::GroupBox.new(tr("Item Values"))
+        item_values = Qt::GroupBox.new("Item Values")
 
         values_layout = Qt::FormLayout.new
         @raw_value = Qt::LineEdit.new
         @raw_value.setReadOnly(true)
-        values_layout.addRow(tr("Raw Value:"), @raw_value)
+        values_layout.addRow("Raw Value:", @raw_value)
         @hex_raw_value = nil
         @hex_raw_num_digits = 0
         case item.data_type
@@ -67,21 +67,21 @@ module Cosmos
             @hex_raw_value = Qt::LineEdit.new
             @hex_raw_value.setReadOnly(true)
             @hex_raw_num_digits = (((item.bit_size - 1) / 8) + 1) * 2
-            values_layout.addRow(tr("Hex Raw Value:"), @hex_raw_value)
+            values_layout.addRow("Hex Raw Value:", @hex_raw_value)
           end
         end
         @converted_value = Qt::LineEdit.new
         @converted_value.setReadOnly(true)
-        values_layout.addRow(tr("Converted Value:"), @converted_value)
+        values_layout.addRow("Converted Value:", @converted_value)
         @formatted_value = Qt::LineEdit.new
         @formatted_value.setReadOnly(true)
-        values_layout.addRow(tr("Formatted Value:"), @formatted_value)
+        values_layout.addRow("Formatted Value:", @formatted_value)
         @formatted_with_units_value = Qt::LineEdit.new
         @formatted_with_units_value.setReadOnly(true)
-        values_layout.addRow(tr("Formatted with Units Value:"), @formatted_with_units_value)
+        values_layout.addRow("Formatted with Units Value:", @formatted_with_units_value)
         @limits_state = Qt::LineEdit.new
         @limits_state.setReadOnly(true)
-        values_layout.addRow(tr("Limits State:"), @limits_state)
+        values_layout.addRow("Limits State:", @limits_state)
 
         item_values.setLayout(values_layout)
         layout.addWidget(item_values)
@@ -101,7 +101,7 @@ module Cosmos
         end
 
         # Display the item details
-        item_details = Qt::GroupBox.new(tr("Item Details"))
+        item_details = Qt::GroupBox.new("Item Details")
         item_details.setLayout(build_details_layout(item, :TLM))
         layout.addWidget(item_details)
 
@@ -159,7 +159,7 @@ module Cosmos
       elsif @limits_layout
         label = Qt::Label.new(label_text)
         @limits_labels[limits_set] = label
-        @limits_layout.addRow(tr("#{limits_set}:"), label)
+        @limits_layout.addRow("#{limits_set}:", label)
       end
     end
 

data/lib/cosmos/gui/qt.rb

@@ -12,6 +12,7 @@
 # adding workarounds should they be needed to work through problems with
 # interacting with QT from Ruby.
 
+require 'stringio'
 require 'cosmos'
 check_filename = File.join(Cosmos::USERPATH, "#{File.basename($0, File.extname($0))}_qt_check.txt")
 qt_in_system_folder = false
@@ -70,8 +71,16 @@ if Kernel.is_windows?
   end
 end
 
+if Kernel.is_windows?
+  temp_stderr = $stderr.clone
+  $stderr.reopen(File.new('nul', 'w'))
+end
 # This will either lock up or raise an error if older Qt dlls are present in the Windows system folders
-require 'Qt'
+begin
+  require 'Qt'
+ensure
+  $stderr.reopen(temp_stderr) if Kernel.is_windows?
+end
 File.delete(check_filename) if Kernel.is_windows? and File.exist?(check_filename)
 
 module Cosmos

data/lib/cosmos/gui/qt_tool.rb

@@ -14,10 +14,12 @@ require 'cosmos/gui/dialogs/about_dialog'
 require 'cosmos/gui/dialogs/exception_dialog'
 require 'cosmos/gui/dialogs/pry_dialog'
 require 'cosmos/gui/dialogs/scroll_text_dialog'
+require 'cosmos/gui/utilities/classification_banner'
 require 'ostruct'
 require 'optparse'
 
 module Cosmos
+
   # Base class of all COSMOS GUI Tools based on QT. It creates the help menu
   # which contains the About menu option. It provides configuration to all
   # tools to remember both the application window location and size across
@@ -28,6 +30,8 @@ module Cosmos
 
     @@redirect_io_thread = nil
 
+    include ClassificationBanner
+
     # Create a new application. IO is redirected such that writing to stdout or
     # stderr will result in a popup to be displayed to the user. Thus
     # applications should not write to stdout (i.e. puts or write) or stderr
@@ -65,6 +69,9 @@ module Cosmos
         @options.config_file = config_path(@options.config_file, ".txt", tool_name)
         @options.stylesheet = config_path(@options.stylesheet, ".css", tool_name)
       end
+
+      # Add a banner based on system configuration
+      add_classification_banner
     end
 
     # Creates a path to a configuration file. If the file is given it is
@@ -96,17 +103,17 @@ module Cosmos
     # placed in the File menu and must be manually added by the user. The
     # about_action is added to the Help menu by {#initialize_help_menu}.
     def initialize_actions
-      @exit_action = Qt::Action.new(Cosmos.get_icon('close.png'), tr('E&xit'), self)
-      @exit_keyseq = Qt::KeySequence.new(tr('Ctrl+Q'))
+      @exit_action = Qt::Action.new(Cosmos.get_icon('close.png'), 'E&xit', self)
+      @exit_keyseq = Qt::KeySequence.new('Ctrl+Q')
       @exit_action.shortcut = @exit_keyseq
-      @exit_action.statusTip = tr('Exit the application')
+      @exit_action.statusTip = 'Exit the application'
       connect(@exit_action, SIGNAL('triggered()'), self, SLOT('close()'))
 
-      @about_action = Qt::Action.new(Cosmos.get_icon('help.png'), tr('&About'), self)
-      @about_action.statusTip = tr('About the application')
+      @about_action = Qt::Action.new(Cosmos.get_icon('help.png'), '&About', self)
+      @about_action.statusTip = 'About the application'
       connect(@about_action, SIGNAL('triggered()'), self, SLOT('about()'))
-      @documentation_action = Qt::Action.new(tr('&Documentation'), self)
-      @documentation_action.statusTip = tr('COSMOS Online Documentation')
+      @documentation_action = Qt::Action.new('&Documentation', self)
+      @documentation_action.statusTip = 'COSMOS Online Documentation'
       self.connect(@documentation_action, SIGNAL('triggered()')) do
         Qt::DesktopServices.openUrl(Qt::Url.new("http://cosmosrb.com"))
       end
@@ -130,7 +137,7 @@ module Cosmos
       default_dirs = [default_dirs] unless default_dirs.is_a? Array
       default_dirs.each do |default_dir|
         default_context = default_dir.split('/')[-2..-1].join('/')
-        action = Qt::Action.new(tr(default_context), self)
+        action = Qt::Action.new(default_context, self)
         action.statusTip = status_tip if status_tip
         action.connect(SIGNAL('triggered()')) { callback.call(default_dir) }
         menu.addAction(action)
@@ -149,7 +156,7 @@ module Cosmos
           else
             name = "#{target_name}/#{target_sub_dir}"
           end
-          action = Qt::Action.new(tr(name), self)
+          action = Qt::Action.new(name, self)
           action.statusTip = status_tip if status_tip
           action.connect(SIGNAL('triggered()')) { callback.call(dir) }
           menu.addAction(action)
@@ -160,7 +167,7 @@ module Cosmos
     # Creates the Help menu and adds the about_action to it. Thus this MUST be
     # called after initialize_actions.
     def initialize_help_menu
-      @help_menu = menuBar().addMenu(tr('&Help'))
+      @help_menu = menuBar().addMenu('&Help')
       @help_menu.addAction(@about_action)
       @help_menu.addAction(@documentation_action)
     end

data/lib/cosmos/gui/text/ruby_editor.rb

@@ -24,6 +24,7 @@ module Cosmos
     signals 'breakpoint_set(int)'
     signals 'breakpoint_cleared(int)'
     signals 'breakpoints_cleared()'
+    signals 'font_changed(const QFont &)'
 
     attr_accessor :enable_breakpoints
     attr_accessor :filename
@@ -156,10 +157,10 @@ module Cosmos
     CHAR_57 = Qt::Char.new(57)
     BREAKPOINT_SET = 1
     BREAKPOINT_CLEAR = -1
+    MINIMUM_POINT_SIZE = 4
 
-    def initialize(parent)
+    def initialize(parent, font = Cosmos.get_default_font)
       super(parent)
-      font = Cosmos.get_default_font
       setFont(font)
       @fontMetrics = Cosmos.getFontMetrics(font)
 
@@ -180,6 +181,18 @@ module Cosmos
       line_count_changed(-1)
     end
 
+    def wheelEvent(event)
+      if event.modifiers() == Qt::ControlModifier && event.delta > 0
+        event.setAccepted(true)
+        zoom_in()
+      elsif event.modifiers() == Qt::ControlModifier && event.delta < 0
+        event.setAccepted(true)
+        zoom_out()
+      else
+        super(event)
+      end
+    end
+
     def dispose
       super()
       @syntax.dispose
@@ -288,6 +301,31 @@ module Cosmos
       cursor.endEditBlock
     end
 
+    def zoom_in
+      font = Cosmos.getFont(font().family, font().pointSize + 1)
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
+      emit font_changed(font)
+    end
+
+    def zoom_out
+      return if font().pointSize <= MINIMUM_POINT_SIZE
+      font = Cosmos.getFont(font().family, font().pointSize - 1)
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
+      emit font_changed(font)
+    end
+
+    def zoom_default
+      font = Cosmos.get_default_font
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
+      # Force a repaint of the number area by doing a small scroll
+      verticalScrollBar.setValue(verticalScrollBar.minimum+1)
+      verticalScrollBar.setValue(verticalScrollBar.minimum)
+      emit font_changed(font)
+    end
+
     def resizeEvent(e)
       super(e)
       cr = self.contentsRect()
@@ -302,6 +340,7 @@ module Cosmos
 
     def line_number_area_paint_event(event)
       painter = Qt::Painter.new(@lineNumberArea)
+      painter.setFont(font())
       # Check for weird bad initialization conditions
       if painter.isActive and not painter.paintEngine.nil?
         event_rect = event.rect()
@@ -403,8 +442,8 @@ module Cosmos
     end
 
     def create_add_breakpoint_action(point)
-      action = Qt::Action.new(tr("Add Breakpoint"), self)
-      action.statusTip = tr("Add a breakpoint at this line")
+      action = Qt::Action.new("Add Breakpoint", self)
+      action.statusTip = "Add a breakpoint at this line"
       action.connect(SIGNAL('triggered()')) do
         line_at_point(point) do |line|
           add_breakpoint(line)
@@ -415,8 +454,8 @@ module Cosmos
     end
 
     def create_clear_breakpoint_action(point)
-      action = Qt::Action.new(tr("Clear Breakpoint"), self)
-      action.statusTip = tr("Clear an existing breakpoint at this line")
+      action = Qt::Action.new("Clear Breakpoint", self)
+      action.statusTip = "Clear an existing breakpoint at this line"
       action.connect(SIGNAL('triggered()')) do
         line_at_point(point) do |line|
           clear_breakpoint(line)
@@ -427,8 +466,8 @@ module Cosmos
     end
 
     def create_clear_all_breakpoints_action
-      action = Qt::Action.new(tr("Clear All Breakpoints"), self)
-      action.statusTip = tr("Clear all existing breakpoints")
+      action = Qt::Action.new("Clear All Breakpoints", self)
+      action.statusTip = "Clear all existing breakpoints"
       action.connect(SIGNAL('triggered()')) do
         clear_breakpoints
         emit breakpoints_cleared

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

@@ -0,0 +1,60 @@
+# 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
+
+module ClassificationBanner
+
+  # Add to Qt::MainWindow the ability to display a classification banner. Typically used on every QtTool and Screen
+  class Qt::MainWindow
+
+    def add_classification_banner
+      # Add a classification banner if the system configuration called for one
+      classification_banner = Cosmos::System.instance.classificiation_banner
+      unless classification_banner.nil?
+        # Get the RGB color information from the classification_banner
+        color_red   = classification_banner['color'].red
+        color_green = classification_banner['color'].green
+        color_blue  = classification_banner['color'].blue
+        color_rgb   = "#{color_red},#{color_green},#{color_blue}"
+
+        # Create a classification toolbar
+        classification_toolbar = Qt::ToolBar.new
+        # Disable right clicking on the bar (prevents it from being hidden unintentionally)
+        classification_toolbar.setContextMenuPolicy(Qt::PreventContextMenu)
+        # Freeze the bar at the top
+        classification_toolbar.setFloatable(false)
+        classification_toolbar.setMovable(false)
+        # Specify sizes and set the style (background = background color, color = text color)
+        classification_toolbar.minimumHeight = 20
+        classification_toolbar.maximumHeight = 20
+        classification_toolbar.setStyleSheet("background:rgb(#{color_rgb});color:white;text-align:center;border:none;")
+
+        # Create a frame that will hold a horizontal layout
+        label_frame = Qt::Frame.new
+        label_layout = Qt::HBoxLayout.new(label_frame)
+        label_layout.setContentsMargins(0,1,0,0) # Centers the text nicely inside the horizontal layout
+
+        # Create a label of the classification and add it the horizontal layout
+        label = Qt::Label.new("#{classification_banner['display_text']}")
+        label.setStyleSheet("margin:0px;")
+
+        # Add stretchers on either side so it is always in the middle and looks nice
+        label_layout.addStretch(1)
+        label_layout.addWidget(label)
+        label_layout.addStretch(1)
+
+        # Add the frame to the main toolbar, then add the toolbar to the MainWindow
+        classification_toolbar.addWidget(label_frame)
+        self.addToolBar(classification_toolbar)
+      end
+
+    end
+
+  end
+end

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

@@ -10,6 +10,7 @@
 
 require 'cosmos/script/script'
 require 'cosmos/gui/choosers/combobox_chooser'
+require 'cosmos/tools/tlm_viewer/screen'
 
 $cmd_tlm_gui_window = nil
 
@@ -358,6 +359,31 @@ module Cosmos
       $cmd_tlm_gui_window
     end
 
+    def local_screen(title = "Local Screen", screen_def = nil, x_pos = nil, y_pos = nil, &block)
+      screen = nil
+      if block_given?
+        screen_def = yield
+      end
+
+      Qt.execute_in_main_thread(true) do
+        begin
+          if block_given?
+            screen = Screen.new(title, screen_def, nil, :REALTIME, x_pos, y_pos, nil, nil, false, false, block.binding )
+          else
+            screen = Screen.new(title, screen_def, nil, :REALTIME, x_pos, y_pos, nil, nil, false, false)
+          end
+        rescue Exception => err
+          puts err.formatted
+        end
+      end
+
+      screen
+    end
+
+    def close_local_screens
+      Qt.execute_in_main_thread(true) { Screen.close_all_screens(nil) }
+    end
+
   end # module Script
   $VERBOSE = old_verbose
 

data/lib/cosmos/interfaces.rb

@@ -20,3 +20,4 @@ require 'cosmos/interfaces/protocols/template_protocol'
 require 'cosmos/interfaces/protocols/terminated_protocol'
 
 require 'cosmos/interfaces/protocols/override_protocol'
+require 'cosmos/interfaces/protocols/crc_protocol'

data/lib/cosmos/interfaces/interface.rb

@@ -46,6 +46,9 @@ module Cosmos
     # @return [Array] Array of packet logger classes for this interface
     attr_accessor :packet_log_writer_pairs
 
+    # @return [Array] Array of stored packet log writers
+    attr_accessor :stored_packet_log_writer_pairs
+
     # @return [RawLoggerPair] RawLoggerPair instance or nil
     attr_accessor :raw_logger_pair
 
@@ -122,6 +125,7 @@ module Cosmos
       @reconnect_delay = 5.0
       @disable_disconnect = false
       @packet_log_writer_pairs = []
+      @stored_packet_log_writer_pairs = []
       @raw_logger_pair = RawLoggerPair.new(@name)
       @routers = []
       @cmd_routers = []