scratchpad-app 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2884ac594e63c4fd66c60441cb52c595695647cf
-  data.tar.gz: 51c7ea9f35da8ae5bc63c889fdb774164700220e
+  metadata.gz: 8cd78a3303c728a889426ab83b482fdd916e9d45
+  data.tar.gz: 8cda57dffa9ac5231ad91e5b544e39342439422e
 SHA512:
-  metadata.gz: abada001f419834283f7cff672a162661333f5874717536ea9a74efdc9aad09ec49874e0d459da25603739658452367bbf0e60a80faddce8b95ac61a10b0d420
-  data.tar.gz: 3ad90cab79e78509edfb3d7cf61ab76d88a40aefda89b0f869ae9d4e8f23c69d2f3776c23ae7374408d6ddec27ecd39fb0e8dac1ea70a097e5a6137eeec319b3
+  metadata.gz: d4f1081f5fa861c46dffb23cba4e78af918b90082ad861365af2cdf1cac15c2414760d71e54686c5afe4949256350fa4c65a2a0160b051138878af2d7d98a972
+  data.tar.gz: a028e60e3382d2eb7c16e7c9ce8a47183bbcea880ad7acff0d858492852eaf554c4befaaf82596ef390947bac0e3fae4ad9cd31934b49d632839cd69e697a583

data/README.md

@@ -9,7 +9,7 @@
 
 ## 使い方
 
-左マウスボタンで線が書けて、右クリックで全消去します。
+左マウスボタンで線が書けて、右クリックでメニューが出ます。
 
 画像の保存機能や消しゴム機能はありません。
 

data/lib/scratchpad.rb

@@ -4,6 +4,24 @@ require "scratchpad/version"
 require 'toml'
 require 'gtk2'
 
+class Array
+  def x
+    self[0]
+  end
+
+  def x=(val)
+    self[0]=val
+  end
+
+  def y
+    self[1]
+  end
+
+  def y=(val)
+    self[1]=val
+  end
+end
+
 module Scratchpad
 
 # 便利関数
@@ -35,6 +53,26 @@ def color_bytes_to_floats(bytes)
   return bytes.map { |b| b / 255.0 }
 end
 
+def plus(v1, v2)
+  [v1.x + v2.x, v1.y + v2.y]
+end
+
+def vector(p1, p2)
+  [p2.x - p1.x, p2.y - p1.y]
+end
+
+def dot_product(v1, v2)
+  return v1.x * v2.x + v1.y * v2.y
+end
+
+def scalar_times(factor, v)
+  v.map { |x| factor * x }
+end
+
+def vec_lerp(alpha, v1, v2)
+  return plus(scalar_times(alpha, v1), scalar_times(1.0-alpha, v2))
+end
+
 # /便利関数
 
 class Pen
@@ -42,14 +80,17 @@ class Pen
   extend Scratchpad
 
   attr_reader :x, :y
+  attr_accessor :color
 
-  FAVORITE_ORANGE = color_bytes_to_floats [255, 109, 50]
-  FAVORITE_BLUE = color_bytes_to_floats [0, 3, 126]
+  BLUE   = color_bytes_to_floats [0, 3, 126]
+  ORANGE = color_bytes_to_floats [255, 109, 50]
+  GREEN  = color_bytes_to_floats [0, 124, 126]
 
   def initialize
     @is_down = false
     @interpolator = Interpolator.new
     @path = []
+    @color = BLUE
   end
 
   # [[x, y, radius]*]
@@ -82,10 +123,6 @@ class Pen
   def radius
     2.0
   end
-
-  def color
-    FAVORITE_BLUE
-  end
 end
 
 class SheetModel < GLib::Object
@@ -95,12 +132,14 @@ class SheetModel < GLib::Object
   include Math
   include Cairo
 
-  attr_reader :surface, :pen, :debug_surface
+  attr_reader :surface, :pen, :debug_surface, :outline_surface
 
