ea 0.6.103 → 0.6.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b98433dd845c2048541c65f723faa1d9a82c38bd9045a440948722e85f7ab3
-  data.tar.gz: aa1bcc2c3d2b8876a21f200e1c638fddabe43a5f80ad694b801e9277d38fbb7d
+  metadata.gz: 430568b3607d439af39bac818b48ee27caa207875c7f2015e3a6f5689419680b
+  data.tar.gz: dfb835e2208d50a51caa01acb96a30e2561f5ccbdf6e83a6a1c55ec368c4b5b8
 SHA512:
-  metadata.gz: 571d077f47d8c101f6285b88b351cfcdc965337bdaec200fb40cf6eb7b00531992b4f850d03faeb403e4b4fb13039d8eafdf83552b0e0c1f930ad826657bb401
-  data.tar.gz: 8f67bc90328fce18c5918b0bf471937d56a4e8730b9df67b0c6bcc5422902b5fd527c585b0fa89d83aea8e1b3dcbc48f5687b5995640b78eb4910824499f85ec
+  metadata.gz: ce35bed8f6b13d1f799d8c99b550ad70d19453e2f2827888c1dce54b246dc9a938baa52cfe2d24f9fb9f093ecce1a86b52c4dbecbb60b397777c592cc61ea654
+  data.tar.gz: 22747dc14774fbfaa984efba1c88078619d8ab6bc74b4d06d5276074a93957dccc071963574aad3ff272377d043e51e613723708d0fa48318acf6558ec920de1

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

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Ea
+  module Sources
+    module Qea
+      class DiagramBuilder
+        # Stored mathematical docking for auto-routed associations.
+        module AutoRouting
+          private
+
+          # Nonuniform horizontal offsets seat the route at the source row.
+          # Uniform offsets retain the shared-overlap routing contract.
+          def source_row_association_ray(model, link_row, diagram_row, geom, context)
+            return model if context || !source_row_association?(model, link_row, geom)
+
+            origins = source_row_origins(*stored_ray_boxes(link_row, diagram_row), geom)
+            return model unless origins
+
+            model.source_anchor, model.target_anchor = origins
+            model.waypoints = origins.map { |point| Ea::Model::Waypoint.new(position: point) }
+            model.style[:overlap_ray] = true
+            model
+          end
+
+          # When the shared row misses the target, retain the physical ports
+          # and let the emitter clip their ray before inserting the elbow.
+          def auto_port_elbow(model, link_row, diagram_row, geom, context)
+            return model if context || !auto_port_elbow_candidate?(model, link_row, geom)
+
+            source, target = stored_ray_boxes(link_row, diagram_row)
+            origins = [stored_ray_origin(source, geom[:sx], geom[:sy]),
+                       stored_ray_origin(target, geom[:ex], geom[:ey])]
+            return model unless auto_port_elbow_origins?(source, target, origins, geom)
+
+            apply_auto_port_elbow(model, origins)
+          end
+
+          def apply_auto_port_elbow(model, origins)
+            model.source_anchor, model.target_anchor = origins
+            model.waypoints = origins.map { |point| Ea::Model::Waypoint.new(position: point) }
+            model.style = model.style.to_h.merge(association_ray_outline: true, auto_port_elbow: true)
+            model
+          end
+
+          def auto_port_elbow_candidate?(model, link_row, geom)
+            auto_port_elbow_model?(model) && link_row.path.to_s.empty? &&
+              source_row_style?(model.style.to_h) && uniform_overlap_offsets?(geom) && geom[:edge] == 4
+          end
+
+          def auto_port_elbow_model?(model)
+            model.connector_type == "Association" && model.has_geometry_offsets &&
+              model.source_anchor && model.target_anchor && model.waypoints.size == 2
+          end
+
+          def auto_port_elbow_origins?(source, target, origins, geom)
+            return false if overlap_origins(source, target, geom)
+            return false unless source_row_faces_target?(source, target, geom[:edge])
+            return false unless origins.first.x == source.x - 1
+            return false if within_height?(origins.first.y, target)
+            return false unless crosses_target_horizontal_edge?(origins, target)
+
+            [source, target].zip(origins).all? { |box, origin| inside_box?(origin, grown_bounds(box, 1)) }
+          end
+
+          def crosses_target_horizontal_edge?(origins, target)
+            outline = grown_bounds(target, 1)
+            edge = Ea::Model::Bounds.new(x: outline.x, width: outline.width, height: 0,
+                                         y: origins.first.y < outline.y ? outline.y : outline.y + outline.height)
+            segment_crosses_box?(*origins, edge)
+          end
+
+          def source_row_origins(source, target, geom)
+            return nil unless source_row_faces_target?(source, target, geom[:edge])
+
+            row = source_row_y(source, geom)
+            return nil unless [source, target].all? { |box| within_height?(row, box) }
+
+            [source, target].map { |box| Ea::Model::Point.new(x: box.x + box.width / 2.0, y: row) }
+          end
+
+          def source_row_y(source, geom)
+            (source.y + source.height / 2.0 - geom[:sy]).floor
+          end
+
+          def source_row_faces_target?(source, target, edge)
+            if edge == 2
+              source.x + source.width < target.x
+            else
+              target.x + target.width < source.x
+            end
+          end
+
+          def source_row_association?(model, link_row, geom)
+            model.connector_type == "Association" && model.has_geometry_offsets &&
+              model.source_anchor && model.target_anchor &&
+              link_row.path.to_s.empty? && source_row_style?(model.style.to_h) &&
+              source_row_offsets?(geom)
+          end
+
+          def source_row_style?(style)
+            style[:mode] == "2" && style[:lwidth] == "2" && !style[:tree]
+          end
+
+          def source_row_offsets?(geom)
+            geom.values_at(:sx, :sy, :ex, :ey).all? &&
+              [2, 4].include?(geom[:edge]) && geom[:sy] != geom[:ey]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Ea
+  module Sources
+    module Qea
+      class DiagramBuilder
+        # Restore a saved square axis when its target remains on the outline
+        # but the source has moved beyond the saved endpoint into the gap.
+        module StoredSquarePorts
+          private
+
+          def restore_stored_square_ports(model, link_row, diagram_row, geom, context)
+            return model if context || !stored_square_port_style?(model, link_row, geom)
+
+            connector = database.find_connector(link_row.connectorid)
+            points = stored_square_port_coordinates(connector)
+            boxes = stored_square_port_boxes(connector, diagram_row)
+            return model unless points && boxes
+
+            ends = reclip_stored_square_source(points, *boxes)
+            return model unless ends
+
+            model.source_anchor, model.target_anchor = ends
+            model.waypoints = ends.map { |point| Ea::Model::Waypoint.new(position: point) }
+            model
+          end
+
+          def stored_square_port_style?(model, link_row, geom)
+            style = model.style.to_h
+            model.connector_type == "Association" && link_row.path.to_s.empty? &&
+              style.values_at(:mode, :tree, :lwidth) == %w[3 OS 2] &&
+              geom.values_at(:edge, :sx, :sy, :ex, :ey) == [1, 0, 0, 0, 0]
+          end
+
+          def stored_square_port_coordinates(connector)
+            return unless connector
+
+            values = [connector.ptstartx, connector.ptstarty, connector.ptendx, connector.ptendy]
+            return if values.any?(&:nil?)
+
+            [[values[0], -values[1]], [values[2], -values[3]]]
+          end
+
+          def stored_square_port_boxes(connector, diagram_row)
+            return unless connector
+
+            placements = [source_placement_for(connector, diagram_row),
+                          target_placement_for(connector, diagram_row)]
+            placements.map { |placement| bounds_from_rect(placement) } if placements.all?
+          end
+
+          def reclip_stored_square_source(points, source, target)
+            first, last = points
+            return unless first[0] == last[0] && square_axis_inside_boxes?(first[0], source, target)
+
+            return unless stored_square_source_in_gap?(points, source, target)
+
+            [Ea::Model::Point.new(x: first[0], y: source.y),
+             Ea::Model::Point.new(x: last[0], y: last[1])]
+          end
+
+          def stored_square_source_in_gap?(points, source, target)
+            first, last = points
+            target_edge = target.y + target.height + 1
+            last[1] == target_edge && target_edge < first[1] && first[1] < source.y
+          end
+
+          def square_axis_inside_boxes?(axis, source, target)
+            [source, target].all? do |box|
+              box.width.positive? && box.height.positive? && axis.between?(box.x, box.x + box.width)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,8 +11,13 @@ module Ea
       # styles).
       class DiagramBuilder
         autoload :Routing, "ea/sources/qea/diagram_builder/routing"
