cosmos 3.9.1 → 3.9.2

data/demo/config/data/crc.txt

@@ -20,7 +20,7 @@
 "config/targets/INST/screens/limits.txt" 0x98430974
 "config/targets/INST/screens/ground.txt" 0x2D89624D
 "config/targets/INST/screens/block.txt" 0x77C3F2F0
-"config/targets/INST/screens/adcs.txt" 0xBF096628
+"config/targets/INST/screens/adcs.txt" 0x73D61F93
 "config/targets/INST/screens/other.txt" 0x2F7A1014
 "config/targets/INST/screens/tabs.txt" 0x8C8BB548
 "config/targets/INST/cmd_tlm_server.txt" 0x3FC45604
@@ -67,8 +67,11 @@
 "config/data/vswitchon.gif" 0xD747AC45
 "config/system/system.txt" 0xFA24EDAA
 "config/system/system2.txt" 0xC75EBA65
+"config/tools/launcher/launcher2.css" 0x69DA47AB
 "config/tools/launcher/launcher.txt" 0x1B96FE7C
 "config/tools/launcher/launcher2.txt" 0xB0B9B1D1
+"config/tools/launcher/launcher.css" 0x6314C0C0
+"config/tools/example_application.css" 0x2987FE3F
 "config/tools/table_manager/MCConfigurationTable_fsw1_def.txt" 0x6531613A
 "config/tools/table_manager/ConfigTables_def.txt" 0xC38DCB2A
 "config/tools/table_manager/ExampleTableDefinition.txt" 0x59060429
@@ -78,12 +81,13 @@
 "config/tools/tlm_viewer/tlm_viewer.txt" 0x825AF31C
 "config/tools/data_viewer/data_viewer.txt" 0xCAC3B017
 "config/tools/test_runner/test_runner.txt" 0x1EB7E49C
+"config/tools/test_runner/test_runner.css" 0x06987062
 "config/tools/tlm_extractor/tlm_extractor4.txt" 0x068824C2
 "config/tools/tlm_extractor/tlm_extractor3.txt" 0x475006AA
 "config/tools/tlm_extractor/tlm_extractor.txt" 0x0B97FA7D
 "config/tools/tlm_extractor/_adcs_time.txt" 0x3DAD5094
 "config/tools/tlm_extractor/tlm_extractor2.txt" 0x5C780BD2
-"config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0xF1C5C3B4
+"config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0x20C1091B
 "config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xFAE90F35
 "config/tools/tlm_grapher/README.txt" 0x93B2C07E
 "config/tools/opengl_builder/README.txt" 0x93B2C07E

data/demo/config/targets/INST/screens/adcs.txt

@@ -1,4 +1,4 @@
-SCREEN AUTO AUTO 1.0
+SCREEN AUTO AUTO 1.0 FIXED
 
 VERTICAL
 

data/demo/config/tools/cmd_tlm_server/cmd_tlm_server2.txt

@@ -1,4 +1,4 @@
-TITLE 'COSMOS Command and Telemetry Server - Demo Configuration'
+TITLE 'COSMOS Command and Telemetry Server - Demo Configuration 2'
 
 PACKET_LOG_WRITER DEFAULT meta_packet_log_writer.rb META DATA config/data/meta_init.txt
 PACKET_LOG_WRITER COSMOSLOG packet_log_writer.rb cosmos

data/demo/config/tools/example_application.css

@@ -0,0 +1,58 @@
+/* Rename this file to application.css to set a global style */
+QMainWindow {
+  background-color: #d1d1d2;
+}
+QLabel {
+  font-size: 14px;
+  font-family: Arial;
+}
+QPushButton {
+  font-size: 12px;
+  padding: 4px;
+  border: 1px solid black;
+  border-radius: 4px;
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b1bac4, stop: 1 #767c83);
+}
+QPushButton:hover:!pressed
+{
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4cbdff, stop: 1 #3585b3);
+}
+QPushButton:pressed {
+  background-color: #3585b3
+}
+QTableView {
+  background-color: #d1d1d2;
+}
+QHeaderView::section:horizontal {
+  background-color: #3585b3;
+}
+QHeaderView::section:vertical {
+  background-color: #767c83;
+  color: white;
+}
+QTabWidget:pane { /* The tab widget frame */
+  border-top: 2px solid #C2C7CB;
+}
+QTabWidget::tab-bar {
+  left: 10px; /* move to the right */
+}
+/* Style the tab using the tab sub-control. Note that it reads QTabBar _not_ QTabWidget */
+QTabBar::tab {
+  border: 2px solid #C4C4C3;
+  border-bottom-color: #C2C7CB; /* same as the pane color */
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  min-width: 8ex;
+  padding: 2px;
+}
+QTabBar::tab:selected, QTabBar::tab:hover {
+  background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fafafa, stop: 0.4 #f4f4f4, stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
+}
+QTabBar::tab:selected {
+  border-color: #9B9B9B;
+  border-bottom-color: #C2C7CB; /* same as pane color */
+}
+QTabBar::tab:!selected {
+  margin-top: 2px; /* make non-selected tabs look smaller */
+}
+

data/demo/config/tools/launcher/launcher.css

@@ -0,0 +1,7 @@
+#Label {
+  font-size: 20px;
+}
+#Divider {
+  border: 2px solid #3585b3;
+  border-radius: 1px;
+}

data/demo/config/tools/launcher/launcher2.css

@@ -0,0 +1,10 @@
+QMainWindow {
+  background-color: #9a1f20;
+}
+#Label {
+  font-size: 20px;
+}
+#Divider {
+  border: 2px solid #3585b3;
+  border-radius: 1px;
+}

data/demo/config/tools/test_runner/test_runner.css

@@ -0,0 +1,45 @@
+QLabel {
+  font-size: 14px;
+}
+QCheckBox {
+  font-size: 14px;
+}
+#PauseOnError {
+  color: blue;
+}
+#ContinueTestCaseAfterError {
+  color: purple;
+}
+#AbortTestingAfterError {
+  color: green;
+}
+#Manual {
+  color: darkblue;
+}
+#LoopTesting {
+  color: magenta;
+}
+#BreakLoopAfterError {
+  color: maroon;
+}
+QPushButton {
+  border: 1px solid #8f8f91;
+  border-radius: 6px;
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7ff, stop: 1 #c0dbff);
+  min-width: 80px;
+  font-size: 14px;
+  padding: 2px 5px;
+}
+QPushButton:hover:!pressed
+{
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7ff, stop: 1 #80abff);
+}
+QPushButton:pressed {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c0dbff, stop: 1 #f6f7ff);
+}
+QPushButton:flat {
+  border: none;
+}
+QPushButton:default {
+  border-color: #80abff;
+}

data/ext/cosmos/ext/packet/packet.c

