ea 0.6.53 → 0.6.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '007348c214ad1a2ed4226d46e55a528dafcb12d9e4b5eae9e4d3a3e7d13b5c8c'
-  data.tar.gz: 7b6af86fe7a76f8661c993b2559345d1538ef5fda6f4fa912f6925be4e4a79f2
+  metadata.gz: 7d4c834fa91906a0866bf29561214b7c9d140cb4b2a7106eb332f4ec029e56f1
+  data.tar.gz: e99cb2ff135675ec69d47397c102bd67f07925d8e59565bbabf6b96fb70cb60d
 SHA512:
-  metadata.gz: 4b75f8f3f76d3c4433f147c7f9afba023c84f7961e5c901465c6d237a8775817d130596b4c75714d0bc367bc7605e5db1b356bc8bff2d23a45b723e77deaadf3
-  data.tar.gz: e6d556ef5bdc04dad2fe196d26114672d7f7b0c9c5e580588279697f3ec5c45538d0fd0729a5847716dd01b98acb64a529aa1d19c38363a99fc307168e5554c6
+  metadata.gz: 302544eb3d7bc17747114aac54f1aacb3b91c6f87340c699d4c35bb8eace2f76c9a4766fd675eb1d58d0c5faa039624124ee5d7dca75d36b7a2e6e109d9aef2c
+  data.tar.gz: e5a86d18db02e980a690a2653529f17cd87b431ba7d7aee03683abe6f1fc3de9d4881347817735365a53575e234a91e0cca36364552a39d24e9b725a06932017

data/lib/ea/model/diagram_connector.rb

@@ -44,6 +44,13 @@ module Ea
       # when the geometry string carries no offsets (auto-routed).
       attribute :source_port, Ea::Model::Point
       attribute :target_port, Ea::Model::Point
+      # Ray origins for the drawn line: element center translated by
+      # the stored Geometry SX/SY / EX/EY offsets. EA clips the
+      # segment between the two anchors at the DRAWN outlines
+      # (F851A657: anchors center+(-29,0)/center+(-29,0) clip to EA's
+      # (297,788)/(433,514) within 1.5px).
+      attribute :source_anchor, Ea::Model::Point
+      attribute :target_anchor, Ea::Model::Point
 
       json do
         map "id", to: :id
@@ -57,6 +64,8 @@ module Ea
         map "targetEdge", to: :target_edge
         map "sourcePort", to: :source_port
         map "targetPort", to: :target_port
+        map "sourceAnchor", to: :source_anchor
+        map "targetAnchor", to: :target_anchor
         map "connectorType", to: :connector_type
         map "direction", to: :direction
         map "sourceStereotype", to: :source_stereotype

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

@@ -111,26 +111,27 @@ module Ea
           value.nil? || value.to_s.empty? ? nil : value
         end
 
-        # EA stores the element font size in tenths of a point in the
-        # objectstyle string, SHIFTED one point up from what it
-        # renders: explicit fontsz 100 renders 9pt (0D31AED1: every
-        # element stores 100, all 321 texts publish at 9pt), 70
-        # renders 6pt, 140 renders 13pt. 0 means "use default", and
-        # 80/90 (8pt / 9pt) are EA's classic defaults the dialogs
-        # write back when the user never customized — such elements
-        # render at the theme size. Only genuinely custom sizes are
-        # surfaced as explicit element fonts.
-        USE_DEFAULT_FONTSZ = [0, 80, 90].freeze
+        # EA stores the element font size in tenths of a point and
+        # renders it through GDI's double rounding: pixel height =
+        # floor(tenths * 96 / 720), then point size =
+        # floor(pixels * 72 / 96). 70 -> 9px -> 6pt (F3660305 Text),
+        # 80 -> 10px -> 7pt, 90 -> 12px -> 9pt (4EBDE645's PI_*
+        # classes), 100 -> 13px -> 9pt (0D31AED1's all-100 elements
+        # publish 321 texts at 9pt), 120 -> 16px -> 12pt
+        # (412BC89E's Boundary title), 140 -> 18px -> 13pt.
+        # fontsz=0 ("use default", written back by the font dialog)
+        # renders at the 7pt theme size.
+        USE_DEFAULT_FONTSZ = [0].freeze
+        GDI_DPI = 96
 
         def font_size_from(style_hash)
           raw = style_hash[:fontsz]
           return nil if raw.nil? || raw.to_s.empty?
 
-          return nil if raw.to_i.zero?
-
           return nil if USE_DEFAULT_FONTSZ.include?(raw.to_i)
 
-          (raw.to_f / 10).round - 1
+          pixels = (raw.to_f * GDI_DPI / 720).floor
+          (pixels * 72.0 / GDI_DPI).floor
         end
 
         def build_connectors(diagram_row)
@@ -372,6 +373,10 @@ module Ea
             target_stereotype: connector&.deststereotype,
             waypoints: context ? context_waypoints_for(connector, diagram_row) :
                          waypoints_for_link(link_row, diagram_row),