+        autoload :AutoRouting, "ea/sources/qea/diagram_builder/auto_routing"
+        autoload :StoredSquarePorts, "ea/sources/qea/diagram_builder/stored_square_ports"
         include Routing
+        include AutoRouting
+        include StoredSquarePorts
         private_constant :Routing
+        private_constant :AutoRouting, :StoredSquarePorts
 
         attr_reader :database
 
@@ -436,8 +441,11 @@ module Ea
           model = mode2_overlap_ray(model, link_row, diagram_row, geom, context)
           model = association_stored_ray(model, link_row, diagram_row, geom, context)
           model = correct_stored_ray_origins(model, link_row, diagram_row, geom, context)
+          model = source_row_association_ray(model, link_row, diagram_row, geom, context)
           model = overlap_ray_origins(model, link_row, diagram_row, geom, context)
-          mark_default_square_ray(model, link_row, geom, context)
+          model = auto_port_elbow(model, link_row, diagram_row, geom, context)
+          model = mark_default_square_ray(model, link_row, geom, context)
+          restore_stored_square_ports(model, link_row, diagram_row, geom, context)
         end
 
         # Ray origin for one connector end: the element's center

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

@@ -60,9 +60,26 @@ module Ea
           pairs = expanded ? candidate : original
           target = expanded ? outline.last : target_bounds
           pairs = default_square_pairs(connector, points, source_bounds, target, pairs)
-          stored_top_pairs(connector, expanded ? outline.first : source_bounds, pairs)
+          source = expanded ? outline.first : source_bounds
+          pairs = stored_top_pairs(connector, source, pairs)
+          auto_port_elbow_pairs(connector, source, target, pairs)
         end
 
+        # Auto routing turns at the clipped target column when the source
+        # leaves a side edge and the target enters through its top or bottom.
+        def auto_port_elbow_pairs(connector, source, target, pairs)
+          return pairs unless connector.style.to_h[:auto_port_elbow] == true
+
+          first, last = pairs
+          return pairs unless on_side_edge?(first, source) &&
+                              [target.y, target.y + target.height].include?(last[1]) &&
+                              last[0].between?(target.x, target.x + target.width)
+          return pairs if first[0] == last[0] || first[1] == last[1]
+
+          [first, [last[0], first[1]], last]
+        end
+        private_class_method :auto_port_elbow_pairs
+
         # EDGE=1 explicitly seats an external source ray on the top edge;
         # its first contact can instead be the bottom when its origin is below.
         def stored_top_pairs(connector, source, pairs)

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.103"
+  VERSION = "0.6.105"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.103
+  version: 0.6.105
 platform: ruby
 authors:
 - Ribose Inc.
@@ -817,7 +817,9 @@ files:
 - lib/ea/sources/qea/connector_relationship_map.rb
 - lib/ea/sources/qea/context_diagram_support.rb
 - lib/ea/sources/qea/diagram_builder.rb
+- lib/ea/sources/qea/diagram_builder/auto_routing.rb
 - lib/ea/sources/qea/diagram_builder/routing.rb
+- lib/ea/sources/qea/diagram_builder/stored_square_ports.rb
 - lib/ea/sources/qea/diagram_style_parser.rb
 - lib/ea/sources/qea/id_normalizer.rb
 - lib/ea/sources/qea/instance_builder.rb