whirled_peas 0.9.1 → 0.13.0

data/lib/whirled_peas/graphics/container_coords.rb

@@ -9,11 +9,11 @@ module WhirledPeas
       end
 
       def left
-        start_left + settings.position.left
+        start_left
       end
 
       def top
-        start_top + settings.position.top
+        start_top
       end
 
       def border_left
@@ -33,35 +33,33 @@ module WhirledPeas
       end
 
       def content_left(col_index=0)
-        padding_left + settings.padding.left + col_index * grid_width
+        padding_left + settings.padding.left + col_index * dimensions.grid_width
       end
 
-      def content_top(row_index=0)
-        padding_top + settings.padding.top + row_index * grid_height
-      end
-
-      def inner_grid_width
-        settings.padding.left +
-          dimensions.content_width +
-          settings.padding.right
+      def offset_content_left(col_index=0)
+        if settings.content_start.left
+          content_left(col_index) + settings.content_start.left
+        elsif settings.content_start.right
+          left_offset = dimensions.content_width - dimensions.children_width
+          content_left(col_index) + left_offset - settings.content_start.right
+        else
+          content_left(col_index)
+        end
       end
 
-      def grid_width
-        (settings.border.inner_vert? ? 1 : 0) +
-          inner_grid_width +
-          (settings.scrollbar.vert? ? 1 : 0)
-      end
-
-      def inner_grid_height
-        settings.padding.top +
-          dimensions.content_height +
-          settings.padding.bottom
+      def content_top(row_index=0)
+        padding_top + settings.padding.top + row_index * dimensions.grid_height
       end
 
-      def grid_height
-        (settings.border.inner_horiz? ? 1 : 0) +
-          inner_grid_height +
-          (settings.scrollbar.horiz? ? 1 : 0)
+      def offset_content_top(row_index=0)
+        if settings.content_start.top
+          content_top(row_index) + settings.content_start.top
+        elsif settings.content_start.bottom
+          top_offset = dimensions.content_height - dimensions.children_height
+          content_top(row_index) + top_offset - settings.content_start.bottom
+        else
+          content_top(row_index)
+        end
       end
 
       private

data/lib/whirled_peas/graphics/container_dimensions.rb

@@ -31,6 +31,30 @@ module WhirledPeas
         end
       end
 
+      def inner_grid_width
+        settings.padding.left +
+          content_width +
+          settings.padding.right
+      end
+
+      def grid_width
+        (settings.border.inner_vert? ? 1 : 0) +
+          inner_grid_width +
+          (settings.scrollbar.vert? ? 1 : 0)
+      end
+
+      def inner_grid_height
+        settings.padding.top +
+          content_height +
+          settings.padding.bottom
+      end
+
+      def grid_height
+        (settings.border.inner_horiz? ? 1 : 0) +
+          inner_grid_height +
+          (settings.scrollbar.horiz? ? 1 : 0)
+      end
+
       def outer_width
         @outer_width ||= margin_width +
           outer_border_width +

data/lib/whirled_peas/graphics/container_painter.rb

@@ -2,6 +2,7 @@ require 'whirled_peas/utils/formatted_string'
 
 require_relative 'container_coords'
 require_relative 'painter'
+require_relative 'scrollbar_helper'
 
 module WhirledPeas
   module Graphics
@@ -34,11 +35,17 @@ module WhirledPeas
 
         # Paint the top border if the settings call for it
         if settings.border.top?
-          canvas.stroke(stroke_left, stroke_top, top_border_stroke(canvas_coords), formatting, &block)
+          canvas.stroke(stroke_left, stroke_top, top_border_stroke, formatting, &block)
           stroke_top += 1
         end
         # Precalculate the middle border container grids with more than 1 row
-        middle_border = dimensions.num_rows > 1 ? middle_border_stroke(canvas_coords) : ''
+        middle_border = dimensions.num_rows > 1 ? middle_border_stroke : ''
+
+        vert_scrollbar = settings.scrollbar.vert? ? ScrollbarHelper.vert(
+          dimensions.children_height + dimensions.padding_height,
+          dimensions.inner_grid_height,
+          canvas_coords.content_top - canvas_coords.offset_content_top,
+        ) : []
 
         # Paint each grid row by row
         dimensions.num_rows.times do |row_num|
