glimmer-libui-cc-graphs_and_charts 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b1c01b4d2bd5df0119a5da0969ea0f8697880f5e82b951df8fb11e7ff64cef5
-  data.tar.gz: 277fd2a3c47009ae872f84393c2f59700c099ea5da6ad472307c4d581fac8b2f
+  metadata.gz: c3b89df50fd8dd9d1670fd4e54568fdf90538dfb8a1566bbb7431826c8578f2e
+  data.tar.gz: 52820e7aaef7a1edbead1748cc33fc50408d7dd8a7763a93db53154cf4232752
 SHA512:
-  metadata.gz: 3bc2bb802a8a058bf9ffb4fb65c5fa2afa9a3fc0578a0956c9ea4e1d2ab1ddc47fe1f2f89ba3afa2e16500c6f4c28a7154caa541d7961075c56c5d8976f4e06f
-  data.tar.gz: bc82a867fa5ee64776a724d46db62c7039c353cbfaaebabb9e822901faea7e3371fe8ca9c8b1324b96decd880c52e46637dc1c871a4a98175c33abe19ee977d3
+  metadata.gz: 5d5ab5c841bd63fc6154b326cd8ff7cb175dd727292a6bfbd95082274f42127f850a321de30224099904064c8809228d5a063cf353cb0296eb31e675b4e227e9
+  data.tar.gz: b690434592d74c43929567d856771528e4e31792d575682983838a4fe619fd319f0935e594f8413f2ad7904b59b4ac13ff345e665de570edcdbeb9ef354b7248

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.3
+
+- Automatically scale number of `bar_chart` horizontal grid markers so that if the chart width gets small enough for them to run into each other, less of them are displayed
+
 ## 0.2.2
 
 - Display `bar_chart` axis labels `x_axis_label` and `y_axis_label`

data/README.md

