Refactor line_graph_drawing and qt #110

lib/cosmos/gui/line_graph/line_graph_drawing.rb

@@ -33,7 +33,7 @@ def draw_graph_into_back_buffer
       calculate_scaling_factors()
 
       # Draw overall graph and origin lines
-      clear_canvas_and_draw_graph_rectangle(@painter)
+      draw_graph_background(@painter)
       draw_origin_lines(@painter)
 
       # Draw gridlines and titles
@@ -45,7 +45,6 @@ def draw_graph_into_back_buffer
       draw_y_axis_title(@painter, :LEFT)
       draw_y_axis_title(@painter, :RIGHT)
 
-      # Draw legend and lines
       draw_legend(@painter)
 
       draw_lines(@painter, :LEFT)
@@ -54,7 +53,6 @@ def draw_graph_into_back_buffer
 
     # Draws the graph to the screen
     def draw_graph_to_screen
-      # Draw frame around graph
       draw_frame(@painter)
 
       # Draw cursor line and popups if present
@@ -64,16 +62,10 @@ def draw_graph_to_screen
       draw_error_icon(@painter)
     end # def draw_graph_to_screen
 
-    # Clears the entire canvas and then draws the colored rectangle for the graph
-    def clear_canvas_and_draw_graph_rectangle(dc)
-      # Draw graph background
-      color = Cosmos::getColor(@graph_back_color)
-      dc.setPen(color)
-      dc.setBrush(Cosmos.getBrush(@@gradient))
-      dc.drawRect(@graph_left_x,@graph_top_y,@graph_right_x - @graph_left_x,@graph_bottom_y - @graph_top_y)
-      # Draw the graph border
-      dc.addRectColor(@graph_left_x, @graph_top_y, @graph_right_x - @graph_left_x, @graph_bottom_y - @graph_top_y, @label_and_border_color)
-    end # def clear_canvas_and_draw_graph_rectangle
+    # Draws the colored rectangle for the graph
+    def draw_graph_background(dc)
+      dc.addRectColorFill(@graph_left_x, @graph_top_y, @graph_right_x - @graph_left_x, @graph_bottom_y - @graph_top_y, @label_and_border_color, @@gradient)
+    end
 
     # Draws origin lines if they fall on the graph
     def draw_origin_lines(dc)
@@ -97,11 +89,12 @@ def draw_y_axis_grid_lines(dc)
       @y_grid_lines.each_with_index do |value, index|
         # Don't draw gridlines that are too close to 0
         if ((value > (@y_grid_line_scale / 2.0)) || (value < (@y_grid_line_scale / -2.0)))
-          grid_lines << draw_y_label_and_grid_line(dc, value, index, true)
+          grid_lines << draw_y_label(dc, value, index, true)
         else
-          grid_lines << draw_y_label_and_grid_line(dc, 0, index, true)
+          grid_lines << draw_y_label(dc, 0, index, true)
         end
       end
+      # Now draw all the grid lines so we can use a single Pen for all
       grid_lines.each do |y|
         dc.addLineColor(@graph_left_x, y, @graph_right_x, y, Cosmos::DASHLINE_PEN)
       end
@@ -148,10 +141,8 @@ def calculate_y_labels
       @graph_right_x -= (right_widths.max + GRAPH_SPACER)
     end
 
-    # This function is used to draw a horizontal line on the graph with a label.
-    # This line is not clipped so the value must fall on the graph. Uses the
-    # label values calculated in calculate_y_labels.
-    def draw_y_label_and_grid_line(dc, value, index, show_line)
+    # This function is used to draw the y labels.
+    def draw_y_label(dc, value, index, show_line)
       left_value = value
       right_value = value
       left_text = @left_text[index]
@@ -197,28 +188,29 @@ def draw_y_label_and_grid_line(dc, value, index, show_line)
                              y + (@font_size / 2))
         end
       end
