ea 0.6.138 → 0.6.140

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

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+module Ea
+  module Svg
+    module EaEmitter
+      # Segment arithmetic for connector bridges: where two segments cross at
+      # any slope, and where the arc chord sits on the carrier segment.
+      module SegmentGeometry
+        EPSILON = 1e-9
+
+        module_function
+
+        def distance(point, other)
+          Math.hypot(point[0] - other[0], point[1] - other[1])
+        end
+
+        # 0 for a horizontal segment, 1 for a vertical one, nil otherwise.
+        def axis_for(first, last)
+          return 0 if first[1] == last[1] && first[0] != last[0]
+          return 1 if first[0] == last[0] && first[1] != last[1]
+
+          nil
+        end
+
+        # A proper crossing of two segments; parallel and collinear segments
+        # never cross. Each span must leave `radius` of room either side.
+        def crossing(first, last, start, finish, radius)
+          point = axis_crossing(first, last, start, finish) ||
+                  slanted_crossing(first, last, start, finish)
+          return unless point && room?(point, first, last, radius) && room?(point, start, finish, radius)
+          return unless chord_fits?(first, last, point, radius)
+
+          point
+        end
+
+        # The arc chord, one radius either side of the crossing along the
+        # carrier's dominant axis. A horizontal/vertical carrier keeps the
+        # exact crossing. On a slanted carrier EA seats the centre on the
+        # integer grid at floor(crossing) and offsets it by the half-chord
+        # (radius, truncated radius * slope), signed with the line direction.
+        def chord(first, last, crossing, radius)
+          major = dominant_axis(first, last)
+          step = last[major] > first[major] ? radius : -radius
+          return axis_chord(first, crossing, major, step) if first[1 - major] == last[1 - major]
+
+          slanted_chord(first, last, crossing, major, step)
+        end
+
+        def slanted_chord(first, last, crossing, major, step)
+          centre = crossing.map { |value| (value + EPSILON).floor }
+          half = half_chord(first, last, major, step)
+          [-1, 1].map { |sign| centre.zip(half).map { |c, h| c + sign * h } }
+        end
+
+        def half_chord(first, last, major, step)
+          minor = 1 - major
+          slope = (last[minor] - first[minor]).fdiv(last[major] - first[major])
+          major.zero? ? [step, (step * slope).truncate] : [(step * slope).truncate, step]
+        end
+
+        def axis_chord(first, crossing, major, step)
+          start = crossing.dup
+          finish = crossing.dup
+          start[1 - major] = finish[1 - major] = first[1 - major]
+          start[major] -= step
+          finish[major] += step
+          [start, finish]
+        end
+
+        # Integer seating must not extend the decorated carrier past an end.
+        def chord_fits?(first, last, point, radius)
+          chord(first, last, point, radius).all? do |seat|
+            [0, 1].all? { |axis| within?(seat[axis], first[axis], last[axis]) }
+          end
+        end
+
+        def dominant_axis(first, last)
+          (last[0] - first[0]).abs >= (last[1] - first[1]).abs ? 0 : 1
+        end
+
+        def axis_crossing(first, last, start, finish)
+          axis = axis_for(first, last)
+          return unless axis && axis_for(start, finish) == 1 - axis
+
+          axis.zero? ? [start[0], first[1]] : [first[0], start[1]]
+        end
+
+        def slanted_crossing(first, last, start, finish)
+          return if axis_for(first, last) && axis_for(start, finish)
+
+          direction = delta(first, last)
+          other = delta(start, finish)
+          denominator = cross(direction, other)
+          return if denominator.zero?
+
+          advance(first, direction, cross(delta(first, start), other).fdiv(denominator))
+        end
+
+        def advance(origin, direction, fraction)
+          [origin[0] + fraction * direction[0], origin[1] + fraction * direction[1]]
+        end
+
+        def delta(from, to)
+          [to[0] - from[0], to[1] - from[1]]
+        end
+
+        def cross(one, other)
+          one[0] * other[1] - one[1] * other[0]
+        end
+
+        def room?(point, first, last, radius)
+          distance(point, first) >= radius && distance(point, last) >= radius &&
+            [0, 1].all? { |axis| within?(point[axis], first[axis], last[axis]) }
+        end
+
+        def within?(value, from, to)
+          minimum, maximum = [from, to].minmax
+          value >= minimum - EPSILON && value <= maximum + EPSILON
+        end
+      end
+    end
+  end
+end

data/lib/ea/svg/ea_emitter.rb