@@ -1,4 +1,4 @@
-# Graphs and Charts 0.2.2 (Alpha)
+# Graphs and Charts 0.2.3 (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)
@@ -14,7 +14,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.2.2'
+gem 'glimmer-libui-cc-graphs_and_charts', '~> 0.2.3'
 ```
 
 Run:
@@ -50,6 +50,8 @@ You can then nest `bar_chart` under `window` or some container like `vertical_bo
 bar_chart(
   width: 900,
   height: 300,
+  x_axis_label: 'Month',
+  y_axis_label: 'New Customer Accounts',
   values: {
     'Jan' => 30,
     'Feb' => 49,
@@ -87,6 +89,8 @@ class BasicBarChart
       @bar_chart = bar_chart(
         width: 900,
         height: 300,
+        x_axis_label: 'Month',
+        y_axis_label: 'New Customer Accounts',
         values: {
           'Jan' => 30,
           'Feb' => 49,

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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.2.2 ruby lib
+# stub: glimmer-libui-cc-graphs_and_charts 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-libui-cc-graphs_and_charts".freeze
-  s.version = "0.2.2".freeze
+  s.version = "0.2.3".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 = "2024-01-01"
+  s.date = "2024-01-03"
   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/bar_chart.rb

@@ -121,8 +121,9 @@ module Glimmer
         @grid_marker_number_values = nil
         @grid_marker_numbers = nil
         @chart_stroke_marker_values = nil
-        @mod_values = nil
+        @y_axis_mod_values = nil
         @y_value_max = nil
+        @bars_data = nil
       end
       
       def calculate_dynamic_options
@@ -183,7 +184,7 @@ module Glimmer
         @grid_marker_number_values ||= []
 #         @grid_marker_numbers ||= []
         @chart_stroke_marker_values ||= []
-        @mod_values ||= []
+        @y_axis_mod_values ||= []
         y_axis_grid_marker_points.each_with_index do |marker_point, index|
           @grid_marker_number_values[index] ||= begin
             value = (y_axis_grid_marker_points.size - index).to_i
@@ -199,11 +200,11 @@ module Glimmer
             color_hash[:thickness] = (index != y_axis_grid_marker_points.size - 1 ? 2 : 1) if color_hash[:thickness].nil?
           end
           chart_stroke_marker_value = @chart_stroke_marker_values[index]
-          @mod_values[index] ||= begin
-            mod_value_multiplier = ((y_axis_grid_marker_points.size / max_marker_count) + 1)
+          @y_axis_mod_values[index] ||= begin
+            mod_value_multiplier = ((y_axis_grid_marker_points.size / y_axis_max_marker_count) + 1)
             [(5 * mod_value_multiplier), 1].max
           end
-          mod_value = @mod_values[index]
+          mod_value = @y_axis_mod_values[index]
           comparison_value = (mod_value > 2) ? 0 : 1
           if mod_value > 2
             if grid_marker_number_value % mod_value == comparison_value
@@ -284,19 +285,24 @@ module Glimmer
           }
         }
       end
-      def max_marker_count
-        [(0.15*height).to_i, 1].max
+      
+      def y_axis_max_marker_count
+        [(0.15*height_drawable).to_i, 1].max
       end
       
       def bars
-        values.each_with_index do |(x_value, y_value), index|
+        @bars_data = calculate_bars_data
+        @bars_data.each do |bar_data|
+          bar(bar_data)
+        end
+        x_axis_grid_markers(@bars_data)
+      end
+      
+      def calculate_bars_data
+        values.each_with_index.map do |(x_value, y_value), index|
           x = chart_y_axis_label_padding_width + chart_grid_marker_padding_width + chart_padding_width + (index * bar_width_including_padding) + bar_padding_width
           bar_height = y_value * y_resolution
           y = height - chart_grid_marker_padding_height - chart_x_axis_label_padding_height - chart_padding_height - bar_height
-          rectangle(x, y, bar_width, bar_height) {
-            fill chart_color_bar
-          }
-          
           x_axis_grid_marker_text = x_value.to_s
           grid_marker_number_font = marker_font
           x_axis_grid_marker_text_size = estimate_width_of_text(x_axis_grid_marker_text, grid_marker_number_font)
@@ -304,9 +310,45 @@ module Glimmer
           x_axis_grid_marker_x = middle_of_bar_x - x_axis_grid_marker_text_size/2.0
           middle_of_x_axis_grid_marker_padding = height - chart_grid_marker_padding_height/2.0 - chart_x_axis_label_padding_height
           x_axis_grid_marker_y = middle_of_x_axis_grid_marker_padding - chart_font_marker_text[:size]/2.0 - 7.0
-          text(x_axis_grid_marker_x, x_axis_grid_marker_y, x_axis_grid_marker_text_size) {
-            string(x_axis_grid_marker_text) {
-              font grid_marker_number_font
+          {
+            index: index,
+            x: x,
+            y: y,
+            bar_width: bar_width,
+            bar_height: bar_height,
+            x_axis_grid_marker_x: x_axis_grid_marker_x,
+            x_axis_grid_marker_y: x_axis_grid_marker_y,
+            x_axis_grid_marker_text: x_axis_grid_marker_text,
+            x_axis_grid_marker_text_size: x_axis_grid_marker_text_size,
+          }
+        end
+      end
+      
+      def bar(bar_data)
+        rectangle(bar_data[:x], bar_data[:y], bar_data[:bar_width], bar_data[:bar_height]) {
+          fill chart_color_bar
+        }
+      end
+      
+      def x_axis_grid_markers(bars_data)
+        skip_count = 0
+        collision_detected = true
+        while collision_detected
+          collision_detected = bars_data.each_with_index.any? do |bar_data, index|
+            next if index == 0
+            last_bar_text_data = bars_data[index - 1]
+            bar_data[:x_axis_grid_marker_x] < (last_bar_text_data[:x_axis_grid_marker_x] + last_bar_text_data[:x_axis_grid_marker_text_size] + 5)
+          end
+          if collision_detected
+            skip_count += 1
+            bars_data = bars_data.each_with_index.select {|bar_data, index| index % (skip_count+1) == 0 }.map(&:first)
+          end
+        end
+        x_axis_grid_marker_font = marker_font
+        bars_data.each do |bar_data|
+          text(bar_data[:x_axis_grid_marker_x], bar_data[:x_axis_grid_marker_y], bar_data[:x_axis_grid_marker_text_size]) {
+            string(bar_data[:x_axis_grid_marker_text]) {
+              font x_axis_grid_marker_font
               color chart_color_marker_text
             }
           }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-libui-cc-graphs_and_charts
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-01 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui