glimmer-libui-cc-graphs_and_charts 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2a02d818ffec27e5d64eafa181c90e1362b62ea8f201018fe92705b0d95a664
-  data.tar.gz: 6de4a548a1c74d91cc389663d9917311bd66523402ba984ac05a250d8cff5baa
+  metadata.gz: e5c81413f717dac087558fbed16937659603f9bb6a4a2b849cadf31bade1750c
+  data.tar.gz: c76f09ab3cff5d2486c45c59841ed1bacff95ad6d7b63033e01965318adef73e
 SHA512:
-  metadata.gz: 738a36dedf90e91774876d7cc41f545edb00ac03d65cd6bf89eaf30eac5374b4abfa591d007d971476a02dd854ca14a262a7fcda34fdc24ac531b17509ee0dcf
-  data.tar.gz: 2039bf32f7d8fb7930c24fda0eba1def6c30db968d452cb219a7ceab604bfed450b87b8d68ae061d75017ea59f6161d46b9fbebd8ab5581727116ebfd32fec82
+  metadata.gz: 82239ec1af1f0186761ac787f94d2f5756abc9cc17ea67dbaf5f38f9b27c35cc834c947f46df19309bee5f425d9a764a0ed335163bcc764a2e84b44d6ebf7b4a
+  data.tar.gz: 65c1a640f16352f4ec249bff010824872b4c7bea47d818d7264fc4c2b9c57ab40307f32fa0f22c449944d3d7ab51cd07d4ae513e12255d2a7da9de4cb6e46fe3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.1.8
+
+- Fix the display of grid marker lines when passing `values` with non-Integer y-axis values (especially max y-axis value being non-Integer). It now shows highest grid marker having a non-Integer value while keeping smaller values as Integer (e.g. 1, 2, 3, 3.75).
+
 ## 0.1.7
 
 - Scale `y` axis when using `values` option to fill up the vertical graph height if all y-axis values are smaller than `1`

data/README.md

@@ -1,4 +1,4 @@
-# Graphs and Charts 0.1.7 (Alpha)
+# Graphs and Charts 0.1.8 (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.7'
+gem 'glimmer-libui-cc-graphs_and_charts', '~> 0.1.8'
 ```
 
 Run:
@@ -183,7 +183,7 @@ BasicLineGraph.launch
 require 'glimmer-dsl-libui'
 require 'glimmer/view/line_graph'
 
-class BasicLineGraph
+class BasicLineGraphRelative
   include Glimmer::LibUI::Application
   
   before_body do
@@ -191,7 +191,7 @@ class BasicLineGraph
   end
   
   body {
-    window('Basic Line Graph', 900, 330) {
+    window('Basic Line Graph Relative', 900, 330) {
       line_graph(
         width: 900,
         height: 300,
@@ -220,7 +220,7 @@ class BasicLineGraph
   }
 end
 
-BasicLineGraph.launch
+BasicLineGraphRelative.launch
 ```
 
 ![basic line graph relative](/screenshots/glimmer-libui-cc-graphs_and_charts-mac-basic-line-graph-relative.png)

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/examples/graphs_and_charts/basic_line_graph.rb

@@ -17,11 +17,11 @@ class BasicLineGraph
             name: 'Stock 1',
             stroke: [163, 40, 39, thickness: 2],
             values: {
-              Time.new(2030, 12, 1) => 80,
-              Time.new(2030, 12, 2) => 36,
-              Time.new(2030, 12, 4) => 10,
-              Time.new(2030, 12, 5) => 60,
-              Time.new(2030, 12, 6) => 20,
+              Time.new(2030, 12, 1) => 2,
+              Time.new(2030, 12, 2) => 2.5,
+              Time.new(2030, 12, 4) => 1,
+              Time.new(2030, 12, 5) => 0,
+              Time.new(2030, 12, 6) => 2,
             },
             x_value_format: -> (time) {time.strftime("%a %d %b %Y %T GMT")},
           },
