cosmos 3.4.2 → 3.5.0

data/lib/cosmos/gui/opengl/gl_viewer.rb

@@ -532,15 +532,15 @@ module Cosmos
       w[0]*@transform[0][2] + w[1]*@transform[1][2] + w[2]*@transform[2][2] + @transform[3][2]
     end
 
+    def calc_prime(v)
+      return [v[0]*@itransform[0][0] + v[1]*@itransform[1][0] + v[2]*@itransform[2][0] + @itransform[3][0],
+              v[0]*@itransform[0][1] + v[1]*@itransform[1][1] + v[2]*@itransform[2][1] + @itransform[3][1],
+              v[0]*@itransform[0][2] + v[1]*@itransform[1][2] + v[2]*@itransform[2][2] + @itransform[3][2]]
+    end
+
     def worldVector(fx, fy, tx, ty)
-      wfm = screenToTarget(fx, fy)
-      wto = screenToTarget(tx, ty)
-      wfm_prime = [wfm[0]*@itransform[0][0] + wfm[1]*@itransform[1][0] + wfm[2]*@itransform[2][0] + @itransform[3][0],
-                         wfm[0]*@itransform[0][1] + wfm[1]*@itransform[1][1] + wfm[2]*@itransform[2][1] + @itransform[3][1],
-                         wfm[0]*@itransform[0][2] + wfm[1]*@itransform[1][2] + wfm[2]*@itransform[2][2] + @itransform[3][2]]
-      wto_prime = [wto[0]*@itransform[0][0] + wto[1]*@itransform[1][0] + wto[2]*@itransform[2][0] + @itransform[3][0],
-                         wto[0]*@itransform[0][1] + wto[1]*@itransform[1][1] + wto[2]*@itransform[2][1] + @itransform[3][1],
-                         wto[0]*@itransform[0][2] + wto[1]*@itransform[1][2] + wto[2]*@itransform[2][2] + @itransform[3][2]]
+      wfm_prime = calc_prime(screenToTarget(fx, fy))
+      wto_prime = calc_prime(screenToTarget(tx, ty))
       return [wto_prime[0] - wfm_prime[0], wto_prime[1] - wfm_prime[1], wto_prime[2] - wfm_prime[2]]
     end
 

data/lib/cosmos/gui/qt.rb

@@ -175,6 +175,24 @@ module Cosmos
     font
   end
 
+  # Get the default small font for the platform (Windows, Mac, Linux)
+  def self.get_default_small_font
+    if Kernel.is_windows?
+      Cosmos.getFont("courier", 9)
+    else
+      Cosmos.getFont("courier", 12)
+    end
+  end
+
+  # Get the default font for the platform (Windows, Mac, Linux)
+  def self.get_default_font
+    if Kernel.is_windows?
+      Cosmos.getFont("Courier", 10)
+    else
+      Cosmos.getFont("Courier", 14)
+    end
+  end
+
   def self.getFontMetrics(font)
     font_metrics = FONT_METRICS[font]
     unless font_metrics
@@ -217,28 +235,23 @@ module Cosmos
 
   # Load the applications icon
   def self.get_icon(name, fail_blank = true)
-    icon = nil
-    filename = File.join(::Cosmos::USERPATH, 'config', 'data', name)
-    begin
-      raise unless File.exist? filename
-      icon = Qt::Icon.new(filename)
-      raise if icon.isNull
-    rescue
-      begin
-        filename = File.join(::Cosmos::PATH, 'data', name)
-        raise unless File.exist? filename
-        icon = Qt::Icon.new(filename)
-        raise if icon.isNull
-      rescue
-        # Return a blank icon if we couldn't find an icon in either the user path or cosmos path
-        if fail_blank
-          icon = Qt::Icon.new
+    icon = Qt::Icon.new(Cosmos.data_path(name))
+    icon = nil if icon.isNull && !fail_blank
+    return icon
+  end
+
+  # Try to change to a configuration in a packet log reader
+  def self.check_log_configuration(packet_log_reader, log_filename)
+    config_change_success, change_error = packet_log_reader.open(log_filename)
+    unless config_change_success
+      Qt.execute_in_main_thread(true) do
+        if change_error
+          Qt::MessageBox.warning(Qt::Application.instance.activeWindow, 'Warning', "When opening: #{log_filename}\n\nAn error occurred when changing to saved configuration:\n#{packet_log_reader.configuration_name}\n\n#{change_error.formatted}\n\nUsing default configuration")
         else
