ea 0.6.91 → 0.6.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf0f3e11888e4492386de976f97e4024e39d9dbc95083a5b184c0fb25d8cfead
-  data.tar.gz: 467687628f21bf50264c0210de75e2fad5013a14d7f2a1572d65dfb218429052
+  metadata.gz: 641441bf5b181aaadd045223f47a59069d916f48247f19ab4e6bc6c19cfeee03
+  data.tar.gz: 0eb407d782f28301f0747a2f251ce3412f97cc60882f87cc7062567d1e7e4a64
 SHA512:
-  metadata.gz: 67a177d6e826985a3526c63bae7ed1f10e55b51ca97ec1507e5cb2f89f309b789f734c27cd41b678777e3ea72cb730a44485799972c3bbab916dedfd51f404c5
-  data.tar.gz: 55d5d873894f3e26fb786a71efaab326ecd4df2d16d167bf3dc7158e1775e139f9a9c2096cd79c5ae136315421c1d19156320d1c895837d691ecd7a97e772a2a
+  metadata.gz: d705861a5209c8646e01fb097b4329e634744bdeef07355d00598a45bff1134ab186c69c0088250a3a3c5ece15d2c39281653c0e667a473fea80dbfd4bb9b9c0
+  data.tar.gz: 84fce6fa28c77169812dda317ef720035c1ac9b17ac854238aa376480980308b7c506e6f3fa52e23807e7cc851546fe65b0c6b8bda72b937b1d9a99ab82953ad

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

@@ -19,6 +19,8 @@ module Ea
         # for those — only simple role names render.
         class EndLabel
           PROPERTY_STEREOTYPE = "«Property»"
+          SEAT_FONT_SIZE = 7
+          SEAT_X_INSET = 3
 
           attr_reader :canvas, :model_index, :document, :theme,
                       :font_family, :font_size, :font_unit
@@ -41,8 +43,9 @@ module Ea
           #   anchor     - [x, y] of the connector endpoint
           #   connector  - the DiagramConnector (for relationship lookup)
           #   end_kind   - :source or :target
+          #   heading    - [dx, dy] of the first leg leaving the anchor
           def texts(text_box:, mult_box:, anchor:, connector:, end_kind:,
-                    tree: false)
+                    tree: false, heading: nil)
             from_property, role, mult = role_and_multiplicity(connector, end_kind)
             if role_empty?(role) && mult_empty?(mult)
               other_from_prop, other_role, other_mult = role_and_multiplicity(connector,
@@ -73,6 +76,11 @@ module Ea
             # the end has none.
             stereo = connector_source_dest_stereotype(connector, end_kind)
             stereo = stereo.nil? || stereo.empty? ? nil : "«#{stereo}»"
+            direction = leg_direction(end_kind, heading)
+            if direction && !(tree && zero_offset?(text_box, mult_box))
+              text_pos = role_seat(direction, anchor, text_box, role) || text_pos
+              mult_pos = mult_seat(direction, anchor, mult_box) || mult_pos
+            end
 
             build_texts(role:, mult:, standalone:,
                         text_pos:, mult_pos:, stereo:, text_box:)
@@ -109,6 +117,63 @@ module Ea
             end
           end
 
+          # Stored source-end boxes on a 7pt label whose first leg
+          # leaves straight up or straight right are seated at the box
+          # corner, anchor + (OX, OY) with no sign flip, 3px to its
+          # right: the multiplicity 6px above it on an upward leg and
+          # 15px below it on a rightward one, the role 7px above it on
+          # a rightward one. Other sizes, headings, the target end,
+          # custom presentation keep their offsets; zero multiplicity boxes keep their default seat.
+          def leg_direction(end_kind, heading)
+            return nil unless source_seat?(end_kind, heading)
+
+            dx, dy = heading
+            return :up if dx.zero? && dy.negative?
+            return :right if dy.zero? && dx.positive?
+
+            nil
+          end
+
+          # Role text on a rightward leg is left-aligned at the corner,
+          # 7px above it. Upward legs keep the plain role offset.
+          def role_seat(direction, anchor, box, role)
+            return nil unless direction == :right
+            return nil if box.nil? || role_empty?(role)
+            return nil unless default_presentation?(box)
+
+            x, y = seat_corner(anchor, box)
+            [x + SEAT_X_INSET, y - 7]
+          end
+
+          def mult_seat(direction, anchor, box)
+            return nil if box.nil? || stored_offsets_zero?(box)
+            return nil unless default_presentation?(box)
+
+            x, y = seat_corner(anchor, box)
+            [x + SEAT_X_INSET, direction == :right ? y + 15 : y - 6]
+          end
+
+          def source_seat?(end_kind, heading)
+            end_kind == :source && heading &&
+              font_size == SEAT_FONT_SIZE && font_unit == "pt"
+          end
+
+          # Boxes with explicit string-keyed OX/OY (the QEA shape) that
+          # are unrotated, unhidden, unstyled and left/center aligned.
+          def default_presentation?(box)
+            return false unless box["ox"] && box["oy"]
+            return false unless [nil, 0, 1].include?(box["alignment"])
+            return false unless [nil, -1].include?(box["color"])
+
+            box["rotation"].to_i.zero? && box["direction"].to_i.zero? &&
+              box.values_at("hidden", "bold", "italic", "underline")
+                 .none?
+          end
+
+          def seat_corner(anchor, box)
+            [anchor[0] + box["ox"].to_i, anchor[1] + box["oy"].to_i]
+          end
+
           def build_texts(role:, mult:, standalone:, text_pos:, mult_pos:,
                           stereo:, text_box:)
             if role && !role.empty? && text_pos

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

@@ -78,15 +78,16 @@ module Ea
           boxes = connector.label_boxes || {}
           tree = tree_shaped?(points)
 
-          src_tb, src_mb = end_boxes(boxes, :llt, :llb) ||
-                           default_label_boxes(points, :source)
+          stored_src = end_boxes(boxes, :llt, :llb)
+          src_tb, src_mb = stored_src || default_label_boxes(points, :source)
           tgt_tb, tgt_mb = end_boxes(boxes, :lrt, :lrb) ||
                            default_label_boxes(points, :target)
 
           texts = []
           end_renderer.texts(text_box: src_tb, mult_box: src_mb,
                              anchor: source_pt, connector: connector,
-                             end_kind: :source, tree: tree && tree[:source]).each { |t| texts << t }
+                             end_kind: :source, tree: tree && tree[:source],
+                             heading: stored_src && leg_heading(points)).each { |t| texts << t }
           end_renderer.texts(text_box: tgt_tb,
                              mult_box: tgt_mb,
                              anchor: target_pt, connector: connector,
@@ -105,6 +106,10 @@ module Ea
           { source: true, target: true }
         end
 
+        def leg_heading(points)
+          [points[1][0] - points[0][0], points[1][1] - points[0][1]]
+        end
+
         def end_boxes(boxes, text_key, mult_key)
           return nil if boxes[text_key].nil? && boxes[mult_key].nil?
 

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.91"
+  VERSION = "0.6.92"
 end

metadata

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