- Revert unintentional change to QuartzRenderer (rebase error? idk)

- Fix quadratic behaviour in SVGRenderer
- Add documentation to new members in Color (and add a generic RandomNumberGenerator version).

Author: karwa

Sources/QuartzRenderer/QuartzRenderer.swift

@@ -43,8 +43,6 @@ public class QuartzRenderer: Renderer {
                               height: Int(imageSize.height))
             context.setFillColor(Color.white.cgColor)
             context.fill(rect)
-          self.context.setShouldSmoothFonts(false)
-//          context.setShouldAntialias(false)
         }
     }
 
@@ -66,8 +64,6 @@ public class QuartzRenderer: Renderer {
         self.context.setAllowsFontSmoothing(true)
         self.context.setShouldSmoothFonts(fontSmoothing)
         self.isExternalContext = false
-      self.context.setShouldSmoothFonts(false)
-//      context.setShouldAntialias(false)
     }
 
     /// Creates a renderer with the given external context and dimensions..

Sources/SVGRenderer/SVGRenderer.swift

@@ -220,15 +220,11 @@ public class SVGRenderer: Renderer{
     }
 
     public func getTextLayoutSize(text: String, textSize size: Float) -> Size {
-        var width: Float = 0
-        let scaleFactor = size/100.0
-
-        for i in 0..<text.count {
-          let index =  text.index(text.startIndex, offsetBy: i)
-          guard let asciiVal = text[index].ascii else { continue }
-          width = width + Float(Self.LCARS_CHAR_SIZE_ARRAY[Int(asciiVal)])
+        let width = text.reduce(into: Float(0)) { width, character in
+            guard let asciiVal = character.ascii else { return }
+            width += Float(Self.LCARS_CHAR_SIZE_ARRAY[Int(asciiVal)])
         }
-
+        let scaleFactor = size/100.0
         return Size(width: width*scaleFactor + 25, height: size)
     }
 

Sources/SwiftPlot/Color.swift

@@ -31,24 +31,43 @@ public struct Color {
 }
 
 extension Color {
-  
-  public func withAlpha(_ alpha: Float) -> Color {
-    var color = self
-    color.a = alpha
-    return color
-  }
-  
-  public func linearBlend(with other: Color, offset: Float) -> Color {
-    return Color(
-      (other.r - r) * offset + r,
-      (other.g - g) * offset + g,
-      (other.b - b) * offset + b,
-      (other.a - a) * offset + a)
-  }
 
+    /// Returns a `Color` whose RBGA components are generated by given `RandomNumberGenerator`.
+    ///
+    public static func random<RNG: RandomNumberGenerator>(using generator: inout RNG) -> Color {
+        return Color(.random(in: 0...1.0, using: &generator),
+                     .random(in: 0...1.0, using: &generator),
+                     .random(in: 0...1.0, using: &generator),
+                     .random(in: 0...1.0, using: &generator))
+    }
+    
+    /// Returns a `Color` whose RBGA components are generated by the system's default `RandomNumberGenerator`.
+    ///
     public static func random() -> Color {
-        return Color(.random(in: 0...1.0), .random(in: 0...1.0),
-                     .random(in: 0...1.0), .random(in: 0...1.0))
+        var generator = SystemRandomNumberGenerator()
+        return Color.random(using: &generator)
+    }
+    
+    /// Returns a `Color` whose RGB components are given by this color, and whose alpha component is `alpha`.
+    ///
+    public func withAlpha(_ alpha: Float) -> Color {
+        var color = self
+        color.a = alpha
+        return color
+    }
+    
+    /// Returns a `Color` whose components are a distance `offset` between this and another color.
+    ///
+    ///	- parameters:
+    ///		- other:	The color to blend with.
+    ///		- offset:	The fractional distance between this color and `other`, between 0 and 1.
+    ///					A value of 0 always returns this color, and a value of 1 always returns `other`.
+    ///
+    public func linearBlend(with other: Color, offset: Float) -> Color {
+        return Color((other.r - r) * offset + r,
+                     (other.g - g) * offset + g,
+                     (other.b - b) * offset + b,
+                     (other.a - a) * offset + a)
     }
 }