-          icon = nil
+          Qt::MessageBox.warning(Qt::Application.instance.activeWindow, 'Warning', "When opening: #{log_filename}\n\nThe following saved configuration was not found:\n#{packet_log_reader.configuration_name}\n\nUsing default configuration")
         end
       end
     end
-    return icon
   end
 end
 
@@ -268,6 +281,16 @@ class Qt::CoreApplication
 end
 #### END TEMPORARY UNTIL INCLUDED IN QTBINDINGS ####
 
+class Qt::Icon
+  def initialize(param = nil)
+    if param
+      super(param)
+    else
+      super()
+    end
+  end
+end
+
 class Qt::Dialog
   def initialize(parent = Qt::Application.activeWindow,
                  flags = (Qt::WindowTitleHint | Qt::WindowSystemMenuHint))
@@ -437,7 +460,15 @@ class Qt::LineEdit
 end
 
 class Qt::PlainTextEdit
+  BLANK = ''.freeze
+  BREAK = '<br/>'.freeze
+  AMP = '&amp;'.freeze
+  NBSP = '&nbsp;'.freeze
+  GT = '&gt;'.freeze
+  LT = '&lt;'.freeze
   @@color_cache = {}
+  @@mapping = {'&'=>AMP,"\n"=>BLANK,"\s"=>NBSP,'>'=>GT,'<'=>LT}
+  @@regex = Regexp.union(@@mapping.keys)
 
   def add_formatted_text(text, color = nil)
     if text =~ /[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F-\xFF]/
@@ -446,16 +477,16 @@ class Qt::PlainTextEdit
       text << "\n"
     end
     if text =~ /<G>/ or color == Cosmos::GREEN
-      text.gsub!(/<G>/, '')
+      text.gsub!(/<G>/, BLANK)
       addText(text, Cosmos::GREEN)
     elsif text =~ /<Y>/ or color == Cosmos::YELLOW
-      text.gsub!(/<Y>/, '')
+      text.gsub!(/<Y>/, BLANK)
       addText(text, Cosmos::YELLOW)
     elsif text =~ /<R>/ or color == Cosmos::RED
-      text.gsub!(/<R>/, '')
+      text.gsub!(/<R>/, BLANK)
       addText(text, Cosmos::RED)
     elsif text =~ /<B>/ or color == Cosmos::BLUE
-      text.gsub!(/<B>/, '')
+      text.gsub!(/<B>/, BLANK)
       addText(text, Cosmos::BLUE)
     else
       addText(text) # default is Cosmos::BLACK
@@ -464,7 +495,7 @@ class Qt::PlainTextEdit
 
   def addText(text, color = Cosmos::BLACK)
     @current_text ||= ''
-    @current_text << escape_text(text.chomp, color) << '<br/>'.freeze
+    @current_text << escape_text(text.chomp, color) << BREAK
   end
 
   def flush
@@ -522,14 +553,12 @@ class Qt::PlainTextEdit
   end
 
   private
-
   def escape_text(text, color)
+    @@color_cache[color] ||= "#%02X%02X%02X" % [color.red, color.green, color.blue]
     # You might think gsub! would use less memory but benchmarking proves gsub
     # with a regular express argument is the fastest and uses the least memory.
     # However, this is still an expensive operation due to how many times it is called.
-    text = text.gsub(/&/,'&amp;'.freeze).gsub(/\n/,'<br/>'.freeze).gsub(/\s/, '&nbsp;'.freeze).gsub(/>/,'&gt;'.freeze).gsub(/</,'&lt;'.freeze)
-    @@color_cache[color] ||= "#%02X%02X%02X" % [color.red, color.green, color.blue]
-    "<font color=\"#{@@color_cache[color]}\">#{text}</font>"
+    "<font color=\"#{@@color_cache[color]}\">#{text.gsub(@@regex,@@mapping)}</font>"
   end
 end
 

data/lib/cosmos/gui/qt_tool.rb

@@ -365,12 +365,14 @@ module Cosmos
     def self.restore_io(stdout = true, stderr = true)
       $stdout = STDOUT if stdout
       $stderr = STDERR if stderr
+      @@redirect_io_thread_sleeper.cancel
+      Qt::CoreApplication.processEvents()
       Cosmos.kill_thread(self, @@redirect_io_thread)
       @@redirect_io_thread = nil
     end
 
     def self.graceful_kill
-      @@redirect_io_thread_sleeper.cancel
+      # Just to remove warning
     end
 
   end # class QtTool

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

@@ -16,15 +16,19 @@ require 'cosmos/gui/text/completion_text_edit'
 module Cosmos
 
   class RubyEditor < CompletionTextEdit
+    # private slot used to connect to the blockCountChanged signal
     slots 'line_count_changed()'
+    # private slot used to connect to the updateRequest signal
     slots 'update_line_number_area(const QRect &, int)'
+
     signals 'breakpoint_set(int)'
     signals 'breakpoint_cleared(int)'
     signals 'breakpoints_cleared()'
 
     attr_accessor :enable_breakpoints
 
-    # This works but slows down the GUI significantly when pasting a large (10k line) block of code into the editor
+    # This works but slows down the GUI significantly when
+    # pasting a large (10k line) block of code into the editor
     class RubySyntax < Qt::SyntaxHighlighter
       # Ruby keywords - http://www.ruby-doc.org/docs/keywords/1.9/
       # Also include some common methods that are typically called by
@@ -85,6 +89,8 @@ module Cosmos
           ['\bclass\b\s*(\w+)', 1, STYLES['class']],
           # Ruby symbol
           [':\b\w+', 0, STYLES['symbol']],
+          # Ruby namespace operator
+          ['\b\w+(::\b\w+)+', 0, STYLES['class']],
           # Ruby global
           ['\\$\b\w+', 0, STYLES['string']],
           # A single # or a # not followed by { to the end
@@ -141,12 +147,8 @@ module Cosmos
         self
       end
 
-      def sizeHint()
-        return Qt::Size(@codeEditor.lineNumberAreaWidth(), 0)
-      end
-
       def paintEvent(event)
-        @codeEditor.lineNumberAreaPaintEvent(event)
+        @codeEditor.line_number_area_paint_event(event)
       end
     end
 
@@ -154,13 +156,9 @@ module Cosmos
 
     def initialize(parent)
       super(parent)
-      if Kernel.is_windows?
-        setFont(Cosmos.getFont("Courier", 10))
-        @fontMetrics = Cosmos.getFontMetrics(Cosmos.getFont("Courier", 10))
-      else
-        setFont(Cosmos.getFont("Courier", 14))
-        @fontMetrics = Cosmos.getFontMetrics(Cosmos.getFont("Courier", 14))
-      end
+      font = Cosmos.get_default_font
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
 
       # This is needed so text searching highlights correctly
       setStyleSheet("selection-background-color: lightblue; selection-color: black;")
@@ -168,7 +166,8 @@ module Cosmos
       @breakpoints = []
       @enable_breakpoints = false
 
-      # RubySyntax works but slows down the GUI significantly when pasting a large (10k line) block of code into the editor
+      # RubySyntax works but slows down the GUI significantly when
+      # pasting a large (10k line) block of code into the editor
       @syntax = RubySyntax.new(document())
       @lineNumberArea = LineNumberArea.new(self)
 
@@ -186,46 +185,16 @@ module Cosmos
 
     def context_menu(point)
       menu = createStandardContextMenu()
-      if @enable_breakpoints
-        menu.addSeparator()
-
-        add_breakpoint = Qt::Action.new(tr("Add Breakpoint"), self)
-        add_breakpoint.statusTip = tr("Add a breakpoint at this line")
-        add_breakpoint.connect(SIGNAL('triggered()')) { breakpoint_click(point) }
-        menu.addAction(add_breakpoint)
-
-        clear_breakpoint = Qt::Action.new(tr("Clear Breakpoint"), self)
-        clear_breakpoint.statusTip = tr("Clear an existing breakpoint at this line")
-        clear_breakpoint.connect(SIGNAL('triggered()')) { breakpoint_click(point, false) }
-        menu.addAction(clear_breakpoint)
-
-        clear_all_breakpoints = Qt::Action.new(tr("Clear All Breakpoints"), self)
-        clear_all_breakpoints.statusTip = tr("Clear all existing breakpoints")
-        clear_all_breakpoints.connect(SIGNAL('triggered()')) do
-          clear_breakpoints()
-          emit breakpoints_cleared
-        end
-        menu.addAction(clear_all_breakpoints)
-      end
-      return menu
-    end
+      return menu unless @enable_breakpoints
 