-  def initialize
+  def initialize(width, height)
     super()
-    @surface = ImageSurface.new(Cairo::FORMAT_ARGB32, 1200, 900)
-    @debug_surface = ImageSurface.new(Cairo::FORMAT_ARGB32, 1200, 900)
+    @surface         = ImageSurface.new(Cairo::FORMAT_ARGB32, width, height)
+    @debug_surface   = ImageSurface.new(Cairo::FORMAT_ARGB32, width, height)
+    @outline_surface = ImageSurface.new(Cairo::FORMAT_ARGB32, width, height)
+
     cr = Context.new(@surface)
     cr.set_operator(Cairo::OPERATOR_OVER)
     cr.line_cap = cr.line_join = :round
@@ -116,17 +155,14 @@ class SheetModel < GLib::Object
   end
 
   def clear
-    cr.save do
-      cr.set_operator(Cairo::OPERATOR_SOURCE)
-      cr.set_source_rgba(0, 0, 0, 0)
-      cr.paint
-    end
-    clear_debug
+    clear_surface(@surface)
+    clear_surface(@outline_surface)
+    clear_surface(@debug_surface)
     signal_emit('changed')
   end
 
-  def clear_debug
-    c = Context.new(@debug_surface)
+  def clear_surface(surface)
+    c = Context.new(surface)
     c.save do
       c.set_operator(Cairo::OPERATOR_SOURCE)
       c.set_source_rgba(0, 0, 0, 0)
@@ -155,55 +191,61 @@ class SheetModel < GLib::Object
       case @portion 
       when :all
         path = @pen.path
+
+        stroke_outline(path)
+
         cr.set_source_rgba(@pen.color)
         cr.line_width = @pen.radius
-        path.each.with_index do |(x, y, radius), i|
-          if i == 0
-	    cr.move_to(x, y)
-	  else
-            cr.line_to(x, y)
-	  end
-        end
-        cr.stroke
+        stroke_path(cr, path)
       when :latter_half
         path = @pen.path[5..10] || []
+
+        stroke_outline(path)
+
         cr.set_source_rgba(@pen.color)
         cr.line_width = @pen.radius
-        path.each.with_index do |(x, y, radius), i|
-	  if i == 0
-	    cr.move_to(x, y)
-	  else
-            # cr.arc(x, y, (i/4.0)*@pen.radius, 0, 2*PI)
-            cr.line_to(x, y)
-	  end
-        end
-        cr.stroke
+        stroke_path(cr, path)
       end
       @portion = :all
+      signal_emit('changed')
     else
       if @portion == :first_half
         path = @pen.path[0..4] || []
+
+        stroke_outline(path)
+
         cr.set_source_rgba(@pen.color)
         cr.line_width = @pen.radius
-        path.each.with_index do |(x, y, radius), i|
-	  if i == 0
-	    cr.move_to(x, y)
-	  else
-            cr.line_to(x, y)
-	  end
-        end
-        cr.stroke
+        stroke_path(cr, path)
+
         @portion = :all
+        signal_emit('changed')
       end
     end
-    signal_emit('changed')
+  end
+
+  def stroke_outline(path)
+    cr = Cairo::Context.new(@outline_surface)
+    cr.line_cap = cr.line_join = :round
+    cr.set_source_rgba([1, 1, 1, 1.0])
+    cr.line_width = @pen.radius * 3
+    stroke_path(cr, path)
+  end
+
+  def stroke_path(cr, path)
+    path.each.with_index do |(x, y, radius), i|
+      if i == 0
+	cr.move_to(x, y)
+      else
+        cr.line_to(x, y)
+      end
+    end
+    cr.stroke
   end
 
   def pen_move(ev)
     @pen.move(ev)
     update
-
-    signal_emit('changed')
   end
 end
 
@@ -214,69 +256,68 @@ class SheetView < Gtk::DrawingArea
     super()
     self.app_paintable = true
 
