glimmer-libui-cc-graphs_and_charts 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94aec489e11216cb8904df362b1b99634dcf7ed4fa8aad2c629ff0afcf516d9c
-  data.tar.gz: ea39289228f18ee1596aaab82da7ba432250074de094903c741786c0195de75b
+  metadata.gz: aefbc0c06b3968b4e633e3d923cf886e64421d5debea0e0e8a2376a54b45df86
+  data.tar.gz: beb20ca4b10e5ff0187becd7e1d3aeb087033a35093ea932dcde4a4b980ae22f
 SHA512:
-  metadata.gz: 4399555f8b93a1af2409f8b6b6c8ddbe268eaff2eadb575de3107768a6c3f173fe74b0e8bae12c5e0ddf12ed7053d01492a71feb67f98a9fc24cde0f493d8597
-  data.tar.gz: e7d5a072f1475ec0710fdd5a76f0cd1cf98fd2dca7231a38bd42a80f4e56c5fbde16f8c5d79b85634329e29833684d6c5d77c7f98cfcf739e479de9ff208ece1
+  metadata.gz: 619d28542b4a45eaa32b1f71e912ca24e11ba48ececef50bb7a5503ee0854a17591df78b2e6202f90625b747947b661f5a247e8eeb4c4fdf6ef1cf7ae8bbce6f
+  data.tar.gz: 1d48203f5a1a03e0c84eb60301085bd89c4cf589a41214b825d07ea22afa2a910fc331f80a62802e1c7e2b2d4f29b0daab63150da1cbb8c48eed76f27926b331

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 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
+
 ## 0.1.2
 
 - Fix issue with crashing if the mouse hovers over a graph without any points yet

data/README.md

@@ -1,4 +1,4 @@
-# Graphs and Charts 0.1.2 (Alpha)
+# Graphs and Charts 0.1.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)
@@ -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.2'
+gem 'glimmer-libui-cc-graphs_and_charts', '~> 0.1.3'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.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.1.2 ruby lib
+# stub: glimmer-libui-cc-graphs_and_charts 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-libui-cc-graphs_and_charts".freeze
-  s.version = "0.1.2"
+  s.version = "0.1.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 = "2023-12-18"
+  s.date = "2023-12-19"
   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 = [
@@ -31,14 +31,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer-libui-cc-graphs_and_charts".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.4.6".freeze
+  s.rubygems_version = "3.5.1".freeze
   s.summary = "Graphs and Charts - Glimmer DSL for LibUI Custom Controls".freeze
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<glimmer-dsl-libui>.freeze, ["~> 0.11"])
-  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-  s.add_development_dependency(%q<juwelier>.freeze, ["= 2.4.9"])
-  s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<glimmer-dsl-libui>.freeze, ["~> 0.11".freeze])
+  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0".freeze])
+  s.add_development_dependency(%q<juwelier>.freeze, ["= 2.4.9".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
 end
 

data/lib/glimmer/view/line_graph.rb

@@ -331,6 +331,8 @@ module Glimmer
               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], 4) {
                 fill lines[index][:stroke]
               }
@@ -340,7 +342,12 @@ module Glimmer
             end
             text_label = formatted_x_value(@closest_point_index)
             text_label_width = estimate_width_of_text(text_label, DEFAULT_GRAPH_FONT_MARKER_TEXT)
-            closest_point_texts = lines.map { |line| "#{line[:name]}: #{line[:y_values][@closest_point_index]}" }
+            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
@@ -348,7 +355,7 @@ module Glimmer
             square_to_label_padding = 10.0
             label_padding = 10.0
             text_label_x = width - graph_padding_width - text_label_width - label_padding -
-              (lines.size*(square_size + square_to_label_padding) + (lines.size - 1)*label_padding + closest_point_text_widths.sum)
+              (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) {
@@ -359,11 +366,11 @@ module Glimmer
             }
 
             relative_x = text_label_x + text_label_width
-            lines.size.times do |index|
+            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[index][:stroke]
+                fill lines_with_closest_points[index][:stroke]
               }
 
               attribute_label_x = square_x + square_size + square_to_label_padding

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-libui-cc-graphs_and_charts
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: Graphs and Charts - Glimmer DSL for LibUI Custom Controls