-    def breakpoint_click(point, add_breakpoint = true)
-      line = point.y / @fontMetrics.height() + 1 + firstVisibleBlock().blockNumber()
-      if add_breakpoint
-        if line <= document.blockCount()
-          breakpoint(line)
-          emit breakpoint_set(line)
-        end
-      else
-        if line <= document.blockCount()
-          clear_breakpoint(line)
-          emit breakpoint_cleared(line)
-        end
-      end
+      menu.addSeparator()
+      menu.addAction(create_add_breakpoint_action(point))
+      menu.addAction(create_clear_breakpoint_action(point))
+      menu.addAction(create_clear_all_breakpoints_action())
+      menu
     end
 
-    def breakpoint(line)
+    def add_breakpoint(line)
       @breakpoints << line
       @lineNumberArea.repaint
     end
@@ -242,19 +211,18 @@ module Cosmos
 
     def comment_or_uncomment_lines
       cursor = textCursor
-      # Figure out if the cursor has a selection
-      no_selection = true
-      no_selection = false if cursor.hasSelection
+      no_selection = cursor.hasSelection ? false : true
 
       # Start the edit block so this can be all undone with a single undo step
       cursor.beginEditBlock
       selection_end = cursor.selectionEnd
       # Initially place the cursor at the beginning of the selection
-      # If nothing is selected this will just put the cursor at the beginning of the current line
+      # If nothing is selected this will just put the cursor at the beginning
+      # of the current line
       cursor.setPosition(textCursor.selectionStart)
       cursor.movePosition(Qt::TextCursor::StartOfLine)
       result = true
-      while (cursor.position < selection_end and result == true) or (no_selection)
+      while (cursor.position < selection_end && result == true) || (no_selection)
         # Check for a special comment
         if cursor.block.text =~ /^\S*#~/
           cursor.deleteChar
@@ -269,63 +237,27 @@ module Cosmos
         # Move the cursor to the beginning of the next line
         cursor.movePosition(Qt::TextCursor::StartOfLine)
         result = cursor.movePosition(Qt::TextCursor::Down)
-        # If nothing was selected then we're working with a single line and we can break
+        # If nothing was selected then its a single line so break
         break if no_selection
       end
       cursor.endEditBlock
     end
 
-    def lineNumberAreaWidth
-      digits = 1
-      my_document = document()
-      max = [1, my_document.blockCount()].max
-
-      # Figure the line number power of ten to determine how much space we need
-      while (max >= 10)
-        max /= 10
-        digits += 1
-      end
-      # We'll always display space for 5 digits so the line number area
-      # isn't constantly expanding and contracting
-      digits = 5 if digits < 5
-      digits += 1 # always allow room for a breakpoint symbol
-      # Get the font width of the character 57 ('9')
-      # times the number of digits to display
-      return (3 + @fontMetrics.width(CHAR_57) * digits)
-    end
-
-    def line_count_changed
-      setViewportMargins(lineNumberAreaWidth(), 0, 0, 0)
-      update
-    end
-
-    def update_line_number_area(rect, dy)
-      if (dy)
-        @lineNumberArea.scroll(0, dy)
-      else
-        @lineNumberArea.update(0, rect.y(), @lineNumberArea.width(), rect.height())
-      end
-      my_viewport = viewport()
-      viewport_rect = my_viewport.rect()
-      line_count_changed() if (rect.contains(viewport_rect))
-      viewport_rect.dispose
-    end
-
     def resizeEvent(e)
       super(e)
       cr = self.contentsRect()
       rect = Qt::Rect.new(cr.left(),
         cr.top(),
-        lineNumberAreaWidth(),
+        line_number_area_width(),
         cr.height())
       @lineNumberArea.setGeometry(rect)
       cr.dispose
       rect.dispose
     end
 
-    def lineNumberAreaPaintEvent(event)
+    def line_number_area_paint_event(event)
       painter = Qt::Painter.new(@lineNumberArea)
-      # On initialization sometimes we get some weird bad conditions so check for them
+      # Check for weird bad initialization conditions
       if painter.isActive and not painter.paintEngine.nil?
         event_rect = event.rect()
         painter.fillRect(event_rect, Qt::lightGray)
