ea 0.6.91 → 0.6.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf0f3e11888e4492386de976f97e4024e39d9dbc95083a5b184c0fb25d8cfead
-  data.tar.gz: 467687628f21bf50264c0210de75e2fad5013a14d7f2a1572d65dfb218429052
+  metadata.gz: ffc412a948388b91fc07382b857fdcdbb4fda6a6d12bdc4cba7931c29720bf2e
+  data.tar.gz: 06cf5da1fb2062d414866f36e03798cfc9052fb2fcae45dfb78552e754d07662
 SHA512:
-  metadata.gz: 67a177d6e826985a3526c63bae7ed1f10e55b51ca97ec1507e5cb2f89f309b789f734c27cd41b678777e3ea72cb730a44485799972c3bbab916dedfd51f404c5
-  data.tar.gz: 55d5d873894f3e26fb786a71efaab326ecd4df2d16d167bf3dc7158e1775e139f9a9c2096cd79c5ae136315421c1d19156320d1c895837d691ecd7a97e772a2a
+  metadata.gz: 3d498df6109da7ad7c4368b589f34c9dbe3a48171571e9993fef75d80874e3f1eb6a31e6f890db39c5f413a61e895da8e3bf7f81a6d01b94fdc0a225267fb809
+  data.tar.gz: ec4537e30476a83f7ecc39c29aacb1d54f6a788f9a87c97bfcf86f665ece6010ca640a31062d30c0ad2f1fa8362bc1e834f207355989b27f9197ede225eff54a

data/lib/ea/sources/qea/diagram_builder/routing.rb

@@ -8,6 +8,21 @@ module Ea
         module Routing
           private
 
+          # A lateral tree leaves the side edge before turning upward.
+          # Keep that dock only when its first leg actually points outward.
+          def lateral_source_exit?(points, link_row, bounds)
+            return false unless points.size == 3 && DiagramStyleParser.parse(link_row.style)[:tree] == "LV"
+
+            anchor, bend = points.take(2)
+            anchor[1] == bend[1] && outward_side_exit?(anchor[0], bend[0], bounds)
+          end
+
+          def outward_side_exit?(anchor_x, bend_x, bounds)
+            left = bounds.x
+            right = left + bounds.width
+            (anchor_x == left && bend_x < left) || (anchor_x == right && bend_x > right)
+          end
+
           # Keep a vertical tree trunk whose bends still fit both boxes
           # and the open gap; the closest facing edges need not share its x.
           def preserve_stored_tree?(points, link_row, connector, src, tgt)

data/lib/ea/sources/qea/diagram_builder.rb

@@ -577,9 +577,8 @@ module Ea
         #     describe the source-side and target-side bend offsets
         #     relative to the edge attachment points.
         #
-        # Path takes precedence when present — it's the authoritative
-        # routing. SX/SY/EX/EY are fallback for auto-routed direct
-        # connectors with at most one bend on each end.
+        # Custom-line Path takes precedence when present. Direct mode
+        # ignores old custom bends; SX/SY/EX/EY supply its endpoint ports.
         #
         # If we can't resolve the source or target element placement
         # for this diagram, we emit no waypoints (the connector will
@@ -607,8 +606,10 @@ module Ea
                          element_edge_point(target_placement, :target, edge_out)
 
           intermediate = intermediate_waypoints(link_row)
-          if edge_out == 2 && source_port && target_port &&
-             !valid_tree_path?(intermediate, source_placement)
+          if DiagramStyleParser.parse(link_row.style)[:mode] == "1"
+            points = [source_point, target_point]
+          elsif edge_out == 2 && source_port && target_port &&
+                !valid_tree_path?(intermediate, source_placement)
             # A stale tree Path (not on the source's facing edge) is
             # recomputed: source port -> corner at (target dock x,
             # source exit y) -> target port.
@@ -923,7 +924,7 @@ module Ea
           target_y = tgt_b.y + tgt_b.height
           source_y -= inset if points[1][1] < source_y - inset
           target_y += inset if points[-2][1] > target_y + inset
-          unless strict && points[1][1] >= source_y
+          unless lateral_source_exit?(points, link_row, src_b) || (strict && points[1][1] >= source_y)
             points[0] = [points[1][0].clamp(src_b.x, src_b.x + src_b.width), source_y]
           end
           unless strict && points[-2][1] <= target_y

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,12 +43,23 @@ 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
+          #   stored_labels - the connector has stored label boxes at
+          #                   either end; false keeps the opposite-end
+          #                   fallback
           def texts(text_box:, mult_box:, anchor:, connector:, end_kind:,
-                    tree: false)
+                    tree: false, heading: nil, stored_labels: false)
             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,
                                                               opposite(end_kind))
+              if stored_labels
+                return [] if role_empty?(other_role) && mult_empty?(other_mult)
+
+                return own_stereotype_only(text_box, anchor, connector,
+                                           end_kind)
+              end
+
               role = other_role if role_empty?(role)
               mult ||= other_mult
               from_property ||= other_from_prop
@@ -73,6 +86,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:)
@@ -80,6 +98,19 @@ module Ea
 
           private
 
+          # With stored boxes on the connector, an end that carries no
+          # data of its own draws only its own stereotype; the data end
+          # draws the role and multiplicity; with no data anywhere nothing
+          # is drawn. Connectors with no stored box keep the opposite-end
+          # fallback.
+          def own_stereotype_only(text_box, anchor, connector, end_kind)
+            stereo = connector_source_dest_stereotype(connector, end_kind)
+            pos = position_at(text_box, anchor)
+            return [] if stereo.nil? || stereo.empty? || pos.nil?
+
+            [text_at(pos[0], pos[1], "«#{stereo}»")]
+          end
+
           # EA's tree-route label clusters (hand-verified against the
           # EA-published reference, SY 8542 with canvas=(0,0)):
           # source-end pairs stack at the exit point (role +3/-23,
@@ -109,6 +140,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,19 +78,23 @@ module Ea
           boxes = connector.label_boxes || {}
           tree = tree_shaped?(points)
 
-          src_tb, src_mb = end_boxes(boxes, :llt, :llb) ||
-                           default_label_boxes(points, :source)
-          tgt_tb, tgt_mb = end_boxes(boxes, :lrt, :lrb) ||
-                           default_label_boxes(points, :target)
+          stored_src = end_boxes(boxes, :llt, :llb)
+          stored_tgt = end_boxes(boxes, :lrt, :lrb)
+          stored_labels = !(stored_src.nil? && stored_tgt.nil?)
+          src_tb, src_mb = stored_src || default_label_boxes(points, :source)
+          tgt_tb, tgt_mb = stored_tgt || 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),
+                             stored_labels: stored_labels).each { |t| texts << t }
           end_renderer.texts(text_box: tgt_tb,
                              mult_box: tgt_mb,
                              anchor: target_pt, connector: connector,
-                             end_kind: :target, tree: tree && tree[:target]).each { |t| texts << t }
+                             end_kind: :target, tree: tree && tree[:target],
+                             stored_labels: stored_labels).each { |t| texts << t }
           texts
         end
 
@@ -105,6 +109,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.93"
 end

metadata

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