cpee-frames 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d33782c18a633f94faa8add964f95d0f44912516775c14538e6d12bdbc486505
-  data.tar.gz: fc7719677b5caa0f0a74b9536102c5d65ee2482e62201d1f64c0191a249b71f3
+  metadata.gz: f6e3e17dafdfc33eea6a1985ef1195ae366e481783eee9a0521f2e24b376ab89
+  data.tar.gz: b1027c8c1e6ddea9122c87ccef384c1e628f8db1fa6369f61e819d235446cb96
 SHA512:
-  metadata.gz: 4dda8dac7b5c65ff3d4a87681e843cfae72be0cbb5ae103727bdfa374a12dd6742fb1966ce4e70d457c16c4732e51abed31c7499a59c8adb778bcc92b556a410
-  data.tar.gz: 5d75b601db50a612e2b31d4200c7cefd4647c3eb0f864772b6585d94b5f71e7d122d320b0d0a7c709b31cc6bc77f4617aea17337108c47953a88ea6977e29375
+  metadata.gz: 182e44f12d97f59918eaea3a2590614c7758f920f2a4ce06ed848623348941fd60bfc493add7228f4f228d32867fb42bf66984d0505a68f95d4c294b49e7c17b
+  data.tar.gz: 190580b76dfc5a2100ad0cd1fbee4056f7db53ce9fa9cc7845574b3d87c8ee7923470c8b7da53e0047590696bc563790c3c1f4caaa880227fb5d8d4ff9894d86

data/cpee-frames.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-frames"
-  s.version          = "1.0.2"
+  s.version          = "1.0.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "GPL-3.0"
   s.summary          = "Dashboard management service with UI and backend for the cpee.org family of workflow management tools"

data/lib/cpee-frames/implementation.rb

@@ -29,6 +29,17 @@ module CPEE
 
     SERVER = File.expand_path(File.join(__dir__,'frames.xml'))
 
+    def self::overlap?(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
+      if l1x > r2x || l2x > r1x
+          return false
+      end
+      if l1y > r2y || l2y > r1y
+          return false
+      end
+      return true
+    end
+
+
     # https://coderwall.com/p/atyfyq/ruby-string-to-boolean
     # showbutton
     refine String do #{{{
@@ -100,7 +111,7 @@ module CPEE
 
         #check if new frame overlaps others if it does, delete overlapped frames
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
             data_hash["data"].delete(c)
           end
         end
@@ -146,7 +157,7 @@ module CPEE
 
         #check if new frame overlaps others if it does, delete overlapped frames
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
             data_hash["data"].delete(c)
           end
         end
@@ -199,7 +210,7 @@ module CPEE
         data_hash = JSON::parse(file)
 
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[0].value.to_i, @p[1].value.to_i, (@p[0].value.to_i + 1), (@p[1].value.to_i + 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[0].value.to_i, @p[1].value.to_i, (@p[0].value.to_i + 1), (@p[1].value.to_i + 1))
             data_hash["data"].delete(c)
           end
         end
@@ -208,16 +219,6 @@ module CPEE
       end
     end
 
-    def doOverlap(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
-      if l1x > r2x || l2x > r1x
-          return false;
-      end
-      if l1y > r2y || l2y > r1y
-          return false;
-      end
-      return true;
-    end
-
     class Delete < Riddl::Implementation
       def response
         data_dir = @a[1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-frames
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Manuell Gall