+            source_anchor: port_anchor_for(connector, diagram_row,
+                                           geom, :source),
+            target_anchor: port_anchor_for(connector, diagram_row,
+                                           geom, :target),
             source_port: connection_port(diagram_row, connector, :source, geom),
             target_port: connection_port(diagram_row, connector, :target, geom),
             label_boxes: context ? {} : (geom[:label_boxes] || {}),
@@ -383,6 +388,26 @@ module Ea
           )
         end
 
+        # Ray origin for one connector end: the element's center
+        # translated by the stored SX/SY (source) or EX/EY (target)
+        # offset. EA clips the anchor-to-anchor segment at the drawn
+        # outlines.
+        def port_anchor_for(connector, diagram_row, geom, end_kind)
+          return nil unless connector
+
+          object_id = end_kind == :source ? connector.start_object_id :
+                                           connector.end_object_id
+          placement = diagram_object_placement(diagram_row.diagram_id,
+                                               object_id)
+          return nil unless placement
+
+          bounds = bounds_from_rect(placement)
+          dx = (end_kind == :source ? geom[:sx] : geom[:ex]).to_i
+          dy = (end_kind == :source ? geom[:sy] : geom[:ey]).to_i
+          Ea::Model::Point.new(x: bounds.x + bounds.width / 2 + dx,
+                               y: bounds.y + bounds.height / 2 + dy)
+        end
+
         # Context diagrams re-route every drawn connector as a
         # direct line at draw time: the center-to-center ray clipped
         # at both box outlines. The stored SX/SY/EDGE geometry is

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

@@ -19,11 +19,12 @@ module Ea
         # self-loop, or no drawn bounds for either end).
         def pairs_for(connector, diagram, model_index, bounds_map)
           return nil unless bounds_map
-          return nil unless direct?(connector)
+          return nil unless direct?(connector) || two_point?(connector)
 
           points = waypoint_pairs(connector)
           return nil unless points.size == 2
 
+
           rel = relationship_for(connector, model_index)
           return nil unless rel
 
@@ -35,8 +36,45 @@ module Ea
           return nil unless source_bounds && target_bounds
           return nil if source_ref == target_ref
 
-          [edge_point(source_bounds, target_bounds),
-           edge_point(target_bounds, source_bounds)]
+          sa = connector.source_anchor
+          ta = connector.target_anchor
+          if sa && ta
+            [anchor_exit(sa, source_bounds, ta),
+             anchor_exit(ta, target_bounds, sa)]
+          else
+            [edge_point(source_bounds, target_bounds),
+             edge_point(target_bounds, source_bounds)]
+          end
+        end
+
+        # Exit point of the anchor-to-anchor segment through a box's
+        # outline: smallest positive t whose crossing lies on the
+        # rectangle perimeter.
+        def anchor_exit(anchor, bounds, other)
+          ax, ay = anchor.x.to_f, anchor.y.to_f
+          ox, oy = other.x.to_f, other.y.to_f
+          dx, dy = ox - ax, oy - ay
+          candidates = []
+          if dx != 0
+            [bounds.x, bounds.x + bounds.width].each do |x|
+              t = (x - ax) / dx
+              candidates << [t, x, ay + t * dy] if t.positive?
+            end
+          end
+          if dy != 0
+            [bounds.y, bounds.y + bounds.height].each do |y|
+              t = (y - ay) / dy
+              candidates << [t, ax + t * dx, y] if t.positive?
+            end
+          end
+          on_perimeter = candidates.select do |_t, x, y|
+            x >= bounds.x - 0.01 && x <= bounds.x + bounds.width + 0.01 &&
+              y >= bounds.y - 0.01 && y <= bounds.y + bounds.height + 0.01
+          end
+          best = on_perimeter.min_by(&:first)
+          # EA floors the dock coordinates (F851A657: 297.75 -> 297,
+          # 433.7 -> 433) - a rounded-up dock is a visible miss.
+          best ? [best[1].floor, best[2].floor] : [ax.floor, ay.floor]
         end
 
         # EA never docks a horizontal connector line at the header
@@ -85,6 +123,12 @@ module Ea
             %w[direct regenerated].any? { |k| style.key?(k) }
         end
 
+        # EXPERIMENT: every auto-laid 2-waypoint connector re-docks
+        # as the center-to-center ray clipped at the drawn outlines.
+        def two_point?(connector)
+          (connector.waypoints || []).size == 2
+        end
+
         def waypoint_pairs(connector)
           (connector.waypoints || []).filter_map do |wp|
             next unless wp.position
@@ -126,11 +170,11 @@ module Ea
           if dx.abs * bounds.height > dy.abs * bounds.width
             x = dx.positive? ? bounds.x + bounds.width : bounds.x
             y = safe_y(cx, cy, dx, dy, x)
-            [x, y]
+            [x, y.floor]
           else
             y = dy.positive? ? bounds.y + bounds.height : bounds.y
             x = safe_x(cx, cy, dx, dy, y)
-            [x, y]
+            [x.floor, y]
           end
         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.53"
+  VERSION = "0.6.55"
 end

metadata

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