Merge pull request #116 from karwa/heatmap

Add a heatmap

Author: KarthikRIyer

.swift-format

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "lineLength": 100,
+    "indentation": {
+        "spaces": 4
+    },
+    "maximumBlankLines": 1,
+    "respectsExistingLineBreaks": true,
+    "blankLineBetweenMembers": {
+        "ignoreSingleLineProperties": true
+    },
+    "lineBreakBeforeControlFlowKeywords": false,
+    "lineBreakBeforeEachArgument": false
+}

Sources/AGGRenderer/CPPAGGRenderer/CPPAGGRenderer.cpp

@@ -481,8 +481,9 @@ namespace CPPAGGRenderer{
     void get_text_size(const char *s, float size, float* outW, float* outH){
       font_width = font_height = size;
       m_contour.width(-font_weight*font_height*0.05);
-        float x = 0;
-        float y = 0;
+      float x = 0;
+      float maxY = 0;
+      float minY = 0;
       // set rotation of font engine to zero before calculating text width
       agg::trans_affine matrix;
       matrix *= agg::trans_affine_rotation(agg::deg2rad(0));
@@ -496,16 +497,16 @@ namespace CPPAGGRenderer{
           const agg::glyph_cache* glyph = m_fman.glyph(*s);
           if(glyph){
             x+=glyph->advance_x;
-            float height = glyph->bounds.y2 - glyph->bounds.y1;
-            y = max(y, height);
+            maxY = max(maxY, (float)glyph->bounds.y2);
+            minY = min(minY, (float)glyph->bounds.y1);
           }
           ++s;
         }
       }
         if (outW)
             *outW = x;
         if (outH)
-        *outH = y;
+          *outH = abs(maxY - minY);
     }
 
     unsigned save_image(const char *s, const char** errorDesc){

Sources/QuartzRenderer/QuartzRenderer.swift

@@ -485,7 +485,8 @@ public class QuartzRenderer: Renderer {
         #endif
         let string = NSAttributedString(string: "\(text)", attributes: attributes)
         let size = string.size()
-        return Size(width: Float(size.width), height: Float(size.height))
+        // FIXME: 'size.height' is always too big and misaligns text.
+        return Size(width: Float(size.width), height: s)
     }
 
     enum WritePNGError: Error {

Sources/SVGRenderer/SVGRenderer.swift

@@ -220,14 +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)
-            width = width + Float(Self.LCARS_CHAR_SIZE_ARRAY[Int(text[index].ascii!)])
+        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/AdaptersNamespace.swift

@@ -0,0 +1,2 @@
+
+public enum Mapping {}

Sources/SwiftPlot/Color.swift

@@ -0,0 +1,100 @@
+public struct Color {
+    public var r: Float
+    public var g: Float
+    public var b: Float
+    public var a: Float
+    public init(_ r: Float, _ g: Float, _ b: Float, _ a: Float) {
+        self.r = r
+        self.g = g
+        self.b = b
+        self.a = a
+    }
+    public static let transparent = Color(0, 0, 0, 0)
+    public static let black: Color = Color(0.0, 0.0, 0.0, 1.0)
+    public static let white: Color = Color(1.0, 1.0, 1.0, 1.0)
+    public static let transluscentWhite: Color = Color(1.0, 1.0, 1.0, 0.7)
+    public static let purple: Color = Color(0.5, 0.0, 0.5, 1.0)
+    public static let lightBlue: Color = Color(0.529, 0.808, 0.922, 1.0)
+    public static let blue: Color = Color(0.0, 0.0, 1.0, 1.0)
+    public static let darkBlue: Color = Color(0.0, 0.0, 0.54, 1.0)
+    public static let green: Color = Color(0.0, 0.5, 0.0, 1.0)
+    public static let darkGreen: Color = Color(0.0, 0.39, 0.0, 1.0)
+    public static let yellow: Color = Color(1.0, 1.0, 0.0, 1.0)
+    public static let gold: Color = Color(1.0, 0.84, 0.0, 1.0)
+    public static let orange: Color = Color(1.0, 0.647, 0.0, 1.0)
+    public static let red: Color = Color(1.0, 0.0, 0.0, 1.0)
+    public static let darkRed: Color = Color(0.54, 0.0, 0.0, 1.0)
+    public static let brown: Color = Color(0.54, 0.27, 0.1, 1.0)
+    public static let pink: Color = Color(1.0, 0.75, 0.79, 1.0)
+    public static let gray: Color = Color(0.5, 0.5, 0.5, 1.0)
+    public static let darkGray: Color = Color(0.66, 0.66, 0.66, 1.0)
+}
+
+extension Color {
+
+    /// Returns a `Color` whose RBGA components are generated by the 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 {
+        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)
+    }
+}
+
+#if canImport(CoreGraphics)
+    import CoreGraphics
+
+    fileprivate let RGBColorSpace = CGColorSpaceCreateDeviceRGB()
+
+    public extension Color {
+        @available(tvOS 13.0, watchOS 6.0, *)
+        var cgColor: CGColor {
+            if #available(OSX 10.15, iOS 13.0, *) {
+                return CGColor(
+                    srgbRed: CGFloat(r),
+                    green: CGFloat(g),
+                    blue: CGFloat(b),
+                    alpha: CGFloat(a))
+            } else {
+                var tuple = (CGFloat(r), CGFloat(g), CGFloat(b), CGFloat(a))
+                return withUnsafePointer(to: &tuple) { tupPtr in
+                    return tupPtr.withMemoryRebound(to: CGFloat.self, capacity: 4) { floatPtr in
+                        return CGColor(colorSpace: RGBColorSpace, components: floatPtr)!
+                    }
+                }
+            }
+        }
+    }
+#endif