+    @dirty = true
+
     set_size_request(800, 600)
     signal_connect('expose-event') do
       draw
       true
     end
-    last_point = nil
-    signal_connect('motion-notify-event') do |self_, ev|
-      ev.x = ev.x + 0.5
-      ev.y = ev.y + 0.5
-
-      c = Cairo::Context.new(@model.debug_surface)
-        c.set_source_rgba([0, 1, 0])
-        c.rectangle(ev.x - 1, ev.y - 1, 2, 2)
-        # c.set_source_rgba([0, 0, 1])
-        # c.rectangle(ev.x - 2, ev.y - 2, 4, 4)
-      c.fill
-      c.destroy
 
-      if last_point == nil
-        last_point = [ev.x, ev.y]
-        @model.pen_move(ev)
-      else
-        if distance(last_point, [ev.x, ev.y]) < (1.0/0.0)
-          last_point = midpoint(last_point, [ev.x, ev.y])
-          ev.x, ev.y = last_point
-        else
-          last_point = [ev.x, ev.y]
-        end
-        @model.pen_move(ev)
-      end
+    # モーションノティファイ。
+    @last_point = nil
+    signal_connect('motion-notify-event') do |self_, ev|
+      handle_motion_notify_event(ev)
     end
+
+    # ボタンプレス。このイベントは同じ座標へのモーションノティファイの
+    # 後に来る。
     signal_connect('button-press-event') do |self_, ev|
+      # デバッグ描画。ボタン押下座標に赤の四角を描く。
       c = Cairo::Context.new(@model.debug_surface)
       c.set_source_rgba([1, 0, 0])
       c.rectangle(ev.x - 2, ev.y - 2, 4, 4)
       c.fill
       c.destroy
 
-
       if ev.button == 1
         @model.pen_down(ev)
+      elsif ev.button == 2
+        # 押し間違いを防ぐ。
+        unless @model.pen.down?
+          @model.clear
+        end
       elsif ev.button == 3
-        @model.clear
+        # 押し間違いを防ぐ。
+        unless @model.pen.down?
+          menu_popup(ev)
+        end
       end
     end
+
+    # ボタンリリース。このイベントは同じ座標へのモーションノティファイ
+    # の後に来る。
     signal_connect('button-release-event') do |self_, ev|
+      # デバッグ描画。ボタンリリース座標に赤の四角を描く。
       c = Cairo::Context.new(@model.debug_surface)
       c.set_source_rgba([1, 0, 0])
       c.rectangle(ev.x - 2, ev.y - 2, 4, 4)
       c.fill
       c.destroy
 
-      if ev.button == 1
+      if ev.button == 1 && @model.pen.down?
         @model.pen_move(ev)
         @model.pen_up(ev)
       end
     end
 
-    @model = SheetModel.new
+    @model = SheetModel.new(screen.width, screen.height)
     @model.signal_connect('changed') do
-      # invalidate
+      @dirty = true
     end
 
+    # POINTER_MOTION_HINT_MASKを付けるとこちらの反応が遅い場合にポイン
+    # ター座標を省略する。
     self.events |= Gdk::Event::BUTTON_PRESS_MASK |
                    Gdk::Event::BUTTON_RELEASE_MASK |
                    # Gdk::Event::POINTER_MOTION_HINT_MASK |
@@ -284,6 +325,88 @@ class SheetView < Gtk::DrawingArea
 
   end
 
