ea 0.6.92 → 0.6.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641441bf5b181aaadd045223f47a59069d916f48247f19ab4e6bc6c19cfeee03
-  data.tar.gz: 0eb407d782f28301f0747a2f251ce3412f97cc60882f87cc7062567d1e7e4a64
+  metadata.gz: ffc412a948388b91fc07382b857fdcdbb4fda6a6d12bdc4cba7931c29720bf2e
+  data.tar.gz: 06cf5da1fb2062d414866f36e03798cfc9052fb2fcae45dfb78552e754d07662
 SHA512:
-  metadata.gz: d705861a5209c8646e01fb097b4329e634744bdeef07355d00598a45bff1134ab186c69c0088250a3a3c5ece15d2c39281653c0e667a473fea80dbfd4bb9b9c0
-  data.tar.gz: 84fce6fa28c77169812dda317ef720035c1ac9b17ac854238aa376480980308b7c506e6f3fa52e23807e7cc851546fe65b0c6b8bda72b937b1d9a99ab82953ad
+  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

@@ -44,12 +44,22 @@ module Ea
           #   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, heading: nil)
+                    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
@@ -88,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,

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

@@ -79,19 +79,22 @@ module Ea
           tree = tree_shaped?(points)
 
           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 = end_boxes(boxes, :lrt, :lrb) ||
-                           default_label_boxes(points, :target)
+          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],
-                             heading: stored_src && leg_heading(points)).each { |t| texts << t }
+                             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
 

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.92"
+  VERSION = "0.6.93"
 end

metadata

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