ea 0.6.114 → 0.6.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 251161fffac3b07a12851b0abd26a046998a61b19a9418da8c6d6ceea1cbb09f
-  data.tar.gz: 549486eec86fb19c6275db6ab7dafdcb7987c1a22b12df2740140e60c7bb2690
+  metadata.gz: c4e23583eed4c1a582614c26b2c77ada31ab41af83b00b474fcdc199d807b599
+  data.tar.gz: 7c02275d511da08c73e261f53815f8d55092420a7bff501151c5b713162068d6
 SHA512:
-  metadata.gz: c5cccbc615740b54619be7e36e4c6edb6382768d97b8a120841aca69018b73e693d9dadb8480e78c9e1e0a18ccfc09122668caf9680571496d99b44372c593cd
-  data.tar.gz: 87a9b79c59a7102d10aaf4968c052f5a63c1e707ef4daf2376d1278ca79b1317e2fc7d47988d57cb09c5abe88d57aeb12b611ba7066e421a1820ce07ac7ff581
+  metadata.gz: 378bb61902c1103887fcc9807e675fd2ebfc2dfe50c7b5266c20f2570b02a42ed0c8b120fc81ca626a6b4d9a421f45d2fd151c21b189714282a50f668ce07b79
+  data.tar.gz: 3e4edfe09c4c9235c39e47b6cd202f64bed7904d2b99567cabbff418ecbb7298a1e38b7a0c805fe2e12d760b7e2c11274cf67ee36811925dad804c9c24e61670

data/config/themes/119.yml

@@ -34,7 +34,7 @@ colors:
 
 # Stroke widths.
 strokes:
-  element_border: 2
+  element_border: 1
   connector_line: 2
   divider: 2
   marker: 2

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

@@ -144,10 +144,23 @@ module Ea
             font_italic: truthy?(style_hash[:italic]),
             font_underline: truthy?(style_hash[:ul]),
             show_tagged_values: truthy?(style_hash[:tag]),
+            line_width: effective_line_width(obj_row, style_hash),
             background_color: style_hash[:bcol]&.to_i
           )
         end
 
+        # Negative widths inherit the saved object border, then the diagram theme.
+        def effective_line_width(obj_row, style)
+          object = database.find_object(obj_row.ea_object_id)
+          [style[:lwth], object&.borderwidth].each do |raw|
+            next if raw.nil? || raw.to_s.empty?
+
+            width = raw.to_i
+            return width if width >= 0
+          end
+          nil
+        end
+
         def truthy?(raw)
           raw == "1" || raw == "-1"
         end

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

@@ -215,7 +215,7 @@ module Ea
         private_class_method :overlap_ray?
 
         # The QEA builder flags a model relationship drawn without any
-        # diagram link row; EA strokes it at the 2px box outline.
+        # diagram link row; its docks follow the resolved element borders.
         def default_model_connector?(connector)
           connector.style.to_h[:phantom_outline] == true && !connector.has_geometry_offsets &&
             %w[Aggregation Association].include?(connector.connector_type)
@@ -243,16 +243,32 @@ module Ea
         end
         private_class_method :border_width?
 
-        # Explicit zero-width borders keep that end on the geometric edge;
-        # absent or inherited widths retain the default outer-stroke docking.
+        # EA seats docks on whole pixels; a 1px border keeps the geometric edge.
         def outline_bounds(box, diagram, ref, duid)
-          return box if border_width?(diagram, ref, duid, 0)
-
-          Ea::Model::Bounds.new(x: box.x - 1, y: box.y - 1,
-                                width: box.width + 2, height: box.height + 2)
+          inset = (outline_width(diagram, ref, duid) / 2.0).floor
+          Ea::Model::Bounds.new(x: box.x - inset, y: box.y - inset,
+                                width: box.width + 2 * inset, height: box.height + 2 * inset)
         end
         private_class_method :outline_bounds
 
+        def outline_width(diagram, ref, duid)
+          widths = end_placements(diagram, ref, duid).map do |element|
+            effective_border_width(element, diagram)
+          end.uniq
+          widths.size == 1 ? widths.first : diagram.theme.stroke_width
+        end
+        private_class_method :outline_width
+
+        def effective_border_width(element, diagram)
+          return element.line_width if element.line_width && element.line_width >= 0
+
+          raw = element.style.to_h[:lwth]
+          return raw.to_i if raw && raw.to_i >= 0
+
+          diagram.theme.stroke_width
+        end
+        private_class_method :effective_border_width
+
         def end_placements(diagram, ref, duid)
           placed = Array(diagram&.elements).select { |el| el.model_element_ref == ref }
           named = placed.select { |el| duid && el.duid.to_s.casecmp?(duid.to_s) }

data/lib/ea/svg/ea_emitter/element/legend_renderer.rb

@@ -169,7 +169,11 @@ module Ea
           end
 
           def title_font_size
-            legend.heading_size || Ea::Model::Legend::DEFAULT_HEADING_SIZE
+            return Ea::Model::Legend::DEFAULT_HEADING_SIZE unless legend.heading_size
+
+            # HEADINGSIZE is stored in pixels; SVG legend text uses points.
+            points = legend.heading_size * 72.0 / 96
+            points == points.to_i ? points.to_i : points
           end
 
           def item_font_size

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

@@ -273,7 +273,7 @@ module Ea
             classifier: classifier,
             fill: resolve_fill(element, classifier),
             stroke: resolve_stroke,
-            stroke_width: resolve_stroke_width,
+            stroke_width: resolve_stroke_width(element),
             text_fill: theme.text_color,
             family: family, size: size, size_unit: size_unit, logical_height: logical_height,
             header_lines: header_lines,
@@ -670,7 +670,9 @@ module Ea
           color_resolver.stroke_for(nil)
         end
 
-        def resolve_stroke_width
+        def resolve_stroke_width(element)
+          return element.line_width if element.line_width && element.line_width >= 0
+
           theme.themed? ? theme.stroke_width : DEFAULT_STROKE_WIDTH
         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.114"
+  VERSION = "0.6.115"
 end

metadata

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