archimate 2.0.2 → 2.0.3

data/lib/archimate/svg/path.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+using Archimate::CoreRefinements
+
 module Archimate
   module Svg
     class Path
+      LINE_CURVE_RADIUS = 5
+
       attr_reader :connection
 
       def initialize(connection)
@@ -23,28 +27,42 @@ module Archimate
       # @return Point at the given percent along line between start and end
       def point(fraction)
         length_from_start = length * fraction
-        segments.each do |a, b|
-          seg_length = b - a
-          if seg_length >= length_from_start
-            pct = length_from_start / seg_length
-            return Point.new(
-              a.x + ((b.x - a.x) * pct),
-              a.y + ((b.y - a.y) * pct)
-            )
-          else
-            length_from_start -= seg_length
-          end
+        segments.each do |segment|
+          return segment.from_start(length_from_start) if segment.length >= length_from_start
+          length_from_start -= segment.length
         end
         Point.new(0.0, 0.0)
       end
 
-      # builds the line coordinates for the path
-      # rough drawing is the point at center of first element, point of each bendpoint, and center of end element
-      # First naive implementation
-      # if left/right range of both overlap, use centerpoint of overlap range as x val
-      # if top/bottom range of both overlap, use centerpoint of overlap range as y val
+      # New implementation of SVG d method for a set of points
+      # making smooth curves at each bendpoint
+      #
+      # Given three points: a, b, c
+      # The result should be:
+      # (a is already part of the path -> first point is a move_to command)
+      # line_to(segment(a-b) - curve_radius (from end))
+      # q_curve(b, segment(b-c) - curve_radius (from start))
+      #
+      # For cases with more bendpoints (with values d, e, ...)
+      # repeat the above section with c as the new a value (so then [c, d, e], [d, e, f], etc.)
       def d
-        [move_to(points.first)].concat(points[1..-1].map { |pt| line_to(pt) }).join(" ")
+        [move_to(points.first)]
+          .concat(
+            points
+              .each_cons(3)
+              .flat_map { |a, b, c| curve_segment(a, b, c) }
+          )
+          .concat([line_to(points.last)])
+          .join(" ")
+      end
+
+      def curve_segment(a, b, c)
+        pt1 = Segment.new(a, b).from_end(LINE_CURVE_RADIUS)
+        pt2 = Segment.new(b, c).from_start(LINE_CURVE_RADIUS)
+        [
+          line_to(pt1),
+          q_curve(b, pt2)
+        ]
       end
 
       def points
@@ -52,37 +70,29 @@ module Archimate
       end
 
       def segments
-        (0..points.length - 2).map { |i| [points[i], points[i + 1]] }
+        (0..points.length - 2).map { |i| Segment.new(points[i], points[i + 1]) }
       end
 
       # Returns the lengths of each segment of the line
       def segment_lengths
-        segments.map { |a, b| b - a }
+        segments.map(&:length)
       end
 
       private
 
       def source_bounds
-        @source_bounds ||= connection.source&.absolute_position || DataModel::Bounds.zero
+        @source_bounds ||= connection.source_bounds || DataModel::Bounds.zero
       end
 
       def target_bounds
-        @target_bounds ||= connection.target&.absolute_position || DataModel::Bounds.zero
+        @target_bounds ||= connection.target_bounds || DataModel::Bounds.zero
       end
 
       def normalized_bend_points
-        source_bounds_center = source_bounds.center
-        bp_bounds = connection.bendpoints.map do |bp|
-          DataModel::Bounds.new(
-            x: source_bounds_center.x + (bp.x || 0),
-            y: source_bounds_center.y + (bp.y || 0),
-            width: 0,
-            height: 0
-          )
-        end
-        bp_bounds.reject do |bounds|
-          bounds.inside?(source_bounds) || bounds.inside?(target_bounds)
-        end
+        connection
+          .bendpoints
+          .reject { |bendpoint| [source_bounds, target_bounds].any? { |bounds| bendpoint.inside?(bounds) } }
+          .map { |bendpoint| DataModel::Bounds.from_location(bendpoint) }
       end
 
       def calc_points
@@ -98,17 +108,21 @@ module Archimate
         points.uniq
       end
 
-      # a: Bounds
-      # b: Bounds
+      # Takes the bounds of two objects and returns the optimal points
+      # between from the edge of `a` to the edge of `b`
+      # if left/right range of both overlap, use centerpoint of overlap range as x val
+      # if top/bottom range of both overlap, use centerpoint of overlap range as y val
+      # @param a [Bounds]
+      # @param b [Bounds]
       def bounds_to_points(a, b)
         ax_range = a.x_range
         bx_range = b.x_range
 
-        overlap_x_center = ranges_overlap(ax_range, bx_range)
+        overlap_x_center = ax_range.overlap_midpoint(bx_range)
 
         if overlap_x_center
           ax = bx = overlap_x_center
-        elsif b.is_right_of?(a)
+        elsif b.right_of?(a)
           ax = a.right
           bx = b.left
         else
@@ -119,11 +133,11 @@ module Archimate
         ay_range = a.y_range
         by_range = b.y_range
 
-        overlap_y_center = ranges_overlap(ay_range, by_range)
+        overlap_y_center = ay_range.overlap_midpoint(by_range)
 
         if overlap_y_center
           ay = by = overlap_y_center
-        elsif b.is_above?(a)
+        elsif b.above?(a)
           ay = a.top
           by = b.bottom
         else
@@ -135,18 +149,15 @@ module Archimate
       end
 
       def move_to(point)
-        "M #{point.x} #{point.y}"
+        "M #{point}"
       end
 
       def line_to(point)
-        "L #{point.x} #{point.y}"
+        "L #{point}"
       end
 
-      def ranges_overlap(r1, r2)
-        begin_max = [r1, r2].map(&:begin).max
-        end_min = [r1, r2].map(&:end).min
-        return nil if begin_max > end_min
-        (begin_max + end_min) / 2.0
+      def q_curve(cp, pt)
+        "Q #{cp} #{pt}"
       end
     end
   end

data/lib/archimate/svg/point.rb

@@ -9,6 +9,10 @@ module Archimate
           ((other.y - y)**2)
         )
       end
+
+      def to_s
+        [x, y].map(&:to_s).join(" ")
+      end
     end
   end
 end

data/lib/archimate/svg/segment.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Archimate
+  module Svg
+    Segment = Struct.new(:a, :b) do
+      def length
+        b - a
+      end
+
+      def from_end(dist)
+        length = b - a
+        from_start(length - dist)
+      end
+
+      def from_start(dist)
+        length = b - a
+        return a if dist.negative?
+        return b if length < dist
+        point_at_percent(dist / length)
+      end
+
+      def point_at_percent(pct)
+        Point.new(
+          a.x + ((b.x - a.x) * pct),
+          a.y + ((b.y - a.y) * pct)
+        )
+      end
+    end
+  end
+end

data/lib/archimate/svg/svg_template.svg.erb

@@ -80,8 +80,8 @@
     <symbol id="archimate-collaboration-badge" class="archimate-badge"  viewBox="0 0 20 15" preserveAspectRatio="xMaxYMin meet">
       <path d="m7.5 14 a 6.5 6.5 0 0 1 0 -13 a 6.5 6.5 0 0 1 0 13 m 5 0 a 6.5 6.5 0 0 1 0 -13 a 6.5 6.5 0 0 1 0 13" style="fill:inherit;stroke:inherit"/>
     </symbol>
-    <symbol id="archimate-communication-badge" class="archimate-badge"  viewBox="0 0 20 15">
-      <path d="m7.5 -1 l -6.5 6.5 l 6.5 6.5 m 5 -13 l 6.5 6.5 l -6.5 6.5 m -7 -6.5 h 3 m 3 0 h 3" style="fill:inherit;stroke:inherit"/>
+    <symbol id="archimate-communication-path-badge" class="archimate-badge"  viewBox="0 0 20 15">
+      <path d="m7.5 -1 l -6.5 6.5 l 6.5 6.5 m 5 -13 l 6.5 6.5 l -6.5 6.5 m -7 -6.5 h 2 m 1.5 0 h 2 m 1.5 0 h 2" style="fill:inherit;stroke:inherit"/>
     </symbol>
     <symbol id="archimate-constraint-badge" class="archimate-badge"  viewBox="0 0 20 15">
       <path d="m6 -1 h 13 l -5 10 h -13 z m 4 0 l -5 10" style="fill:inherit;stroke:inherit"/>
@@ -93,6 +93,9 @@
     <symbol id="archimate-driver-badge" class="archimate-badge"  viewBox="0 0 20 15">
       <path d="m17.5 6.5 a 6.5 6.5 0 0 0 -13 0 a 6.5 6.5 0 0 0 13 0 m 2 0 h -17 m 8.5 -8.5 v 17 m -6.01 -2.49 l 12.02 -12.02 m 0 12.02 l -12.02 -12.02" style="fill:inherit;stroke:inherit"/>
     </symbol>
+    <symbol id="archimate-event-badge" class="archimate-badge"  viewBox="0 0 20 20">
+      <path d="m1 1 a 8 6.5 0 0 1 0 12 h 12 a 6 5.5 0 0 0 0 -12 z" style="fill:inherit;stroke:inherit"/>
+    </symbol>
     <symbol id="archimate-function-badge" class="archimate-badge"  viewBox="0 0 20 20" preserveAspectRatio="xMaxYMin meet">
       <path d="m7 15 l 0 -9 l 6 -5 l 6 5 l 0 9 l -6 -6 z" style="fill:none;stroke:inherit"/>
     </symbol>