@@ -29,11 +29,11 @@ class BasicLineGraph
             name: 'Stock 2',
             stroke: [47, 109, 104, thickness: 2],
             values: {
-              Time.new(2030, 12, 1) => 62,
+              Time.new(2030, 12, 1) => 2,
               Time.new(2030, 12, 2) => 0,
-              Time.new(2030, 12, 3) => 90,
-              Time.new(2030, 12, 5) => 0,
-              Time.new(2030, 12, 7) => 17,
+              Time.new(2030, 12, 3) => 2.5,
+              Time.new(2030, 12, 5) => 1,
+              Time.new(2030, 12, 7) => 2,
             },
             x_value_format: -> (time) {time.strftime("%a %d %b %Y %T GMT")},
           },

data/examples/graphs_and_charts/basic_line_graph_relative.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.prepend(File.expand_path(File.join(__dir__, '..', '..', 'lib'))) if F
 require 'glimmer-dsl-libui'
 require 'glimmer/view/line_graph'
 
-class BasicLineGraph
+class BasicLineGraphRelative
   include Glimmer::LibUI::Application
   
   before_body do
@@ -12,7 +12,7 @@ class BasicLineGraph
   end
   
   body {
-    window('Basic Line Graph', 900, 330) { |main_window|
+    window('Basic Line Graph Relative', 900, 330) { |main_window|
       @line_graph = line_graph(
         width: 900,
         height: 300,
@@ -46,4 +46,4 @@ class BasicLineGraph
   }
 end
 
-BasicLineGraph.launch
+BasicLineGraphRelative.launch

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.7 ruby lib
+# stub: glimmer-libui-cc-graphs_and_charts 0.1.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-libui-cc-graphs_and_charts".freeze
-  s.version = "0.1.7".freeze
+  s.version = "0.1.8".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-23"
+  s.date = "2023-12-26"
   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

@@ -189,13 +189,10 @@ module Glimmer
         @grid_marker_numbers ||= []
         @graph_stroke_marker_values ||= []
         @mod_values ||= []
-        if lines && lines.all? {|line| line[:values]} && !y_value_max_for_all_lines.nil? && y_value_max_for_all_lines > 1
-          return
-        end
         grid_marker_points.each_with_index do |marker_point, index|
           @grid_marker_number_values[index] ||= begin
             value = (grid_marker_points.size - index).to_i
-            value = y_value_max_for_all_lines if !y_value_max_for_all_lines.nil? && y_value_max_for_all_lines.to_i != y_value_max_for_all_lines && grid_marker_points.size == 1
+            value = y_value_max_for_all_lines if !y_value_max_for_all_lines.nil? && y_value_max_for_all_lines.to_i != y_value_max_for_all_lines && index == 0
             value
           end
           grid_marker_number_value = @grid_marker_number_values[index]
@@ -241,15 +238,31 @@ module Glimmer
       
       def grid_marker_points
         if @grid_marker_points.nil?
-          graph_y_max = [y_value_max_for_all_lines, y_value_max_for_all_lines.between?(0, 1) ? y_value_max_for_all_lines : 1].max
-          current_graph_height = (height - graph_padding_height * 2)
-          division_height = current_graph_height / graph_y_max
-          @grid_marker_points = graph_y_max.ceil.times.map do |marker_index|
-            x = graph_padding_width
-            y = graph_padding_height + marker_index * division_height
-            {x: x, y: y}
+          if lines[0]&.[](:y_values)
+            graph_y_max = [y_value_max_for_all_lines, 1].max
+            current_graph_height = (height - graph_padding_height * 2)
+            division_height = current_graph_height / graph_y_max
+            @grid_marker_points = graph_y_max.to_i.times.map do |marker_index|
+              x = graph_padding_width
+              y = graph_padding_height + marker_index * division_height
+              {x: x, y: y}
+            end
+          else
+            graph_y_max = y_value_max_for_all_lines
+            y_value_count = graph_y_max.ceil
+            @grid_marker_points = y_value_count.times.map do |marker_index|
+              x = graph_padding_width
+              y_value = y_value_count - marker_index
+              if marker_index == 0 && graph_y_max.ceil != graph_y_max.to_i
+                y_value = graph_y_max
+              end
+              scaled_y_value = y_value.to_f * y_resolution.to_f
+              y = height - graph_padding_height - scaled_y_value
+              {x: x, y: y}
+            end
           end
         end
+
         @grid_marker_points
       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.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui