ea 0.6.97 → 0.6.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ca3f0fd4381aec39af89849d601c85defa496b697f1fe625558c8a210aef64
-  data.tar.gz: adbc3773a202f06ad7327ace0fbea64daacea45a4719afb28959332673dafdcd
+  metadata.gz: b3c13e631927ad57c6168b6d7c02eaed8e933c89ad7dfcd0a055fb6b8a69e8e1
+  data.tar.gz: 3edb35912780be1170fce402dd141823f4c5e44c92a6f84451fa136d3eb026a8
 SHA512:
-  metadata.gz: 99b878a17d58444e251964011cf2af59d46459223e657b8ffbf1a4602dc572af56e594bedd05c321cec0502d91e654cdd013d5b408277027d1c4f41c65885d3f
-  data.tar.gz: 73ef9107ec26ea7b60f7c9e5d00b7fa09b4d08b10842345c589a75dfd13a62b553287b95b0ad1b71e0c45fc032ab30ff1299fecb03e2a3abac69027a69180e97
+  metadata.gz: 6544102e41ff1bde04737e18f93de5ea0ee657c47335f7eeb12316162ca33fbf2e0d5b0dc1572fccc5174373781b1368508d606641286c88ebe2d7f9f2232079
+  data.tar.gz: eb3cb4702ea44ba8759ab9774a1ca445684b9d6ce7043153b4823657c191fff45c6db267ee74b1ed20cdec2064248b60a0f5112827b92edfa4aaecaa495fa093

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

@@ -8,6 +8,41 @@ module Ea
         module Routing
           private
 
+          # An empty custom-line Path has no authored corner to preserve.
+          # Keep normalized port routes; replace only the computed EDGE2 jog.
+          def direct_empty_path_ray(model, link_row, diagram_row, geom, context)
+            return model if context
+            return model unless empty_path_ray_candidate?(model, link_row, geom)
+
+            source, target = stored_ray_boxes(link_row, diagram_row)
+            return model unless empty_path_ray_gap?(source, target, geom)
+
+            model.waypoints = [model.source_port, model.target_port].map do |point|
+              Ea::Model::Waypoint.new(position: point)
+            end
+            set_stored_ray_origins(model, source, target, geom)
+          end
+
+          def empty_path_ray_gap?(source, target, geom)
+            return false unless source.x + source.width < target.x
+
+            [stored_ray_origin(source, geom[:sx], geom[:sy]),
+             stored_ray_origin(target, geom[:ex], geom[:ey])].all? do |origin|
+              within_height?(origin.y, source) && within_height?(origin.y, target)
+            end
+          end
+
+          def empty_path_ray_candidate?(model, link_row, geom)
+            %w[Generalization Aggregation].include?(model.connector_type) &&
+              model.waypoints.size == 3 && empty_path_ray_style?(model.style, link_row, geom) &&
+              model.has_geometry_offsets && model.source_port && model.target_port
+          end
+
+          def empty_path_ray_style?(style, link_row, geom)
+            style[:mode] == "3" && style[:lwidth] == "2" && !style[:tree] &&
+              geom[:edge] == 2 && link_row.path.to_s.empty?
+          end
+
           # Stored SY/EY use mathematical Y; ray origins use screen Y.
           # Computed-jog origins are already normalized to their derived ports.
           def correct_stored_ray_origins(model, link_row, diagram_row, geom, context)

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

@@ -16,16 +16,11 @@ module Ea
 
         attr_reader :database
 
-        # Generalizations whose EA CustomProperties carry
-        # isSubstitutable draw '{isSubstitutable=false}' at the label
-        # seat (t_xref 'connector property' rows keyed by connector
-        # guid; VALU 0/empty both mean false).
+        # This flag requests the false annotation, not the property's Boolean
+        # value. An explicit true (-1) must not request a false annotation.
         def substitutable_connector?(conn)
-          @substitutable_guids ||= database.collections[:xrefs]
-                                           .select do |x|
-            x.xref_type == "connector property" &&
-              x.name == "CustomProperties" &&
-              x.description.to_s.include?("isSubstitutable")
+          @substitutable_guids ||= database.collections[:xrefs].select do |xref|
+            false_substitutability_xref?(xref)
           end.map(&:client).to_set
           @substitutable_guids.include?(conn.ea_guid)
         end
