credo-detector 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905e46749f9bd9954908098155eae5ec9af84178589e1421a5d5bbd7848d31cb
-  data.tar.gz: da1d43425df1458dc5c8734d56917c28ac29908b74ceaff04113d55e229e1971
+  metadata.gz: ac9f99f1a615f2e9a287e0af9906802d8bdee4cc8eae16c21607081501fc2c64
+  data.tar.gz: 298e77d46495f6785f78f189f66fe6128c57c36a747eafd02b074ec9bd8c4bfd
 SHA512:
-  metadata.gz: 9a51bfba3f70da442f2a299c86e5ea37538f79608b8c3697c65c20d9a15c9a3a0df6e56106810741af293e956539474e1e969dcb1168fc01d6b6b9006149eeaa
-  data.tar.gz: 28bb26cf7fdcf0bb739e44d51242a318a9cbe302a3159f25cfdbd1b143d3c17d847727730e8998db23547c4a2a631e327dd876bb981310eb698121a822b86ba4
+  metadata.gz: 1c46fdedfa2f40f5b0fe2c0dfa757f28f7e6238329c979568455c68ae8b7cb4fb7e22eb277c6704084e32df6afb6ff390084c96747599b8becafb4bb06f3af16
+  data.tar.gz: 2e11ac4204f3f3c1654214fc9312a80d9018f94c0e2a40a3930a85d9f3086d90bbfb6885ab6f107224f20ae68ea82b14a335278405b23278d0c716bcb885ed90

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    credo-detector (0.1.0)
-      rmagick
+    credo-detector (0.1.3)
+      rmagick (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
+    pkg-config (1.4.9)
     rake (13.0.6)
     rake-compiler (1.2.0)
       rake
-    rmagick (4.2.6)
+    rmagick (4.3.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -31,6 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   credo-detector!
+  pkg-config (~> 1.4)
   rake (~> 13.0)
   rake-compiler (~> 1.0)
   rspec (~> 3.0)

data/README.md

@@ -1,22 +1,73 @@
-# Credo::Detector
+# Credo Detector
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/credo/detector`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
+
+
+
+
+
+
+
+
+[Credo](https://credo.science/) detector for Ruby!
+
+This allows you to both calibrate your sensor and run detection on multiple cameras.
 
 ## Installation
 
-Install the gem and add to the application's Gemfile by executing:
+### Prerequirements
+
+#### macOS
+
+Install OpenCV4 with:
+
+    $ brew install opencv
+
+Install imagemagick with:
+   
+    $ brew install pkg-config imagemagick
+
+#### Ubuntu/Debian
+
+Install OpenCV4 with:
 
-    $ bundle add credo-detector
+    $ sudo apt install libopencv-dev
 
-If bundler is not being used to manage dependencies, install the gem by executing:
+Install imagemagick with:
 
-    $ gem install credo-detector
+    $ sudo apt install libmagickwand-dev
+
+### Other systems
+
+We require pkg-config for native library compilation, a C++ compiler, ImageMagick and OpenCV4.
+
+### I have met all the requirements
+
+Install this gem with:
+
+    $ gem install credo detector
+
+You can also use it in your app, in which case add
+
+    gem "credo-detector"
+
+to your Gemfile.
 
 ## Usage
 
-TODO: Write usage instructions here
+### CLI
+
+We do not support sending results to Credo since we're still haven't validated the detection, but you can calibrate your cameras and run the code locally with:
+
+    $ credo calibrate
+
+and run the detection with
+
+    $ credo detect
+
+You can choose camera with `--camera={camera_id}`. Cameras are numbered starting from 0.
+
+If you want to run multiple cameras run the application multiple times with different camera ids.
 
 ## Development
 
@@ -26,7 +77,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/credo-detector. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/credo-detector/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/khasinski/credo-detector. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/credo-detector/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -34,4 +85,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Credo::Detector project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/credo-detector/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Credo Detector project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/khasinski/credo-detector/blob/master/CODE_OF_CONDUCT.md).

data/exe/credo

@@ -12,7 +12,7 @@ help = "usage: credo [options]
 These are common Credo commands used in various situations:
 
    calibrate [--tests=300] [--camera=0]     Calibrates the camera
-   detect    [--camera=0] [--config]        Starts detection, sends the results back to server
+   detect    [--camera=0] [--threshold=60]  Starts detection
    version                                  Prints version, same as credo -v or credo --version
 "
 
@@ -35,8 +35,17 @@ OptionParser.new do |opt|
     @camera = [camera_number.to_i, 0].max
   end
 
+  opt.on("-t", "--threshold=60", Integer, "Sets the minimum detection threshold, 0-255") do |threshold|
+    @threshold = [[threshold.to_i, 0].max, 255].min
+  end
+
   opt.on("calibrate") do
-    Credo::Calibration.calibrate(tests: @tests.to_i, device_id: @camera.to_i)
+    Credo::Calibration.calibrate(tests: @tests.to_i || 0, device_id: @camera.to_i)
+    exit
+  end
+
+  opt.on("detect") do
+    Credo::Detector.detect(device_id: @camera.to_i, threshold: @threshold || 60)
     exit
   end
 end.parse!

data/ext/grab_frame_ext/extconf.rb

@@ -1,7 +1,9 @@
 require "mkmf"
+require "pkg-config"
 
 $CXXFLAGS << " -std=c++11 "
-$INCFLAGS << " -I/opt/homebrew/opt/opencv/include/opencv4/   "
-$LDFLAGS << " -L/opt/homebrew/opt/opencv/lib -lopencv_core -lopencv_videoio"
+
+$INCFLAGS << " " + PKGConfig.cflags("opencv4")
+$LDFLAGS << " " + PKGConfig.libs("opencv4")
 
 create_makefile("grab_frame_ext")

data/lib/credo/calibration.rb

@@ -16,11 +16,9 @@ module Credo
       puts "Calibration completed"
       puts "Maximum value: #{max_values.max}"
       puts "Average of maximum values: #{max_values.sum.to_f / max_values.size}"
-    rescue Interrupt, RuntimeError
-      puts
-      puts "Calibration interrupted"
     ensure
       Framegrabber.release
+      "Calibration interrupted"
     end
 
     def self.grab_frame

data/lib/credo/detector/version.rb

@@ -2,6 +2,6 @@
 
 module Credo
   module Detector
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

data/lib/credo/detector.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require_relative "detector/version"
+require_relative "../framegrabber"
+require "grab_frame_ext"
 require "date"
+require "rmagick"
 
 module Credo
   module Detector
@@ -10,41 +13,64 @@ module Credo
     class Error < StandardError; end
 
     def self.detect(device_id: 0, threshold: 60)
-      @last_ping = linux_time
-      @last_detection_time = 0
-
       Framegrabber.open(device_id)
 
-      sample_number = sample_save = 0
-      print("Start sampling...")
-      sleep(2)
+      detections = 0
+
       loop do
-        time_dat = DateTime.now.strftime("%Y-%m-%d %H:%M:%S:%f")
-        detection_time = linux_time
-        sample_number += 1
         grab_frame!
-        print("\r Sample: #{sample_number} | Saved #{sample_save} | Press Ctrl + c to exit")
         sleep(0.000001)
+        subpixels = @frame.flatten
+
+        next print "\rToo much light detected, please cover your camera" if too_bright?(subpixels, threshold)
+        print "\rBrightest subpixel: #{subpixels.max}"
+        next if subpixels.max < threshold
+
+        detections += 1
 
-        counter = 0
-        xy_coordinates = []
+        multi_detections = 0
+        @frame.each.with_index do |row, x|
+          row.each.with_index do |pixel, y|
+            next if pixel.max < threshold
 
-        flattened = @frame.flatten
-        coords = []
-        if flattened.any? { |subpixel| subpixel > threshold }
-          @frame.each_with_index do |row, x|
-            row.each_with_index do |pixel, y|
-              coords << [x, y] if pixel.any? { |subpixel| subpixel > threshold }
-            end
+            multi_detections += 1
+
+            cropped = crop(x, y)
+            filename = "detections/Sample no. #{detections}:#{multi_detections}.png"
+
+            save_hit(cropped, filename)
+            puts "\n#{filename} saved"
           end
         end
       end
     ensure
       Framegrabber.release
+      puts "Camera disabled"
     end
 
     private
 
+    def self.save_hit(cropped, filename)
+      image = Magick::Image.constitute(cropped.first.size, cropped.size, "I", bgr_to_gray(cropped))
+      image.write(filename) do |img|
+        img.depth = 8
+        img.format = "png"
+      end
+    end
+
+    def self.crop(x, y)
+      @frame.slice(x-10, 20).map { |row| row.slice(y-10, 20) }
+    end
+
+    def self.bgr_to_gray(image)
+      # https://docs.opencv.org/3.4/de/d25/imgproc_color_conversions.html#color_convert_rgb_gray
+      image.flatten(1).map { |bgr| (0.299 * bgr[2] + 0.587 * bgr[1] + 0.114 * bgr[0])/255.0 }
+    end
+
+    def self.too_bright?(subpixels, threshold)
+      subpixels.sum.fdiv(subpixels.size) >= threshold
+    end
+
     def self.grab_frame!
       @frame = Framegrabber.grab_frame
     end
@@ -55,6 +81,49 @@ module Credo
   end
 end
 
-require_relative "../framegrabber"
-require_relative "calibration"
-require "grab_frame_ext"
+
+# time.sleep(0.000001)
+# counter = 0
+# xy_coordinates = []
+# if np.max(data) >= int(threshold):
+#
+#   all_ziped = list(zip(list(np.where(data >= int(threshold))[1]), list(np.where(data >= int(threshold))[0])))
+#   all_ziped.sort()
+#
+# while counter < len(all_ziped):
+#   if len(all_ziped) == 1:
+#     xy_coordinates.append(all_ziped[0])
+#   break
+#   elif counter == 0:
+#     xy_coordinates.append(all_ziped[counter])
+#   counter += 1
+#   elif all_ziped[counter][0] - 10 < all_ziped[counter - 1][0]:
+#     counter += 1
+#   else:
+#     xy_coordinates.append(all_ziped[counter])
+#   counter += 1
+#   multi_detection = 0
+#   for x, y in xy_coordinates:
+#     if x >= 11 and y >= 11:
+#       img_crop = data[y-10:y + 10,
+#       x-10:x + 10]
+#     r = 50.0 / img_crop.shape[1]
+#     dim = (50, int(img_crop.shape[0] * r))
+#     sample_save = sample_save + 1
+#     if img_crop is None:
+#                      pass
+#       else:
+#         print(time_dat, sample_number, x, y,
+#               round(np.average(data), 4), np.max(data),
+#               sep=',', file=open(str(path) + "/Report.txt", "a"))
+#       img_zoom = cv2.resize(img_crop, dim, interpolation=cv2.INTER_AREA)
+#       gray_img_zoom = cv2.cvtColor(img_zoom, cv2.COLOR_BGR2GRAY)
+#       cv2.imwrite(str(path) + "/" + str(time_dat) +
+#                     " Sample no. %i:%i.png" % (sample_number,multi_detection), gray_img_zoom)
+#       picture = open(str(path) + "/" + str(time_dat) +" Sample no. %i:%i.png"
+#       % (sample_number,multi_detection), 'rb')
+#       picture_read = picture.read()
+#       base64_picture = str(base64.b64encode(picture_read))[2:]
+#       multi_detection += 1
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credo-detector
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Krzysztof Hasiński
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -25,20 +25,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pkg-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description:
 email:
 - krzysztof.hasinski@gmail.com
@@ -56,6 +70,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- detections/.gitkeep
 - exe/credo
 - ext/grab_frame_ext/extconf.rb
 - ext/grab_frame_ext/grab_frame_ext.cpp
@@ -78,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="