ea 0.6.96 → 0.6.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b98c8ee8bf786f5160291763db47b38d8213a029ef4d647df1d73c386551dba
-  data.tar.gz: 3f0ee88fdb07d831f70e1ec51f634048140887a5231baa3dc0eea778a7f60d7a
+  metadata.gz: c2ca3f0fd4381aec39af89849d601c85defa496b697f1fe625558c8a210aef64
+  data.tar.gz: adbc3773a202f06ad7327ace0fbea64daacea45a4719afb28959332673dafdcd
 SHA512:
-  metadata.gz: f0297306864b343dc4bdd5cae1c6cdaabeb7a5bb043cc592c76f11c5b42cfce4e7895bbfb3e92c51a263072203ca7e46b5eb3640633856474afbdc22798db2ba
-  data.tar.gz: de6096010a2802088ea9d8cee6fa9105c1b6622f4de8b89274668a5231645fd19727ad7633c74db66fbc6be04f70009f0d4d270f8ba4440189ff282f168d1313
+  metadata.gz: 99b878a17d58444e251964011cf2af59d46459223e657b8ffbf1a4602dc572af56e594bedd05c321cec0502d91e654cdd013d5b408277027d1c4f41c65885d3f
+  data.tar.gz: 73ef9107ec26ea7b60f7c9e5d00b7fa09b4d08b10842345c589a75dfd13a62b553287b95b0ad1b71e0c45fc032ab30ff1299fecb03e2a3abac69027a69180e97

data/config/themes/39.yml

@@ -0,0 +1,8 @@
+id: "39"
+name: EA theme 39 connector labels
+font:
+  unit: px
+label_font:
+  family: Cambria
+  size: 7
+  unit: pt

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

@@ -8,6 +8,78 @@ module Ea
         module Routing
           private
 
+          # 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)
+            return model if context
+            return model unless stored_ray_candidate?(model, link_row, geom)
+
+            source, target = stored_ray_boxes(link_row, diagram_row)
+            return model unless stored_ray_gap?(source, target, model.style[:mode], geom[:edge])
+
+            set_stored_ray_origins(model, source, target, geom)
+          end
+
+          def stored_ray_boxes(link_row, diagram_row)
+            connector = database.find_connector(link_row.connectorid)
+            [source_placement_for(connector, diagram_row),
+             target_placement_for(connector, diagram_row)].map { |placement| bounds_from_rect(placement) }
+          end
+
+          def set_stored_ray_origins(model, source, target, geom)
+            model.source_anchor = stored_ray_origin(source, geom[:sx], geom[:sy])
+            model.target_anchor = stored_ray_origin(target, geom[:ex], geom[:ey])
+            model
+          end
+
+          def stored_ray_candidate?(model, link_row, geom)
+            %w[Generalization Aggregation].include?(model.connector_type) &&
+              model.waypoints.size == 2 && stored_ray_style?(model.style, link_row) &&
+              stored_ray_geometry?(model, geom) && !normalized_port_anchors?(model)
+          end
+
+          def stored_ray_style?(style, link_row)
+            %w[1 3].include?(style[:mode]) && !style[:tree] &&
+              (style[:mode] == "1" || link_row.path.to_s.empty?)
+          end
+
+          def stored_ray_geometry?(model, geom)
+            model.has_geometry_offsets && model.source_port && model.target_port &&
+              (!geom[:sy].to_i.zero? || !geom[:ey].to_i.zero?)
+          end
+
+          def normalized_port_anchors?(model)
+            same_port_anchor?(model.source_anchor, model.source_port) &&
+              same_port_anchor?(model.target_anchor, model.target_port)
+          end
+
+          def same_port_anchor?(anchor, port)
+            anchor.x == port.x && anchor.y == port.y
+          end
+
+          def stored_ray_gap?(source, target, mode, edge)
+            return horizontal_ray_gap?(source, target) || vertical_ray_gap?(source, target) if mode == "1"
+
+            if edge == 1
+              target.y + target.height < source.y
+            elsif edge == 4
+              target.x + target.width < source.x
+            end
+          end
+
+          def horizontal_ray_gap?(source, target)
+            source.x + source.width < target.x || target.x + target.width < source.x
+          end
+
+          def vertical_ray_gap?(source, target)
+            source.y + source.height < target.y || target.y + target.height < source.y
+          end
+
+          def stored_ray_origin(bounds, x_offset, y_offset)
+            Ea::Model::Point.new(x: bounds.x + bounds.width / 2 + x_offset.to_i,
+                                 y: bounds.y + bounds.height / 2 - y_offset.to_i)
+          end
+
           # Square routing keeps the stored orthogonal trunk, even when a
           # shorter facing-edge route exists between the same boxes.
           def stored_square_route(link_row, connector, source, target)

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

@@ -385,7 +385,7 @@ module Ea
           geom = parse_geometry_fields(link_row.geometry)
           context = ContextDiagramSupport.package_context(diagram_row) ||
                     ContextDiagramSupport.element_regenerate?(diagram_row)
