redgreenblue 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61701a3122fc8e8b4f4352142862f7e3d63ed317cea1321cfe1bafd5d697a42
-  data.tar.gz: 4a76d444f8080acb74656963654375e975eb91eb0068f6c4012e9233daf58bb7
+  metadata.gz: 0e6715019b7628fa8a5027295b3fb5e617f829d494eda1c4a0dad495adca6e44
+  data.tar.gz: 745987a3b640392f140bc6f7d3d18575f815a75a00d96162a0a9f3cdba64cc71
 SHA512:
-  metadata.gz: 502bc188625f8df6fc3a55fa53454728602843ddd39f61c8199009f0e55c1fbd38a496d27c889c565b578ae85dd9cd051a457deec87979374d89006833f37707
-  data.tar.gz: b811b0e1bc0bd366406be48eead2f11328c8304eee6eb34192bc92c40c31a4683dc5771a3944650749707df7e5a40e330d64c02b7f7818c0064dca5253ffe019
+  metadata.gz: 16538077413e35eeeae4d4da51bfd6eca7d7d3c9beba338df99742278762aa243dce8262fd9f95276154881dbdafe5ab26e4282ac2e485d82337f69a3bb61679
+  data.tar.gz: 5dabac01d2f52b4cd187f4248a4d3a520e76ff5c419ead409468bb01b14935b67b528375fca2ad338d79f8257c74489511609da792a88f52f4eb8de670377cd6

data/lib/redgreenblue/cie_1994.rb

@@ -0,0 +1,55 @@
+class RGB
+
+  # Returns the difference between this (reference) color and another color, according to the CIE 1994 delta E formula.
+  #
+  # By default uses parameters for use in graphic arts, and reference conditions.
+  # Parameters (k1, k2, kl, kc, kh) can be individually overriden for different applications and for variations in conditions.
+  #
+  # Based on:
+  # - http://www.brucelindbloom.com/Eqn_DeltaE_CIE94.html
+  # - https://archive.org/details/gov.law.cie.15.2004
+  # - https://en.wikipedia.org/wiki/Color_difference
+  def delta_e_cie_1994(another, k1: 0.045, k2: 0.015, kl: 1, kc: 1, kh: 1)
+
+    l , a , b  =         cie_lab(round: false)
+    l2, a2, b2 = another.cie_lab(round: false)
+
+    c  = Math.hypot(a , b )
+    c2 = Math.hypot(a2, b2)
+
+    da = a - a2
+    db = b - b2
+    dc = c - c2
+
+    dh2 = (da ** 2) + (db ** 2) - (dc ** 2)
+    dl = l - l2
+
+    sl = 1
+    sc = 1 + k1 * c
+    sh = 1 + k2 * c
+
+    Math.sqrt(
+      ( (dl  / ( kl*sl)) ** 2  ) +
+      ( (dc  / ( kc*sc)) ** 2  ) +
+      (  dh2 / ((kh*sh)  ** 2) )
+    ).round(6)
+
+  end
+
+  alias de94 delta_e_cie_1994
+
+  # Returns the difference between this (reference) color and another color, according to the CIE 1994 delta E formula.
+  #
+  # For use in graphic arts, under reference conditions.
+  def de94g(another)
+    delta_e_cie_1994(another)
+  end
+
+  # Returns the difference between this (reference) color and another color, according to the CIE 1994 delta E formula.
+  #
+  # For use with textiles, under reference conditions.
+  def de94t(another)
+    delta_e_cie_1994(another, k1: 0.048, k2: 0.014, kl: 2)
+  end
+
+end

data/lib/redgreenblue/match.rb

@@ -18,4 +18,32 @@ class RGB
     others.map { |c| [ c, de76(c) ] }.sort_by { |a| a[1] }
   end
 