-      y
-    end # def draw_y_label_and_grid_line
+      return y
+    end
 
     # Draws the gridlines for the x-axis
     def draw_x_axis_grid_lines(dc)
       grid_lines = []
       @x_grid_lines.each do |value, label|
         # If the line has states or is far enough away from the origin
         if @lines.x_states || ((value > (@x_grid_line_scale / 2.0)) || (value < (@x_grid_line_scale / -2.0)))
-          grid_lines << draw_x_label_and_grid_line(dc, value, label, true)
+          grid_lines << draw_x_label(dc, value, label, true)
         else
-          grid_lines << draw_x_label_and_grid_line(dc, 0, nil, true)
+          grid_lines << draw_x_label(dc, 0, nil, true)
         end
       end
+      # Now draw all the grid lines so we can use a single Pen for all
       grid_lines.each do |x1, y1, x2, y2|
         dc.addLineColor(x1, y1, x2, y2, Cosmos::DASHLINE_PEN)
       end
     end # def draw_x_axis_grid_lines
 
-    # This function is used to draw a vertical line on the graph with a label.
-    # This line is not clipped so the value must fall on the graph
-    def draw_x_label_and_grid_line(dc, value, label, show_line)
+    # This function is used to draw the x labels and returns the line
+    # positions.
+    def draw_x_label(dc, value, label, show_line)
       if label
         text = label.to_s
       else
@@ -290,17 +282,17 @@ def draw_horizontal_lines(dc)
       end
     end
 
-    # Draw the overall graph title
+    # Draw the overall graph title above the graph
     def draw_title(dc)
       if @title
         metrics = Cosmos.getFontMetrics(@title_font)
         dc.setFont(@title_font)
         dc.addSimpleTextAt(@title, (self.width / 2) - (metrics.width(@title) / 2), metrics.height)
         dc.setFont(@font)
       end
-    end # def draw_title
+    end
 
-    # Draws the title for the X-axis
+    # Draws the x axis title below the graph
     def draw_x_axis_title(dc)
       if @x_axis_title
         metrics = Cosmos.getFontMetrics(@font)
@@ -310,9 +302,9 @@ def draw_x_axis_title(dc)
           (((@graph_right_x - @graph_left_x) / 2) + @graph_left_x) - (text_width / 2),
           @graph_bottom_y + (2 * text_height) + GRAPH_SPACER)
       end
-    end # def draw_x_axis_title
+    end
 
-    # Draws a title for a Y-axis
+    # Draws titles to the left and right of the Y axis
     def draw_y_axis_title(dc, axis)
       metrics = Cosmos.getFontMetrics(@font)
       if axis == :LEFT
@@ -334,58 +326,46 @@ def draw_y_axis_title(dc, axis)
           dc.addSimpleTextAt(character, graph_x + ((max_width - cur_width) / 2), start_height + text_height * index)
         end
       end
-    end # def draw_y_axis_title
+    end
 
     # Draws the legend on the bottom of the graph
     def draw_legend(dc)
+      return if !@show_legend || @lines.empty?
+
+      text_x, text_y, legend_width, legend_height = get_legend_position()
+      if @lines.axes == :BOTH
+        draw_legend_text(dc, :LEFT, text_x, text_y, legend_height)
+        draw_legend_text(dc, :RIGHT, text_x + (legend_width / 2), text_y, legend_height)
+      else
+        draw_legend_text(dc, false, text_x, text_y, legend_height)
+      end
+    end
+
+    # Calculate the legend x, y, width and height
+    def get_legend_position
       metrics = Cosmos.getFontMetrics(@font)