@@ -117,6 +120,11 @@
     <symbol id="archimate-network-badge" class="archimate-badge"  viewBox="0 0 20 15">
       <path d="m9 9.5 a 2.5 2.5 0 0 0 -5 0 a 2.5 2.5 0 0 0 5 0 m -2 -2.5 l 1 -3 m 0.5 0 a 2.5 2.5 0 0 0 0 -5 a 2.5 2.5 0 0 0 0 5 m 2 -2.5 h 3.5 a 2.5 2.5 0 0 0 5 0 a 2.5 2.5 0 0 0 -5 0 m 2 2.5 l -1 3 m -0.5 0 a 2.5 2.5 0 0 0 0 5 a 2.5 2.5 0 0 0 0 -5 m -2 2.5 h -3.5" style="fill:inherit;stroke:inherit"/>
     </symbol>
+    <symbol id="archimate-app-component-badge" class="archimate-badge" viewBox="0 0 20 20">
+      <path d="m6 4 v -3 h 12 v 17 h -12 v -3 m 0 -4 v -3" style="fill:inherit;stroke:inherit;"/>
+      <rect x="1" y="4" width="9" height="4" style="fill:inherit;stroke:inherit;"/>
+      <rect x="1" y="11" width="9" height="4" style="fill:inherit;stroke:inherit;"/>
+    </symbol>
     <symbol id="archimate-node-badge" class="archimate-badge" viewBox="0 0 20 20">
       <path d="M1 19 v -15 l 3 -3 h 15 v 15 l -3 3 z M 16 19 v -15 l 3 -3 m -3 3 h -15" style="fill:none;stroke:inherit;stroke-linejoin:miter;"/>
     </symbol>
@@ -143,7 +151,7 @@
     </symbol>
 
     <!-- Line Markers -->
-    <marker id="archimate-dot-marker" viewBox="0 0 10 10" refX="0" refY="4" markerUnits="strokeWidth" markerWidth="10" markerHeight="10">
+    <marker id="archimate-dot-marker" viewBox="0 0 10 10" refX="4" refY="4" markerUnits="strokeWidth" markerWidth="10" markerHeight="10">
       <circle cx="4" cy="4" r="3" fill="black" stroke="black" />
     </marker>
     <marker id="archimate-used-by-arrow" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="8" orient="auto">

data/lib/archimate/svg/view_node.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Archimate
+  module Svg
+    class ViewNode
+      attr_reader :view_node
+
+      def initialize(view_node)
+        @view_node = view_node
+      end
+
+      # The info needed to render is contained in the view node with the exception of
+      # any offset needed. So this will need to be included in the recursive drawing of children
+      def render_elements(svg)
+        Nokogiri::XML::Builder.with(svg) do |xml|
+          EntityFactory.make_entity(view_node, nil).to_svg(xml)
+        end
+        svg
+      end
+    end
+  end
+end

data/lib/archimate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Archimate
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/archimate.rb

@@ -35,7 +35,6 @@ module Archimate
   end
 
   module FileFormats
-    autoload :ArchiFileFormat, 'archimate/file_formats/archi_file_format'
     autoload :ArchiFileReader, 'archimate/file_formats/archi_file_reader'
     autoload :ArchiFileWriter, 'archimate/file_formats/archi_file_writer'
     autoload :ModelExchangeFileReader, 'archimate/file_formats/model_exchange_file_reader'
@@ -51,7 +50,6 @@ module Archimate
   end
 
   module Svg
-    autoload :Child, 'archimate/svg/child'
     autoload :CssStyle, 'archimate/svg/css_style'
     autoload :Connection, 'archimate/svg/connection'
     autoload :Diagram, 'archimate/svg/diagram'
@@ -60,7 +58,9 @@ module Archimate
     autoload :Extents, 'archimate/svg/extents'
     autoload :Path, 'archimate/svg/path'
     autoload :Point, 'archimate/svg/point'
+    autoload :Segment, 'archimate/svg/segment'
     autoload :SvgTemplate, 'archimate/svg/svg_template'
+    autoload :ViewNode, 'archimate/svg/view_node'
   end
 
   autoload :FileFormat, 'archimate/file_format'
@@ -69,6 +69,7 @@ module Archimate
   autoload :DerivedRelations, 'archimate/derived_relations'
 
   require "archimate/version"
+  require "archimate/core_refinements"
   require "archimate/config"
   require "archimate/logging"
   require "archimate/color"