@@ -333,20 +265,7 @@ module Cosmos
         block = firstVisibleBlock()
         blockNumber = block.blockNumber()
 
-        offset = contentOffset()
-        rect = blockBoundingGeometry(block)
-        rect2 = rect.translated(offset)
-        top = rect2.top()
-        rect3 = blockBoundingRect(block)
-        bottom = top + rect3.height()
-        offset.dispose
-        offset = nil
-        rect.dispose
-        rect = nil
-        rect2.dispose
-        rect2 = nil
-        rect3.dispose
-        rect3 = nil
+        top, bottom = block_top_and_bottom(block)
 
         width = @lineNumberArea.width()
         height = @fontMetrics.height()
@@ -390,6 +309,107 @@ module Cosmos
       painter.dispose
       painter = nil
     end
+
+    private
+
+    def line_count_changed
+      setViewportMargins(line_number_area_width(), 0, 0, 0)
+      update
+    end
+
+    def update_line_number_area(rect, dy)
+      if (dy)
+        @lineNumberArea.scroll(0, dy)
+      else
+        @lineNumberArea.update(0, rect.y(), @lineNumberArea.width(), rect.height())
+      end
+      my_viewport = viewport()
+      viewport_rect = my_viewport.rect()
+      line_count_changed() if (rect.contains(viewport_rect))
+      viewport_rect.dispose
+    end
+
+    def line_number_area_width
+      digits = 1
+      my_document = document()
+      max = [1, my_document.blockCount()].max
+
+      # Figure the line number power of ten to determine how much space we need
+      while (max >= 10)
+        max /= 10
+        digits += 1
+      end
+      # We'll always display space for 5 digits so the line number area
+      # isn't constantly expanding and contracting
+      digits = 5 if digits < 5
+      digits += 1 # always allow room for a breakpoint symbol
+      # Get the font width of the character 57 ('9')
+      # times the number of digits to display
+      return (3 + @fontMetrics.width(CHAR_57) * digits)
+    end
+
+    def line_at_point(point)
+      line = point.y / @fontMetrics.height() + 1 +
+        firstVisibleBlock().blockNumber()
+      yield line if line <= document.blockCount()
+    end
+
+    def create_add_breakpoint_action(point)
+      add_breakpoint = Qt::Action.new(tr("Add Breakpoint"), self)
+      add_breakpoint.statusTip = tr("Add a breakpoint at this line")
+      add_breakpoint.connect(SIGNAL('triggered()')) do
+        line_at_point(point) do |line|
+          add_breakpoint(line)
+          emit breakpoint_set(line)
+        end
+      end
+      add_breakpoint
+    end
+
+    def create_clear_breakpoint_action(point)
+      clear_breakpoint = Qt::Action.new(tr("Clear Breakpoint"), self)
+      clear_breakpoint.statusTip = tr("Clear an existing breakpoint at this line")
+      clear_breakpoint.connect(SIGNAL('triggered()')) do
+        line_at_point(point) do |line|
+          clear_breakpoint(line)
+          emit breakpoint_cleared(line)
+        end
+      end
+      clear_breakpoint
+    end
+
+    def create_clear_all_breakpoints_action
+      clear_all_breakpoints = Qt::Action.new(tr("Clear All Breakpoints"), self)
+      clear_all_breakpoints.statusTip = tr("Clear all existing breakpoints")
+      clear_all_breakpoints.connect(SIGNAL('triggered()')) do
+        clear_breakpoints
+        emit breakpoints_cleared
+      end
+      clear_all_breakpoints
+    end
+
+    # Get the top and bottom coordinates of the block in viewport coordinates
+    def block_top_and_bottom(block)
+      # bounding rect of the text block in content coordinates
+      rect = blockBoundingGeometry(block)
+      offset = contentOffset() # content origin in viewport coordinates
+      # translate the rect to get visual coordinates on the viewport
+      rect2 = rect.translated(offset)
+      top = rect2.top()
+      # bounding rect in block coordinates
+      rect3 = blockBoundingRect(block)
+      bottom = top + rect3.height()
+      # Now call the destructors and set to nil to allow garbage collection
+      offset.dispose
+      offset = nil
+      rect.dispose
+      rect = nil
+      rect2.dispose
+      rect2 = nil
+      rect3.dispose
+      rect3 = nil
+      return top, bottom
+    end
   end
 
 end # module Cosmos