+  def tick
+    return if @last_motion_notify_event.nil?
+
+    t = Time.now
+    if (t - @last_motion_notify_event_time) > 0.033
+      handle_motion_notify_event(@last_motion_notify_event)
+      @last_motion_notify_event_time = t
+    end
+  end
+
+  def handle_motion_notify_event(ev)
+    @last_motion_notify_event = ev.dup
+    @last_motion_notify_event_time = Time.now
+
+    ev.x = ev.x + 0.5
+    ev.y = ev.y + 0.5
+
+    # デバッグ描画。ポインター座標に緑の四角を描く。
+    c = Cairo::Context.new(@model.debug_surface)
+    c.set_source_rgba([0, 1, 0])
+    c.rectangle(ev.x - 1, ev.y - 1, 2, 2)
+    c.fill
+    c.destroy
+
+    if @last_point == nil
+      @last_point = [ev.x, ev.y]
+      @model.pen_move(ev)
+    else
+      # 1サンプル時間あたり距離30以上移動した場合は完全にポインター
+      # 座標にならう。
+      d = distance(@last_point, [ev.x, ev.y])
+      alpha = if d <= 5.0 then 0.30 else 0.60 end
+      p [d, alpha] if $DEBUG
+      @last_point = vec_lerp(alpha, [ev.x, ev.y], @last_point)
+      ev.x, ev.y = @last_point
+      @model.pen_move(ev)
+    end
+  end
+
+  def dirty?
+    @dirty
+  end
+
+  def create_context_menu
+    menu = Gtk::Menu.new
+
+    item1 = Gtk::MenuItem.new('クリア')
+    item1.signal_connect('activate') do
+      @model.clear
+    end
+    menu.append(item1)
+
+    menu.append(Gtk::MenuItem.new)
+
+    item2 = Gtk::MenuItem.new('青')
+    item2.signal_connect('activate') do 
+      @model.pen.color = Pen::BLUE
+    end
+    menu.append(item2)
+
+    item3 = Gtk::MenuItem.new('オレンジ')
+    item3.signal_connect('activate') do
+      @model.pen.color = Pen::ORANGE
+    end
+    menu.append(item3)
+
+    item4 = Gtk::MenuItem.new('緑')
+    item4.signal_connect('activate') do
+      @model.pen.color = Pen::GREEN
+    end
+    menu.append(item4)
+
+    menu.show_all
+
+    return menu
+  end
+
+  def menu_popup(button_event)
+    menu = create_context_menu
+    menu.popup(nil, nil, button_event.button, button_event.time)
+  end
+
   def draw
     cr = window.create_cairo_context
 
@@ -292,10 +415,17 @@ class SheetView < Gtk::DrawingArea
     cr.paint 
 
     cr.set_operator(Cairo::OPERATOR_OVER)
+
+    cr.set_source(@model.outline_surface)
+    cr.paint
+
     cr.set_source(@model.surface)
     cr.paint
-    # cr.set_source(@model.debug_surface)
-    # cr.paint
+
+    if $DEBUG
+      cr.set_source(@model.debug_surface)
+      cr.paint
+    end
 
     cr.destroy
   end
@@ -303,6 +433,7 @@ class SheetView < Gtk::DrawingArea
   def invalidate
     window.invalidate(window.clip_region, true)
     window.process_updates(true)
+    @dirty = false
   end     
 end
 
@@ -327,23 +458,20 @@ class Program
   include Gtk
 
   def initialize
-    @quit_requested = false
-
     Signal.trap(:INT) {
       STDERR.puts("Interrupted")
-      Gtk.main_quit
-      @quit_requested = true
+      quit
     }
   end
 
   def quit
-    @quit_requested = true
+    Gtk.main_quit
   end
 
   def run
     win = MainWindow.new
     win.signal_connect('delete-event') do
-      Gtk.main_quit
+      quit
     end
 
     win.maximize
@@ -352,12 +480,13 @@ class Program
     win.show_all
 
     Gtk.timeout_add(33) do
-      sheet.invalidate
+      sheet.tick
+      if sheet.dirty?
+        sheet.invalidate
+      end
+      true
     end
 
-    # until @quit_requested
-    #  Gtk.main_iteration while Gtk.events_pending?
-    # end
     Gtk.main
   end
 end

data/lib/scratchpad/version.rb

@@ -1,3 +1,3 @@
 module Scratchpad
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scratchpad-app
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A paint program for note taking.