glimmer-libui-cc-graphs_and_charts 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefbc0c06b3968b4e633e3d923cf886e64421d5debea0e0e8a2376a54b45df86
-  data.tar.gz: beb20ca4b10e5ff0187becd7e1d3aeb087033a35093ea932dcde4a4b980ae22f
+  metadata.gz: 13c6855a27c49f14aaa6bc865f8d954a4500a86b99943446a9b9c7d8f153bd87
+  data.tar.gz: 1fb52e2748e28024d4dbd46f9077a4b1e14aae00367487c16b622b514404cf56
 SHA512:
-  metadata.gz: 619d28542b4a45eaa32b1f71e912ca24e11ba48ececef50bb7a5503ee0854a17591df78b2e6202f90625b747947b661f5a247e8eeb4c4fdf6ef1cf7ae8bbce6f
-  data.tar.gz: 1d48203f5a1a03e0c84eb60301085bd89c4cf589a41214b825d07ea22afa2a910fc331f80a62802e1c7e2b2d4f29b0daab63150da1cbb8c48eed76f27926b331
+  metadata.gz: 0ce8817b76f6b9cc5ac0c5fc88223aa4c07625f747d3a79dc95569055862a77e65578543134be4fff45f783a83098d509abf27f7db48fe1bd4fdf1412a4c9fc0
+  data.tar.gz: 933bdaeb6f80038e708b13dee69f43c7532fe2facc25a37f1598858179b9f8efb08d7a3665b085fee975e90c319df5ce08bc2913430103ae42933d52a738d243

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.1.5
+
+- Render circles for every point in addition to the lines connecting all the points
+- Render a single point if there is only 1 value in `lines` `y_values` instead of rendering nothing until 2 values exist at least
+- Support `graph_point_radius`, `graph_selected_point_radius`, and `graph_fill_selected_point` options for custimizing the circle of every rendered point and selected point.
+- Avoid rendering on top of the grid markers on the left side
+- Optimize performance of rendering grid markers and showing mouse hover selection stats of a point
+
+## 0.1.4
+
+- Fix issue with crashing at `lib/glimmer/view/line_graph.rb:243:in y_value_max_for_all_lines': undefined method max for nil:NilClass`
+
 ## 0.1.3
 
 - Fix issue with crashing if lines had points that did not share the same x-axis values as opposed to all points in all lines falling on the same x-axis values

data/README.md