-          collapse_computed_jog(Ea::Model::DiagramConnector.new(
+          model = collapse_computed_jog(Ea::Model::DiagramConnector.new(
             id: IdNormalizer.synthetic("dc", diagram_row.diagram_id,
                                        link_row.instance_id),
             diagram_id: IdNormalizer.from_guid(diagram_row.ea_guid),
@@ -410,6 +410,7 @@ module Ea
             has_geometry_offsets: geometry_has_offsets?(link_row.geometry),
             is_substitutable: substitutable_connector?(connector)
           ), link_row, diagram_row, geom)
+          correct_stored_ray_origins(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

@@ -106,7 +106,7 @@ module Ea
         def outline_connector?(connector, bounds)
           return true if %w[Generalization Aggregation].include?(connector.connector_type)
 
-          return false unless stored_association?(connector)
+          return false unless stored_association?(connector) || offset_free_association?(connector)
 
           # Diagonal Association rounding and tree docks keep their existing rules.
           pairs = clipped_pairs(bounds, [connector.source_anchor, connector.target_anchor])
@@ -122,6 +122,20 @@ module Ea
         end
         private_class_method :stored_association?
 
+        def offset_free_association?(connector)
+          style = connector.style.to_h
+          connector.connector_type == "Association" && style[:mode] == "3" && !style[:tree] &&
+            %i[direct regenerated].none? { |key| style.key?(key) } && offset_free_anchors?(connector)
+        end
+        private_class_method :offset_free_association?
+
+        def offset_free_anchors?(connector)
+          !connector.has_geometry_offsets &&
+            [connector.source_port, connector.target_port].all?(&:nil?) &&
+            [connector.source_anchor, connector.target_anchor].all?
+        end
+        private_class_method :offset_free_anchors?
+
         def clipped_pairs(bounds, anchors)
           source, target = bounds
           source_anchor, target_anchor = anchors

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

@@ -91,6 +91,8 @@ module Ea
                          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))
+              mult_pos = target_multiplicity_seat(heading, anchor, mult_box) || mult_pos
             end
 
             build_texts(role:, mult:, standalone:,
@@ -251,6 +253,14 @@ module Ea
             [x - width - 3, y + 15] if width
           end
 
+          def target_multiplicity_seat(heading, anchor, box)
+            return nil unless seat_font?
+            return nil unless heading && heading[0].zero? && heading[1].negative?
+            return nil unless cambria_box?(box) && stored_offsets_zero?(box)
+
+            [anchor[0] + 8, anchor[1] - 7]
+          end
+
           def cambria_box?(box)
             box && default_presentation?(box) && font_family.to_s.casecmp("Cambria").zero?
           end

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

@@ -97,6 +97,7 @@ module Ea
                              mult_box: tgt_mb,
                              anchor: target_pt, connector: connector,
                              end_kind: :target, tree: tree && tree[:target],
+                             heading: stored_tgt && leg_heading(points.reverse),
                              stored_labels: stored_labels).each { |t| texts << t }
           texts
         end
@@ -112,11 +113,21 @@ module Ea
           { source: true, target: true }
         end
 
-        # Clipping can slant a stored vertical leg. Keep its label direction
-        # while the label position follows the final emitted endpoint.
+        # A diagonal clipped leg keeps the seat of its unambiguous exit face.
+        # Unknown faces retain the stored-upward fallback.
         def source_heading(connector, points)
           heading = leg_heading(points)
-          return heading unless points.size == 2 && heading[0].nonzero? && heading[1].negative?
+          return heading unless points.size == 2 && heading.none?(&:zero?)
+
+          box = source_dock_bounds(connector)
+          face = box && dock_face_heading(points.first, box)
+          return face if face && face.zip(heading).any? { |axis, delta| (axis * delta).positive? }
+
+          stored_upward_heading(connector, heading)
+        end
+
+        def stored_upward_heading(connector, heading)
+          return heading unless heading[1].negative?
 
           stored = waypoint_pairs(connector)
           return heading unless stored.size == 2
@@ -125,6 +136,49 @@ module Ea
           original[0].zero? && original[1].negative? ? original : heading
         end
 
+        def source_dock_bounds(connector)
+          return nil unless model_index && drawn_bounds
+
+          relationship = model_index[connector.relationship_ref]
+          return nil unless relationship
+
+          source, target = ConnectorRedock.end_refs(relationship)
+          return nil if source == target
+          return nil unless drawn_bounds[target]
+
+          drawn_bounds[source]
+        end
+
+        def dock_face_heading(point, box)
+          return nil unless box.width.positive? && box.height.positive?
+
+          vertical_dock_heading(point, box) || horizontal_dock_heading(point, box)
+        end
+
+        def vertical_dock_heading(point, box)
+          x, y = point
+          left = box.x
+          return nil unless x > left && x < left + box.width
+
+          top = box.y
+          return [0, -1] if [top, top - 1].include?(y)
+
+          bottom = top + box.height
+          [0, 1] if [bottom, bottom + 1].include?(y)
+        end
+
+        def horizontal_dock_heading(point, box)
+          x, y = point
+          top = box.y
+          return nil unless y > top && y < top + box.height
+
+          left = box.x
+          return [-1, 0] if [left, left - 1].include?(x)
+
+          right = left + box.width
+          [1, 0] if [right, right + 1].include?(x)
+        end
+
         def leg_heading(points)
           [points[1][0] - points[0][0], points[1][1] - points[0][1]]
         end
@@ -172,7 +226,7 @@ module Ea
             theme: theme,
             font_family: label_font_family,
             font_size: label_font_size,
-            font_unit: theme.font_size_unit
+            font_unit: theme.label_font_size_unit
           )
         end
 