@@ -191,9 +191,15 @@ static VALUE received_time_equals(VALUE self, VALUE received_time) {
  *   received */
 static VALUE received_count_equals(VALUE self, VALUE received_count) {
   volatile VALUE read_conversion_cache = rb_ivar_get(self, id_ivar_read_conversion_cache);
+#ifdef RUBY_INTEGER_UNIFICATION /* Ruby 2.4.0 unified Fixnum and Bignum into Integer. This check allows the code to build pre- and post-2.4.0. */
+  if (rb_funcall(received_count, id_method_class, 0) != rb_cInteger) {
+      rb_raise(rb_eArgError, "received_count must be an Integer but is a %s", RSTRING_PTR(rb_funcall(rb_funcall(received_count, id_method_class, 0), id_method_to_s, 0)));
+  }
+#else
   if (rb_funcall(received_count, id_method_class, 0) != rb_cFixnum) {
     rb_raise(rb_eArgError, "received_count must be a Fixnum but is a %s", RSTRING_PTR(rb_funcall(rb_funcall(received_count, id_method_class, 0), id_method_to_s, 0)));
   }
+#endif
   rb_ivar_set(self, id_ivar_received_count, received_count);
   if (RTEST(read_conversion_cache)) {
     rb_funcall(read_conversion_cache, id_method_clear, 0);

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

@@ -13,23 +13,32 @@ require 'cosmos/gui/qt'
 module Cosmos
   # Dialog which creates a read only list of text
   class ScrollTextDialog < Qt::Dialog
+    TEXT_MARGIN = 30
+    SCREEN_WIDTH_MARGIN = 40
+    SCREEN_HEIGHT_MARGIN = 100
+
     # @param parent [Qt::Widget] Parent of this dialog
     # @param title [String] Dialog title
     # @param text [String] Text to display
     def initialize(parent, title, text)
       super(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
-      setMinimumWidth(700)
-      setMinimumHeight(400)
-
       setWindowTitle(title)
-      # Intentionally don't load icon as this can cause loop of unexpected output running with --debug
 
       layout = Qt::VBoxLayout.new
-      text.gsub!("\n","<br>")
-      @text_edit = Qt::TextEdit.new(text, self)
+      @text_edit = Qt::TextEdit.new(text.gsub("\n","<br>"), self)
       @text_edit.setReadOnly(true)
       layout.addWidget(@text_edit)
 
+      rec = Qt::Application::desktop.screenGeometry()
+      font = @text_edit.document().defaultFont()
+      font_metrics = Qt::FontMetrics.new(font)
+      text_size = font_metrics.size(0, text)
+      text_width = text_size.width + TEXT_MARGIN
+      text_height = text_size.height + TEXT_MARGIN
+      width = text_width > rec.width ? rec.width - SCREEN_WIDTH_MARGIN : text_width
+      height = text_height > rec.height ? rec.height - SCREEN_HEIGHT_MARGIN : text_height
+      @text_edit.setMinimumSize(width, height)
+
       self.setLayout(layout)
       self.raise
       self.exec

data/lib/cosmos/gui/qt_tool.rb

@@ -36,21 +36,57 @@ module Cosmos
     def initialize(options)
       # Call QT::MainWindow constructor
       super() # MUST BE FIRST - All code before super is executed twice in RubyQt Based classes
+      @options = options
+      @about_string = nil
 
       # Add Path for plugins
       Qt::Application.instance.addLibraryPath(Qt::PLUGIN_PATH) if Kernel.is_windows?
-
       # Prevent killing the parent process from killing this GUI application
       Process.setpgrp unless Kernel.is_windows?
 
-      self.class.redirect_io if options.redirect_io
+      self.class.redirect_io if @options.redirect_io
+      self.window_title = @options.title
+      Cosmos.load_cosmos_icon
 
-      # Configure instance variables
-      @options = options
-      @about_string = nil
+      # Read the application wide stylesheet if it exists
+      app_style = File.join(Cosmos::USERPATH, 'config', 'tools', 'application.css')
+      @stylesheet = ''
+      @stylesheet = File.read(app_style) if File.exist? app_style
+
+      # Get the source file location of the tool calling this method
+      location = self.class.instance_method(:initialize).source_location[0]
+      tool_name = location.split('/')[-2]
+      config_dir = File.join(Cosmos::USERPATH, 'config', 'tools', tool_name)
+      if File.exist? config_dir
+        @options.config_dir = config_dir
+        @options.config_file = config_path(@options.config_file, ".txt", tool_name)
+        @options.stylesheet = config_path(@options.stylesheet, ".css", tool_name)
+      end
+    end
 
-      self.window_title = options.title
-      Cosmos.load_cosmos_icon
+    # Creates a path to a configuration file. If the file is given it is
+    # checked for an absolute path. If it is not absolute, the configuration
+    # directory is prepended to the filename. If no file is given a default is
+    # generated based on the application name.
+    #
+    # @param filename [String] Path to a configuration file
+    # @param type [String] File extension, e.g. '.txt'
+    # @param tool_name [String] Name of the tool calling this method
+    # @return [String|nil] Path to a configuration file or nil if none found
+    def config_path(filename, type, tool_name)
+      return filename if filename && File.exist?(filename)
+      if filename
+        # Add the configuration dir onto the filename
+        filename = File.join(@options.config_dir, filename)
+      else
+        # No file passed so default to a file named after the class
+        filename = File.join(@options.config_dir, "#{tool_name}#{type}")
+      end
+      if File.exist? filename
+        filename
+      else
+        nil
+      end
     end
 
     # Create the exit_action and the about_action. The exit_action is not
@@ -127,6 +163,11 @@ module Cosmos
     # position of the windows for subsequent launches of the application.
     # Finally it can initally show the application as minimized or maximized.
     def complete_initialize
+      if @options.stylesheet
+        @stylesheet << File.read(@options.stylesheet)
+      end
+      setStyleSheet(@stylesheet)
+
       # Handle manually sizing the window
       resize(@options.width, @options.height) unless @options.auto_size
 
@@ -294,9 +335,18 @@ module Cosmos
         end
 
         # Create the system option
-        option_parser.on("--system VALUE", "Use an alternative system.txt file") do |arg|
+        option_parser.on("--system FILE", "Use an alternative system.txt file") do |arg|
           System.instance(File.join(USERPATH, 'config', 'system', arg))
         end
+        option_parser.on("-c", "--config FILE", "Use the specified configuration file") do |arg|
+          options.config_file = arg
+        end
+        option_parser.on("--stylesheet FILE", "Use the specified stylesheet") do |arg|
+          options.stylesheet = arg
+        end
+
+        option_parser.separator("")
+        option_parser.separator("Window Size Options:")
 
         # Create the minimized option
         option_parser.on("--minimized", "Start the tool minimized") do |arg|

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

@@ -17,7 +17,7 @@ module Cosmos
 
   class RubyEditor < CompletionTextEdit
     # private slot used to connect to the blockCountChanged signal
-    slots 'line_count_changed()'
+    slots 'line_count_changed(int)'
     # private slot used to connect to the updateRequest signal
     slots 'update_line_number_area(const QRect &, int)'
 
@@ -26,6 +26,7 @@ module Cosmos
     signals 'breakpoints_cleared()'
 
     attr_accessor :enable_breakpoints
+    attr_accessor :filename
 
     # This works but slows down the GUI significantly when
     # pasting a large (10k line) block of code into the editor
@@ -153,6 +154,8 @@ module Cosmos
     end
 
     CHAR_57 = Qt::Char.new(57)
+    BREAKPOINT_SET = 1
+    BREAKPOINT_CLEAR = -1
 
     def initialize(parent)
       super(parent)
@@ -171,10 +174,10 @@ module Cosmos
       @syntax = RubySyntax.new(document())
       @lineNumberArea = LineNumberArea.new(self)
 
-      connect(self, SIGNAL('blockCountChanged(int)'), self, SLOT('line_count_changed()'))
+      connect(self, SIGNAL('blockCountChanged(int)'), self, SLOT('line_count_changed(int)'))
       connect(self, SIGNAL('updateRequest(const QRect &, int)'), self, SLOT('update_line_number_area(const QRect &, int)'))
 
-      line_count_changed()
+      line_count_changed(-1)
     end
 
     def dispose
@@ -196,19 +199,61 @@ module Cosmos
 
     def add_breakpoint(line)
       @breakpoints << line
+      block = document.findBlockByNumber(line-1)
+      block.setUserState(BREAKPOINT_SET)
+      block.dispose
+      block = nil
       @lineNumberArea.repaint
     end
 
     def clear_breakpoint(line)
       @breakpoints.delete(line)
+      block = document.findBlockByNumber(line-1)
+      block.setUserState(BREAKPOINT_CLEAR)
+      block.dispose
+      block = nil
       @lineNumberArea.repaint
     end
 
     def clear_breakpoints
       @breakpoints = []
+      block = document.firstBlock()
+      while (block.isValid())
+        block.setUserState(BREAKPOINT_CLEAR)
+        next_block = block.next()
+        block.dispose
+        block = next_block
+      end
+      block.dispose
+      block = nil
       @lineNumberArea.repaint
     end
 
+    def update_breakpoints
+      return if @breakpoints.empty?
+
+      breakpoints = []
+      block = document.firstBlock()
+      while (block.isValid())
+        if block.userState() == BREAKPOINT_SET
+          line = block.firstLineNumber() + 1
+          breakpoints << line
+        end
+        next_block = block.next()
+        block.dispose
+        block = next_block
+      end
+      block.dispose
+      block = nil
+
+      # Only emit signals if the breakpoints have changed.
+      if @breakpoints.sort != breakpoints.sort
+        emit breakpoints_cleared
+        breakpoints.each {|line| emit breakpoint_set(line)}
+        @breakpoints = breakpoints
+      end
+    end
+
     def comment_or_uncomment_lines
       cursor = textCursor
       no_selection = cursor.hasSelection ? false : true
@@ -281,7 +326,7 @@ module Cosmos
                              Qt::AlignRight,  # flags
                              number.to_s)     # text
 
-            if @enable_breakpoints and @breakpoints.include?(number)
+            if @enable_breakpoints and block.userState() == BREAKPOINT_SET
               painter.setBrush(Cosmos::RED)
               painter.drawEllipse(2,
                                   top+2,
@@ -312,7 +357,10 @@ module Cosmos
 
     private
 
-    def line_count_changed
+    def line_count_changed(new_block_count)
+      if new_block_count >= 0
+        update_breakpoints()
+      end
       setViewportMargins(line_number_area_width(), 0, 0, 0)
       update
     end
@@ -325,7 +373,7 @@ module Cosmos
       end
       my_viewport = viewport()
       viewport_rect = my_viewport.rect()
-      line_count_changed() if (rect.contains(viewport_rect))
+      line_count_changed(-1) if (rect.contains(viewport_rect))
       viewport_rect.dispose
     end