@@ -99,6 +94,22 @@ module Ea
 
         private
 
+        def false_substitutability_xref?(xref)
+          return false unless xref.xref_type == "connector property" && xref.name == "CustomProperties"
+
+          description = xref.description.to_s
+          description.include?("isSubstitutable") && !true_substitutability_property?(description)
+        end
+
+        def true_substitutability_property?(description)
+          description.scan(/@PROP=(.*?)@ENDPROP;/m).any? do |match|
+            property = match.first
+            property.include?("@NAME=isSubstitutable@ENDNAME;") &&
+              property.include?("@TYPE=Boolean@ENDTYPE;") &&
+              property[/@VALU=(.*?)@ENDVALU;/m, 1] == "-1"
+          end
+        end
+
         def build_elements(diagram_row)
           objs = database.diagram_objects_for(diagram_row.diagram_id) || []
           objs.map { |obj_row| build_element(obj_row, diagram_row) }
@@ -410,6 +421,7 @@ module Ea
             has_geometry_offsets: geometry_has_offsets?(link_row.geometry),
             is_substitutable: substitutable_connector?(connector)
           ), link_row, diagram_row, geom)
+          model = direct_empty_path_ray(model, link_row, diagram_row, geom, context)
           correct_stored_ray_origins(model, link_row, diagram_row, geom, context)
         end
 

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

@@ -209,18 +209,46 @@ module Ea
                       divider_y_by_ref[target_ref]]
           return nil unless bounds.all? && dividers.all?
 
-          adjusted = row_slot_pairs(pairs, bounds, dividers)
+          preserve_source = explicit_horizontal_source_dock?(pairs, connector)
+          adjusted = row_slot_pairs(pairs, bounds, dividers, preserve_source: preserve_source)
           if stroke_outline?(connector, bounds) &&
              pairs == pairs_for(connector, diagram, model_index, bounds_map)
             original = clipped_pairs(bounds, [connector.source_anchor, connector.target_anchor])
-            original_final = row_slot_pairs(original, bounds, dividers)
+            original_final = row_slot_pairs(original, bounds, dividers, preserve_source: preserve_source)
             adjusted = original_final if original != pairs && !forward_route?(original_final, adjusted)
           end
           adjusted == pairs ? nil : adjusted
         end
 
-        def row_slot_pairs(pairs, bounds, dividers)
+        # A supplied horizontal port already specifies its row. Moving it
+        # to the next compartment row would discard that explicit coordinate.
+        def explicit_horizontal_source_dock?(pairs, connector)
+          return false unless explicit_horizontal_ray?(connector)
+
+          connector.source_anchor.y == connector.target_anchor.y &&
+            connector.source_port.y == connector.source_anchor.y &&
+            pairs.first[1] == connector.source_port.y
+        end
+        private_class_method :explicit_horizontal_source_dock?
+
+        def explicit_horizontal_ray?(connector)
+          explicit_horizontal_ray_style?(connector) && connector.has_geometry_offsets &&
+            connector.source_port && connector.target_port &&
+            connector.source_anchor && connector.target_anchor
+        end
+        private_class_method :explicit_horizontal_ray?
+
+        def explicit_horizontal_ray_style?(connector)
+          style = connector.style.to_h
+          %w[Generalization Aggregation].include?(connector.connector_type) &&
+            style[:mode] == "3" && !style[:tree] && !style[:direct] && !style[:regenerated]
+        end
+        private_class_method :explicit_horizontal_ray_style?
+
+        def row_slot_pairs(pairs, bounds, dividers, preserve_source: false)
           pairs.each_with_index.map do |(x, y), index|
+            next [x, y] if preserve_source && index.zero?
+
             row_slot?(x, y, bounds[index], dividers[index]) ? [x, y + ROW_SLOT_PITCH] : [x, y]
           end
         end

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

@@ -86,12 +86,14 @@ module Ea
             stereo = stereo.nil? || stereo.empty? ? nil : "«#{stereo}»"
             direction = leg_direction(end_kind, heading)
             if direction && !(tree && zero_offset?(text_box, mult_box))
