p5rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5142534f423ae6b2e335259f2b2e949d0c67923caed5257b18536467cd071dc
-  data.tar.gz: 2d0fdb1a392ba9601bc82c0ca5ac5f281ea8b09dadf27f8a44800af2c0bf5683
+  metadata.gz: b79ebfd6c7fa06d28955e916d1dd8c40f550eac344f03b7eaf65f6281c3bed2f
+  data.tar.gz: f2b2555f10efd15b009e146dc232a3b947514960cb81c81487bc0c8d39e205e1
 SHA512:
-  metadata.gz: 7e1cf13da82440fc26ef0cf0ac63a022e58c3b9543b78256c04f984e3e5aa3ba3abe37b3a36ed941eb3ab9791dcbfbbe8a4a24a47d2a8ef7044f8d64ed8fd8d7
-  data.tar.gz: d1b0f0a06fa8a585f5534ff1d1e8d9071fa06543bebc2bc141fa4b54f8887f199646f1f3cfc727267e4caaad87c12d8977379040309fbe3ac7a9f78655035038
+  metadata.gz: 5f7ccdcb0a16223887864366aeb2957adb705d8a96bbb60f51195bda826acad9e4a7a67ae925e82f5e7f35c4fdfca2641fac32eb560e8c7d01c9ae280760e008
+  data.tar.gz: ee31129a27f4073937c6bb5c2bdffbcc41c9b1ae29ccb425ee7d49b1bbcca391747461899544e21bd30557d0c1fa51d5f4460d5b62f410de580fa3b01909cc72

data/lib/p5rb.rb

@@ -34,7 +34,7 @@ module P5
         @buffer.push "ellipse(#{args.join ?,})"
       end
       def fill color, alpha = nil
-        @buffer.push "fill(#{color.inspect}#{", #{alpha}" if alpha})"
+        @buffer.push "fill(#{color}#{", #{alpha}" if alpha})"
       end
       def rect x, y, w, h, fill: nil
         (@buffer.push "push()"; fill fill) if fill
@@ -50,6 +50,12 @@ module P5
       def textAlign *args
         @buffer.push "textAlign(#{args.join ", "})"
       end
+      def textWidth text
+        @buffer.push "textWidth(#{text.inspect})"
+      end
+      def textAscent text
+        @buffer.push "textAscent(#{text.inspect})"
+      end
       def text text, x, y, fill: nil
         (@buffer.push "push()"; fill fill) if fill
         @buffer.push "text(#{text.inspect}, #{x}, #{y})"
@@ -106,7 +112,8 @@ module P5
         end
       end
     end
-    def plot_bar data
+    def plot_bar_grouped data
+      # TODO: this is currently pretty much hardcoded for a time dates charting
       cls = data.values.flat_map(&:keys).uniq.sort
       size = cls.size + 1
       from, to = data.keys.minmax
@@ -115,15 +122,53 @@ module P5
         setup do
           noStroke
           textAlign :CENTER
-          cls.each_with_index{ |_, i| text _, 50+400/(size-2)*i, 25, fill: %w{ red green blue }[i] }
+          cls.each_with_index{ |_, i| text _, 50+400/(size-2)*i, 25, fill: %w{ 'red' 'green' 'blue' }[i] }
           textAlign :RIGHT, :TOP
           (from..to).each do |date|
             y = map date.ajd.to_i, from.ajd.to_i, to.ajd.to_i, 50, 450
             text date.strftime("%m-%d"), 45, y
-            rect 50, y,                            map(data.fetch(date,{})[cls[0]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "red"
-            rect 50, "#{y}+#{400/(to-from)/size}", map(data.fetch(date,{})[cls[1]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "green"
-            rect 50, "#{y}+#{800/(to-from)/size}", map(data.fetch(date,{})[cls[2]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "blue"
+            rect 50, y,                            map(data.fetch(date,{})[cls[0]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "'red'"
+            rect 50, "#{y}+#{400/(to-from)/size}", map(data.fetch(date,{})[cls[1]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "'green'"
+            rect 50, "#{y}+#{800/(to-from)/size}", map(data.fetch(date,{})[cls[2]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "'blue'"
+          end
+        end
+      end
+    end
+    def plot_bar_stacked data, names, colorize
+      count = {}
+      max = data.map do |_, day|
+        day.each{ |k,v| count[k] ||= 0; count[k] += v }.map(&:last).reduce :+
+      end.max
+      pairs = {}
+      data.each_cons(2) do |(_, day1), (_, day2)|
+        (day1.map(&:first) & day2.map(&:first)).each{ |_| pairs[_] ||= 0; pairs[_] += 1 }
+      end
+      require "pcbr"
+      require "set"
+      pcbr = PCBR.new
+      count.max_by(colorize){ |k,v| v }.each{ |k,v| pcbr.store k, [-v, pairs[k]||0] }
+      top = pcbr.sorted
+      size = 500
+      P5 size, size do
+        setup do
+          noStroke
+          textAlign :RIGHT, :TOP
+          border = 25
+          left = "#{border} + textWidth(\"00-00 - 00-00\") + 5"
+          data.each_with_index do |(bin, day), i|
+            y1 = map i, 0, data.size, border, size-border
+            y2 = map i+1, 0, data.size, border, size-border
+            text bin, "#{left} - 5", y1
+            pos = 0
+            day.sort_by{ |k,| top.index(k) || top.size }.each do |k, v|
+              rect \
+                map(pos, 0, max, left, size-border), y1,
+                map(v, 0, max, 0, "#{size}-#{border}-(#{left})"), "#{y2}-#{y1}",
+                fill: top.include?(k) ? "color('hsl(#{(((3-Math.sqrt(5))*180 * top.index(k)) % 360).round}, 75%, 75%)')" : "color('hsl(0, 0%, 75%)')"
+              pos += v
+            end
           end
+          top.each_with_index{ |id, i| text names[id].inspect[1..-2], size-border, "#{border} + textAscent('X') * #{i}", fill: "color('hsl(#{(((3-Math.sqrt(5))*180 * top.index(id)) % 360).round}, 75%, 75%)')" }
         end
       end
     end
@@ -135,6 +180,7 @@ def P5 width, height, &block
   <<~HEREDOC
     <html>
       <head>
+        <meta charset="UTF-8">
         <script src="https://github.com/processing/p5.js/releases/download/v1.4.2/p5.min.js"></script>
         <script>
           function setup() {

data/p5rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "p5rb"
-  spec.version      = "0.0.2"
+  spec.version      = "0.0.3"
   spec.summary      = "Ruby DSL for p5.js"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -8,5 +8,7 @@ Gem::Specification.new do |spec|
   spec.license      = "MIT"
   spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/p5rb"}
 
+  spec.add_dependency "pcbr"
+
   spec.files        = %w{ LICENSE p5rb.gemspec lib/p5rb.rb }
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: p5rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
-dependencies: []
+date: 2022-12-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pcbr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nakilon@gmail.com
 executables: []