ea 0.6.38 → 0.6.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 766805714007ed9c6bff335cc0cdcc0323276ff11cceee7e4982113d64b9f295
-  data.tar.gz: cb822f672eb96d3d298df5788c007e21d15003fb48232f503cd15c9f3caef76d
+  metadata.gz: 164d7f4eec0c15cd5811283a701759887c6b7431337dd9160506d87c9a9ab673
+  data.tar.gz: 603a2def1016cee9b7747c6131d6e815be09c566d8d4325bc0109d71565b9b5f
 SHA512:
-  metadata.gz: 91c69faf5a4855b583813d23e6f827bd606e611cc2fce020fc601b3af65c8bc00a9c8aa131a4ce78d4b0b387bca797fef12939af7e1b5f5dcff1e0887c1e3bd3
-  data.tar.gz: b087a7ffc8deea335482b15f5818a4f9e130a728887d6955a769c2f369e945b8ec503f83bacc8318ba6599b4213f68b3086c1b2164e5a7bbd4d95519902d29d0
+  metadata.gz: bcdeea949d117ea448e114300f8f3114d78000fd0212a4e2428e120084957df3bf309fe0bea278303432133c3f91168177b43fab6483088f56df26a7d0cc33f4
+  data.tar.gz: 847c43fba07dd14374d031f80731cf10656ebb2e1e63f5674a5c0414dffc1024bba9b7e8026a62f93f17a24921cd7ef5da30b9cb2cec1c598f02b6e76e2321d1

data/lib/ea/svg/ea_emitter/bounds_calculator.rb

@@ -38,6 +38,8 @@ module Ea
           @model_index = model_index
         end
 
+        attr_reader :effective_inset_left
+
         def compute
           points = element_points
           return [0, 0, 1, 1] if points.empty?
@@ -48,12 +50,13 @@ module Ea
           min_y = ys.min || 0
           # When the leftmost element touches stored x=0 the left
           # inset is 30, not 35 (all five such sample diagrams are
-          # exactly 5px narrower; min_x>0 diagrams keep 35).
-          left = min_x.zero? ? INSET_LEFT - 5 : INSET_LEFT
+          # exactly 5px narrower; min_x>0 diagrams keep 35). Canvas
+          # translation must use the same value.
+          @effective_inset_left = min_x.zero? ? INSET_LEFT - 5 : INSET_LEFT
           [
             min_x,
             min_y,
-            (xs.max - min_x) + left + INSET_RIGHT,
+            (xs.max - min_x) + @effective_inset_left + INSET_RIGHT,
             (ys.max - min_y) + INSET_TOP + INSET_BOTTOM
           ]
         end

data/lib/ea/svg/ea_emitter/canvas.rb

@@ -21,15 +21,17 @@ module Ea
         # against the maintenance diagram.
         PX_PER_CM = 37.795275591
         FRAME_INSET_LEFT = 35
+        INSET_TOUCHING_ORIGIN = 30
         FRAME_INSET_TOP = 40
 
-        attr_reader :min_x, :min_y, :width, :height
+        attr_reader :min_x, :min_y, :width, :height, :inset_left
 
-        def initialize(min_x:, min_y:, width:, height:)
+        def initialize(min_x:, min_y:, width:, height:, inset_left: FRAME_INSET_LEFT)
           @min_x = min_x
           @min_y = min_y
           @width = width
           @height = height
+          @inset_left = inset_left
         end
 
         # Build a Canvas for a diagram by running the bound
@@ -37,9 +39,10 @@ module Ea
         # element bounds needed) for callers that only need a
         # frame-size estimate.
         def self.from(diagram, model_index: nil)
-          min_x, min_y, width, height =
-            BoundsCalculator.new(diagram, model_index: model_index).compute
-          new(min_x: min_x, min_y: min_y, width: width, height: height)
+          bc = BoundsCalculator.new(diagram, model_index: model_index)
+          min_x, min_y, width, height = bc.compute
+          new(min_x: min_x, min_y: min_y, width: width, height: height,
+              inset_left: bc.effective_inset_left || FRAME_INSET_LEFT)
         end
 
         # Second-pass canvas over the DRAWN extents captured by the
@@ -62,11 +65,14 @@ module Ea
           max_y = (pts + extra).map(&:last).max || 0
           return from(diagram, model_index: model_index) if pts.empty?
 
+          inset_left = min_x.zero? ? INSET_TOUCHING_ORIGIN
+                                    : BoundsCalculator::INSET_LEFT
           new(min_x: min_x, min_y: min_y,
-              width: (max_x - min_x) + BoundsCalculator::INSET_LEFT +
+              width: (max_x - min_x) + inset_left +
                      BoundsCalculator::INSET_RIGHT,
               height: (max_y - min_y) + BoundsCalculator::INSET_TOP +
-                      BoundsCalculator::INSET_BOTTOM)
+                      BoundsCalculator::INSET_BOTTOM,
+              inset_left: inset_left)
         end
 
         def view_box
@@ -85,7 +91,7 @@ module Ea
         # the content area from the canvas top-left by
         # FRAME_INSET_LEFT/TOP.
         def translate_x(x)
-          x - min_x + FRAME_INSET_LEFT
+          x - min_x + inset_left
         end
 
         def translate_y(y)

data/lib/ea/svg/ea_emitter/label/midpoint_label.rb

@@ -33,6 +33,17 @@ module Ea
             return nil if content.nil?
 
             mx, my = midpoint(points)
+            # EA splits a "name: value" label at the colon-space into
+            # two lines centered on the same slot (81F92FC7: "new
+            # ownership:" / "LA_Right" at y 172/185, both centered on
+            # x=480).
+            if (idx = content.index(": ")) && content.length > idx + 2
+              return [
+                render_text(mx, my, content[0..idx]),
+                render_text(mx, my + LINE_PITCH, content[(idx + 2)..])
+              ].join("\n")
+            end
+
             render_text(mx, my, content)
           end
 
@@ -74,6 +85,8 @@ module Ea
 
           private
 
+          LINE_PITCH = 13
+
           def midpoint(points)
             mid_idx = points.size / 2
             if points.size.odd?

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.38"
+  VERSION = "0.6.40"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.38
+  version: 0.6.40
 platform: ruby
 authors:
 - Ribose Inc.