@@ -52,8 +59,9 @@ module WhirledPeas
 
           # Paint the interior of each row (horizontal borders, veritical scroll bar and
           # background color for the padding and content area)
-          canvas_coords.inner_grid_height.times do |row_within_cell|
-            canvas.stroke(stroke_left, stroke_top, content_line_stroke(canvas_coords, row_within_cell), formatting, &block)
+          dimensions.inner_grid_height.times do |row_within_cell|
+            content_line = content_line_stroke(row_within_cell, vert_scrollbar)
+            canvas.stroke(stroke_left, stroke_top, content_line, formatting, &block)
             stroke_top += 1
           end
 
@@ -66,7 +74,7 @@ module WhirledPeas
 
         # Paint the bottom border if the settings call for it
         if settings.border.bottom?
-          canvas.stroke(stroke_left, stroke_top, bottom_border_stroke(canvas_coords), formatting, &block)
+          canvas.stroke(stroke_left, stroke_top, bottom_border_stroke, formatting, &block)
           stroke_top += 1
         end
       end
@@ -176,59 +184,49 @@ module WhirledPeas
       end
 
       # Return the stroke for the top border
-      def top_border_stroke(canvas_coords)
+      def top_border_stroke
         line_stroke(
           settings.border.style.top_left,
           settings.border.style.top_junc,
           settings.border.style.top_right
         ) do