+  # Matches this (reference) color to a set of colors using the CIE 1994 delta E formula.
+  #
+  # Returns the given set of colors with their difference from this color, sorted by difference (nearest color first).
+  #
+  # By default uses parameters for use in graphic arts, and reference conditions.
+  # Parameters (k1, k2, kl, kc, kh) can be individually overriden for different applications and for variations in conditions.
+  def match_de94(others, k1: 0.045, k2: 0.015, kl: 1, kc: 1, kh: 1)
+    others.map { |c| [ c, de94(c, k1: k1, k2: k2, kl: kl, kc: kc, kh: kh) ] }.sort_by { |a| a[1] }
+  end
+
+  # Matches this (reference) color to a set of colors using the CIE 1994 delta E formula.
+  #
+  # For use in graphic arts, under reference conditions.
+  #
+  # Returns the given set of colors with their difference from this color, sorted by difference (nearest color first).
+  def match_de94g(others)
+    others.map { |c| [ c, de94g(c) ] }.sort_by { |a| a[1] }
+  end
+
+  # Matches this (reference) color to a set of colors using the CIE 1994 delta E formula.
+  #
+  # For use with textiles, under reference conditions.
+  #
+  # Returns the given set of colors with their difference from this color, sorted by difference (nearest color first).
+  def match_de94t(others)
+    others.map { |c| [ c, de94t(c) ] }.sort_by { |a| a[1] }
+  end
+
 end

data/lib/redgreenblue/opt/philipshue.rb

@@ -22,6 +22,8 @@ class RGB
   # @example Use
   #  RGB.magenta.to_philips_hue_api_hsb_arguments
   #  => {"on"=>true, "bri"=>254, "hue"=>54613, "sat"=>254}
+  #  RGB.black.to_philips_hue_api_hsb_arguments
+  #  => {"on"=>false}
   # @return [Hash] API arguments
   def to_philips_hue_api_hsb_arguments(black_off=true)
     my_hsb = hsb

data/lib/redgreenblue/version.rb

@@ -1,7 +1,7 @@
 class RGB
 
   # redgreenblue version.
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 
   # Returns RGB::VERSION.
   def self.version

data/lib/redgreenblue/view.rb

@@ -1,19 +1,25 @@
 class RGB
 
-  # Prints details for the RGB object, using multiple lines.
-  def view
-    puts _inspect_view
+  # Prints a color swatch and details for the RGB object, using multiple lines.
+  #
+  # You can optionally supply a second color to be shown inside the swatch, for comparison.
+  def view(other=nil)
+    puts _inspect_view other
   end
 
   alias v view
 
   private
 
-  def _inspect_view
+  def _inspect_view(other=nil)
     o = []
     o << 3.times.map { terminal_background + "      \e[0m "}
     o << [ "#{_inspect_hex} ", '%-7.7s ' % color_space, '        ' ]
 
+    if other
+      o[0][1] = terminal_background + '  ' + other.terminal_background + '  ' + terminal_background + "  \e[0m "
+    end
+
     o << components.map { |c| c.terminal_background + "  \e[0m " }
     o << %w(R: G: B:)
     o << values.map { |v| '%1.5f ' % v }

data/lib/redgreenblue/web.rb

@@ -106,4 +106,9 @@ class RGB
     round ? contrast_ratio.round(8) : contrast_ratio
   end
 
+  # Returns true if this is one of the 216 so-called "web safe" colors, otherwise false.
+  def web_safe?
+    ( values - [0.0, 0.2, 0.4, 0.6, 0.8, 1.0] ).empty?
+  end
+
 end

data/lib/redgreenblue.rb

@@ -15,7 +15,7 @@ end
 
   gamma
 
-  cie_1931 cie_1976
+  cie_1931 cie_1976 cie_1994
 
   name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redgreenblue
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - lllist.eu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -23,6 +23,7 @@ files:
 - lib/redgreenblue/bgr24bit.rb
 - lib/redgreenblue/cie_1931.rb
 - lib/redgreenblue/cie_1976.rb
+- lib/redgreenblue/cie_1994.rb
 - lib/redgreenblue/gamma.rb
 - lib/redgreenblue/gif.rb
 - lib/redgreenblue/gpl.rb
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A simple Ruby library for handling RGB colors.