-              text_pos = source_property_seat(connector, direction, anchor, text_box, role) ||
+              text_pos = plain_vertical_role(connector, direction, anchor, text_box, role) ||
+                         source_property_seat(connector, direction, anchor, text_box, role) ||
                          plain_upward_seat(connector, direction, anchor, text_box, role) ||
                          role_seat(direction, anchor, text_box, role) || text_pos
               mult_pos = directional_multiplicity(connector, direction, anchor, mult_box, mult) ||
                          mult_seat(direction, anchor, mult_box) || mult_pos
             elsif end_kind == :target && !(tree && zero_offset?(text_box, mult_box))
+              text_pos = target_upward_role(connector, heading, anchor, text_box, role) || text_pos
               mult_pos = target_multiplicity_seat(heading, anchor, mult_box) || mult_pos
             end
 
@@ -201,6 +203,36 @@ module Ea
             [x - SEAT_X_INSET - width, y - 6]
           end
 
+          def target_upward_role(connector, heading, anchor, box, role)
+            return nil unless heading && heading[0].zero? && heading[1].negative?
+
+            plain_vertical_role(connector, :target_up, anchor, box, role)
+          end
+
+          def plain_vertical_role(connector, direction, anchor, box, role)
+            return nil unless %i[down target_up].include?(direction) && plain_vertical_box?(box)
+
+            end_kind = direction == :down ? :source : :target
+            return nil unless plain_vertical_connector?(connector, end_kind)
+
+            width = Ea::Fonts::Metrics.text_length(role, font_size, family: font_family)
+            return nil unless width
+
+            x, y = seat_corner(anchor, box)
+            [x - width - 8, y + (end_kind == :source ? 15 : -7)]
+          end
+
+          def plain_vertical_box?(box)
+            seat_font? && cambria_box?(box) && [0, 1].include?(box["alignment"])
+          end
+
+          def plain_vertical_connector?(connector, end_kind)
+            style = connector.style.to_h
+            connector.connector_type == "Association" &&
+              connector_source_dest_stereotype(connector, end_kind).empty? &&
+              style[:mode] == "3" && style[:lwidth] == "0" && !style[:tree]
+          end
+
           def plain_role_route?(style)
             %w[1 3].include?(style[:mode]) && %w[0 2].include?(style[:lwidth]) &&
               [nil, "V"].include?(style[:tree])

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

@@ -96,6 +96,9 @@ module Ea
           LINE_PITCH = 13
 
           def label_position(connector, points)
+            name_seat = stored_name_position(connector, points)
+            return name_seat if name_seat
+
             return midpoint(points) unless default_substitutable_seat?(connector) &&
                                            upward_four_point_route?(points)
 
@@ -103,6 +106,40 @@ module Ea
             [source[0] + 3, ((source[1] + bend[1]) / 2).floor - 1]
           end
 
+          # At 7pt, a centered name's stored corner is 3px below its baseline.
+          def stored_name_position(connector, points)
+            box = stored_name_box(connector)
+            return nil unless box
+
+            width = Ea::Fonts::Metrics.text_length(midpoint_content(connector), font_size, family: font_family)
+            return nil unless width
+
+            x, y = midpoint(points)
+            offset_x, offset_y = box.values_at("ox", "oy").map(&:to_i)
+            [x + offset_x - (width / 2.0).floor, y + offset_y - 3]
+          end
+
+          def stored_name_box(connector)
+            return nil unless connector.is_a?(Ea::Model::DiagramConnector) && measured_name_font?
+            return nil if connector.is_substitutable || stereotype_label(connector)
+            return nil if midpoint_content(connector).include?(": ")
+
+            box = connector.label_boxes.to_h[:lmt]
+            box if default_name_box?(box)
+          end
+
+          def measured_name_font?
+            font_family.to_s.casecmp("Cambria").zero? && font_size == 7 && font_unit == "pt"
+          end
+
+          def default_name_box?(box)
+            return false unless box && box["alignment"] == 1
+            return false unless box.values_at("ox", "oy").all?
+            return false unless [nil, 0, 1].include?(box["direction"]) && [nil, -1].include?(box["color"])
+
+            box["rotation"].to_i.zero? && box.values_at("bold", "italic", "underline", "hidden").none?
+          end
+
           def default_substitutable_seat?(connector)
             connector.is_a?(Ea::Model::DiagramConnector) && connector.is_substitutable &&
               connector.connector_type == "Generalization" && font_size == 7 &&

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.97"
+  VERSION = "0.6.98"
 end

metadata

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