-          settings.border.style.top_horiz * (canvas_coords.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
+          settings.border.style.top_horiz * (dimensions.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
         end
       end
 
       # Return the stroke for an inner horizontal border
-      def middle_border_stroke(canvas_coords)
+      def middle_border_stroke
         line_stroke(
           settings.border.style.left_junc,
           settings.border.style.cross_junc,
           settings.border.style.right_junc
         ) do
-          settings.border.style.middle_horiz * (canvas_coords.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
+          settings.border.style.middle_horiz * (dimensions.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
         end
       end
 
       # Return the stroke for the bottom border
-      def bottom_border_stroke(canvas_coords)
+      def bottom_border_stroke
         line_stroke(
           settings.border.style.bottom_left,
           settings.border.style.bottom_junc,
           settings.border.style.bottom_right
         ) do
-          settings.border.style.bottom_horiz * (canvas_coords.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
+          settings.border.style.bottom_horiz * (dimensions.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
         end
       end
 
       # Return the stroke for a grid row between any borders
-      def content_line_stroke(canvas_coords, row_within_cell)
+      def content_line_stroke(row_within_cell, vert_scrollbar)
         line_stroke(
           settings.border.style.left_vert,
           settings.border.style.middle_vert,
           settings.border.style.right_vert,
         ) do
           if settings.scrollbar.vert?
-            if dimensions.children_height <= canvas_coords.grid_height || children.first.settings.position.top > 0
-              scrollbar_char = GUTTER
-            else
-              scrollbar_char = vert_scroll_char(
-                dimensions.children_height + dimensions.padding_height,
-                canvas_coords.inner_grid_height,
-                -children.first.settings.position.top,
-                row_within_cell
-              )
-            end
-            PADDING * canvas_coords.inner_grid_width + scrollbar_char
+            PADDING * dimensions.inner_grid_width + vert_scrollbar[row_within_cell]
           else
-            PADDING * canvas_coords.inner_grid_width
+            PADDING * dimensions.inner_grid_width
           end
         end
       end
@@ -240,121 +238,11 @@ module WhirledPeas
           settings.border.style.middle_vert,
           settings.border.style.right_vert,
         ) do
-          canvas_coords.inner_grid_width.times.map do |col_within_cell|
-            horiz_scroll_char(
-              dimensions.children_width + dimensions.padding_width,
-              canvas_coords.inner_grid_width,
-              -children.first.settings.position.left,
-              col_within_cell
-            )
-          end.join
-        end
-      end
-
-      # Contants to paint scrollbars
-      GUTTER = ' '
-      HORIZONTAL = %w[▗ ▄ ▖]
-      VERTICAL = %w[
-        ▗
-        ▐
-        ▝
-      ]
-
-      # Determine the character to paint the horizontal scroll bar with for the given column
-      #
-      # @see #scroll_char for more details
-      def horiz_scroll_char(col_count, viewable_col_count, first_visible_col, curr_col)
-        scroll_char(col_count, viewable_col_count, first_visible_col, curr_col, HORIZONTAL)
-      end
-
-      # Determine the character to paint the vertical scroll bar with for the given row
-      #
-      # @see #scroll_char for more details
-      def vert_scroll_char(row_count, viewable_row_count, first_visible_row, curr_row)
-        scroll_char(row_count, viewable_row_count, first_visible_row, curr_row, VERTICAL)
-      end
-
-      private
-
-      # Determine which character to paint a for a scrollbar
-      #
-      # @param total_count [Integer] total number of rows/columns in the content
-      # @param viewable_count [Integer] number of rows/columns visible in the viewport
-      # @param first_visible [Integer] zero-based index of the first row/column that is visible
-      #   in the viewport
-      # @param curr [Integer] zero-based index of the row/column (relative to the first visible
-      #   row/column) that the painted character is being requested for
-      # @param chars [Array<String>] an array with three 1-character strings, the frist is the
-      #   "second half" scrollbar character, the second is the "full" scrollbar character, and
-      #   the third is the "first half" scrollbar character.
-      def scroll_char(total_count, viewable_count, first_visible, curr, chars)
-        return GUTTER unless total_count > 0 && viewable_count > 0
-        # The scroll handle has the exact same relative size and position in the scroll gutter
-        # that the viewable content has in the total content area. For example, a content area
-        # that is 50 columns wide with a view port that is 20 columns wide might look like
-        #
-        #    +---------1-----****2*********3******---4---------+
-        #    |               *                   *             |
-        #    |   hidden      *     viewable      *   hidden    |
-        #    |               *                   *             |
-        #    +---------1-----****2*********3******---4---------+
-        #
-        # The scoll gutter, would look like
-        #
-        #                    |......********.....|
-        #
-        # Scrolling all the way to the right results in
-        #
-        #    +---------1---------2---------3*********4*********+
-        #    |                             *                   *
-        #    |            hidden           *     viewable      *
-        #    |                             *                   *
-        #    +---------1---------2---------3*********4*********+
-        #                                  |...........********|
-        #
-        # Returning to the first example, we can match up the arguments to this method to the
-        # diagram
-        #
-        #                       total_count = 50
-        #    |<----------------------------------------------->|
-        #    |                                                 |
-        #    |                veiwable_count = 20              |
-        #    |               |<----------------->|             |
-        #    ↓               ↓                   ↓             ↓
-        #    +---------1-----****2*********3******---4---------+
-        #    |               *                   *             |
-        #    |   hidden      *     viewable      *   hidden    |
-        #    |               *                   *             |
-        #    +---------1-----****2*********3******---4---------+
-        #                    |......****?***.....|
-        #                    ↑          ↑
-        #      first_visible = 16       |
-        #                             curr = 11
-
-        # The first task of determining how much of the handle is visible in a row/column is to
-        # calculate the range (as a precentage of the total) of viewable items
-        viewable_start = first_visible.to_f / total_count
-        viewable_end = (first_visible + viewable_count).to_f / total_count
-
-        # Always use the same length for the scroll bar so it does not give an inchworm effect
-        # as it scrolls along.
-        #
-        # Also, double the value now to get granularity for half width
-        # scrollbar characters.
-        scrollbar_length = ((2 * viewable_count ** 2).to_f / total_count).ceil
-        scrollbar_start = ((2 * first_visible * viewable_count).to_f / total_count).floor
-
-        first_half = (scrollbar_start...scrollbar_start + scrollbar_length).include?(2 * curr)
-        second_half = (scrollbar_start...scrollbar_start + scrollbar_length).include?(2 * curr + 1)
-
-        if first_half && second_half
-          chars[1]
-        elsif first_half
-          chars[2]
-        elsif second_half
-          chars[0]
-        else
-          GUTTER
+          ScrollbarHelper.horiz(
+            dimensions.children_width + dimensions.padding_width,
+            dimensions.inner_grid_width,
+            canvas_coords.content_left - canvas_coords.offset_content_left
+          ).join
         end
       end
     end

data/lib/whirled_peas/graphics/debugger.rb

@@ -15,16 +15,11 @@ module WhirledPeas
           "#{indent}* #{painter.class}(#{painter.name})",
         ]
         info << "#{indent + '  '}- Dimensions(#{dimensions})"
+        info << "#{indent + '  '}- Theme=#{painter.settings.theme.inspect}" if indent == ''
         info << "#{indent + '  '}- Settings"
         info << Settings::Debugger.new(painter.settings).debug(indent + '    ')
         if painter.is_a?(TextPainter)
-          content = if painter.content.length > 1
-            '<multiline>'
-          elsif painter.content.first.length > 12
-            "#{painter.content.first[0..9]}...".inspect
-          else
-            painter.content.first.inspect
-          end
+          content = painter.content
           info << "#{indent + '  '}- Content(value=#{content})"
         elsif painter.is_a?(ContainerPainter)
           info << "#{indent + '  '}- Children"

data/lib/whirled_peas/graphics/graph_painter.rb

@@ -5,6 +5,10 @@ require_relative 'content_painter'
 module WhirledPeas
   module Graphics
     class GraphPainter < ContentPainter
+      # The number of units along the Y-axis a single character can be divided into
+      Y_AXIS_SCALE = 2
+      private_constant :Y_AXIS_SCALE
+
       def paint(canvas, left, top, &block)
         axis_formatting = [*settings.axis_color, *settings.bg_color]
         plot_formatting = [*settings.color, *settings.bg_color]
@@ -26,8 +30,8 @@ module WhirledPeas
         min_y = 1.0 / 0
         max_y = -1.0 / 0
         if settings.width
-          interpolated = inner_width.times.map do |i|
-            x = (i * (content.length - 1).to_f / inner_width).floor
+          interpolated = (inner_width + 1).times.map do |i|
+            x = (i * (content.length - 1).to_f / (inner_width + 1)).floor
             max_y = content[x] if content[x] > max_y
             min_y = content[x] if content[x] < min_y
             content[x]
@@ -39,31 +43,34 @@ module WhirledPeas
             min_y = y if y < min_y
           end
         end
+        if min_y == max_y
+          min_y -= 1
+          max_y += 1
+        end
         scaled = interpolated.map do |y|
-          (2 * inner_height * (y - min_y).to_f / (max_y - min_y)).floor
+          inner_height * (y - min_y).to_f / (max_y - min_y)
         end
+
         @plot_lines = Array.new(inner_height) { '' }
-        scaled.each.with_index do |y, x_index|
+        scaled[0..-2].each.with_index do |y, x_index|
+          last = x_index == scaled.length - 2
+
+          prev_y = x_index == 0 ? y : scaled[x_index - 1]
+          next_y = scaled[x_index + 1]
+
+          min_y = [(prev_y + y) / 2, y, last ? next_y : (y + next_y) / 2].min
+          min_y = (Y_AXIS_SCALE * min_y).round.to_f / Y_AXIS_SCALE
+
+          max_y = [(prev_y + y) / 2, y, last ? next_y : (y + next_y) / 2].max
+          max_y = (Y_AXIS_SCALE * max_y).round.to_f / Y_AXIS_SCALE
+
           @plot_lines.each.with_index do |row, row_index|
-            bottom_half_index = 2 * (inner_height - row_index - 1)
-            top_half_index = bottom_half_index + 1
-
-            asc, next_y = if scaled.length == 1
-              [true, y]
-            elsif x_index == scaled.length - 1
-              y >= scaled[x_index - 1]
-              [true, y]
-            else
-              scaled[x_index + 1] >= y
-              [true, scaled[x_index + 1]]
-            end
-            if asc
-              top_half = y == top_half_index || (y...next_y).include?(top_half_index)
-              bottom_half = y == bottom_half_index || (y...next_y).include?(bottom_half_index)
-            else
-              top_half = y == top_half_index || (next_y...y).include?(top_half_index)
-              bottom_half = y == bottom_half_index || (next_y...y).include?(bottom_half_index)
-            end
+            bottom_value = inner_height - row_index - 1
+            top_value = bottom_value + 1.0 / Y_AXIS_SCALE
+
+            top_half =  min_y == top_value || (min_y <= top_value && top_value < max_y)
+            bottom_half = min_y == bottom_value || (min_y <= bottom_value && bottom_value < max_y)
+
             row << if top_half && bottom_half
               '█'
             elsif top_half
@@ -83,7 +90,7 @@ module WhirledPeas
       end
 
       def inner_width
-        settings.width.nil? ? content.length : settings.width - 1
+        (settings.width.nil? ? content.length : settings.width) - 1
       end
 
       def axes_lines