@@ -182,7 +236,7 @@ module Ea
             model_index: model_index,
             font_family: label_font_family,
             font_size: label_font_size,
-            font_unit: theme.font_size_unit
+            font_unit: theme.label_font_size_unit
           )
         end
 
@@ -212,7 +266,7 @@ module Ea
         end
 
         def label_font_size
-          theme.font_size || DEFAULT_SIZE
+          theme.label_font_size || DEFAULT_SIZE
         end
       end
     end

data/lib/ea/theme/definition.rb

@@ -65,7 +65,8 @@ module Ea
                                     text_y_offset: 12, line_height: 13).freeze
 
       def initialize(id:, name: nil, font_family: nil, font_size: nil,
-                     label_font_family: nil,
+                     label_font_family: nil, label_font_size: nil,
+                     label_font_size_unit: nil,
                      font_size_unit: "pt", text_weight_normal: 400,
                      text_weight_bold: 700,
                      element_font_size: 9, element_font_unit: "pt",
@@ -83,6 +84,8 @@ module Ea
         @name = name
         @font_family = font_family
         @label_font_family = label_font_family
+        @label_font_size = label_font_size
+        @label_font_size_unit = label_font_size_unit
         @font_size = font_size
         @font_size_unit = font_size_unit
         @text_weight_normal = text_weight_normal
@@ -125,8 +128,18 @@ module Ea
         @label_font_family || font_family
       end
 
+      def label_font_size
+        @label_font_size || font_size
+      end
+
+      def label_font_size_unit
+        @label_font_size_unit || font_size_unit
+      end
+
       def with(**overrides)
-        overrides[:label_font_family] = nil if overrides.key?(:font_family) && !overrides.key?(:label_font_family)
+        clear_label_override(overrides, :font_family, :label_font_family)
+        clear_label_override(overrides, :font_size, :label_font_size)
+        clear_label_override(overrides, :font_size_unit, :label_font_size_unit)
         Definition.new(**to_h.merge(overrides))
       end
 
@@ -159,6 +172,8 @@ module Ea
           font_family: font_family, font_size: font_size,
           font_size_unit: font_size_unit,
           label_font_family: @label_font_family,
+          label_font_size: @label_font_size,
+          label_font_size_unit: @label_font_size_unit,
           text_weight_normal: text_weight_normal,
           text_weight_bold: text_weight_bold,
           element_font_size: element_font_size,
@@ -179,6 +194,12 @@ module Ea
           package: package, note: note, fills: fills
         }
       end
+
+      private
+
+      def clear_label_override(overrides, global_key, label_key)
+        overrides[label_key] = nil if overrides.key?(global_key) && !overrides.key?(label_key)
+      end
     end
   end
 end

data/lib/ea/theme/loader.rb

@@ -10,7 +10,7 @@ module Ea
     #   name: EA White Theme
     #   font: { family: Carlito, size: 7, unit: pt, weight_normal: 400, ... }
     #   element_font: { size: 9, unit: pt }
-    #   label_font: { family: Cambria }
+    #   label_font: { family: Cambria, size: 7, unit: pt }
     #   colors: { text: "#000000", attribute_text: "#66413F", ... }
     #   strokes: { element_border: 2, connector_line: 2, ... }
     #   text_metrics: { width_factor: 0.65 }
@@ -56,6 +56,8 @@ module Ea
             name: data["name"],
             font_family: font["family"],
             label_font_family: label_font["family"],
+            label_font_size: label_font["size"],
+            label_font_size_unit: label_font["unit"],
             font_size: font["size"],
             font_size_unit: font["unit"] || "pt",
             text_weight_normal: font["weight_normal"] || 400,

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.96"
+  VERSION = "0.6.97"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.96
+  version: 0.6.97
 platform: ruby
 authors:
 - Ribose Inc.
@@ -501,6 +501,7 @@ files:
 - config/qea_schema.yml
 - config/stereotype_colors.yml
 - config/themes/119.yml
+- config/themes/39.yml
 - config/themes/default.yml
 - docs/ea_to_uml_type_mapping.md
 - docs/xmi_qea_conversion_capabilities.md