ea 0.6.52 → 0.6.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 592e737c7721bcd03e989dc13572a79c4e8aa53aa654daad717398edb66377ef
-  data.tar.gz: 351a11a714b03d40859c3ad86000eb22efc9edde45d3bb376961fd0f1cbad44d
+  metadata.gz: 4b54f39e2dcdb482e55baad21977878ea11d4325ce84130b5a1be52d94461199
+  data.tar.gz: e06fe1f966c7b82cd9a4ee5e0cef8482f5bb83050a74354d10e674b80e6b1317
 SHA512:
-  metadata.gz: e6cdf30f3261579e60f8d72a48b50adf011d4a2afc6398de8edff40ee2eeb701c4a2f605262714fadd19d6e28d2144df3fb7fa51bb04ce4b9306b04beda16df1
-  data.tar.gz: 0d0cb7de7ad76775de6751904ea3de403d8d645ad3c7acfee0d4394237d0d330846927ba8d720cf7dd5293c44c9c46c3c8c9bd604119962c45dc98ffc34423bb
+  metadata.gz: a8c21021bb901b607f7e823bcd5caef4e10343177db98983f450a517c71d3ec929566c9ddc93dde15985bcc2fee88ffe469c164687589325d085bea94abf200d
+  data.tar.gz: 538ea960c3033cb4b16fdedccdcc9a27be793e1d6615ad836cd340aec103bca7c86937720e74d925a1f06653939015a8a303ada6a7056a0e7209308fde308fb1

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)

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

@@ -33,6 +33,7 @@ module Ea
             multiplicity_upper_raw: raw_upper(row),
             multiplicity_upper: parse_upper(row),
             default_value: row.default,
+            is_derived: boolean(row.derived),
             is_ordered: boolean(row.isordered),
             is_unique: !boolean(row.allowduplicates),
             visibility: visibility_from_scope(row.scope),

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

@@ -64,6 +64,10 @@ module Ea
           def namespaced_name
             prefix = inherited_namespace_prefix
             base = property.name.to_s
+            # EA flags derived attributes with a '/' on the NAME (the
+            # visibility slot still shows '+'): 096AF2FD/GM_GriddedSurface
+            # renders "+ /columns: Integer" / "+ /rows: Integer".
+            base = "/#{base}" if property.is_derived
             prefix && !prefix.empty? ? "#{prefix}::#{base}" : base
           end
 

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

@@ -129,8 +129,11 @@ module Ea
                                                                 foreign_package_name: foreign_package_name_for(classifier),
                                                                 suppress_stereotypes: suppress_stereotypes?) : []
           is_classifier = classifier.is_a?(Ea::Model::Classifier)
+          # Interfaces DO render attribute compartments when they own
+          # attribute rows (936AA434/Surface lists its nine 19107
+          # attributes); the earlier corpus evidence for
+          # header-only interfaces was zero-attribute leaf types.
           attr_lines = if is_classifier && show_attributes? &&
-                          !classifier.is_a?(Ea::Model::Interface) &&
                           attributes_visible?(element)
                          Element::AttributeRenderer.lines_for(
                            classifier, lookup: attribute_lookup,

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.52"
+  VERSION = "0.6.54"
 end

metadata

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