@@ -26,13 +26,19 @@ module Ea
     #
     module EaEmitter
       autoload :Canvas, "ea/svg/ea_emitter/canvas"
+      autoload :CanvasAnchor, "ea/svg/ea_emitter/canvas_anchor"
+      autoload :BottomMargin, "ea/svg/ea_emitter/bottom_margin"
+      autoload :ContentExtent, "ea/svg/ea_emitter/content_extent"
       autoload :Background, "ea/svg/ea_emitter/background"
       autoload :BoundsCalculator, "ea/svg/ea_emitter/bounds_calculator"
       autoload :Style, "ea/svg/ea_emitter/style"
       autoload :Elements, "ea/svg/ea_emitter/elements"
+      autoload :PaintOrder, "ea/svg/ea_emitter/paint_order"
       autoload :Connectors, "ea/svg/ea_emitter/connectors"
       autoload :ConnectorBridges, "ea/svg/ea_emitter/connector_bridges"
       private_constant :ConnectorBridges
+      autoload :SegmentGeometry, "ea/svg/ea_emitter/segment_geometry"
+      private_constant :SegmentGeometry
       autoload :Markers, "ea/svg/ea_emitter/markers"
       autoload :Labels, "ea/svg/ea_emitter/labels"
       autoload :GhostLabels, "ea/svg/ea_emitter/ghost_labels"

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.138"
+  VERSION = "0.6.140"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.138
+  version: 0.6.140
 platform: ruby
 authors:
 - Ribose Inc.
@@ -854,6 +854,7 @@ files:
 - lib/ea/sources/xmi/diagram_builder.rb
 - lib/ea/sources/xmi/diagram_builder/association_class_metadata.rb
 - lib/ea/sources/xmi/diagram_builder/connector_metadata.rb
+- lib/ea/sources/xmi/diagram_builder/element_borders.rb
 - lib/ea/sources/xmi/diagram_builder/font_settings.rb
 - lib/ea/sources/xmi/diagram_builder/stereotype_profiles.rb
 - lib/ea/sources/xmi/diagram_builder/umldi_edges.rb
@@ -875,6 +876,7 @@ files:
 - lib/ea/sources/xmi/relationship_type_map.rb
 - lib/ea/sources/xmi/stereotype_builder.rb
 - lib/ea/sources/xmi/stored_route.rb
+- lib/ea/sources/xmi/stored_route/reversed_routes.rb
 - lib/ea/sources/xmi/tag_builder.rb
 - lib/ea/sources/xmi/type_classifier_map.rb
 - lib/ea/sources/xmi/umldi_keyword_extractor.rb
@@ -898,8 +900,10 @@ files:
 - lib/ea/svg/connector_router.rb
 - lib/ea/svg/ea_emitter.rb
 - lib/ea/svg/ea_emitter/background.rb
+- lib/ea/svg/ea_emitter/bottom_margin.rb
 - lib/ea/svg/ea_emitter/bounds_calculator.rb
 - lib/ea/svg/ea_emitter/canvas.rb
+- lib/ea/svg/ea_emitter/canvas_anchor.rb
 - lib/ea/svg/ea_emitter/color_resolver.rb
 - lib/ea/svg/ea_emitter/compartment.rb
 - lib/ea/svg/ea_emitter/compartment/attributes.rb
@@ -922,6 +926,7 @@ files:
 - lib/ea/svg/ea_emitter/connector_bridges.rb
 - lib/ea/svg/ea_emitter/connector_redock.rb
 - lib/ea/svg/ea_emitter/connectors.rb
+- lib/ea/svg/ea_emitter/content_extent.rb
 - lib/ea/svg/ea_emitter/diagram_frame.rb
 - lib/ea/svg/ea_emitter/document.rb
 - lib/ea/svg/ea_emitter/element.rb
@@ -976,7 +981,9 @@ files:
 - lib/ea/svg/ea_emitter/marker/registry.rb
 - lib/ea/svg/ea_emitter/markers.rb
 - lib/ea/svg/ea_emitter/orthogonal_ray.rb
+- lib/ea/svg/ea_emitter/paint_order.rb
 - lib/ea/svg/ea_emitter/render_context.rb
+- lib/ea/svg/ea_emitter/segment_geometry.rb
 - lib/ea/svg/ea_emitter/style.rb
 - lib/ea/svg/ea_emitter/text_renderer.rb
 - lib/ea/svg/ea_emitter/visibility_symbol.rb