-      # Draw Legend
-      if @show_legend && !@lines.empty?
-        if @lines.axes == :BOTH
-          both_axis = true
-        else
-          both_axis = false
-        end
-        legend_width = 0
-        @lines.legend.each do |legend_text, color, axis|
-          text_width   = metrics.width(legend_text)
-          legend_width = text_width if text_width > legend_width
-        end
-        legend_width += (GRAPH_SPACER * 2)
-        legend_width *= 2 if both_axis
-        legend_graph_x = (self.width - legend_width) / 2
-
-        text_x = legend_graph_x + GRAPH_SPACER
-        text_y = self.height - metrics.height
-
-        # Draw legend text for each line
-        if both_axis
-          left_text_x  = text_x
-          right_text_x = text_x + (legend_width / 2)
-          left_text_y  = text_y
-          right_text_y = text_y
-          @lines.legend.reverse_each do |legend_text, color, axis|
-            if axis == :LEFT
-              dc.addSimpleTextAt(legend_text, left_text_x, left_text_y, color)
-              left_text_y -= metrics.height
-            else
-              dc.addSimpleTextAt(legend_text, right_text_x, right_text_y, color)
-              right_text_y -= metrics.height
-            end
-          end
-          if left_text_y < right_text_y
-            text_y = left_text_y
-          else
-            text_y = right_text_y
-          end
-        else
-          @lines.legend.reverse_each do |legend_text, color, axis|
-            dc.addSimpleTextAt(legend_text, text_x, text_y, color)
-            text_y -= metrics.height
-          end
+      legend_width = 0
+      @lines.legend.each do |legend_text, color, axis|
+        text_width   = metrics.width(legend_text)
+        legend_width = text_width if text_width > legend_width
+      end
+      legend_width += (GRAPH_SPACER * 2)
+      legend_width *= 2 if @lines.axes == :BOTH
+      legend_graph_x = (self.width - legend_width) / 2
+
+      text_x = legend_graph_x + GRAPH_SPACER
+      text_y = self.height - metrics.height
+      return [text_x, text_y, legend_width, metrics.height]
+    end
+
+    def draw_legend_text(dc, specific_axis, text_x, text_y, line_height)
+      @lines.legend.reverse_each do |legend_text, color, axis|
+        if !specific_axis || specific_axis == axis
+          dc.addSimpleTextAt(legend_text, text_x, text_y, color)
+          text_y -= line_height
         end
       end
-    end # def draw_legend
+    end
 
     # Draws all lines for the given axis
     # def draw_lines(dc, axis)
@@ -442,9 +422,8 @@ def draw_popups(dc)
       end # unless popups.empty?
     end
 
-    # Draws the overall frame around the canvas
+    # Draws the overall frame around the graph, legend, labels, etc
     def draw_frame(dc)
-      # Draw Frame Rectangle around canvas
       dc.addRectColor(0,0,self.width-1,self.height-1, @frame_color)
     end
 

lib/cosmos/gui/qt.rb

@@ -108,6 +108,8 @@ def self.getColor(color_r, color_g = nil, color_b = nil)
   end
 
   def self.getBrush(color)
+    return nil unless color
+    return color if color.is_a? Qt::Brush
     brush = nil
     color = Cosmos.getColor(color)
     brush = BRUSHES[color]
@@ -276,10 +278,16 @@ def displayFullSize
     resizeRowsToContents()
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff)
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff)
-    setMinimumSize(2*frameWidth() + horizontalHeader.length + verticalHeader.width,
-                   2*frameWidth() + verticalHeader.length + horizontalHeader.height)
-    setMaximumSize(2*frameWidth() + horizontalHeader.length + verticalHeader.width,
-                   2*frameWidth() + verticalHeader.length + horizontalHeader.height)
+    setMinimumSize(fullWidth, fullHeight)
+    setMaximumSize(fullWidth, fullHeight)
+  end
+
+  def fullWidth
+    2*frameWidth() + horizontalHeader.length + verticalHeader.width
+  end
+
+  def fullHeight
+    2*frameWidth() + verticalHeader.length + horizontalHeader.height
   end
 end
 
@@ -665,69 +673,48 @@ def dispose
 end
 
 class Qt::Painter
-  def initialize(*args)
-    super(*args)
-    @@pen_color = nil
-    @@brush_color = nil
+  def setPen(pen)
+    super(Cosmos::getColor(pen))
+    @pen = pen
+  end
+  def setBrush(brush)
+    super(Cosmos::getBrush(brush))
+    @brush = brush
   end
 
   def addLineColor(x, y, w, h, color = Cosmos::BLACK)
-    if color != @@pen_color
-      @@pen_color = color
-      setPen(Cosmos::getColor(@@pen_color))
-    end
+    setPen(color) if color != @pen
     drawLine(x,y,w,h)
   end
 
   def addRectColor(x, y, w, h, color = Cosmos::BLACK)
-    if color != @@pen_color
-      @@pen_color = color
-      setPen(Cosmos::getColor(@@pen_color))
-    end
-    @@brush_color = nil
-    setBrush(nil)
+    setPen(color) if color != @pen
+    setBrush(nil) if @brush
     drawRect(x,y,w,h)
   end
 
-  def addRectColorFill(x, y, w, h, color = Cosmos::BLACK)
-    if color != @@pen_color
-      @@pen_color = color
-      setPen(Cosmos::getColor(@@pen_color))
-    end
-    if color != @@brush_color
-      @@brush_color = color
-      setBrush(Cosmos.getBrush(@@brush_color))
-    end
+  def addRectColorFill(x, y, w, h, pen_color = Cosmos::BLACK, brush_color = nil)
+    setPen(pen_color) if pen_color != @pen
+    brush_color = pen_color unless brush_color
+    setBrush(brush_color) if brush_color != @brush
     drawRect(x,y,w,h)
   end
 
   def addSimpleTextAt(text, x, y, color = Cosmos::BLACK)
-    if color != @@pen_color
-      @@pen_color = color
-      setPen(Cosmos::getColor(@@pen_color))
-    end
+    setPen(color) if color != @pen
     drawText(x,y,text)
   end
 
   def addEllipseColor(x, y, w, h, color = Cosmos::BLACK)
-    if color != @@pen_color
-      @@pen_color = color
-      setPen(Cosmos::getColor(@@pen_color))
-    end
-    @@brush_color = nil
-    setBrush(nil)
+    setPen(color) if color != @pen
+    setBrush(nil) if @brush
     drawEllipse(x,y,w,h)
   end
 
-  def addEllipseColorFill(x, y, w, h, color = Cosmos::BLACK)
-    if color != @@pen_color
-      @@pen_color = color
-      setPen(Cosmos::getColor(@@pen_color))
-    end
-    if color != @@brush_color
-      @@brush_color = color
-      setBrush(Cosmos.getBrush(@@brush_color))
-    end
+  def addEllipseColorFill(x, y, w, h, pen_color = Cosmos::BLACK, brush_color = nil)
+    setPen(pen_color) if pen_color != @pen
+    brush_color = pen_color unless brush_color
+    setBrush(brush_color) if brush_color != @brush
     drawEllipse(x,y,w,h)
   end
 end

lib/cosmos/gui/text/ruby_editor.rb

@@ -363,7 +363,7 @@ def lineNumberAreaPaintEvent(event)
                              number.to_s)     # text
 
             if @enable_breakpoints and @breakpoints.include?(number)
-              painter.setBrush(Cosmos.getBrush(Cosmos::RED))
+              painter.setBrush(Cosmos::RED)
               painter.drawEllipse(2,
                                   top+2,
                                   ellipse_width,

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

@@ -40,7 +40,7 @@ def paint(painter)
       painter.drawLine(@x1, @y1, @x2, @y2)
       painter.drawLine(@x1, @y1, @x2, @y2)
       if (@connector == true)
-        painter.setBrush(Cosmos.getBrush(@color))
+        painter.setBrush(@color)
         painter.drawEllipse(@point, @width, @width)
       end
       painter.restore

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

@@ -51,7 +51,7 @@ def draw_widget(painter, on_state)
       painter.setPen(pen)
       painter.drawLine(@x1, @y1, @x2, @y2)
       if (@connector == true)
-        painter.setBrush(Cosmos.getBrush(color))
+        painter.setBrush(color)
         painter.drawEllipse(@point, @width, @width)
       end
       painter.restore