fusuma 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3978122d47e2294dd5d8391e76a0507c1e21b8de
-  data.tar.gz: aa5df2c6707a715577a43e43e4a5ea7e9482a084
+  metadata.gz: 85a522e75bfcc182572f9c38a4d073c67f963319
+  data.tar.gz: 6679c88a779acbf8c7183d42609326eb988f9cdb
 SHA512:
-  metadata.gz: 124a58da4e05ae6f4cf9881a0678942eb639728e326651106a4bc6938b1397a7db36bb50efa7fbca8d99e92fe513449291ba03ee5fa906b4e0b87df06e6134ad
-  data.tar.gz: 44cec21490f90665063ebbd3c7567dd595ade069efc583076ffb8842b42bcd9304b55c544f072c4a3be75a1ab6398179eb6bae247574e867d215d02743d2160c
+  metadata.gz: 412eec95e91666f2839d9157d0d4a5dd1073b34b4b514e35c71ac0c69301bef3e52185d3020721543d46f701a5e4c0d71241cae0efc73dd56f66290707c2d83d
+  data.tar.gz: 018d4103d87ffd686e586fdb8c806cdc96ddfd93046df3663c35f3eb5e4043c06053e83b299732c753e4a3582e1a5e617625bc9706b2b6f91119e9cc85b15b2c

data/lib/fusuma/action_stack.rb

@@ -14,8 +14,6 @@ module Fusuma
       @last_triggered_time = last.time
       finger = detect_finger
       clear
-      MultiLogger.debug(finger: finger, direction: direction,
-                        action_type: action_type)
       GestureInfo.new(finger, direction, action_type)
     end
 
@@ -30,7 +28,7 @@ module Fusuma
     GestureInfo = Struct.new(:finger, :direction, :action_type)
 
     def elapsed_time
-      return 0 if length == 0
+      return 0 if length.zero?
       last.time - first.time
     end
 
@@ -44,39 +42,32 @@ module Fusuma
     end
 
     def detect_move
-      moves = sum_moves
-      return nil if moves[:x].zero? && moves[:y].zero?
-      # MultiLogger.debug(moves: moves)
-      return nil if (moves[:x].abs < 200) && (moves[:y].abs < 200)
-      if moves[:x].abs > moves[:y].abs
-        return moves[:x] > 0 ? 'right' : 'left'
-      else
-        moves[:y] > 0 ? 'down' : 'up'
-      end
+      move = avg_moves
+      MultiLogger.debug(move: move)
+      return unless enough_distance?(move)
+      return move[:x] > 0 ? 'right' : 'left' if move[:x].abs > move[:y].abs
+      move[:y] > 0 ? 'down' : 'up'
     end
 
     def detect_zoom
-      diameter = mul_diameter
+      diameter = avg_attrs(:zoom)
+      MultiLogger.debug(diameter: diameter)
       # TODO: change threshold from config files
-      if diameter > 10
-        'in'
-      elsif diameter < 0.1
-        'out'
-      end
+      return unless enough_diameter?(diameter)
+      return 'in' if diameter > 1
+      'out'
     end
 
     def detect_finger
       last.finger
     end
 
-    def sum_moves
-      move_x = sum_attrs(:move_x)
-      move_y = sum_attrs(:move_y)
-      { x: move_x, y: move_y }
-    end
+    Distance = Struct.new(:x, :y)
 
-    def mul_diameter
-      mul_attrs(:zoom)
+    def avg_moves
+      move_x = sum_attrs(:move_x) / length
+      move_y = sum_attrs(:move_y) / length
+      Distance.new(move_x, move_y)
     end
 
     def sum_attrs(attr)
@@ -85,12 +76,8 @@ module Fusuma
       end.compact.inject(:+)
     end
 
-    def mul_attrs(attr)
-      send('map') do |gesture_action|
-        num = gesture_action.send(attr.to_sym.to_s)
-        # NOTE: ignore 0.0, treat as 1(immutable)
-        num.zero? ? 1 : num
-      end.compact.inject(:*)
+    def avg_attrs(attr)
+      sum_attrs(attr) / length
     end
 
     def action_end?
@@ -102,6 +89,19 @@ module Fusuma
       last.action
     end
 
+    def enough_distance?(move)
+      (move[:x].abs > 20) || (move[:y].abs > 20)
+    end
+
+    def enough_diameter?(avg_diameter)
+      delta_diameter = if avg_diameter > 1
+                         avg_diameter - first.zoom
+                       else
+                         first.zoom - avg_diameter
+                       end
+      delta_diameter > 0.3
+    end
+
     def enough_actions?
       (length > 1) && (elapsed_time > 0.1)
     end

data/lib/fusuma/gesture_action.rb

@@ -41,7 +41,7 @@ module Fusuma
 
       def parse_finger_directions(finger_directions_line)
         finger_num, move_x, move_y, _, _, _, zoom =
-          finger_directions_line.tr('/', ' ').split
+          finger_directions_line.tr('/|(|)', ' ').split
         [finger_num, move_x, move_y, zoom]
       end
     end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler