X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Futils.cc;h=2c8905b331a0233c97fc12836a07ae2dd7ad23e3;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=bdc8fad03966e14b3602f76d5ebc3af84e722d86;hpb=b880a381523b2cfdb7ebd17c27fff1adf90fa028;p=ardour.git

diff --git a/libs/canvas/utils.cc b/libs/canvas/utils.cc
index bdc8fad039..2c8905b331 100644
--- a/libs/canvas/utils.cc
+++ b/libs/canvas/utils.cc
@@ -21,136 +21,53 @@
 #include <cmath>
 #include <stdint.h>
 #include <cairomm/context.h>
+
 #include "canvas/utils.h"
 
-using std::max;
-using std::min;
+using namespace std;
+using namespace ArdourCanvas;
 
 void
-ArdourCanvas::color_to_hsv (Color color, double& h, double& s, double& v)
-{
-	double r, g, b, a;
-	double cmax;
-	double cmin;
-	double delta;
-	
-	color_to_rgba (color, r, g, b, a);
-	
-	if (r > g) {
-		cmax = max (r, b);
-	} else {
-		cmax = max (g, b);
-	}
-
-	if (r < g) {
-		cmin = min (r, b);
-	} else {
-		cmin = min (g, b);
-	}
-
-	v = cmax;
-
-	delta = cmax - cmin;
-
-	if (cmax == 0) {
-		// r = g = b == 0 ... v is undefined, s = 0
-		s = 0.0;  
-		h = -1.0;
-	}
-
-	if (delta != 0.0) {	
-		if (cmax == r) {
-			h = fmod ((g - b)/delta, 6.0);
-		} else if (cmax == g) {
-			h = ((b - r)/delta) + 2;
-		} else {
-			h = ((r - g)/delta) + 4;
-		}
-		
-		h *= 60.0;
-	}
-
-	if (delta == 0 || cmax == 0) {
-		s = 0;
-	} else {
-		s = delta / cmax;
-	}
-
-}
-
-ArdourCanvas::Color
-ArdourCanvas::hsv_to_color (double h, double s, double v, double a)
+ArdourCanvas::set_source_rgba (Cairo::RefPtr<Cairo::Context> context, Color color)
 {
-	s = min (1.0, max (0.0, s));
-	v = min (1.0, max (0.0, v));
-
-	if (s == 0) {
-		// achromatic (grey)
-		return rgba_to_color (v, v, v, a);
-	}
-
-	h = min (360.0, max (0.0, h));
-
-	double c = v * s;
-        double x = c * (1.0 - fabs(fmod(h / 60.0, 2) - 1.0));
-        double m = v - c;
-
-        if (h >= 0.0 && h < 60.0) {
-		return rgba_to_color (c + m, x + m, m, a);
-        } else if (h >= 60.0 && h < 120.0) {
-		return rgba_to_color (x + m, c + m, m, a);
-        } else if (h >= 120.0 && h < 180.0) {
-		return rgba_to_color (m, c + m, x + m, a);
-        } else if (h >= 180.0 && h < 240.0) {
-		return rgba_to_color (m, x + m, c + m, a);
-        } else if (h >= 240.0 && h < 300.0) {
-		return rgba_to_color (x + m, m, c + m, a);
-        } else if (h >= 300.0 && h < 360.0) {
-		return rgba_to_color (c + m, m, x + m, a);
-        } 
-	return rgba_to_color (m, m, m, a);
+	context->set_source_rgba (
+		((color >> 24) & 0xff) / 255.0,
+		((color >> 16) & 0xff) / 255.0,
+		((color >>  8) & 0xff) / 255.0,
+		((color >>  0) & 0xff) / 255.0
+		);
 }
 
 void
-ArdourCanvas::color_to_rgba (Color color, double& r, double& g, double& b, double& a)
+ArdourCanvas::set_source_rgb_a (Cairo::RefPtr<Cairo::Context> context, Color color, float alpha)
 {
-	r = ((color >> 24) & 0xff) / 255.0;
-	g = ((color >> 16) & 0xff) / 255.0;
-	b = ((color >>  8) & 0xff) / 255.0;
-	a = ((color >>  0) & 0xff) / 255.0;
+	context->set_source_rgba (
+		((color >> 24) & 0xff) / 255.0,
+		((color >> 16) & 0xff) / 255.0,
+		((color >>  8) & 0xff) / 255.0,
+		alpha
+		);
 }
 
-ArdourCanvas::Color
-ArdourCanvas::rgba_to_color (double r, double g, double b, double a)
+void
+ArdourCanvas::set_source_rgba (cairo_t *cr, Color color)
 {
-	/* clamp to [0 .. 1] range */
-
-	r = min (1.0, max (0.0, r));
-	g = min (1.0, max (0.0, g));
-	b = min (1.0, max (0.0, b));
-	a = min (1.0, max (0.0, a));
-
-	/* convert to [0..255] range */
-
-	unsigned int rc, gc, bc, ac;
-	rc = rint (r * 255.0);
-	gc = rint (g * 255.0);
-	bc = rint (b * 255.0);
-	ac = rint (a * 255.0);
-
-	/* build-an-integer */
-
-	return (rc << 24) | (gc << 16) | (bc << 8) | ac;
+	cairo_set_source_rgba ( cr,
+		((color >> 24) & 0xff) / 255.0,
+		((color >> 16) & 0xff) / 255.0,
+		((color >>  8) & 0xff) / 255.0,
+		((color >>  0) & 0xff) / 255.0
+		);
 }
 
 void
-ArdourCanvas::set_source_rgba (Cairo::RefPtr<Cairo::Context> context, Color color)
+ArdourCanvas::set_source_rgb_a (cairo_t *cr, Color color, float alpha)
 {
-	context->set_source_rgba (
+	cairo_set_source_rgba ( cr,
 		((color >> 24) & 0xff) / 255.0,
 		((color >> 16) & 0xff) / 255.0,
 		((color >>  8) & 0xff) / 255.0,
-		((color >>  0) & 0xff) / 255.0
+		alpha
 		);
 }
 
@@ -170,14 +87,14 @@ ArdourCanvas::distance_to_segment_squared (Duple const & p, Duple const & p1, Du
 		at = p1;
 		t = 0.0;
 		return ((dp1x * dp1x) + (dp1y * dp1y));
-	} 
+	}
 
 
 	// Project a line from p to the segment [p1,p2].  By considering the line
 	// extending the segment, parameterized as p1 + (t * (p2 - p1)),
-	// we find projection of point p onto the line. 
+	// we find projection of point p onto the line.
 	// It falls where t = [(p - p1) . (p2 - p1)] / |p2 - p1|^2
-		
+
 	t = ((dp1x * dx) + (dp1y * dy)) / segLenSquared;
 
 	if (t < kEpsilon) {