@@ -1,4 +1,4 @@
-# Graphs and Charts 0.1.3 (Alpha)
+# Graphs and Charts 0.1.5 (Alpha)
 ## [Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui) Custom Controls
 [![Gem Version](https://badge.fury.io/rb/glimmer-libui-cc-graphs_and_charts.svg)](http://badge.fury.io/rb/glimmer-libui-cc-graphs_and_charts)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -12,7 +12,7 @@ Graphs and Charts (Custom Controls) for [Glimmer DSL for LibUI](https://github.c
 Add this line to Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-libui-cc-graphs_and_charts', '~> 0.1.3'
+gem 'glimmer-libui-cc-graphs_and_charts', '~> 0.1.5'
 ```
 
 Run:
@@ -71,6 +71,8 @@ line_graph(
 
 ![basic line graph](/screenshots/glimmer-libui-cc-graphs_and_charts-mac-basic-line-graph.png)
 
+Look into [lib/glimmer/view/line_graph.rb](/lib/glimmer/view/line_graph.rb) to learn about all supported options.
+
 Basic Line Graph Example:
 
 [examples/graphs_and_charts/basic_line_graph.rb](/examples/graphs_and_charts/basic_line_graph.rb)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/glimmer-libui-cc-graphs_and_charts.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-libui-cc-graphs_and_charts 0.1.3 ruby lib
+# stub: glimmer-libui-cc-graphs_and_charts 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-libui-cc-graphs_and_charts".freeze
-  s.version = "0.1.3".freeze
+  s.version = "0.1.5".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2023-12-19"
+  s.date = "2023-12-21"
   s.description = "Graphs and Charts (Custom Controls) for Glimmer DSL for LibUI, like Line Graph.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [

data/lib/glimmer/view/line_graph.rb

@@ -4,12 +4,21 @@ module Glimmer
   module View
     # General-Purpose Line Graph Custom Control
     class LineGraph
+      class << self
+        def interpret_color(color_object)
+          @color_cache ||= {}
+          @color_cache[color_object] ||= Glimmer::LibUI.interpret_color(color_object)
+        end
+      end
+    
       include Glimmer::LibUI::CustomControl
       
       DEFAULT_GRAPH_PADDING_WIDTH = 5.0
       DEFAULT_GRAPH_PADDING_HEIGHT = 5.0
-      DEFAULT_GRAPH_GRID_MARKER_PADDING_WIDTH = 30.0
+      DEFAULT_GRAPH_GRID_MARKER_PADDING_WIDTH = 37.0
       DEFAULT_GRAPH_POINT_DISTANCE = 15.0
+      DEFAULT_GRAPH_POINT_RADIUS = 1.0
+      DEFAULT_GRAPH_SELECTED_POINT_RADIUS = 3.0
       
       DEFAULT_GRAPH_STROKE_GRID = [185, 184, 185]
       DEFAULT_GRAPH_STROKE_MARKER = [185, 184, 185]
@@ -17,6 +26,8 @@ module Glimmer
       DEFAULT_GRAPH_STROKE_PERIODIC_LINE = [121, 121, 121, thickness: 1, dashes: [1, 1]]
       DEFAULT_GRAPH_STROKE_HOVER_LINE = [133, 133, 133]
       
+      DEFAULT_GRAPH_FILL_SELECTED_POINT = :white
+      
       DEFAULT_GRAPH_COLOR_MARKER_TEXT = [96, 96, 96]
       DEFAULT_GRAPH_COLOR_PERIOD_TEXT = [163, 40, 39]
       
@@ -44,6 +55,8 @@ module Glimmer
       option :graph_padding_height, default: DEFAULT_GRAPH_PADDING_HEIGHT
       option :graph_grid_marker_padding_width, default: DEFAULT_GRAPH_GRID_MARKER_PADDING_WIDTH
       option :graph_point_distance, default: DEFAULT_GRAPH_POINT_DISTANCE
+      option :graph_point_radius, default: DEFAULT_GRAPH_POINT_RADIUS
+      option :graph_selected_point_radius, default: DEFAULT_GRAPH_SELECTED_POINT_RADIUS
       
       option :graph_stroke_grid, default: DEFAULT_GRAPH_STROKE_GRID
       option :graph_stroke_marker, default: DEFAULT_GRAPH_STROKE_MARKER
@@ -51,6 +64,8 @@ module Glimmer
       option :graph_stroke_periodic_line, default: DEFAULT_GRAPH_STROKE_PERIODIC_LINE
       option :graph_stroke_hover_line, default: DEFAULT_GRAPH_STROKE_HOVER_LINE
       
+      option :graph_fill_selected_point, default: DEFAULT_GRAPH_FILL_SELECTED_POINT
+      
       option :graph_color_marker_text, default: DEFAULT_GRAPH_COLOR_MARKER_TEXT
       option :graph_color_period_text, default: DEFAULT_GRAPH_COLOR_PERIOD_TEXT
       
@@ -93,7 +108,7 @@ module Glimmer
         
             if @hover_point && lines && lines[0] && @points && @points[lines[0]] && !@points[lines[0]].empty?
               x = @hover_point[:x]
-              closest_point_index = @points[lines[0]].each_with_index.min_by { |point, index| (point[:x] - x).abs }[1]
+              closest_point_index = ((width - graph_padding_width - x) / graph_point_distance_for_line(lines[0])).round
               if closest_point_index != @closest_point_index
                 @closest_point_index = closest_point_index
                 graph_area.queue_redraw_all
@@ -118,6 +133,11 @@ module Glimmer
         @y_value_max_for_all_lines = nil
         @grid_marker_points = nil
         @points = nil
+        @grid_marker_number_values = nil
+        @grid_marker_numbers = nil
+        @graph_stroke_marker_values = nil
+        @mod_values = nil
+        @estimated_widths_of_text = nil
       end
       
       def calculate_dynamic_options
@@ -127,8 +147,10 @@ module Glimmer
       def calculate_graph_point_distance_per_line
         return unless graph_point_distance == :width_divided_by_point_count
         
-        @graph_point_distance_per_line = lines.inject({}) do |hash, line|
-          hash.merge(line => (width - 2.0*graph_padding_width - graph_grid_marker_padding_width) / (line[:y_values].size - 1).to_f)
+        @graph_point_distance_per_line ||= lines.inject({}) do |hash, line|
+          value = (width - 2.0*graph_padding_width - graph_grid_marker_padding_width) / (line[:y_values].size - 1).to_f
+          value = [value, width - 2.0*graph_padding_width - graph_grid_marker_padding_width].min
+          hash.merge(line => value)
         end
       end
       
@@ -149,12 +171,25 @@ module Glimmer
         line(graph_padding_width, height - graph_padding_height, width - graph_padding_width, height - graph_padding_height) {
           stroke graph_stroke_grid
         }
+        grid_marker_number_font = graph_font_marker_text.merge(size: 11)
+        @grid_marker_number_values ||= []
+        @grid_marker_numbers ||= []
+        @graph_stroke_marker_values ||= []
+        @mod_values ||= []
         grid_marker_points.each_with_index do |marker_point, index|
-          grid_marker_number_value = (grid_marker_points.size - index).to_i
-          grid_marker_number = (grid_marker_number_value >= 1000) ? "#{grid_marker_number_value / 1000}K" : grid_marker_number_value.to_s
-          graph_stroke_marker_value = Glimmer::LibUI.interpret_color(graph_stroke_marker)
-          graph_stroke_marker_value[:thickness] = (index != grid_marker_points.size - 1 ? 2 : 1) if graph_stroke_marker_value[:thickness].nil?
-          mod_value = (2 * ((grid_marker_points.size / max_marker_count) + 1))
+          @grid_marker_number_values[index] ||= (grid_marker_points.size - index).to_i
+          grid_marker_number_value = @grid_marker_number_values[index]
+          @grid_marker_numbers[index] ||= (grid_marker_number_value >= 1000) ? "#{grid_marker_number_value / 1000}K" : grid_marker_number_value.to_s
+          grid_marker_number = @grid_marker_numbers[index]
+          @graph_stroke_marker_values[index] ||= LineGraph.interpret_color(graph_stroke_marker).tap do |color_hash|
+            color_hash[:thickness] = (index != grid_marker_points.size - 1 ? 2 : 1) if color_hash[:thickness].nil?
+          end
+          graph_stroke_marker_value = @graph_stroke_marker_values[index]
+          @mod_values[index] ||= begin
+            mod_value_multiplier = ((grid_marker_points.size / max_marker_count) + 1)
+            [((mod_value_multiplier <= 2 ? 2 : 5) * mod_value_multiplier), 1].max
+          end
+          mod_value = @mod_values[index]
           comparison_value = (mod_value > 2) ? 0 : 1
           if mod_value > 2
             if grid_marker_number_value % mod_value == comparison_value
@@ -173,7 +208,6 @@ module Glimmer
             }
           end
           if grid_marker_number_value % mod_value == comparison_value
-            grid_marker_number_font = graph_font_marker_text.merge(size: 11)
             grid_marker_number_width = estimate_width_of_text(grid_marker_number, grid_marker_number_font)
             text(marker_point[:x] + 4 + 3, marker_point[:y] - 6, grid_marker_number_width) {
               string(grid_marker_number) {
@@ -216,6 +250,11 @@ module Glimmer
               stroke graph_line[:stroke]
             }
           end
+          if last_point.nil? || graph_point_radius > 1
+            circle(point[:x], point[:y], graph_point_radius) {
+              fill graph_line[:stroke]
+            }
+          end
           last_point = point
         end
       end
@@ -239,7 +278,7 @@ module Glimmer
       def y_value_max_for_all_lines
         if @y_value_max_for_all_lines.nil?
           line_visible_y_values = lines.map { |line| line[:y_values][0, max_visible_point_count(line)] }
-          all_visible_y_values = line_visible_y_values.reduce(:+)
+          all_visible_y_values = line_visible_y_values.reduce(:+) || []
           @y_value_max_for_all_lines = all_visible_y_values.max.to_f
         end
         @y_value_max_for_all_lines
@@ -257,14 +296,16 @@ module Glimmer
         points
       end
       
-      def max_visible_point_count(graph_line) = (width / graph_point_distance_for_line(graph_line)).to_i + 1
+      def max_visible_point_count(graph_line) = ((width - graph_grid_marker_padding_width) / graph_point_distance_for_line(graph_line)).to_i + 1
 
       def periodic_lines
         return unless lines && lines[0] && lines[0][:x_interval_in_seconds] && lines[0][:x_interval_in_seconds] == DAY_IN_SECONDS
         day_count = lines[0][:y_values].size
         case day_count
         when ..7
-          @points[lines[0]].each do |point|
+          @points[lines[0]].each_with_index do |point, index|
+            next if index == 0
+            
             line(point[:x], graph_padding_height, point[:x], height - graph_padding_height) {
               stroke graph_stroke_periodic_line
             }
@@ -323,68 +364,64 @@ module Glimmer
           x = @hover_point[:x]
           closest_points = lines.map { |line| @points[line][@closest_point_index] }
           closest_x = closest_points[0]&.[](:x)
-          closest_x_distance = PerfectShape::Point.point_distance(x.to_f, 0, closest_x.to_f, 0)
-          # Today, we make the assumption that all lines have points along the same x-axis values
-          # TODO In the future, we can support different x values along different lines
-          if closest_x_distance < graph_point_distance_for_line(lines[0])
-            line(closest_x, graph_padding_height, closest_x, height - graph_padding_height) {
-              stroke graph_stroke_hover_line
+          line(closest_x, graph_padding_height, closest_x, height - graph_padding_height) {
+            stroke graph_stroke_hover_line
+          }
+          closest_points.each_with_index do |closest_point, index|
+            next unless closest_point && closest_point[:x] && closest_point[:y]
+            
+            circle(closest_point[:x], closest_point[:y], graph_selected_point_radius) {
+              fill graph_fill_selected_point == :line_stroke ? lines[index][:stroke] : graph_fill_selected_point
+              stroke_value = lines[index][:stroke].dup
+              stroke_value << {} unless stroke_value.last.is_a?(Hash)
+              stroke_value.last[:thickness] = 2
+              stroke stroke_value
             }
-            closest_points.each_with_index do |closest_point, index|
-              next unless closest_point && closest_point[:x] && closest_point[:y]
-              
-              circle(closest_point[:x], closest_point[:y], 4) {
-                fill lines[index][:stroke]
-              }
-              circle(closest_point[:x], closest_point[:y], 2) {
-                fill :white
-              }
-            end
-            text_label = formatted_x_value(@closest_point_index)
-            text_label_width = estimate_width_of_text(text_label, DEFAULT_GRAPH_FONT_MARKER_TEXT)
-            lines_with_closest_points = lines.each_with_index.map do |line, index|
-              next if closest_points[index].nil?
-              
-              line
-            end
-            closest_point_texts = lines_with_closest_points.map { |line| "#{line[:name]}: #{line[:y_values][@closest_point_index]}" }
-            closest_point_text_widths = closest_point_texts.map do |text|
-              estimate_width_of_text(text, graph_font_marker_text)
-            end
-            square_size = 12.0
-            square_to_label_padding = 10.0
-            label_padding = 10.0
-            text_label_x = width - graph_padding_width - text_label_width - label_padding -
-              (lines_with_closest_points.size*(square_size + square_to_label_padding) + (lines_with_closest_points.size - 1)*label_padding + closest_point_text_widths.sum)
-            text_label_y = height + graph_padding_height
+          end
+          text_label = formatted_x_value(@closest_point_index)
+          text_label_width = estimate_width_of_text(text_label, DEFAULT_GRAPH_FONT_MARKER_TEXT)
+          lines_with_closest_points = lines.each_with_index.map do |line, index|
+            next if closest_points[index].nil?
+            
+            line
+          end.compact
+          closest_point_texts = lines_with_closest_points.map { |line| "#{line[:name]}: #{line[:y_values][@closest_point_index]}" }
+          closest_point_text_widths = closest_point_texts.map do |text|
+            estimate_width_of_text(text, graph_font_marker_text)
+          end
+          square_size = 12.0
+          square_to_label_padding = 10.0
+          label_padding = 10.0
+          text_label_x = width - graph_padding_width - text_label_width - label_padding -
+            (lines_with_closest_points.size*(square_size + square_to_label_padding) + (lines_with_closest_points.size - 1)*label_padding + closest_point_text_widths.sum)
+          text_label_y = height + graph_padding_height
 
-            text(text_label_x, text_label_y, text_label_width) {
-              string(text_label) {
-                font DEFAULT_GRAPH_FONT_MARKER_TEXT
-                color graph_color_marker_text
-              }
+          text(text_label_x, text_label_y, text_label_width) {
+            string(text_label) {
+              font DEFAULT_GRAPH_FONT_MARKER_TEXT
+              color graph_color_marker_text
             }
+          }
 
-            relative_x = text_label_x + text_label_width
-            lines_with_closest_points.size.times do |index|
-              square_x = relative_x + label_padding
+          relative_x = text_label_x + text_label_width
+          lines_with_closest_points.size.times do |index|
+            square_x = relative_x + label_padding
 
-              square(square_x, text_label_y + 2, square_size) {
-                fill lines_with_closest_points[index][:stroke]
-              }
+            square(square_x, text_label_y + 2, square_size) {
+              fill lines_with_closest_points[index][:stroke]
+            }
 
-              attribute_label_x = square_x + square_size + square_to_label_padding
-              attribute_text = closest_point_texts[index]
-              attribute_text_width = closest_point_text_widths[index]
-              relative_x = attribute_label_x + attribute_text_width
+            attribute_label_x = square_x + square_size + square_to_label_padding
+            attribute_text = closest_point_texts[index]
+            attribute_text_width = closest_point_text_widths[index]
+            relative_x = attribute_label_x + attribute_text_width
 
-              text(attribute_label_x, text_label_y, attribute_text_width) {
-                string(attribute_text) {
-                  font graph_font_marker_text
-                  color graph_color_marker_text
-                }
+            text(attribute_label_x, text_label_y, attribute_text_width) {
+              string(attribute_text) {
+                font graph_font_marker_text
+                color graph_color_marker_text
               }
-            end
+            }
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-libui-cc-graphs_and_charts
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui