mirror of
https://github.com/serratus/quaggaJS.git
synced 2026-08-12 21:21:42 +08:00
Merge pull request #72 from serratus/feature/webpack
From RequireJS to Webpack
This commit is contained in:
@@ -0,0 +1,80 @@
|
||||
{
|
||||
"settings" : {
|
||||
"ecmascript": 6,
|
||||
"jsx": true
|
||||
},
|
||||
"env": {
|
||||
"browser": true,
|
||||
"node": true
|
||||
},
|
||||
"ecmaFeatures": {
|
||||
"blockBindings": true,
|
||||
"forOf": true,
|
||||
"blockBindings": true,
|
||||
"defaultParams": true,
|
||||
"globalReturn": false,
|
||||
"modules": true,
|
||||
"objectLiteralShorthandMethods": true,
|
||||
"objectLiteralShorthandProperties": true,
|
||||
"templateStrings": true,
|
||||
"spread": true,
|
||||
"jsx": true,
|
||||
"arrowFunctions": true,
|
||||
"classes": true,
|
||||
"destructuring": true,
|
||||
"objectLiteralComputedProperties": true
|
||||
},
|
||||
"globals": {},
|
||||
"rules": {
|
||||
"no-unused-expressions": 1,
|
||||
"no-extra-boolean-cast": 1,
|
||||
"no-multi-spaces": 2,
|
||||
"no-underscore-dangle": 0,
|
||||
"comma-dangle": 2,
|
||||
"camelcase": 0,
|
||||
"curly": 2,
|
||||
"eqeqeq": 2,
|
||||
"guard-for-in": 2,
|
||||
"wrap-iife": 0,
|
||||
"no-use-before-define": [1, "nofunc"],
|
||||
"new-cap": 2,
|
||||
"quotes": 0,
|
||||
"strict": 0,
|
||||
"no-caller": 2,
|
||||
"no-empty": 1,
|
||||
"no-new": 2,
|
||||
"no-plusplus": 0,
|
||||
"no-unused-vars": 1,
|
||||
"no-trailing-spaces": 2,
|
||||
|
||||
// STYLE
|
||||
"max-params": [2, 7],
|
||||
"key-spacing": [1, {
|
||||
beforeColon: false,
|
||||
afterColon: true
|
||||
}],
|
||||
"indent": [2, 4],
|
||||
"brace-style": [2, "1tbs"],
|
||||
"comma-spacing": [2, {before: false, after: true}],
|
||||
"comma-style": [2, "last"],
|
||||
"consistent-this": [1, "self"],
|
||||
"eol-last": 0,
|
||||
"new-cap": 0,
|
||||
"new-parens": 2,
|
||||
"no-array-constructor": 2,
|
||||
"no-mixed-spaces-and-tabs": 2,
|
||||
"no-multiple-empty-lines": 2,
|
||||
"semi-spacing": 2,
|
||||
"dot-notation": 2,
|
||||
"no-spaced-func": 1,
|
||||
"no-shadow": 2,
|
||||
"no-undef": 2,
|
||||
"padded-blocks": [2, "never"],
|
||||
"semi": [2, "always"],
|
||||
"space-after-keywords": [2, "always"],
|
||||
"space-infix-ops": 2,
|
||||
"max-len" : [1, 120],
|
||||
"consistent-return": 2,
|
||||
"yoda": 2
|
||||
}
|
||||
}
|
||||
+1
-55
@@ -1,8 +1,7 @@
|
||||
module.exports = function(grunt) {
|
||||
|
||||
// Project configuration.
|
||||
grunt.initConfig({
|
||||
pkg : grunt.file.readJSON('package.json'),
|
||||
pkg: grunt.file.readJSON('package.json'),
|
||||
karma: {
|
||||
unit: {
|
||||
configFile: 'karma.conf.js'
|
||||
@@ -10,67 +9,14 @@ module.exports = function(grunt) {
|
||||
integration: {
|
||||
configFile: 'karma-integration.conf.js'
|
||||
}
|
||||
},
|
||||
uglify : {
|
||||
options : {
|
||||
banner : '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
|
||||
preserveComments: 'some'
|
||||
},
|
||||
build : {
|
||||
src : 'dist/<%= pkg.name %>.js',
|
||||
dest : 'dist/<%= pkg.name %>.min.js'
|
||||
}
|
||||
},
|
||||
jshint : {
|
||||
all : ['Gruntfile.js', 'src/*.js']
|
||||
},
|
||||
requirejs : {
|
||||
compile : {
|
||||
options : {
|
||||
almond : true,
|
||||
wrap : {
|
||||
startFile : 'build/start.frag',
|
||||
endFile : 'build/end.frag'
|
||||
},
|
||||
"baseUrl" : "src",
|
||||
"name" : "quagga",
|
||||
"useStrict": true,
|
||||
"out" : "dist/quagga.js",
|
||||
"include" : ['quagga'],
|
||||
"optimize" : "none",
|
||||
"findNestedDependencies" : true,
|
||||
"skipSemiColonInsertion" : true,
|
||||
|
||||
"shim" : {
|
||||
"typedefs" : {
|
||||
"deps" : [],
|
||||
"exports" : "typedefs"
|
||||
}
|
||||
},
|
||||
|
||||
"paths" : {
|
||||
"typedefs" : "typedefs",
|
||||
"gl-matrix": "../node_modules/gl-matrix/dist/gl-matrix-min"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Load the plugin that provides the "uglify" task.
|
||||
grunt.loadNpmTasks('grunt-contrib-jshint');
|
||||
grunt.loadNpmTasks('grunt-contrib-uglify');
|
||||
|
||||
grunt.loadNpmTasks('grunt-requirejs');
|
||||
grunt.loadNpmTasks('grunt-karma');
|
||||
|
||||
grunt.loadTasks('tasks');
|
||||
|
||||
grunt.registerTask('build', ['check', 'requirejs']);
|
||||
grunt.registerTask('check', ['jshint']);
|
||||
grunt.registerTask('dist', ['build', 'uglify', 'uglyasm']);
|
||||
grunt.registerTask('test', ['karma']);
|
||||
grunt.registerTask('integrationtest', ['karma:integration']);
|
||||
|
||||
grunt.registerTask('default', ['build']);
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
quaggaJS
|
||||
========
|
||||
|
||||
- [Changelog](#changelog) (2015-09-15)
|
||||
- [Changelog](#changelog) (2015-10-13)
|
||||
|
||||
## What is QuaggaJS?
|
||||
|
||||
@@ -90,11 +90,15 @@ You can build the library yourself by simply cloning the repo and typing:
|
||||
|
||||
```console
|
||||
> npm install
|
||||
> grunt dist
|
||||
> npm run build
|
||||
```
|
||||
|
||||
This grunt task builds a non optimized version `quagga.js` and a minified
|
||||
This npm script builds a non optimized version `quagga.js` and a minified
|
||||
version `quagga.min.js` and places both files in the `dist` folder.
|
||||
Additionally, a `quagga.map` source-map is placed alongside these files. This
|
||||
file is only valid for the non-uglified version `quagga.js` because the
|
||||
minified version is altered after compression and does not align with the map
|
||||
file any more.
|
||||
|
||||
## API
|
||||
|
||||
@@ -360,7 +364,7 @@ automatically generated in the coverage/ folder.
|
||||
|
||||
```console
|
||||
> npm install
|
||||
> grunt test
|
||||
> npm run test
|
||||
```
|
||||
## Image Debugging
|
||||
|
||||
@@ -430,6 +434,13 @@ on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
|
||||
|
||||
## <a name="changelog">Changelog</a>
|
||||
|
||||
### 2015-10-13
|
||||
Take a look at the release-notes ([0.8.0]
|
||||
(https://github.com/serratus/quaggaJS/releases/tag/v0.8.0))
|
||||
|
||||
- Improvements
|
||||
- Replaced RequireJS with webpack
|
||||
|
||||
### 2015-09-15
|
||||
Take a look at the release-notes ([0.7.0]
|
||||
(https://github.com/serratus/quaggaJS/releases/tag/v0.7.0))
|
||||
|
||||
Vendored
+10703
-4784
File diff suppressed because one or more lines are too long
Vendored
+3
-10
File diff suppressed because one or more lines are too long
@@ -101,7 +101,7 @@
|
||||
© Copyright by Christoph Oberhofer
|
||||
</p>
|
||||
</footer>
|
||||
<script src="../src/vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
|
||||
<script src="vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
|
||||
<script src="../dist/quagga.js" type="text/javascript"></script>
|
||||
<script src="file_input.js" type="text/javascript"></script>
|
||||
</body>
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||
|
||||
<title>index</title>
|
||||
<meta name="description" content=""/>
|
||||
<meta name="author" content="Christoph Oberhofer"/>
|
||||
|
||||
<meta name="viewport" content="width=device-width; initial-scale=1.0"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/styles.css"/>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header>
|
||||
<div class="headline">
|
||||
<h1>QuaggaJS</h1>
|
||||
|
||||
<h2>An advanced barcode-scanner written in JavaScript</h2>
|
||||
</div>
|
||||
</header>
|
||||
<section id="container" class="container">
|
||||
<h3>Working with file-input</h3>
|
||||
|
||||
<p>This example let's you select an image from your local filesystem.
|
||||
QuaggaJS then tries to decode the barcode using
|
||||
the preferred method (<strong>Code128</strong> or <strong>EAN</strong>).
|
||||
There is no server interaction needed as the
|
||||
file is simply accessed through the <a
|
||||
href="http://www.w3.org/TR/file-upload/">File API</a>.</p>
|
||||
|
||||
<p>This also works great on a wide range of mobile-phones where the camera
|
||||
access through <code>getUserMedia</code> is still very limited.</p>
|
||||
|
||||
<div class="controls">
|
||||
<fieldset class="input-group">
|
||||
<input type="file" capture/>
|
||||
<button>Rerun</button>
|
||||
</fieldset>
|
||||
<fieldset class="reader-config-group">
|
||||
<label>
|
||||
<span>Barcode-Type</span>
|
||||
<select name="decoder_readers">
|
||||
<option value="code_128" selected="selected">Code 128</option>
|
||||
<option value="code_39">Code 39</option>
|
||||
<option value="code_39_vin">Code 39 VIN</option>
|
||||
<option value="ean">EAN</option>
|
||||
<option value="ean_8">EAN-8</option>
|
||||
<option value="upc">UPC</option>
|
||||
<option value="upc_e">UPC-E</option>
|
||||
<option value="codabar">Codabar</option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
<span>Resolution (long side)</span>
|
||||
<select name="input-stream_size">
|
||||
<option value="320">320px</option>
|
||||
<option selected="selected" value="640">640px</option>
|
||||
<option value="800">800px</option>
|
||||
<option value="1280">1280px</option>
|
||||
<option value="1600">1600px</option>
|
||||
<option value="1920">1920px</option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
<span>Patch-Size</span>
|
||||
<select name="locator_patch-size">
|
||||
<option value="x-small">x-small</option>
|
||||
<option value="small">small</option>
|
||||
<option selected="selected" value="medium">medium</option>
|
||||
<option value="large">large</option>
|
||||
<option value="x-large">x-large</option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
<span>Half-Sample</span>
|
||||
<input type="checkbox" checked="checked"
|
||||
name="locator_half-sample" />
|
||||
</label>
|
||||
<label>
|
||||
<span>Single Channel</span>
|
||||
<input type="checkbox" name="input-stream_single-channel" />
|
||||
</label>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div id="result_strip">
|
||||
<ul class="thumbnails"></ul>
|
||||
</div>
|
||||
<div id="interactive" class="viewport"></div>
|
||||
<div id="debug" class="detection"></div>
|
||||
</section>
|
||||
<footer>
|
||||
<p>
|
||||
© Copyright by Christoph Oberhofer
|
||||
</p>
|
||||
</footer>
|
||||
<script src="../src/vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
|
||||
<script data-main="file_input_require.js" src="../node_modules/requirejs/require.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,161 +0,0 @@
|
||||
requirejs.config({
|
||||
"baseUrl" : "../src",
|
||||
"shim" : {
|
||||
"typedefs" : {
|
||||
"deps" : [],
|
||||
"exports" : "typedefs"
|
||||
}
|
||||
},
|
||||
|
||||
"paths" : {
|
||||
"typedefs" : "typedefs",
|
||||
"gl-matrix": "../node_modules/gl-matrix/dist/gl-matrix-min"
|
||||
}
|
||||
});
|
||||
|
||||
requirejs(['quagga'], function(Quagga) {
|
||||
var App = {
|
||||
init: function() {
|
||||
App.attachListeners();
|
||||
},
|
||||
attachListeners: function() {
|
||||
var self = this;
|
||||
|
||||
$(".controls input[type=file]").on("change", function(e) {
|
||||
if (e.target.files && e.target.files.length) {
|
||||
App.decode(URL.createObjectURL(e.target.files[0]));
|
||||
}
|
||||
});
|
||||
|
||||
$(".controls button").on("click", function(e) {
|
||||
var input = document.querySelector(".controls input[type=file]");
|
||||
if (input.files && input.files.length) {
|
||||
App.decode(URL.createObjectURL(input.files[0]));
|
||||
}
|
||||
});
|
||||
|
||||
$(".controls .reader-config-group").on("change", "input, select", function(e) {
|
||||
e.preventDefault();
|
||||
var $target = $(e.target),
|
||||
value = $target.attr("type") === "checkbox" ? $target.prop("checked") : $target.val(),
|
||||
name = $target.attr("name"),
|
||||
state = self._convertNameToState(name);
|
||||
|
||||
console.log("Value of "+ state + " changed to " + value);
|
||||
self.setState(state, value);
|
||||
});
|
||||
},
|
||||
_accessByPath: function(obj, path, val) {
|
||||
var parts = path.split('.'),
|
||||
depth = parts.length,
|
||||
setter = (typeof val !== "undefined") ? true : false;
|
||||
|
||||
return parts.reduce(function(o, key, i) {
|
||||
if (setter && (i + 1) === depth) {
|
||||
o[key] = val;
|
||||
}
|
||||
return key in o ? o[key] : {};
|
||||
}, obj);
|
||||
},
|
||||
_convertNameToState: function(name) {
|
||||
return name.replace("_", ".").split("-").reduce(function(result, value) {
|
||||
return result + value.charAt(0).toUpperCase() + value.substring(1);
|
||||
});
|
||||
},
|
||||
detachListeners: function() {
|
||||
$(".controls input[type=file]").off("change");
|
||||
$(".controls .reader-config-group").off("change", "input, select");
|
||||
$(".controls button").off("click");
|
||||
},
|
||||
decode: function(src) {
|
||||
var self = this,
|
||||
config = $.extend({}, self.state, {src: src});
|
||||
|
||||
Quagga.decodeSingle(config, function(result) {});
|
||||
},
|
||||
setState: function(path, value) {
|
||||
var self = this;
|
||||
|
||||
if (typeof self._accessByPath(self.inputMapper, path) === "function") {
|
||||
value = self._accessByPath(self.inputMapper, path)(value);
|
||||
}
|
||||
|
||||
self._accessByPath(self.state, path, value);
|
||||
|
||||
console.log(JSON.stringify(self.state));
|
||||
App.detachListeners();
|
||||
App.init();
|
||||
},
|
||||
inputMapper: {
|
||||
inputStream: {
|
||||
size: function(value){
|
||||
return parseInt(value);
|
||||
}
|
||||
},
|
||||
numOfWorkers: function(value) {
|
||||
return parseInt(value);
|
||||
},
|
||||
decoder: {
|
||||
readers: function(value) {
|
||||
return [value + "_reader"];
|
||||
}
|
||||
}
|
||||
},
|
||||
state: {
|
||||
inputStream: {
|
||||
size: 640,
|
||||
singleChannel: false
|
||||
},
|
||||
locator: {
|
||||
patchSize: "medium",
|
||||
halfSample: true,
|
||||
showCanvas: true
|
||||
},
|
||||
numOfWorkers: 0,
|
||||
decoder: {
|
||||
readers: ["code_128_reader"],
|
||||
showFrequency: true,
|
||||
showPattern: true
|
||||
},
|
||||
locate: true,
|
||||
src: null
|
||||
}
|
||||
};
|
||||
|
||||
App.init();
|
||||
|
||||
Quagga.onProcessed(function(result) {
|
||||
var drawingCtx = Quagga.canvas.ctx.overlay,
|
||||
drawingCanvas = Quagga.canvas.dom.overlay;
|
||||
|
||||
if (result) {
|
||||
if (result.boxes) {
|
||||
drawingCtx.clearRect(0, 0, parseInt(drawingCanvas.getAttribute("width")), parseInt(drawingCanvas.getAttribute("height")));
|
||||
result.boxes.filter(function (box) {
|
||||
return box !== result.box;
|
||||
}).forEach(function (box) {
|
||||
Quagga.ImageDebug.drawPath(box, {x: 0, y: 1}, drawingCtx, {color: "green", lineWidth: 2});
|
||||
});
|
||||
}
|
||||
|
||||
if (result.box) {
|
||||
Quagga.ImageDebug.drawPath(result.box, {x: 0, y: 1}, drawingCtx, {color: "#00F", lineWidth: 2});
|
||||
}
|
||||
|
||||
if (result.codeResult && result.codeResult.code) {
|
||||
Quagga.ImageDebug.drawPath(result.line, {x: 'x', y: 'y'}, drawingCtx, {color: 'red', lineWidth: 3});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Quagga.onDetected(function(result) {
|
||||
var code = result.codeResult.code,
|
||||
$node,
|
||||
canvas = Quagga.canvas.dom.image;
|
||||
|
||||
$node = $('<li><div class="thumbnail"><div class="imgWrapper"><img /></div><div class="caption"><h4 class="code"></h4></div></div></li>');
|
||||
$node.find("img").attr("src", canvas.toDataURL());
|
||||
$node.find("h4.code").html(code + " (" + result.codeResult.format + ")");
|
||||
$("#result_strip ul.thumbnails").prepend($node);
|
||||
});
|
||||
});
|
||||
@@ -1,25 +1,45 @@
|
||||
var path = require('path');
|
||||
|
||||
module.exports = function(config) {
|
||||
config.set({
|
||||
basePath: '',
|
||||
frameworks: ['mocha', 'requirejs', 'chai', 'sinon', 'sinon-chai'],
|
||||
frameworks: ['mocha', 'chai', 'sinon', 'sinon-chai'],
|
||||
files: [
|
||||
'test-main.js',
|
||||
'src/typedefs.js',
|
||||
{pattern: 'node_modules/async/lib/async.js', included: false},
|
||||
{pattern: 'node_modules/gl-matrix/dist/gl-matrix-min.js', included: false},
|
||||
{pattern: 'src/*.js', included: false},
|
||||
{pattern: 'spec/**/*integration.spec.js', included: false},
|
||||
{pattern: 'test/**/*.*', included: false}
|
||||
'test/test-main-integration.js',
|
||||
{pattern: 'test/integration/**/*.js', included: false},
|
||||
{pattern: 'test/fixtures/**/*.*', included: false}
|
||||
],
|
||||
preprocessors: {
|
||||
'test/test-main-integration.js': ['webpack']
|
||||
},
|
||||
webpack: {
|
||||
module: {
|
||||
preLoaders: [
|
||||
{
|
||||
test: /\.js$/,
|
||||
exclude: [
|
||||
/node_modules/
|
||||
],
|
||||
loader: 'babel'
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['', '.js', '.jsx'],
|
||||
alias: {
|
||||
'input_stream$': path.resolve(__dirname, 'src/input_stream'),
|
||||
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber')
|
||||
}
|
||||
}
|
||||
},
|
||||
plugins: [
|
||||
'karma-chrome-launcher',
|
||||
'karma-mocha',
|
||||
'karma-requirejs',
|
||||
'karma-chai',
|
||||
'karma-sinon',
|
||||
'karma-sinon-chai'
|
||||
'karma-sinon-chai',
|
||||
require('karma-webpack')
|
||||
],
|
||||
reporters: ['progress'],
|
||||
port: 9876,
|
||||
|
||||
+38
-16
@@ -1,31 +1,53 @@
|
||||
var path = require('path');
|
||||
|
||||
module.exports = function(config) {
|
||||
config.set({
|
||||
basePath: '',
|
||||
frameworks: ['mocha', 'requirejs', 'chai', 'sinon', 'sinon-chai'],
|
||||
frameworks: ['source-map-support', 'mocha', 'chai', 'sinon', 'sinon-chai'],
|
||||
files: [
|
||||
'test-main.js',
|
||||
'src/typedefs.js',
|
||||
{pattern: 'node_modules/async/lib/async.js', included: false},
|
||||
{pattern: 'node_modules/gl-matrix/dist/gl-matrix-min.js', included: false},
|
||||
{pattern: 'src/*.js', included: false},
|
||||
{pattern: 'spec/**/*.js', included: false},
|
||||
{pattern: 'test/**/*.*', included: false}
|
||||
],
|
||||
exclude: [
|
||||
'spec/**/*integration.spec.js'
|
||||
'test/test-main.js',
|
||||
{pattern: 'test/spec/**/*.js', included: false}
|
||||
],
|
||||
preprocessors: {
|
||||
'src/*.js': ['coverage']
|
||||
'test/test-main.js': ['webpack']
|
||||
},
|
||||
webpack: {
|
||||
module: {
|
||||
preLoaders: [
|
||||
{
|
||||
test: /\.js$/,
|
||||
exclude: [
|
||||
/node_modules/
|
||||
],
|
||||
loader: 'babel'
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
include: [
|
||||
path.resolve('src')
|
||||
],
|
||||
exclude: /node_modules/,
|
||||
loader: 'isparta'
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['', '.js', '.jsx'],
|
||||
alias: {
|
||||
'input_stream$': path.resolve(__dirname, 'src/input_stream'),
|
||||
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber')
|
||||
}
|
||||
},
|
||||
},
|
||||
plugins: [
|
||||
'karma-chrome-launcher',
|
||||
'karma-coverage',
|
||||
'karma-mocha',
|
||||
'karma-requirejs',
|
||||
'karma-chai',
|
||||
'karma-sinon',
|
||||
'karma-sinon-chai',
|
||||
'karma-phantomjs-launcher'
|
||||
'karma-source-map-support',
|
||||
require('karma-webpack')
|
||||
],
|
||||
reporters: ['progress', 'coverage'],
|
||||
port: 9876,
|
||||
@@ -35,8 +57,8 @@ module.exports = function(config) {
|
||||
browsers: ['Chrome'],
|
||||
singleRun: false,
|
||||
coverageReporter: {
|
||||
type : 'html',
|
||||
dir : 'coverage/'
|
||||
type: 'html',
|
||||
dir: 'coverage/'
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
+6
-12
@@ -1,15 +1,10 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(["cv_utils"], function(CVUtils) {
|
||||
"use strict";
|
||||
|
||||
var Ndarray = require("ndarray"),
|
||||
const CVUtils = require('../src/cv_utils'),
|
||||
Ndarray = require("ndarray"),
|
||||
Interp2D = require("ndarray-linear-interpolate").d2;
|
||||
|
||||
var FrameGrabber = {};
|
||||
var FrameGrabber = {};
|
||||
|
||||
FrameGrabber.create = function(inputStream) {
|
||||
FrameGrabber.create = function(inputStream) {
|
||||
var _that = {},
|
||||
_streamConfig = inputStream.getConfig(),
|
||||
_video_size = CVUtils.imageRef(inputStream.getRealWidth(), inputStream.getRealHeight()),
|
||||
@@ -95,7 +90,6 @@ define(["cv_utils"], function(CVUtils) {
|
||||
};
|
||||
|
||||
return _that;
|
||||
};
|
||||
};
|
||||
|
||||
return (FrameGrabber);
|
||||
});
|
||||
module.exports = FrameGrabber;
|
||||
|
||||
+5
-12
@@ -1,14 +1,8 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
const GetPixels = require("get-pixels");
|
||||
|
||||
define(function() {
|
||||
"use strict";
|
||||
var InputStream = {};
|
||||
|
||||
var GetPixels = require("get-pixels");
|
||||
|
||||
var InputStream = {};
|
||||
|
||||
InputStream.createImageStream = function() {
|
||||
InputStream.createImageStream = function() {
|
||||
var that = {};
|
||||
var _config = null;
|
||||
|
||||
@@ -154,7 +148,6 @@ define(function() {
|
||||
};
|
||||
|
||||
return that;
|
||||
};
|
||||
};
|
||||
|
||||
return (InputStream);
|
||||
});
|
||||
module.exports = InputStream;
|
||||
|
||||
+7798
-11
File diff suppressed because it is too large
Load Diff
+17
-6
@@ -1,18 +1,23 @@
|
||||
{
|
||||
"name": "quagga",
|
||||
"version": "0.7.0",
|
||||
"version": "0.8.0",
|
||||
"description": "An advanced barcode-scanner written in JavaScript",
|
||||
"main": "lib/quagga.js",
|
||||
"browser": "dist/quagga.js",
|
||||
"browser": "dist/quagga.min.js",
|
||||
"devDependencies": {
|
||||
"async": "^1.4.2",
|
||||
"babel-core": "^5.8.25",
|
||||
"babel-eslint": "^4.1.3",
|
||||
"babel-loader": "^5.3.2",
|
||||
"chai": "^3.2.0",
|
||||
"core-js": "^1.2.1",
|
||||
"grunt": "^0.4.5",
|
||||
"grunt-contrib-jshint": "^0.11.3",
|
||||
"grunt-contrib-nodeunit": "^0.4.1",
|
||||
"grunt-contrib-uglify": "^0.9.2",
|
||||
"grunt-karma": "^0.12.1",
|
||||
"grunt-requirejs": "^0.4.2",
|
||||
"isparta-loader": "^1.0.0",
|
||||
"karma": "^0.13.9",
|
||||
"karma-chai": "0.1.0",
|
||||
"karma-chrome-launcher": "^0.2.0",
|
||||
@@ -22,14 +27,20 @@
|
||||
"karma-requirejs": "~0.2.2",
|
||||
"karma-sinon": "^1.0.4",
|
||||
"karma-sinon-chai": "~0.2.0",
|
||||
"karma-source-map-support": "^1.1.0",
|
||||
"karma-webpack": "^1.7.0",
|
||||
"mocha": "^2.3.2",
|
||||
"sinon": "^1.16.1"
|
||||
"sinon": "^1.16.1",
|
||||
"webpack": "^1.12.2"
|
||||
},
|
||||
"directories": {
|
||||
"doc": "doc"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "karma start"
|
||||
"test": "grunt test",
|
||||
"integrationtest": "grunt integrationtest",
|
||||
"build": "webpack && webpack --config webpack.config.min.js && grunt uglyasm && webpack --config webpack.node.config.js",
|
||||
"watch": "webpack --watch"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -56,8 +67,8 @@
|
||||
"dependencies": {
|
||||
"get-pixels": "^3.2.3",
|
||||
"gl-matrix": "^2.3.1",
|
||||
"lodash": "^3.10.1",
|
||||
"ndarray": "^1.0.18",
|
||||
"ndarray-linear-interpolate": "^1.0.0",
|
||||
"requirejs": "^2.1.20"
|
||||
"ndarray-linear-interpolate": "^1.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
var ConcatSource = require("webpack-core/lib/ConcatSource");
|
||||
var OriginalSource = require("webpack-core/lib/OriginalSource");
|
||||
|
||||
function MyUmdPlugin(options) {
|
||||
this.name = options.library;
|
||||
}
|
||||
module.exports = MyUmdPlugin;
|
||||
MyUmdPlugin.prototype.apply = function(compiler) {
|
||||
compiler.plugin("this-compilation", function(compilation) {
|
||||
var mainTemplate = compilation.mainTemplate;
|
||||
compilation.templatesPlugin("render-with-entry", function(source, chunk, hash) {
|
||||
|
||||
var amdFactory = "factory";
|
||||
return new ConcatSource(new OriginalSource(
|
||||
"(function webpackUniversalModuleDefinition(root, factory) {\n" +
|
||||
" if(typeof exports === 'object' && typeof module === 'object')\n" +
|
||||
" module.exports = factory(factory.toString());\n" +
|
||||
" else if(typeof exports === 'object')\n" +
|
||||
" exports[\"" + this.name + "\"] = factory(factory.toString());\n" +
|
||||
" else\n" +
|
||||
" root[\"" + this.name + "\"] = factory(factory.toString());\n" +
|
||||
"})(this, function(__factorySource__) {\nreturn ", "webpack/myModuleDefinition"), source, "\n});\n");
|
||||
}.bind(this));
|
||||
mainTemplate.plugin("global-hash-paths", function(paths) {
|
||||
if(this.name) paths = paths.concat(this.name);
|
||||
return paths;
|
||||
}.bind(this));
|
||||
mainTemplate.plugin("hash", function(hash) {
|
||||
hash.update("umd");
|
||||
hash.update(this.name + "");
|
||||
}.bind(this));
|
||||
}.bind(this));
|
||||
};
|
||||
@@ -1,53 +0,0 @@
|
||||
define(['array_helper'], function(ArrayHelper){
|
||||
describe('init', function() {
|
||||
it('initializes an array with the given value', function() {
|
||||
var input = [0, 0, 0];
|
||||
ArrayHelper.init(input, 5);
|
||||
expect(input).to.deep.equal([5, 5, 5]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('shuffle', function() {
|
||||
before(function() {
|
||||
sinon.stub(Math, 'random').returns(0.5);
|
||||
});
|
||||
|
||||
after(function() {
|
||||
sinon.restore(Math);
|
||||
});
|
||||
it('shuffles the content of an array', function() {
|
||||
var input = [1, 2, 3];
|
||||
expect(ArrayHelper.shuffle(input)).to.deep.equal([3, 1, 2]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('toPointList', function() {
|
||||
it('converts an Array to a List of poitns', function() {
|
||||
var input = [[1, 2], [2, 2], [3, 2]];
|
||||
expect(ArrayHelper.toPointList(input)).to.equal("[[1,2],\r\n[2,2],\r\n[3,2]]");
|
||||
});
|
||||
});
|
||||
|
||||
describe('threshold', function() {
|
||||
it('returns all elements above the given threshold', function() {
|
||||
var input = [1, 2, 3];
|
||||
expect(ArrayHelper.threshold(input, 2, function(score) {
|
||||
return score * 1.5;
|
||||
})).to.deep.equal([2, 3]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('maxIndex', function() {
|
||||
it('gets the index of the biggest element in the array', function() {
|
||||
var input = [1, 2, 3];
|
||||
expect(ArrayHelper.maxIndex(input)).to.equal(2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('max', function() {
|
||||
it('gets the biggest element in the array', function() {
|
||||
var input = [1, 3, 2];
|
||||
expect(ArrayHelper.max(input)).to.equal(3);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,131 +0,0 @@
|
||||
|
||||
define(['barcode_locator', 'config', 'html_utils'],
|
||||
function(BarcodeLocator, Config, HtmlUtils){
|
||||
|
||||
describe('checkImageConstraints', function() {
|
||||
var config,
|
||||
inputStream,
|
||||
imageSize,
|
||||
streamConfig = {};
|
||||
|
||||
beforeEach(function() {
|
||||
imageSize = {
|
||||
x: 640, y: 480
|
||||
};
|
||||
config = HtmlUtils.mergeObjects({}, Config);
|
||||
inputStream = {
|
||||
getWidth: function() {
|
||||
return imageSize.x;
|
||||
},
|
||||
getHeight: function() {
|
||||
return imageSize.y;
|
||||
},
|
||||
setWidth: function() {},
|
||||
setHeight: function() {},
|
||||
setTopRight: function() {},
|
||||
setCanvasSize: function() {},
|
||||
getConfig: function() {
|
||||
return streamConfig;
|
||||
}
|
||||
};
|
||||
sinon.stub(inputStream, "setWidth", function(width) {
|
||||
imageSize.x = width;
|
||||
});
|
||||
sinon.stub(inputStream, "setHeight", function(height) {
|
||||
imageSize.y = height;
|
||||
});
|
||||
sinon.stub(inputStream, "setTopRight");
|
||||
sinon.stub(inputStream, "setCanvasSize");
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
inputStream.setWidth.restore();
|
||||
inputStream.setHeight.restore();
|
||||
});
|
||||
|
||||
it('should not adjust the image-size if not needed', function() {
|
||||
var expected = {x: imageSize.x, y: imageSize.y};
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getWidth()).to.be.equal(expected.x);
|
||||
expect(inputStream.getHeight()).to.be.equal(expected.y);
|
||||
});
|
||||
|
||||
it('should adjust the image-size', function() {
|
||||
var expected = {x: imageSize.x, y: imageSize.y};
|
||||
|
||||
config.locator.halfSample = true;
|
||||
imageSize.y += 1;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getWidth()).to.be.equal(expected.x);
|
||||
expect(inputStream.getHeight()).to.be.equal(expected.y);
|
||||
});
|
||||
|
||||
it('should adjust the image-size', function() {
|
||||
var expected = {x: imageSize.x, y: imageSize.y};
|
||||
|
||||
imageSize.y += 1;
|
||||
config.locator.halfSample = false;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getHeight()).to.be.equal(expected.y);
|
||||
expect(inputStream.getWidth()).to.be.equal(expected.x);
|
||||
});
|
||||
|
||||
it("should take the defined area into account", function() {
|
||||
var expectedSize = {
|
||||
x: 420,
|
||||
y: 315
|
||||
},
|
||||
expectedTopRight = {
|
||||
x: 115,
|
||||
y: 52
|
||||
},
|
||||
expectedCanvasSize = {
|
||||
x: 640,
|
||||
y: 480
|
||||
};
|
||||
|
||||
streamConfig.area = {
|
||||
top: "11%",
|
||||
right: "15%",
|
||||
bottom: "20%",
|
||||
left: "18%"
|
||||
};
|
||||
|
||||
config.locator.halfSample = false;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getHeight()).to.be.equal(expectedSize.y);
|
||||
expect(inputStream.getWidth()).to.be.equal(expectedSize.x);
|
||||
expect(inputStream.setTopRight.getCall(0).args[0]).to.deep.equal(expectedTopRight);
|
||||
expect(inputStream.setCanvasSize.getCall(0).args[0]).to.deep.equal(expectedCanvasSize);
|
||||
});
|
||||
|
||||
it("should return the original size if set to full image", function() {
|
||||
var expectedSize = {
|
||||
x: 640,
|
||||
y: 480
|
||||
},
|
||||
expectedTopRight = {
|
||||
x: 0,
|
||||
y: 0
|
||||
},
|
||||
expectedCanvasSize = {
|
||||
x: 640,
|
||||
y: 480
|
||||
};
|
||||
|
||||
streamConfig.area = {
|
||||
top: "0%",
|
||||
right: "0%",
|
||||
bottom: "0%",
|
||||
left: "0%"
|
||||
};
|
||||
|
||||
config.locator.halfSample = false;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getHeight()).to.be.equal(expectedSize.y);
|
||||
expect(inputStream.getWidth()).to.be.equal(expectedSize.x);
|
||||
expect(inputStream.setTopRight.getCall(0).args[0]).to.deep.equal(expectedTopRight);
|
||||
expect(inputStream.setCanvasSize.getCall(0).args[0]).to.deep.equal(expectedCanvasSize);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,123 +0,0 @@
|
||||
define(['camera_access'], function(CameraAccess){
|
||||
var originalURL,
|
||||
originalMediaStreamTrack,
|
||||
video,
|
||||
stream;
|
||||
|
||||
beforeEach(function() {
|
||||
var tracks = [{
|
||||
stop: function() {}
|
||||
}];
|
||||
|
||||
originalURL = window.URL;
|
||||
originalMediaStreamTrack = window.MediaStreamTrack;
|
||||
window.MediaStreamTrack = {};
|
||||
window.URL = null;
|
||||
|
||||
|
||||
stream = {
|
||||
getVideoTracks: function() {
|
||||
return tracks;
|
||||
}
|
||||
};
|
||||
sinon.spy(tracks[0], "stop");
|
||||
|
||||
video = {
|
||||
src: null,
|
||||
addEventListener: function() {
|
||||
|
||||
},
|
||||
removeEventListener: function() {
|
||||
|
||||
},
|
||||
play: function() {
|
||||
|
||||
},
|
||||
videoWidth: 320,
|
||||
videoHeight: 480
|
||||
};
|
||||
sinon.stub(video, "addEventListener", function(event, cb) {
|
||||
cb();
|
||||
});
|
||||
sinon.stub(video, "play");
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
window.URL = originalURL;
|
||||
window.MediaStreamTrack = originalMediaStreamTrack;
|
||||
});
|
||||
|
||||
describe('success', function() {
|
||||
beforeEach(function() {
|
||||
sinon.stub(navigator, "getUserMedia", function(constraints, success) {
|
||||
success(stream);
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
navigator.getUserMedia.restore();
|
||||
});
|
||||
describe('request', function () {
|
||||
it('should request the camera', function (done) {
|
||||
CameraAccess.request(video, {}, function () {
|
||||
expect(navigator.getUserMedia.calledOnce).to.equal(true);
|
||||
expect(video.src).to.deep.equal(stream);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('release', function () {
|
||||
it('should release the camera', function (done) {
|
||||
CameraAccess.request(video, {}, function () {
|
||||
expect(video.src).to.deep.equal(stream);
|
||||
CameraAccess.release();
|
||||
expect(video.src.getVideoTracks()).to.have.length(1);
|
||||
expect(video.src.getVideoTracks()[0].stop.calledOnce).to.equal(true);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('failure', function() {
|
||||
describe("permission denied", function(){
|
||||
before(function() {
|
||||
sinon.stub(navigator, "getUserMedia", function(constraints, success, failure) {
|
||||
failure(new Error());
|
||||
});
|
||||
});
|
||||
|
||||
after(function() {
|
||||
navigator.getUserMedia.restore();
|
||||
});
|
||||
|
||||
it('should throw if getUserMedia not available', function(done) {
|
||||
CameraAccess.request(video, {}, function(err) {
|
||||
expect(err).to.be.defined;
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("not available", function(){
|
||||
var originalGetUserMedia;
|
||||
|
||||
before(function() {
|
||||
originalGetUserMedia = navigator.getUserMedia;
|
||||
navigator.getUserMedia = undefined;
|
||||
});
|
||||
|
||||
after(function() {
|
||||
navigator.getUserMedia = originalGetUserMedia;
|
||||
});
|
||||
|
||||
it('should throw if getUserMedia not available', function(done) {
|
||||
CameraAccess.request(video, {}, function(err) {
|
||||
expect(err).to.be.defined;
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,145 +0,0 @@
|
||||
|
||||
define(['cv_utils'], function(CVUtils){
|
||||
describe('imageRef', function() {
|
||||
it('gets the image Reference for a coordinate', function() {
|
||||
var res = CVUtils.imageRef(1, 2);
|
||||
expect(res.x).to.equal(1);
|
||||
expect(res.y).to.equal(2);
|
||||
expect(res.toVec2()[0]).to.equal(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('calculatePatchSize', function() {
|
||||
it('should not throw an error in case of valid image size', function() {
|
||||
var expected = {x: 32, y: 32},
|
||||
patchSize = CVUtils.calculatePatchSize("medium", {x: 640, y: 480});
|
||||
|
||||
expect(patchSize).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it('should thow an error if image size it not valid', function() {
|
||||
var expected = {x: 32, y: 32},
|
||||
patchSize = CVUtils.calculatePatchSize("medium", {x: 640, y: 480});
|
||||
|
||||
expect(patchSize).to.be.deep.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('_parseCSSDimensionValues', function() {
|
||||
it("should convert a percentual value correctly", function() {
|
||||
var expected = {
|
||||
value: 10,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("10%");
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a 0% value correctly", function() {
|
||||
var expected = {
|
||||
value: 100,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("100%");
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a 100% value correctly", function() {
|
||||
var expected = {
|
||||
value: 0,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("0%");
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a pixel value to percentage", function() {
|
||||
var expected = {
|
||||
value: 26.3,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("26.3px");
|
||||
|
||||
console.log(result);
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe("_dimensionsConverters", function(){
|
||||
var context;
|
||||
|
||||
beforeEach(function() {
|
||||
context = {
|
||||
width: 640,
|
||||
height: 480
|
||||
};
|
||||
});
|
||||
|
||||
it("should convert a top-value correclty", function() {
|
||||
var expected = 48,
|
||||
result = CVUtils._dimensionsConverters.top({value: 10, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a right-value correclty", function() {
|
||||
var expected = 640 - 128,
|
||||
result = CVUtils._dimensionsConverters.right({value: 20, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a bottom-value correclty", function() {
|
||||
var expected = 480 - 77,
|
||||
result = CVUtils._dimensionsConverters.bottom({value: 16, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a left-value correclty", function() {
|
||||
var expected = 57,
|
||||
result = CVUtils._dimensionsConverters.left({value: 9, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe("computeImageArea", function() {
|
||||
it("should calculate an image-area", function() {
|
||||
var expected = {
|
||||
sx: 115,
|
||||
sy: 48,
|
||||
sw: 429,
|
||||
sh: 336
|
||||
},
|
||||
result = CVUtils.computeImageArea(640, 480, {
|
||||
top: "10%",
|
||||
right: "15%",
|
||||
bottom: "20%",
|
||||
left: "18%"
|
||||
});
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should calculate full image-area", function() {
|
||||
var expected = {
|
||||
sx: 0,
|
||||
sy: 0,
|
||||
sw: 640,
|
||||
sh: 480
|
||||
},
|
||||
result = CVUtils.computeImageArea(640, 480, {
|
||||
top: "0%",
|
||||
right: "0%",
|
||||
bottom: "0%",
|
||||
left: "0%"
|
||||
});
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,114 +0,0 @@
|
||||
define(['events'], function(Events){
|
||||
beforeEach(function() {
|
||||
Events.unsubscribe();
|
||||
});
|
||||
describe("subscribe", function() {
|
||||
|
||||
|
||||
it("should call one callback for a single event", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
});
|
||||
|
||||
it("should call one callback twice if published twice", function() {
|
||||
var callback = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callback);
|
||||
|
||||
Events.publish("test");
|
||||
Events.publish("test");
|
||||
|
||||
expect(callback.calledTwice).to.be.equal(true);
|
||||
});
|
||||
|
||||
it("should call the callback asynchronuously", function(done) {
|
||||
var test = {
|
||||
callback: function() {
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
sinon.stub(test, "callback", function() {
|
||||
expect(test.callback.calledOnce).to.be.true;
|
||||
done();
|
||||
});
|
||||
Events.subscribe("test", test.callback, true);
|
||||
Events.publish("test");
|
||||
expect(test.callback.called).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
describe("once", function() {
|
||||
it("should call the callback once, even when published twice", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub();
|
||||
|
||||
Events.once("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
|
||||
Events.publish("test");
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledTwice).to.be.equal(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("unsubscribe", function() {
|
||||
it("should unsubscribe all callbacks from a single event", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub(),
|
||||
callbackC = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
Events.subscribe("testC", callbackC);
|
||||
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackC.called).to.be.equal(false);
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
|
||||
Events.publish("testC");
|
||||
|
||||
expect(callbackC.calledOnce).to.be.equal(true);
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
|
||||
Events.unsubscribe("test");
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackC.calledOnce).to.be.equal(true);
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
});
|
||||
|
||||
it("should unsubscribe a single callback from a single event", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
|
||||
|
||||
Events.unsubscribe("test", callbackB);
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledTwice).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,248 +0,0 @@
|
||||
|
||||
|
||||
define(['quagga', 'async'], function(Quagga, async) {
|
||||
describe('decodeSingle', function () {
|
||||
var baseFolder = "base/test/fixtures/";
|
||||
|
||||
function generateConfig() {
|
||||
return {
|
||||
inputStream: {
|
||||
size: 640
|
||||
},
|
||||
locator: {
|
||||
patchSize: "medium",
|
||||
halfSample: true
|
||||
},
|
||||
numOfWorkers: 0,
|
||||
decoder: {
|
||||
readers: ["ean_reader"]
|
||||
},
|
||||
locate: true,
|
||||
src: null
|
||||
};
|
||||
}
|
||||
|
||||
this.timeout(10000);
|
||||
|
||||
function _runTestSet(testSet, config) {
|
||||
var readers = config.decoder.readers.slice(),
|
||||
format,
|
||||
folder;
|
||||
|
||||
if (typeof readers[0] === 'string'){
|
||||
format = readers[0];
|
||||
} else {
|
||||
format = readers[0].format;
|
||||
}
|
||||
|
||||
folder = baseFolder + format.split('_').slice(0, -1).join('_') + "/";
|
||||
|
||||
it('should decode ' + folder + " correctly", function(done) {
|
||||
async.eachSeries(testSet, function (sample, callback) {
|
||||
config.src = folder + sample.name;
|
||||
config.readers = readers;
|
||||
Quagga.decodeSingle(config, function(result) {
|
||||
console.log(sample.name);
|
||||
expect(result.codeResult.code).to.equal(sample.result);
|
||||
expect(result.codeResult.format).to.equal(sample.format);
|
||||
callback();
|
||||
});
|
||||
}, function() {
|
||||
done();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
describe("EAN", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "3574660239843"},
|
||||
{"name": "image-002.jpg", "result": "8032754490297"},
|
||||
{"name": "image-003.jpg", "result": "4006209700068"},
|
||||
/* {"name": "image-004.jpg", "result": "9002233139084"}, */
|
||||
/* {"name": "image-005.jpg", "result": "8004030044005"}, */
|
||||
{"name": "image-006.jpg", "result": "4003626011159"},
|
||||
{"name": "image-007.jpg", "result": "2111220009686"},
|
||||
{"name": "image-008.jpg", "result": "9000275609022"},
|
||||
{"name": "image-009.jpg", "result": "9004593978587"},
|
||||
{"name": "image-010.jpg", "result": "9002244845578"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "ean_13";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['ean_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("Code128", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "0001285112001000040801"},
|
||||
// {"name": "image-002.jpg", "result": "FANAVF1461710"},
|
||||
// {"name": "image-003.jpg", "result": "673023"},
|
||||
// {"name": "image-004.jpg", "result": "010210150301625334"},
|
||||
{"name": "image-005.jpg", "result": "419055603900009001012999"},
|
||||
{"name": "image-006.jpg", "result": "419055603900009001012999"},
|
||||
{"name": "image-007.jpg", "result": "T 000003552345"},
|
||||
{"name": "image-008.jpg", "result": "FANAVF1461710"},
|
||||
{"name": "image-009.jpg", "result": "0001285112001000040801"},
|
||||
{"name": "image-010.jpg", "result": "673023"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "code_128";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['code_128_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("Code39", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "B3% $DAD$"},
|
||||
{"name": "image-003.jpg", "result": "CODE39"},
|
||||
{"name": "image-004.jpg", "result": "QUAGGAJS"},
|
||||
/* {"name": "image-005.jpg", "result": "CODE39"}, */
|
||||
{"name": "image-006.jpg", "result": "2/4-8/16-32"},
|
||||
{"name": "image-007.jpg", "result": "2/4-8/16-32"},
|
||||
{"name": "image-008.jpg", "result": "CODE39"},
|
||||
{"name": "image-009.jpg", "result": "2/4-8/16-32"},
|
||||
{"name": "image-010.jpg", "result": "CODE39"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "code_39";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['code_39_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("EAN-8", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "42191605"},
|
||||
{"name": "image-002.jpg", "result": "42191605"},
|
||||
{"name": "image-003.jpg", "result": "90311208"},
|
||||
{"name": "image-004.jpg", "result": "24057257"},
|
||||
{"name": "image-005.jpg", "result": "90162602"},
|
||||
{"name": "image-006.jpg", "result": "24036153"},
|
||||
{"name": "image-007.jpg", "result": "42176817"},
|
||||
{"name": "image-008.jpg", "result": "42191605"},
|
||||
{"name": "image-009.jpg", "result": "42242215"},
|
||||
{"name": "image-010.jpg", "result": "42184799"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "ean_8";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['ean_8_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("UPC", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "882428015268"},
|
||||
{"name": "image-002.jpg", "result": "882428015268"},
|
||||
{"name": "image-003.jpg", "result": "882428015084"},
|
||||
{"name": "image-004.jpg", "result": "882428015343"},
|
||||
{"name": "image-005.jpg", "result": "882428015343"},
|
||||
/* {"name": "image-006.jpg", "result": "882428015046"}, */
|
||||
{"name": "image-007.jpg", "result": "882428015084"},
|
||||
{"name": "image-008.jpg", "result": "882428015046"},
|
||||
{"name": "image-009.jpg", "result": "039047013551"},
|
||||
{"name": "image-010.jpg", "result": "039047013551"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "upc_a";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['upc_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("UPC-E", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "04965802"},
|
||||
{"name": "image-002.jpg", "result": "04965802"},
|
||||
{"name": "image-003.jpg", "result": "03897425"},
|
||||
{"name": "image-004.jpg", "result": "05096893"},
|
||||
{"name": "image-005.jpg", "result": "05096893"},
|
||||
{"name": "image-006.jpg", "result": "05096893"},
|
||||
{"name": "image-007.jpg", "result": "03897425"},
|
||||
{"name": "image-008.jpg", "result": "01264904"},
|
||||
/*{"name": "image-009.jpg", "result": "01264904"},*/
|
||||
{"name": "image-010.jpg", "result": "01264904"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "upc_e";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['upc_e_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("Codabar", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "A10/53+17-70D"},
|
||||
{"name": "image-002.jpg", "result": "B546745735B"},
|
||||
{"name": "image-003.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-004.jpg", "result": "B546745735B"},
|
||||
{"name": "image-005.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-006.jpg", "result": "B546745735B"},
|
||||
{"name": "image-007.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-008.jpg", "result": "A16:9/4:3/3:2D"},
|
||||
{"name": "image-009.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-010.jpg", "result": "C$399.95A"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "codabar";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['codabar_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("I2of5 with localization", function() {
|
||||
var config = {
|
||||
inputStream: {
|
||||
size: 800,
|
||||
singleChannel: false
|
||||
},
|
||||
locator: {
|
||||
patchSize: "small",
|
||||
halfSample: false
|
||||
},
|
||||
numOfWorkers: 0,
|
||||
decoder: {
|
||||
readers: ["i2of5_reader"],
|
||||
},
|
||||
locate: true,
|
||||
src: null
|
||||
}, testSet = [
|
||||
{"name": "image-001.jpg", "result": "2167361334"},
|
||||
{"name": "image-002.jpg", "result": "2167361334"},
|
||||
{"name": "image-003.jpg", "result": "2167361334"},
|
||||
{"name": "image-004.jpg", "result": "2167361334"},
|
||||
{"name": "image-005.jpg", "result": "2167361334"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "i2of5";
|
||||
});
|
||||
|
||||
_runTestSet(testSet, config);
|
||||
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,103 +0,0 @@
|
||||
|
||||
define(['result_collector', 'image_debug'], function(ResultCollector, ImageDebug) {
|
||||
var canvasMock,
|
||||
imageSize,
|
||||
config;
|
||||
|
||||
beforeEach(function() {
|
||||
imageSize = {x: 320, y: 240};
|
||||
config = {
|
||||
capture: true,
|
||||
capacity: 20,
|
||||
blacklist: [{code: "3574660239843", format: "ean_13"}],
|
||||
filter: function(codeResult) {
|
||||
return true;
|
||||
}
|
||||
};
|
||||
canvasMock = {
|
||||
getContext: function() {
|
||||
return {};
|
||||
},
|
||||
toDataURL: sinon.spy(),
|
||||
width: 0,
|
||||
height: 0
|
||||
};
|
||||
sinon.stub(document, "createElement", function(type) {
|
||||
if (type === "canvas") {
|
||||
return canvasMock;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
document.createElement.restore();
|
||||
});
|
||||
|
||||
|
||||
describe('create', function () {
|
||||
it("should return a new collector", function() {
|
||||
ResultCollector.create(config);
|
||||
expect(document.createElement.calledOnce).to.be.equal(true);
|
||||
expect(document.createElement.getCall(0).args[0]).to.equal("canvas");
|
||||
});
|
||||
});
|
||||
|
||||
describe('addResult', function() {
|
||||
beforeEach(function() {
|
||||
sinon.stub(ImageDebug, "drawImage", function() {});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
ImageDebug.drawImage.restore();
|
||||
});
|
||||
|
||||
it("should not add result if capacity is full", function(){
|
||||
config.capacity = 1;
|
||||
var collector = ResultCollector.create(config);
|
||||
collector.addResult([], imageSize, {});
|
||||
collector.addResult([], imageSize, {});
|
||||
collector.addResult([], imageSize, {});
|
||||
expect(collector.getResults()).to.have.length(1);
|
||||
});
|
||||
|
||||
it("should only add results which match constraints", function(){
|
||||
var collector = ResultCollector.create(config),
|
||||
results;
|
||||
|
||||
collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
|
||||
collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
|
||||
collector.addResult([], imageSize, {code: "3574660239843", format: "code_128"});
|
||||
|
||||
results = collector.getResults();
|
||||
expect(results).to.have.length(2);
|
||||
|
||||
results.forEach(function(result) {
|
||||
expect(result).not.to.deep.equal(config.blacklist[0]);
|
||||
});
|
||||
});
|
||||
|
||||
it("should add result if no filter is set", function() {
|
||||
delete config.filter;
|
||||
var collector = ResultCollector.create(config);
|
||||
|
||||
collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
|
||||
expect(collector.getResults()).to.have.length(1);
|
||||
});
|
||||
|
||||
it("should not add results if filter returns false", function() {
|
||||
config.filter = function(){ return false };
|
||||
var collector = ResultCollector.create(config);
|
||||
|
||||
collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
|
||||
expect(collector.getResults()).to.have.length(0);
|
||||
});
|
||||
|
||||
it("should add result if no blacklist is set", function() {
|
||||
delete config.blacklist;
|
||||
var collector = ResultCollector.create(config);
|
||||
|
||||
collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
|
||||
expect(collector.getResults()).to.have.length(1);
|
||||
});
|
||||
});
|
||||
});
|
||||
+9
-16
@@ -1,11 +1,5 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(function() {
|
||||
"use strict";
|
||||
|
||||
return {
|
||||
init : function(arr, val) {
|
||||
export default {
|
||||
init: function(arr, val) {
|
||||
var l = arr.length;
|
||||
while (l--) {
|
||||
arr[l] = val;
|
||||
@@ -16,7 +10,7 @@ define(function() {
|
||||
* Shuffles the content of an array
|
||||
* @return {Array} the array itself shuffled
|
||||
*/
|
||||
shuffle : function(arr) {
|
||||
shuffle: function(arr) {
|
||||
var i = arr.length - 1, j, x;
|
||||
for (i; i >= 0; i--) {
|
||||
j = Math.floor(Math.random() * i);
|
||||
@@ -27,7 +21,7 @@ define(function() {
|
||||
return arr;
|
||||
},
|
||||
|
||||
toPointList : function(arr) {
|
||||
toPointList: function(arr) {
|
||||
var i, j, row = [], rows = [];
|
||||
for ( i = 0; i < arr.length; i++) {
|
||||
row = [];
|
||||
@@ -43,7 +37,7 @@ define(function() {
|
||||
* returns the elements which's score is bigger than the threshold
|
||||
* @return {Array} the reduced array
|
||||
*/
|
||||
threshold : function(arr, threshold, scoreFunc) {
|
||||
threshold: function(arr, threshold, scoreFunc) {
|
||||
var i, queue = [];
|
||||
for ( i = 0; i < arr.length; i++) {
|
||||
if (scoreFunc.apply(arr, [arr[i]]) >= threshold) {
|
||||
@@ -53,7 +47,7 @@ define(function() {
|
||||
return queue;
|
||||
},
|
||||
|
||||
maxIndex : function(arr) {
|
||||
maxIndex: function(arr) {
|
||||
var i, max = 0;
|
||||
for ( i = 0; i < arr.length; i++) {
|
||||
if (arr[i] > arr[max]) {
|
||||
@@ -63,7 +57,7 @@ define(function() {
|
||||
return max;
|
||||
},
|
||||
|
||||
max : function(arr) {
|
||||
max: function(arr) {
|
||||
var i, max = 0;
|
||||
for ( i = 0; i < arr.length; i++) {
|
||||
if (arr[i] > max) {
|
||||
@@ -77,10 +71,9 @@ define(function() {
|
||||
var length = arr.length,
|
||||
sum = 0;
|
||||
|
||||
while(length--) {
|
||||
while (length--) {
|
||||
sum += arr[length];
|
||||
}
|
||||
return sum;
|
||||
}
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
+58
-77
@@ -1,33 +1,16 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import Bresenham from './bresenham';
|
||||
import ImageDebug from './image_debug';
|
||||
import Code128Reader from './code_128_reader';
|
||||
import EANReader from './ean_reader';
|
||||
import Code39Reader from './code_39_reader';
|
||||
import Code39VINReader from './code_39_vin_reader';
|
||||
import CodabarReader from './codabar_reader';
|
||||
import UPCReader from './upc_reader';
|
||||
import EAN8Reader from './ean_8_reader';
|
||||
import UPCEReader from './upc_e_reader';
|
||||
import I2of5Reader from './i2of5_reader';
|
||||
|
||||
define([
|
||||
"bresenham",
|
||||
"image_debug",
|
||||
'code_128_reader',
|
||||
'ean_reader',
|
||||
'code_39_reader',
|
||||
'code_39_vin_reader',
|
||||
'codabar_reader',
|
||||
'upc_reader',
|
||||
'ean_8_reader',
|
||||
'upc_e_reader',
|
||||
'i2of5_reader'
|
||||
], function(
|
||||
Bresenham,
|
||||
ImageDebug,
|
||||
Code128Reader,
|
||||
EANReader,
|
||||
Code39Reader,
|
||||
Code39VINReader,
|
||||
CodabarReader,
|
||||
UPCReader,
|
||||
EAN8Reader,
|
||||
UPCEReader,
|
||||
I2of5Reader) {
|
||||
"use strict";
|
||||
|
||||
var readers = {
|
||||
const READERS = {
|
||||
code_128_reader: Code128Reader,
|
||||
ean_reader: EANReader,
|
||||
ean_8_reader: EAN8Reader,
|
||||
@@ -37,19 +20,19 @@ define([
|
||||
upc_reader: UPCReader,
|
||||
upc_e_reader: UPCEReader,
|
||||
i2of5_reader: I2of5Reader
|
||||
};
|
||||
var BarcodeDecoder = {
|
||||
create : function(config, inputImageWrapper) {
|
||||
};
|
||||
export default {
|
||||
create: function(config, inputImageWrapper) {
|
||||
var _canvas = {
|
||||
ctx : {
|
||||
frequency : null,
|
||||
pattern : null,
|
||||
overlay : null
|
||||
ctx: {
|
||||
frequency: null,
|
||||
pattern: null,
|
||||
overlay: null
|
||||
},
|
||||
dom : {
|
||||
frequency : null,
|
||||
pattern : null,
|
||||
overlay : null
|
||||
dom: {
|
||||
frequency: null,
|
||||
pattern: null,
|
||||
overlay: null
|
||||
}
|
||||
},
|
||||
_barcodeReaders = [];
|
||||
@@ -65,7 +48,7 @@ define([
|
||||
if (!_canvas.dom.frequency) {
|
||||
_canvas.dom.frequency = document.createElement("canvas");
|
||||
_canvas.dom.frequency.className = "frequency";
|
||||
if($debug) {
|
||||
if ($debug) {
|
||||
$debug.appendChild(_canvas.dom.frequency);
|
||||
}
|
||||
}
|
||||
@@ -75,7 +58,7 @@ define([
|
||||
if (!_canvas.dom.pattern) {
|
||||
_canvas.dom.pattern = document.createElement("canvas");
|
||||
_canvas.dom.pattern.className = "patternBuffer";
|
||||
if($debug) {
|
||||
if ($debug) {
|
||||
$debug.appendChild(_canvas.dom.pattern);
|
||||
}
|
||||
}
|
||||
@@ -91,18 +74,19 @@ define([
|
||||
function initReaders() {
|
||||
config.readers.forEach(function(readerConfig) {
|
||||
var reader,
|
||||
config = {};
|
||||
configuration = {};
|
||||
|
||||
if (typeof readerConfig === 'object') {
|
||||
reader = readerConfig.format;
|
||||
config = readerConfig.config;
|
||||
configuration = readerConfig.config;
|
||||
} else if (typeof readerConfig === 'string') {
|
||||
reader = readerConfig;
|
||||
}
|
||||
_barcodeReaders.push(new readers[reader](config));
|
||||
console.log("Before registering reader: ", reader);
|
||||
_barcodeReaders.push(new READERS[reader](configuration));
|
||||
});
|
||||
console.log("Registered Readers: " + _barcodeReaders
|
||||
.map(function(reader) {return JSON.stringify({format: reader.FORMAT, config: reader.config});})
|
||||
.map((reader) => JSON.stringify({format: reader.FORMAT, config: reader.config}))
|
||||
.join(', '));
|
||||
}
|
||||
|
||||
@@ -110,11 +94,11 @@ define([
|
||||
if (typeof document !== 'undefined') {
|
||||
var i,
|
||||
vis = [{
|
||||
node : _canvas.dom.frequency,
|
||||
prop : config.showFrequency
|
||||
node: _canvas.dom.frequency,
|
||||
prop: config.showFrequency
|
||||
}, {
|
||||
node : _canvas.dom.pattern,
|
||||
prop : config.showPattern
|
||||
node: _canvas.dom.pattern,
|
||||
prop: config.showPattern
|
||||
}];
|
||||
|
||||
for (i = 0; i < vis.length; i++) {
|
||||
@@ -135,8 +119,8 @@ define([
|
||||
function getExtendedLine(line, angle, ext) {
|
||||
function extendLine(amount) {
|
||||
var extension = {
|
||||
y : amount * Math.sin(angle),
|
||||
x : amount * Math.cos(angle)
|
||||
y: amount * Math.sin(angle),
|
||||
x: amount * Math.cos(angle)
|
||||
};
|
||||
|
||||
line[0].y -= extension.y;
|
||||
@@ -147,8 +131,9 @@ define([
|
||||
|
||||
// check if inside image
|
||||
extendLine(ext);
|
||||
while (ext > 1 && (!inputImageWrapper.inImageWithBorder(line[0], 0) || !inputImageWrapper.inImageWithBorder(line[1], 0))) {
|
||||
ext -= Math.ceil(ext/2);
|
||||
while (ext > 1 && (!inputImageWrapper.inImageWithBorder(line[0], 0)
|
||||
|| !inputImageWrapper.inImageWithBorder(line[1], 0))) {
|
||||
ext -= Math.ceil(ext / 2);
|
||||
extendLine(-ext);
|
||||
}
|
||||
return line;
|
||||
@@ -156,11 +141,11 @@ define([
|
||||
|
||||
function getLine(box) {
|
||||
return [{
|
||||
x : (box[1][0] - box[0][0]) / 2 + box[0][0],
|
||||
y : (box[1][1] - box[0][1]) / 2 + box[0][1]
|
||||
x: (box[1][0] - box[0][0]) / 2 + box[0][0],
|
||||
y: (box[1][1] - box[0][1]) / 2 + box[0][1]
|
||||
}, {
|
||||
x : (box[3][0] - box[2][0]) / 2 + box[2][0],
|
||||
y : (box[3][1] - box[2][1]) / 2 + box[2][1]
|
||||
x: (box[3][0] - box[2][0]) / 2 + box[2][0],
|
||||
y: (box[3][1] - box[2][1]) / 2 + box[2][1]
|
||||
}];
|
||||
}
|
||||
|
||||
@@ -181,14 +166,13 @@ define([
|
||||
for ( i = 0; i < _barcodeReaders.length && result === null; i++) {
|
||||
result = _barcodeReaders[i].decodePattern(barcodeLine.line);
|
||||
}
|
||||
if(result === null){
|
||||
if (result === null){
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
codeResult: result,
|
||||
barcodeLine: barcodeLine
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -212,8 +196,8 @@ define([
|
||||
// move line perpendicular to angle
|
||||
dir = sideLength / slices * i * (i % 2 === 0 ? -1 : 1);
|
||||
extension = {
|
||||
y : dir * xdir,
|
||||
x : dir * ydir
|
||||
y: dir * xdir,
|
||||
x: dir * ydir
|
||||
};
|
||||
line[0].y += extension.x;
|
||||
line[0].x -= extension.y;
|
||||
@@ -251,17 +235,17 @@ define([
|
||||
line = getLine(box);
|
||||
lineLength = getLineLength(line);
|
||||
lineAngle = Math.atan2(line[1].y - line[0].y, line[1].x - line[0].x);
|
||||
line = getExtendedLine(line, lineAngle, Math.floor(lineLength*0.1));
|
||||
if(line === null){
|
||||
line = getExtendedLine(line, lineAngle, Math.floor(lineLength * 0.1));
|
||||
if (line === null){
|
||||
return null;
|
||||
}
|
||||
|
||||
result = tryDecode(line);
|
||||
if(result === null) {
|
||||
if (result === null) {
|
||||
result = tryDecodeBruteForce(box, line, lineAngle);
|
||||
}
|
||||
|
||||
if(result === null) {
|
||||
if (result === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -270,19 +254,19 @@ define([
|
||||
}
|
||||
|
||||
return {
|
||||
codeResult : result.codeResult,
|
||||
line : line,
|
||||
angle : lineAngle,
|
||||
pattern : result.barcodeLine.line,
|
||||
threshold : result.barcodeLine.threshold
|
||||
codeResult: result.codeResult,
|
||||
line: line,
|
||||
angle: lineAngle,
|
||||
pattern: result.barcodeLine.line,
|
||||
threshold: result.barcodeLine.threshold
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
decodeFromBoundingBox : function(box) {
|
||||
decodeFromBoundingBox: function(box) {
|
||||
return decodeFromBoundingBox(box);
|
||||
},
|
||||
decodeFromBoundingBoxes : function(boxes) {
|
||||
decodeFromBoundingBoxes: function(boxes) {
|
||||
var i, result;
|
||||
for ( i = 0; i < boxes.length; i++) {
|
||||
result = decodeFromBoundingBox(boxes[i]);
|
||||
@@ -299,7 +283,4 @@ define([
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
return (BarcodeDecoder);
|
||||
});
|
||||
};
|
||||
|
||||
+114
-87
@@ -1,10 +1,13 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import ImageWrapper from './image_wrapper';
|
||||
import CVUtils from './cv_utils';
|
||||
import Rasterizer from './rasterizer';
|
||||
import Tracer from './tracer';
|
||||
import skeletonizer from './skeletonizer';
|
||||
import ArrayHelper from './array_helper';
|
||||
import ImageDebug from './image_debug';
|
||||
import glMatrix from 'gl-matrix';
|
||||
|
||||
define("barcode_locator", ["image_wrapper", "cv_utils", "rasterizer", "tracer", "skeletonizer", "array_helper", "image_debug", "gl-matrix"],
|
||||
function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, ImageDebug, glMatrix) {
|
||||
|
||||
var _config,
|
||||
var _config,
|
||||
_currentImageWrapper,
|
||||
_skelImageWrapper,
|
||||
_subImageWrapper,
|
||||
@@ -15,27 +18,26 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
_binaryImageWrapper,
|
||||
_patchSize,
|
||||
_canvasContainer = {
|
||||
ctx : {
|
||||
binary : null
|
||||
ctx: {
|
||||
binary: null
|
||||
},
|
||||
dom : {
|
||||
binary : null
|
||||
dom: {
|
||||
binary: null
|
||||
}
|
||||
},
|
||||
_numPatches = {x: 0, y: 0},
|
||||
_inputImageWrapper,
|
||||
_skeletonizer,
|
||||
vec2 = glMatrix.vec2,
|
||||
mat2 = glMatrix.mat2,
|
||||
self = this;
|
||||
mat2 = glMatrix.mat2;
|
||||
|
||||
function initBuffers() {
|
||||
function initBuffers() {
|
||||
var skeletonImageData;
|
||||
|
||||
if (_config.halfSample) {
|
||||
_currentImageWrapper = new ImageWrapper({
|
||||
x : _inputImageWrapper.size.x / 2 | 0,
|
||||
y : _inputImageWrapper.size.y / 2 | 0
|
||||
x: _inputImageWrapper.size.x / 2 | 0,
|
||||
y: _inputImageWrapper.size.y / 2 | 0
|
||||
});
|
||||
} else {
|
||||
_currentImageWrapper = _inputImageWrapper;
|
||||
@@ -50,22 +52,25 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
|
||||
_labelImageWrapper = new ImageWrapper(_patchSize, undefined, Array, true);
|
||||
|
||||
skeletonImageData = new ArrayBuffer(64*1024);
|
||||
_subImageWrapper = new ImageWrapper(_patchSize, new Uint8Array(skeletonImageData, 0, _patchSize.x * _patchSize.y));
|
||||
_skelImageWrapper = new ImageWrapper(_patchSize, new Uint8Array(skeletonImageData, _patchSize.x * _patchSize.y * 3, _patchSize.x * _patchSize.y), undefined, true);
|
||||
_skeletonizer = skeletonizer(self, {
|
||||
size : _patchSize.x
|
||||
skeletonImageData = new ArrayBuffer(64 * 1024);
|
||||
_subImageWrapper = new ImageWrapper(_patchSize,
|
||||
new Uint8Array(skeletonImageData, 0, _patchSize.x * _patchSize.y));
|
||||
_skelImageWrapper = new ImageWrapper(_patchSize,
|
||||
new Uint8Array(skeletonImageData, _patchSize.x * _patchSize.y * 3, _patchSize.x * _patchSize.y),
|
||||
undefined, true);
|
||||
_skeletonizer = skeletonizer((typeof window !== 'undefined') ? window : (typeof self !== 'undefined') ? self : global, {
|
||||
size: _patchSize.x
|
||||
}, skeletonImageData);
|
||||
|
||||
_imageToPatchGrid = new ImageWrapper({
|
||||
x : (_currentImageWrapper.size.x / _subImageWrapper.size.x) | 0,
|
||||
y : (_currentImageWrapper.size.y / _subImageWrapper.size.y) | 0
|
||||
x: (_currentImageWrapper.size.x / _subImageWrapper.size.x) | 0,
|
||||
y: (_currentImageWrapper.size.y / _subImageWrapper.size.y) | 0
|
||||
}, undefined, Array, true);
|
||||
_patchGrid = new ImageWrapper(_imageToPatchGrid.size, undefined, undefined, true);
|
||||
_patchLabelGrid = new ImageWrapper(_imageToPatchGrid.size, undefined, Int32Array, true);
|
||||
}
|
||||
}
|
||||
|
||||
function initCanvas() {
|
||||
function initCanvas() {
|
||||
if (_config.useWorker || typeof document === 'undefined') {
|
||||
return;
|
||||
}
|
||||
@@ -77,14 +82,25 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
_canvasContainer.ctx.binary = _canvasContainer.dom.binary.getContext("2d");
|
||||
_canvasContainer.dom.binary.width = _binaryImageWrapper.size.x;
|
||||
_canvasContainer.dom.binary.height = _binaryImageWrapper.size.y;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Creates a bounding box which encloses all the given patches
|
||||
* @returns {Array} The minimal bounding box
|
||||
*/
|
||||
function boxFromPatches(patches) {
|
||||
var overAvg, i, j, patch, transMat, minx = _binaryImageWrapper.size.x, miny = _binaryImageWrapper.size.y, maxx = -_binaryImageWrapper.size.x, maxy = -_binaryImageWrapper.size.y, box, scale;
|
||||
function boxFromPatches(patches) {
|
||||
var overAvg,
|
||||
i,
|
||||
j,
|
||||
patch,
|
||||
transMat,
|
||||
minx =
|
||||
_binaryImageWrapper.size.x,
|
||||
miny = _binaryImageWrapper.size.y,
|
||||
maxx = -_binaryImageWrapper.size.x,
|
||||
maxy = -_binaryImageWrapper.size.y,
|
||||
box,
|
||||
scale;
|
||||
|
||||
// draw all patches which are to be taken into consideration
|
||||
overAvg = 0;
|
||||
@@ -158,24 +174,24 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
}
|
||||
|
||||
return box;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Creates a binary image of the current image
|
||||
*/
|
||||
function binarizeImage() {
|
||||
function binarizeImage() {
|
||||
CVUtils.otsuThreshold(_currentImageWrapper, _binaryImageWrapper);
|
||||
_binaryImageWrapper.zeroBorder();
|
||||
if (_config.showCanvas) {
|
||||
_binaryImageWrapper.show(_canvasContainer.dom.binary, 255);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Iterate over the entire image
|
||||
* extract patches
|
||||
*/
|
||||
function findPatches() {
|
||||
function findPatches() {
|
||||
var i,
|
||||
j,
|
||||
x,
|
||||
@@ -185,9 +201,8 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
rasterizer,
|
||||
rasterResult,
|
||||
patch;
|
||||
for ( i = 0; i < _numPatches.x; i++) {
|
||||
for ( j = 0; j < _numPatches.y; j++) {
|
||||
|
||||
for (i = 0; i < _numPatches.x; i++) {
|
||||
for (j = 0; j < _numPatches.y; j++) {
|
||||
x = _subImageWrapper.size.x * i;
|
||||
y = _subImageWrapper.size.y * j;
|
||||
|
||||
@@ -201,7 +216,8 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
rasterResult = rasterizer.rasterize(0);
|
||||
|
||||
if (_config.showLabels) {
|
||||
_labelImageWrapper.overlay(_canvasContainer.dom.binary, Math.floor(360 / rasterResult.count), {x : x, y : y});
|
||||
_labelImageWrapper.overlay(_canvasContainer.dom.binary, Math.floor(360 / rasterResult.count),
|
||||
{x: x, y: y});
|
||||
}
|
||||
|
||||
// calculate moments from the skeletonized patch
|
||||
@@ -215,19 +231,20 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
if (_config.showFoundPatches) {
|
||||
for ( i = 0; i < patchesFound.length; i++) {
|
||||
patch = patchesFound[i];
|
||||
ImageDebug.drawRect(patch.pos, _subImageWrapper.size, _canvasContainer.ctx.binary, {color: "#99ff00", lineWidth: 2});
|
||||
ImageDebug.drawRect(patch.pos, _subImageWrapper.size, _canvasContainer.ctx.binary,
|
||||
{color: "#99ff00", lineWidth: 2});
|
||||
}
|
||||
}
|
||||
|
||||
return patchesFound;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Finds those connected areas which contain at least 6 patches
|
||||
* and returns them ordered DESC by the number of contained patches
|
||||
* @param {Number} maxLabel
|
||||
*/
|
||||
function findBiggestConnectedAreas(maxLabel){
|
||||
function findBiggestConnectedAreas(maxLabel){
|
||||
var i,
|
||||
sum,
|
||||
labelHist = [],
|
||||
@@ -245,8 +262,8 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
|
||||
labelHist = labelHist.map(function(val, idx) {
|
||||
return {
|
||||
val : val,
|
||||
label : idx + 1
|
||||
val: val,
|
||||
label: idx + 1
|
||||
};
|
||||
});
|
||||
|
||||
@@ -260,12 +277,12 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
});
|
||||
|
||||
return topLabels;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
*
|
||||
*/
|
||||
function findBoxes(topLabels, maxLabel) {
|
||||
function findBoxes(topLabels, maxLabel) {
|
||||
var i,
|
||||
j,
|
||||
sum,
|
||||
@@ -295,19 +312,20 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
patch = patches[j];
|
||||
hsv[0] = (topLabels[i].label / (maxLabel + 1)) * 360;
|
||||
CVUtils.hsv2rgb(hsv, rgb);
|
||||
ImageDebug.drawRect(patch.pos, _subImageWrapper.size, _canvasContainer.ctx.binary, {color: "rgb(" + rgb.join(",") + ")", lineWidth: 2});
|
||||
ImageDebug.drawRect(patch.pos, _subImageWrapper.size, _canvasContainer.ctx.binary,
|
||||
{color: "rgb(" + rgb.join(",") + ")", lineWidth: 2});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return boxes;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Find similar moments (via cluster)
|
||||
* @param {Object} moments
|
||||
*/
|
||||
function similarMoments(moments) {
|
||||
function similarMoments(moments) {
|
||||
var clusters = CVUtils.cluster(moments, 0.90);
|
||||
var topCluster = CVUtils.topGeneric(clusters, 1, function(e) {
|
||||
return e.getPoints().length;
|
||||
@@ -320,9 +338,9 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
function skeletonize(x, y) {
|
||||
function skeletonize(x, y) {
|
||||
_binaryImageWrapper.subImageAsCopy(_subImageWrapper, CVUtils.imageRef(x, y));
|
||||
_skeletonizer.skeletonize();
|
||||
|
||||
@@ -330,9 +348,9 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
if (_config.showSkeleton) {
|
||||
_skelImageWrapper.overlay(_canvasContainer.dom.binary, 360, CVUtils.imageRef(x, y));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Extracts and describes those patches which seem to contain a barcode pattern
|
||||
* @param {Array} moments
|
||||
* @param {Object} patchPos,
|
||||
@@ -340,15 +358,14 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
* @param {Number} y
|
||||
* @returns {Array} list of patches
|
||||
*/
|
||||
function describePatch(moments, patchPos, x, y) {
|
||||
function describePatch(moments, patchPos, x, y) {
|
||||
var k,
|
||||
avg,
|
||||
sum = 0,
|
||||
eligibleMoments = [],
|
||||
matchingMoments,
|
||||
patch,
|
||||
patchesFound = [],
|
||||
minComponentWeight = Math.ceil(_patchSize.x/3);
|
||||
minComponentWeight = Math.ceil(_patchSize.x / 3);
|
||||
|
||||
if (moments.length >= 2) {
|
||||
// only collect moments which's area covers at least minComponentWeight pixels.
|
||||
@@ -360,7 +377,6 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
|
||||
// if at least 2 moments are found which have at least minComponentWeights covered
|
||||
if (eligibleMoments.length >= 2) {
|
||||
sum = eligibleMoments.length;
|
||||
matchingMoments = similarMoments(eligibleMoments);
|
||||
avg = 0;
|
||||
// determine the similarity of the moments
|
||||
@@ -370,31 +386,38 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
|
||||
// Only two of the moments are allowed not to fit into the equation
|
||||
// add the patch to the set
|
||||
if (matchingMoments.length > 1 && matchingMoments.length >= (eligibleMoments.length / 4) * 3 && matchingMoments.length > moments.length / 4) {
|
||||
if (matchingMoments.length > 1
|
||||
&& matchingMoments.length >= (eligibleMoments.length / 4) * 3
|
||||
&& matchingMoments.length > moments.length / 4) {
|
||||
avg /= matchingMoments.length;
|
||||
patch = {
|
||||
index : patchPos[1] * _numPatches.x + patchPos[0],
|
||||
pos : {
|
||||
x : x,
|
||||
y : y
|
||||
index: patchPos[1] * _numPatches.x + patchPos[0],
|
||||
pos: {
|
||||
x: x,
|
||||
y: y
|
||||
},
|
||||
box : [vec2.clone([x, y]), vec2.clone([x + _subImageWrapper.size.x, y]), vec2.clone([x + _subImageWrapper.size.x, y + _subImageWrapper.size.y]), vec2.clone([x, y + _subImageWrapper.size.y])],
|
||||
moments : matchingMoments,
|
||||
rad : avg,
|
||||
vec : vec2.clone([Math.cos(avg), Math.sin(avg)])
|
||||
box: [
|
||||
vec2.clone([x, y]),
|
||||
vec2.clone([x + _subImageWrapper.size.x, y]),
|
||||
vec2.clone([x + _subImageWrapper.size.x, y + _subImageWrapper.size.y]),
|
||||
vec2.clone([x, y + _subImageWrapper.size.y])
|
||||
],
|
||||
moments: matchingMoments,
|
||||
rad: avg,
|
||||
vec: vec2.clone([Math.cos(avg), Math.sin(avg)])
|
||||
};
|
||||
patchesFound.push(patch);
|
||||
}
|
||||
}
|
||||
}
|
||||
return patchesFound;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* finds patches which are connected and share the same orientation
|
||||
* @param {Object} patchesFound
|
||||
*/
|
||||
function rasterizeAngularSimilarity(patchesFound) {
|
||||
function rasterizeAngularSimilarity(patchesFound) {
|
||||
var label = 0,
|
||||
threshold = 0.95,
|
||||
currIdx = 0,
|
||||
@@ -414,10 +437,16 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
}
|
||||
|
||||
function trace(currentIdx) {
|
||||
var x, y, currentPatch, patch, idx, dir, current = {
|
||||
x : currentIdx % _patchLabelGrid.size.x,
|
||||
y : (currentIdx / _patchLabelGrid.size.x) | 0
|
||||
}, similarity;
|
||||
var x,
|
||||
y,
|
||||
currentPatch,
|
||||
idx,
|
||||
dir,
|
||||
current = {
|
||||
x: currentIdx % _patchLabelGrid.size.x,
|
||||
y: (currentIdx / _patchLabelGrid.size.x) | 0
|
||||
},
|
||||
similarity;
|
||||
|
||||
if (currentIdx < _patchLabelGrid.data.length) {
|
||||
currentPatch = _imageToPatchGrid.data[currentIdx];
|
||||
@@ -434,9 +463,8 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
continue;
|
||||
}
|
||||
|
||||
patch = _imageToPatchGrid.data[idx];
|
||||
if (_patchLabelGrid.data[idx] === 0) {
|
||||
similarity = Math.abs(vec2.dot(patch.vec, currentPatch.vec));
|
||||
similarity = Math.abs(vec2.dot(_imageToPatchGrid.data[idx].vec, currentPatch.vec));
|
||||
if (similarity > threshold) {
|
||||
trace(idx);
|
||||
}
|
||||
@@ -471,16 +499,17 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
patch = _imageToPatchGrid.data[j];
|
||||
hsv[0] = (_patchLabelGrid.data[j] / (label + 1)) * 360;
|
||||
CVUtils.hsv2rgb(hsv, rgb);
|
||||
ImageDebug.drawRect(patch.pos, _subImageWrapper.size, _canvasContainer.ctx.binary, {color: "rgb(" + rgb.join(",") + ")", lineWidth: 2});
|
||||
ImageDebug.drawRect(patch.pos, _subImageWrapper.size, _canvasContainer.ctx.binary,
|
||||
{color: "rgb(" + rgb.join(",") + ")", lineWidth: 2});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return label;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
init : function(inputImageWrapper, config) {
|
||||
export default {
|
||||
init: function(inputImageWrapper, config) {
|
||||
_config = config;
|
||||
_inputImageWrapper = inputImageWrapper;
|
||||
|
||||
@@ -488,7 +517,7 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
initCanvas();
|
||||
},
|
||||
|
||||
locate : function() {
|
||||
locate: function() {
|
||||
var patchesFound,
|
||||
topLabels,
|
||||
boxes;
|
||||
@@ -545,8 +574,8 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
patchSize = CVUtils.calculatePatchSize(config.patchSize, size);
|
||||
console.log("Patch-Size: " + JSON.stringify(patchSize));
|
||||
|
||||
inputStream.setWidth(Math.floor(Math.floor(size.x/patchSize.x)*(1/halfSample)*patchSize.x));
|
||||
inputStream.setHeight(Math.floor(Math.floor(size.y/patchSize.y)*(1/halfSample)*patchSize.y));
|
||||
inputStream.setWidth(Math.floor(Math.floor(size.x / patchSize.x) * (1 / halfSample) * patchSize.x));
|
||||
inputStream.setHeight(Math.floor(Math.floor(size.y / patchSize.y) * (1 / halfSample) * patchSize.y));
|
||||
|
||||
if ((inputStream.getWidth() % patchSize.x) === 0 && (inputStream.getHeight() % patchSize.y) === 0) {
|
||||
return true;
|
||||
@@ -556,6 +585,4 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
|
||||
width + " )and height (" + height +
|
||||
") must a multiple of " + patchSize.x);
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
+36
-45
@@ -1,17 +1,10 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(
|
||||
function() {
|
||||
"use strict";
|
||||
|
||||
function BarcodeReader(config) {
|
||||
function BarcodeReader(config) {
|
||||
this._row = [];
|
||||
this.config = config || {};
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
BarcodeReader.prototype._nextUnset = function(line, start) {
|
||||
BarcodeReader.prototype._nextUnset = function(line, start) {
|
||||
var i;
|
||||
|
||||
if (start === undefined) {
|
||||
@@ -23,9 +16,9 @@ define(
|
||||
}
|
||||
}
|
||||
return line.length;
|
||||
};
|
||||
};
|
||||
|
||||
BarcodeReader.prototype._matchPattern = function(counter, code) {
|
||||
BarcodeReader.prototype._matchPattern = function(counter, code) {
|
||||
var i,
|
||||
error = 0,
|
||||
singleError = 0,
|
||||
@@ -39,10 +32,10 @@ define(
|
||||
}
|
||||
error += singleError;
|
||||
}
|
||||
return error/modulo;
|
||||
};
|
||||
return error / modulo;
|
||||
};
|
||||
|
||||
BarcodeReader.prototype._nextSet = function(line, offset) {
|
||||
BarcodeReader.prototype._nextSet = function(line, offset) {
|
||||
var i;
|
||||
|
||||
offset = offset || 0;
|
||||
@@ -52,9 +45,9 @@ define(
|
||||
}
|
||||
}
|
||||
return line.length;
|
||||
};
|
||||
};
|
||||
|
||||
BarcodeReader.prototype._normalize = function(counter, modulo) {
|
||||
BarcodeReader.prototype._normalize = function(counter, modulo) {
|
||||
var i,
|
||||
self = this,
|
||||
sum = 0,
|
||||
@@ -80,16 +73,16 @@ define(
|
||||
normalized.push(norm);
|
||||
}
|
||||
} else {
|
||||
ratio = (sum + numOnes)/modulo;
|
||||
ratio = (sum + numOnes) / modulo;
|
||||
for (i = 0; i < counter.length; i++) {
|
||||
norm = counter[i] / ratio;
|
||||
normalized.push(norm);
|
||||
}
|
||||
}
|
||||
return normalized;
|
||||
};
|
||||
};
|
||||
|
||||
BarcodeReader.prototype._matchTrace = function(cmpCounter, epsilon) {
|
||||
BarcodeReader.prototype._matchTrace = function(cmpCounter, epsilon) {
|
||||
var counter = [],
|
||||
i,
|
||||
self = this,
|
||||
@@ -97,9 +90,9 @@ define(
|
||||
isWhite = !self._row[offset],
|
||||
counterPos = 0,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : 0
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: 0
|
||||
},
|
||||
error;
|
||||
|
||||
@@ -148,9 +141,9 @@ define(
|
||||
bestMatch.end = self._row.length - 1;
|
||||
bestMatch.counter = counter;
|
||||
return bestMatch;
|
||||
};
|
||||
};
|
||||
|
||||
BarcodeReader.prototype.decodePattern = function(pattern) {
|
||||
BarcodeReader.prototype.decodePattern = function(pattern) {
|
||||
var self = this,
|
||||
result;
|
||||
|
||||
@@ -171,9 +164,9 @@ define(
|
||||
result.format = self.FORMAT;
|
||||
}
|
||||
return result;
|
||||
};
|
||||
};
|
||||
|
||||
BarcodeReader.prototype._matchRange = function(start, end, value) {
|
||||
BarcodeReader.prototype._matchRange = function(start, end, value) {
|
||||
var i;
|
||||
|
||||
start = start < 0 ? 0 : start;
|
||||
@@ -183,9 +176,9 @@ define(
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
};
|
||||
|
||||
BarcodeReader.prototype._fillCounters = function(offset, end, isWhite) {
|
||||
BarcodeReader.prototype._fillCounters = function(offset, end, isWhite) {
|
||||
var self = this,
|
||||
counterPos = 0,
|
||||
i,
|
||||
@@ -206,26 +199,24 @@ define(
|
||||
}
|
||||
}
|
||||
return counters;
|
||||
};
|
||||
};
|
||||
|
||||
Object.defineProperty(BarcodeReader.prototype, "FORMAT", {
|
||||
Object.defineProperty(BarcodeReader.prototype, "FORMAT", {
|
||||
value: 'unknown',
|
||||
writeable: false
|
||||
});
|
||||
});
|
||||
|
||||
BarcodeReader.DIRECTION = {
|
||||
FORWARD : 1,
|
||||
REVERSE : -1
|
||||
};
|
||||
BarcodeReader.DIRECTION = {
|
||||
FORWARD: 1,
|
||||
REVERSE: -1
|
||||
};
|
||||
|
||||
BarcodeReader.Exception = {
|
||||
StartNotFoundException : "Start-Info was not found!",
|
||||
CodeNotFoundException : "Code could not be found!",
|
||||
PatternNotFoundException : "Pattern could not be found!"
|
||||
};
|
||||
BarcodeReader.Exception = {
|
||||
StartNotFoundException: "Start-Info was not found!",
|
||||
CodeNotFoundException: "Code could not be found!",
|
||||
PatternNotFoundException: "Pattern could not be found!"
|
||||
};
|
||||
|
||||
BarcodeReader.CONFIG_KEYS = {};
|
||||
BarcodeReader.CONFIG_KEYS = {};
|
||||
|
||||
return (BarcodeReader);
|
||||
}
|
||||
);
|
||||
export default BarcodeReader;
|
||||
|
||||
+34
-38
@@ -1,17 +1,15 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import CVUtils from './cv_utils';
|
||||
import ImageWrapper from './image_wrapper';
|
||||
|
||||
define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
"use strict";
|
||||
var Bresenham = {};
|
||||
var Bresenham = {};
|
||||
|
||||
var Slope = {
|
||||
DIR : {
|
||||
UP : 1,
|
||||
DOWN : -1
|
||||
var Slope = {
|
||||
DIR: {
|
||||
UP: 1,
|
||||
DOWN: -1
|
||||
}
|
||||
};
|
||||
/**
|
||||
};
|
||||
/**
|
||||
* Scans a line of the given image from point p1 to p2 and returns a result object containing
|
||||
* gray-scale values (0-255) of the underlying pixels in addition to the min
|
||||
* and max values.
|
||||
@@ -20,7 +18,7 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
* @param {Object} p2 The end point {x,y}
|
||||
* @returns {line, min, max}
|
||||
*/
|
||||
Bresenham.getBarcodeLine = function(imageWrapper, p1, p2) {
|
||||
Bresenham.getBarcodeLine = function(imageWrapper, p1, p2) {
|
||||
var x0 = p1.x | 0,
|
||||
y0 = p1.y | 0,
|
||||
x1 = p2.x | 0,
|
||||
@@ -73,7 +71,7 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
y = y0;
|
||||
ystep = y0 < y1 ? 1 : -1;
|
||||
for ( x = x0; x < x1; x++) {
|
||||
if(steep){
|
||||
if (steep){
|
||||
read(y, x);
|
||||
} else {
|
||||
read(x, y);
|
||||
@@ -86,13 +84,13 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
}
|
||||
|
||||
return {
|
||||
line : line,
|
||||
min : min,
|
||||
max : max
|
||||
};
|
||||
line: line,
|
||||
min: min,
|
||||
max: max
|
||||
};
|
||||
};
|
||||
|
||||
Bresenham.toOtsuBinaryLine = function(result) {
|
||||
Bresenham.toOtsuBinaryLine = function(result) {
|
||||
var line = result.line,
|
||||
image = new ImageWrapper({x: line.length - 1, y: 1}, line),
|
||||
threshold = CVUtils.determineOtsuThreshold(image, 5);
|
||||
@@ -104,15 +102,14 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
line: line,
|
||||
threshold: threshold
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Converts the result from getBarcodeLine into a binary representation
|
||||
* also considering the frequency and slope of the signal for more robust results
|
||||
* @param {Object} result {line, min, max}
|
||||
*/
|
||||
Bresenham.toBinaryLine = function(result) {
|
||||
|
||||
Bresenham.toBinaryLine = function(result) {
|
||||
var min = result.min,
|
||||
max = result.max,
|
||||
line = result.line,
|
||||
@@ -130,15 +127,15 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
// 1. find extrema
|
||||
currentDir = line[0] > center ? Slope.DIR.UP : Slope.DIR.DOWN;
|
||||
extrema.push({
|
||||
pos : 0,
|
||||
val : line[0]
|
||||
pos: 0,
|
||||
val: line[0]
|
||||
});
|
||||
for ( i = 0; i < line.length - 2; i++) {
|
||||
slope = (line[i + 1] - line[i]);
|
||||
slope2 = (line[i + 2] - line[i + 1]);
|
||||
if ((slope + slope2) < rThreshold && line[i + 1] < (center*1.5)) {
|
||||
if ((slope + slope2) < rThreshold && line[i + 1] < (center * 1.5)) {
|
||||
dir = Slope.DIR.DOWN;
|
||||
} else if ((slope + slope2) > threshold && line[i + 1] > (center*0.5)) {
|
||||
} else if ((slope + slope2) > threshold && line[i + 1] > (center * 0.5)) {
|
||||
dir = Slope.DIR.UP;
|
||||
} else {
|
||||
dir = currentDir;
|
||||
@@ -146,15 +143,15 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
|
||||
if (currentDir !== dir) {
|
||||
extrema.push({
|
||||
pos : i,
|
||||
val : line[i]
|
||||
pos: i,
|
||||
val: line[i]
|
||||
});
|
||||
currentDir = dir;
|
||||
}
|
||||
}
|
||||
extrema.push({
|
||||
pos : line.length,
|
||||
val : line[line.length - 1]
|
||||
pos: line.length,
|
||||
val: line[line.length - 1]
|
||||
});
|
||||
|
||||
for ( j = extrema[0].pos; j < extrema[1].pos; j++) {
|
||||
@@ -175,15 +172,15 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
}
|
||||
|
||||
return {
|
||||
line : line,
|
||||
threshold : threshold
|
||||
};
|
||||
line: line,
|
||||
threshold: threshold
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Used for development only
|
||||
*/
|
||||
Bresenham.debug = {
|
||||
Bresenham.debug = {
|
||||
printFrequency: function(line, canvas) {
|
||||
var i,
|
||||
ctx = canvas.getContext("2d");
|
||||
@@ -211,7 +208,6 @@ define(["cv_utils", "image_wrapper"], function(CVUtils, ImageWrapper) {
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
return (Bresenham);
|
||||
});
|
||||
export default Bresenham;
|
||||
|
||||
+23
-27
@@ -1,18 +1,15 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define, MediaStreamTrack */
|
||||
const merge = require('lodash/object/merge');
|
||||
|
||||
define(["html_utils"], function(HtmlUtils) {
|
||||
"use strict";
|
||||
var streamRef,
|
||||
var streamRef,
|
||||
loadedDataHandler;
|
||||
|
||||
/**
|
||||
/**
|
||||
* Wraps browser-specific getUserMedia
|
||||
* @param {Object} constraints
|
||||
* @param {Object} success Callback
|
||||
* @param {Object} failure Callback
|
||||
*/
|
||||
function getUserMedia(constraints, success, failure) {
|
||||
function getUserMedia(constraints, success, failure) {
|
||||
if (typeof navigator.getUserMedia !== 'undefined') {
|
||||
navigator.getUserMedia(constraints, function (stream) {
|
||||
streamRef = stream;
|
||||
@@ -22,9 +19,9 @@ define(["html_utils"], function(HtmlUtils) {
|
||||
} else {
|
||||
failure(new TypeError("getUserMedia not available"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function loadedData(video, callback) {
|
||||
function loadedData(video, callback) {
|
||||
var attempts = 10;
|
||||
|
||||
function checkVideo() {
|
||||
@@ -41,16 +38,16 @@ define(["html_utils"], function(HtmlUtils) {
|
||||
attempts--;
|
||||
}
|
||||
checkVideo();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Tries to attach the camera-stream to a given video-element
|
||||
* and calls the callback function when the content is ready
|
||||
* @param {Object} constraints
|
||||
* @param {Object} video
|
||||
* @param {Object} callback
|
||||
*/
|
||||
function initCamera(constraints, video, callback) {
|
||||
function initCamera(constraints, video, callback) {
|
||||
getUserMedia(constraints, function(src) {
|
||||
video.src = src;
|
||||
if (loadedDataHandler) {
|
||||
@@ -62,20 +59,20 @@ define(["html_utils"], function(HtmlUtils) {
|
||||
}, function(e) {
|
||||
callback(e);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Normalizes the incoming constraints to satisfy the current browser
|
||||
* @param config
|
||||
* @param cb Callback which is called whenever constraints are created
|
||||
* @returns {*}
|
||||
*/
|
||||
function normalizeConstraints(config, cb) {
|
||||
function normalizeConstraints(config, cb) {
|
||||
var constraints = {
|
||||
audio: false,
|
||||
video: true
|
||||
},
|
||||
videoConstraints = HtmlUtils.mergeObjects({
|
||||
videoConstraints = merge({
|
||||
width: 640,
|
||||
height: 480,
|
||||
minAspectRatio: 0,
|
||||
@@ -86,9 +83,9 @@ define(["html_utils"], function(HtmlUtils) {
|
||||
if ( typeof MediaStreamTrack !== 'undefined' && typeof MediaStreamTrack.getSources !== 'undefined') {
|
||||
MediaStreamTrack.getSources(function(sourceInfos) {
|
||||
var videoSourceId;
|
||||
for (var i = 0; i != sourceInfos.length; ++i) {
|
||||
for (var i = 0; i < sourceInfos.length; ++i) {
|
||||
var sourceInfo = sourceInfos[i];
|
||||
if (sourceInfo.kind == "video" && sourceInfo.facing == videoConstraints.facing) {
|
||||
if (sourceInfo.kind === "video" && sourceInfo.facing === videoConstraints.facing) {
|
||||
videoSourceId = sourceInfo.id;
|
||||
}
|
||||
}
|
||||
@@ -114,30 +111,29 @@ define(["html_utils"], function(HtmlUtils) {
|
||||
};
|
||||
return cb(constraints);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Requests the back-facing camera of the user. The callback is called
|
||||
* whenever the stream is ready to be consumed, or if an error occures.
|
||||
* @param {Object} video
|
||||
* @param {Object} callback
|
||||
*/
|
||||
function request(video, videoConstraints, callback) {
|
||||
function request(video, videoConstraints, callback) {
|
||||
normalizeConstraints(videoConstraints, function(constraints) {
|
||||
initCamera(constraints, video, callback);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
request : function(video, constraints, callback) {
|
||||
export default {
|
||||
request: function(video, constraints, callback) {
|
||||
request(video, constraints, callback);
|
||||
},
|
||||
release : function() {
|
||||
release: function() {
|
||||
var tracks = streamRef && streamRef.getVideoTracks();
|
||||
if (tracks.length) {
|
||||
tracks[0].stop();
|
||||
}
|
||||
streamRef = null;
|
||||
}
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
+24
-31
@@ -1,28 +1,24 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(["gl-matrix"], function(glMatrix) {
|
||||
"use strict";
|
||||
|
||||
var vec2 = glMatrix.vec2;
|
||||
import {vec2} from 'gl-matrix';
|
||||
/**
|
||||
* Creates a cluster for grouping similar orientations of datapoints
|
||||
*/
|
||||
var Cluster = {
|
||||
create : function(point, threshold) {
|
||||
var points = [], center = {
|
||||
rad : 0,
|
||||
vec : vec2.clone([0, 0])
|
||||
}, pointMap = {};
|
||||
export default {
|
||||
create: function(point, threshold) {
|
||||
var points = [],
|
||||
center = {
|
||||
rad: 0,
|
||||
vec: vec2.clone([0, 0])
|
||||
},
|
||||
pointMap = {};
|
||||
|
||||
function init() {
|
||||
add(point);
|
||||
updateCenter();
|
||||
}
|
||||
|
||||
function add(point) {
|
||||
pointMap[point.id] = point;
|
||||
points.push(point);
|
||||
function add(pointToAdd) {
|
||||
pointMap[pointToAdd.id] = pointToAdd;
|
||||
points.push(pointToAdd);
|
||||
}
|
||||
|
||||
function updateCenter() {
|
||||
@@ -37,36 +33,33 @@ define(["gl-matrix"], function(glMatrix) {
|
||||
init();
|
||||
|
||||
return {
|
||||
add : function(point) {
|
||||
if (!pointMap[point.id]) {
|
||||
add(point);
|
||||
add: function(pointToAdd) {
|
||||
if (!pointMap[pointToAdd.id]) {
|
||||
add(pointToAdd);
|
||||
updateCenter();
|
||||
}
|
||||
},
|
||||
fits : function(point) {
|
||||
fits: function(otherPoint) {
|
||||
// check cosine similarity to center-angle
|
||||
var similarity = Math.abs(vec2.dot(point.point.vec, center.vec));
|
||||
var similarity = Math.abs(vec2.dot(otherPoint.point.vec, center.vec));
|
||||
if (similarity > threshold) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
getPoints : function() {
|
||||
getPoints: function() {
|
||||
return points;
|
||||
},
|
||||
getCenter : function() {
|
||||
getCenter: function() {
|
||||
return center;
|
||||
}
|
||||
};
|
||||
},
|
||||
createPoint : function(point, id, property) {
|
||||
createPoint: function(newPoint, id, property) {
|
||||
return {
|
||||
rad : point[property],
|
||||
point : point,
|
||||
id : id
|
||||
rad: newPoint[property],
|
||||
point: newPoint,
|
||||
id: id
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
return (Cluster);
|
||||
});
|
||||
};
|
||||
|
||||
+49
-55
@@ -1,33 +1,26 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import BarcodeReader from './barcode_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./barcode_reader"
|
||||
],
|
||||
function(BarcodeReader) {
|
||||
"use strict";
|
||||
|
||||
function CodabarReader() {
|
||||
function CodabarReader() {
|
||||
BarcodeReader.call(this);
|
||||
this._counters = [];
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
var properties = {
|
||||
ALPHABETH_STRING: {value: "0123456789-$:/.+ABCD"},
|
||||
ALPHABET: {value: [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 45, 36, 58, 47, 46, 43, 65, 66, 67, 68]},
|
||||
CHARACTER_ENCODINGS: {value: [0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024, 0x030, 0x048, 0x00c, 0x018, 0x045, 0x051, 0x054, 0x015, 0x01A, 0x029, 0x00B, 0x00E]},
|
||||
CHARACTER_ENCODINGS: {value: [0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024, 0x030, 0x048, 0x00c, 0x018,
|
||||
0x045, 0x051, 0x054, 0x015, 0x01A, 0x029, 0x00B, 0x00E]},
|
||||
START_END: {value: [0x01A, 0x029, 0x00B, 0x00E]},
|
||||
MIN_ENCODED_CHARS: {value: 4},
|
||||
MAX_ACCEPTABLE: {value: 2.0},
|
||||
PADDING: {value: 1.5},
|
||||
FORMAT: {value: "codabar", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
CodabarReader.prototype.constructor = CodabarReader;
|
||||
CodabarReader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
CodabarReader.prototype.constructor = CodabarReader;
|
||||
|
||||
CodabarReader.prototype._decode = function() {
|
||||
CodabarReader.prototype._decode = function() {
|
||||
var self = this,
|
||||
result = [],
|
||||
start,
|
||||
@@ -57,7 +50,7 @@ define(
|
||||
if (result.length > 1 && self._isStartEnd(pattern)) {
|
||||
break;
|
||||
}
|
||||
} while(nextStart < self._counters.length);
|
||||
} while (nextStart < self._counters.length);
|
||||
|
||||
// verify end
|
||||
if ((result.length - 2) < self.MIN_ENCODED_CHARS || !self._isStartEnd(pattern)) {
|
||||
@@ -77,24 +70,26 @@ define(
|
||||
end = start.start + self._sumCounters(start.startCounter, nextStart - 8);
|
||||
|
||||
return {
|
||||
code : result.join(""),
|
||||
start : start.start,
|
||||
end : end,
|
||||
startInfo : start,
|
||||
decodedCodes : result
|
||||
};
|
||||
code: result.join(""),
|
||||
start: start.start,
|
||||
end: end,
|
||||
startInfo: start,
|
||||
decodedCodes: result
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._verifyWhitespace = function(startCounter, endCounter) {
|
||||
if ((startCounter - 1 <= 0) || this._counters[startCounter-1] >= (this._calculatePatternLength(startCounter) / 2.0)) {
|
||||
if ((endCounter + 8 >= this._counters.length) || this._counters[endCounter+7] >= (this._calculatePatternLength(endCounter) / 2.0)) {
|
||||
CodabarReader.prototype._verifyWhitespace = function(startCounter, endCounter) {
|
||||
if ((startCounter - 1 <= 0)
|
||||
|| this._counters[startCounter - 1] >= (this._calculatePatternLength(startCounter) / 2.0)) {
|
||||
if ((endCounter + 8 >= this._counters.length)
|
||||
|| this._counters[endCounter + 7] >= (this._calculatePatternLength(endCounter) / 2.0)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._calculatePatternLength = function(offset) {
|
||||
CodabarReader.prototype._calculatePatternLength = function(offset) {
|
||||
var i,
|
||||
sum = 0;
|
||||
|
||||
@@ -103,9 +98,9 @@ define(
|
||||
}
|
||||
|
||||
return sum;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._thresholdResultPattern = function(result, startCounter){
|
||||
CodabarReader.prototype._thresholdResultPattern = function(result, startCounter){
|
||||
var self = this,
|
||||
categorization = {
|
||||
space: {
|
||||
@@ -137,16 +132,17 @@ define(
|
||||
}
|
||||
|
||||
["space", "bar"].forEach(function(key) {
|
||||
var kind = categorization[key];
|
||||
kind.wide.min = Math.floor((kind.narrow.size/kind.narrow.counts + kind.wide.size / kind.wide.counts) / 2);
|
||||
kind.narrow.max = Math.ceil(kind.wide.min);
|
||||
kind.wide.max = Math.ceil((kind.wide.size * self.MAX_ACCEPTABLE + self.PADDING) / kind.wide.counts);
|
||||
var newkind = categorization[key];
|
||||
newkind.wide.min =
|
||||
Math.floor((newkind.narrow.size / newkind.narrow.counts + newkind.wide.size / newkind.wide.counts) / 2);
|
||||
newkind.narrow.max = Math.ceil(newkind.wide.min);
|
||||
newkind.wide.max = Math.ceil((newkind.wide.size * self.MAX_ACCEPTABLE + self.PADDING) / newkind.wide.counts);
|
||||
});
|
||||
|
||||
return categorization;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._charToPattern = function(char) {
|
||||
CodabarReader.prototype._charToPattern = function(char) {
|
||||
var self = this,
|
||||
charCode = char.charCodeAt(0),
|
||||
i;
|
||||
@@ -157,9 +153,9 @@ define(
|
||||
}
|
||||
}
|
||||
return 0x0;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._validateResult = function(result, startCounter) {
|
||||
CodabarReader.prototype._validateResult = function(result, startCounter) {
|
||||
var self = this,
|
||||
thresholds = self._thresholdResultPattern(result, startCounter),
|
||||
i,
|
||||
@@ -184,9 +180,9 @@ define(
|
||||
pos += 8;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._patternToChar = function(pattern) {
|
||||
CodabarReader.prototype._patternToChar = function(pattern) {
|
||||
var i,
|
||||
self = this;
|
||||
|
||||
@@ -196,9 +192,9 @@ define(
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._computeAlternatingThreshold = function(offset, end) {
|
||||
CodabarReader.prototype._computeAlternatingThreshold = function(offset, end) {
|
||||
var i,
|
||||
min = Number.MAX_VALUE,
|
||||
max = 0,
|
||||
@@ -215,9 +211,9 @@ define(
|
||||
}
|
||||
|
||||
return ((min + max) / 2.0) | 0;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._toPattern = function(offset) {
|
||||
CodabarReader.prototype._toPattern = function(offset) {
|
||||
var numCounters = 7,
|
||||
end = offset + numCounters,
|
||||
barThreshold,
|
||||
@@ -243,9 +239,9 @@ define(
|
||||
}
|
||||
|
||||
return pattern;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._isStartEnd = function(pattern) {
|
||||
CodabarReader.prototype._isStartEnd = function(pattern) {
|
||||
var i;
|
||||
|
||||
for (i = 0; i < this.START_END.length; i++) {
|
||||
@@ -254,9 +250,9 @@ define(
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._sumCounters = function(start, end) {
|
||||
CodabarReader.prototype._sumCounters = function(start, end) {
|
||||
var i,
|
||||
sum = 0;
|
||||
|
||||
@@ -264,9 +260,9 @@ define(
|
||||
sum += this._counters[i];
|
||||
}
|
||||
return sum;
|
||||
};
|
||||
};
|
||||
|
||||
CodabarReader.prototype._findStart = function() {
|
||||
CodabarReader.prototype._findStart = function() {
|
||||
var self = this,
|
||||
i,
|
||||
pattern,
|
||||
@@ -287,8 +283,6 @@ define(
|
||||
};
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
return (CodabarReader);
|
||||
}
|
||||
);
|
||||
export default CodabarReader;
|
||||
|
||||
+50
-66
@@ -1,28 +1,20 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import BarcodeReader from './barcode_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./barcode_reader"
|
||||
],
|
||||
function(BarcodeReader) {
|
||||
"use strict";
|
||||
|
||||
function Code128Reader() {
|
||||
function Code128Reader() {
|
||||
BarcodeReader.call(this);
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
CODE_SHIFT : {value: 98},
|
||||
CODE_C : {value: 99},
|
||||
CODE_B : {value: 100},
|
||||
CODE_A : {value: 101},
|
||||
START_CODE_A : {value: 103},
|
||||
START_CODE_B : {value: 104},
|
||||
START_CODE_C : {value: 105},
|
||||
STOP_CODE : {value: 106},
|
||||
MODULO : {value: 11},
|
||||
CODE_PATTERN : {value: [
|
||||
var properties = {
|
||||
CODE_SHIFT: {value: 98},
|
||||
CODE_C: {value: 99},
|
||||
CODE_B: {value: 100},
|
||||
CODE_A: {value: 101},
|
||||
START_CODE_A: {value: 103},
|
||||
START_CODE_B: {value: 104},
|
||||
START_CODE_C: {value: 105},
|
||||
STOP_CODE: {value: 106},
|
||||
MODULO: {value: 11},
|
||||
CODE_PATTERN: {value: [
|
||||
[2, 1, 2, 2, 2, 2],
|
||||
[2, 2, 2, 1, 2, 2],
|
||||
[2, 2, 2, 2, 2, 1],
|
||||
@@ -134,12 +126,12 @@ define(
|
||||
SINGLE_CODE_ERROR: {value: 1},
|
||||
AVG_CODE_ERROR: {value: 0.5},
|
||||
FORMAT: {value: "code_128", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
Code128Reader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
Code128Reader.prototype.constructor = Code128Reader;
|
||||
Code128Reader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
Code128Reader.prototype.constructor = Code128Reader;
|
||||
|
||||
Code128Reader.prototype._decodeCode = function(start) {
|
||||
Code128Reader.prototype._decodeCode = function(start) {
|
||||
var counter = [0, 0, 0, 0, 0, 0],
|
||||
i,
|
||||
self = this,
|
||||
@@ -147,10 +139,10 @@ define(
|
||||
isWhite = !self._row[offset],
|
||||
counterPos = 0,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : start,
|
||||
end : start
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: start,
|
||||
end: start
|
||||
},
|
||||
code,
|
||||
error,
|
||||
@@ -181,9 +173,9 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
Code128Reader.prototype._findStart = function() {
|
||||
Code128Reader.prototype._findStart = function() {
|
||||
var counter = [0, 0, 0, 0, 0, 0],
|
||||
i,
|
||||
self = this,
|
||||
@@ -191,10 +183,10 @@ define(
|
||||
isWhite = false,
|
||||
counterPos = 0,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : 0,
|
||||
end : 0
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: 0,
|
||||
end: 0
|
||||
},
|
||||
code,
|
||||
error,
|
||||
@@ -241,9 +233,9 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
Code128Reader.prototype._decode = function() {
|
||||
Code128Reader.prototype._decode = function() {
|
||||
var self = this,
|
||||
startInfo = self._findStart(),
|
||||
code = null,
|
||||
@@ -255,20 +247,19 @@ define(
|
||||
rawResult = [],
|
||||
decodedCodes = [],
|
||||
shiftNext = false,
|
||||
unshift,
|
||||
lastCharacterWasPrintable;
|
||||
unshift;
|
||||
|
||||
if (startInfo === null) {
|
||||
return null;
|
||||
}
|
||||
code = {
|
||||
code : startInfo.code,
|
||||
start : startInfo.start,
|
||||
end : startInfo.end
|
||||
code: startInfo.code,
|
||||
start: startInfo.start,
|
||||
end: startInfo.end
|
||||
};
|
||||
decodedCodes.push(code);
|
||||
checksum = code.code;
|
||||
switch(code.code) {
|
||||
switch (code.code) {
|
||||
case self.START_CODE_A:
|
||||
codeset = self.CODE_A;
|
||||
break;
|
||||
@@ -294,7 +285,7 @@ define(
|
||||
}
|
||||
decodedCodes.push(code);
|
||||
|
||||
switch(codeset) {
|
||||
switch (codeset) {
|
||||
case self.CODE_A:
|
||||
if (code.code < 64) {
|
||||
result.push(String.fromCharCode(32 + code.code));
|
||||
@@ -322,9 +313,6 @@ define(
|
||||
if (code.code < 96) {
|
||||
result.push(String.fromCharCode(32 + code.code));
|
||||
} else {
|
||||
if (code.code != self.STOP_CODE) {
|
||||
lastCharacterWasPrintable = false;
|
||||
}
|
||||
switch (code.code) {
|
||||
case self.CODE_SHIFT:
|
||||
shiftNext = true;
|
||||
@@ -363,7 +351,7 @@ define(
|
||||
done = true;
|
||||
}
|
||||
if (unshift) {
|
||||
codeset = codeset == self.CODE_A ? self.CODE_B : self.CODE_A;
|
||||
codeset = codeset === self.CODE_A ? self.CODE_B : self.CODE_A;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -373,14 +361,14 @@ define(
|
||||
|
||||
// find end bar
|
||||
code.end = self._nextUnset(self._row, code.end);
|
||||
if(!self._verifyTrailingWhitespace(code)){
|
||||
if (!self._verifyTrailingWhitespace(code)){
|
||||
return null;
|
||||
}
|
||||
|
||||
// checksum
|
||||
// Does not work correctly yet!!! startcode - endcode?
|
||||
checksum -= multiplier * rawResult[rawResult.length - 1];
|
||||
if (checksum % 103 != rawResult[rawResult.length - 1]) {
|
||||
if (checksum % 103 !== rawResult[rawResult.length - 1]) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -391,21 +379,19 @@ define(
|
||||
// remove last code from result (checksum)
|
||||
result.splice(result.length - 1, 1);
|
||||
|
||||
|
||||
|
||||
return {
|
||||
code : result.join(""),
|
||||
start : startInfo.start,
|
||||
end : code.end,
|
||||
codeset : codeset,
|
||||
startInfo : startInfo,
|
||||
decodedCodes : decodedCodes,
|
||||
endInfo : code
|
||||
};
|
||||
code: result.join(""),
|
||||
start: startInfo.start,
|
||||
end: code.end,
|
||||
codeset: codeset,
|
||||
startInfo: startInfo,
|
||||
decodedCodes: decodedCodes,
|
||||
endInfo: code
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
BarcodeReader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
BarcodeReader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
var self = this,
|
||||
trailingWhitespaceEnd;
|
||||
|
||||
@@ -416,8 +402,6 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
return (Code128Reader);
|
||||
}
|
||||
);
|
||||
export default Code128Reader;
|
||||
|
||||
+39
-46
@@ -1,30 +1,26 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import BarcodeReader from './barcode_reader';
|
||||
import ArrayHelper from './array_helper';
|
||||
|
||||
define(
|
||||
[
|
||||
"./barcode_reader",
|
||||
"./array_helper"
|
||||
],
|
||||
function(BarcodeReader, ArrayHelper) {
|
||||
"use strict";
|
||||
|
||||
function Code39Reader() {
|
||||
function Code39Reader() {
|
||||
BarcodeReader.call(this);
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
var properties = {
|
||||
ALPHABETH_STRING: {value: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"},
|
||||
ALPHABET: {value: [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 45, 46, 32, 42, 36, 47, 43, 37]},
|
||||
CHARACTER_ENCODINGS: {value: [0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A]},
|
||||
ALPHABET: {value: [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
|
||||
79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 45, 46, 32, 42, 36, 47, 43, 37]},
|
||||
CHARACTER_ENCODINGS: {value: [0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, 0x109, 0x049,
|
||||
0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106,
|
||||
0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A
|
||||
]},
|
||||
ASTERISK: {value: 0x094},
|
||||
FORMAT: {value: "code_39", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
Code39Reader.prototype.constructor = Code39Reader;
|
||||
Code39Reader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
Code39Reader.prototype.constructor = Code39Reader;
|
||||
|
||||
Code39Reader.prototype._toCounters = function(start, counter) {
|
||||
Code39Reader.prototype._toCounters = function(start, counter) {
|
||||
var self = this,
|
||||
numCounters = counter.length,
|
||||
end = self._row.length,
|
||||
@@ -49,11 +45,11 @@ define(
|
||||
}
|
||||
|
||||
return counter;
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype._decode = function() {
|
||||
Code39Reader.prototype._decode = function() {
|
||||
var self = this,
|
||||
counters = [0,0,0,0,0,0,0,0,0],
|
||||
counters = [0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
result = [],
|
||||
start = self._findStart(),
|
||||
decodedChar,
|
||||
@@ -80,27 +76,27 @@ define(
|
||||
lastStart = nextStart;
|
||||
nextStart += ArrayHelper.sum(counters);
|
||||
nextStart = self._nextSet(self._row, nextStart);
|
||||
} while(decodedChar !== '*');
|
||||
} while (decodedChar !== '*');
|
||||
result.pop();
|
||||
|
||||
if (!result.length) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(!self._verifyTrailingWhitespace(lastStart, nextStart, counters)) {
|
||||
if (!self._verifyTrailingWhitespace(lastStart, nextStart, counters)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
code : result.join(""),
|
||||
start : start.start,
|
||||
end : nextStart,
|
||||
startInfo : start,
|
||||
decodedCodes : result
|
||||
};
|
||||
code: result.join(""),
|
||||
start: start.start,
|
||||
end: nextStart,
|
||||
startInfo: start,
|
||||
decodedCodes: result
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype._verifyTrailingWhitespace = function(lastStart, nextStart, counters) {
|
||||
Code39Reader.prototype._verifyTrailingWhitespace = function(lastStart, nextStart, counters) {
|
||||
var trailingWhitespaceEnd,
|
||||
patternSize = ArrayHelper.sum(counters);
|
||||
|
||||
@@ -109,9 +105,9 @@ define(
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype._patternToChar = function(pattern) {
|
||||
Code39Reader.prototype._patternToChar = function(pattern) {
|
||||
var i,
|
||||
self = this;
|
||||
|
||||
@@ -120,9 +116,9 @@ define(
|
||||
return String.fromCharCode(self.ALPHABET[i]);
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype._findNextWidth = function(counters, current) {
|
||||
Code39Reader.prototype._findNextWidth = function(counters, current) {
|
||||
var i,
|
||||
minWidth = Number.MAX_VALUE;
|
||||
|
||||
@@ -133,9 +129,9 @@ define(
|
||||
}
|
||||
|
||||
return minWidth;
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype._toPattern = function(counters) {
|
||||
Code39Reader.prototype._toPattern = function(counters) {
|
||||
var numCounters = counters.length,
|
||||
maxNarrowWidth = 0,
|
||||
numWideBars = numCounters,
|
||||
@@ -144,7 +140,7 @@ define(
|
||||
pattern,
|
||||
i;
|
||||
|
||||
while(numWideBars > 3) {
|
||||
while (numWideBars > 3) {
|
||||
maxNarrowWidth = self._findNextWidth(counters, maxNarrowWidth);
|
||||
numWideBars = 0;
|
||||
pattern = 0;
|
||||
@@ -169,13 +165,13 @@ define(
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
};
|
||||
|
||||
Code39Reader.prototype._findStart = function() {
|
||||
Code39Reader.prototype._findStart = function() {
|
||||
var self = this,
|
||||
offset = self._nextSet(self._row),
|
||||
patternStart = offset,
|
||||
counter = [0,0,0,0,0,0,0,0,0],
|
||||
counter = [0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
counterPos = 0,
|
||||
isWhite = false,
|
||||
i,
|
||||
@@ -187,7 +183,6 @@ define(
|
||||
counter[counterPos]++;
|
||||
} else {
|
||||
if (counterPos === counter.length - 1) {
|
||||
|
||||
// find start pattern
|
||||
if (self._toPattern(counter) === self.ASTERISK) {
|
||||
whiteSpaceMustStart = Math.floor(Math.max(0, patternStart - ((i - patternStart) / 4)));
|
||||
@@ -214,8 +209,6 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
return (Code39Reader);
|
||||
}
|
||||
);
|
||||
export default Code39Reader;
|
||||
|
||||
+15
-25
@@ -1,28 +1,20 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import Code39Reader from './code_39_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./code_39_reader"
|
||||
],
|
||||
function(Code39Reader) {
|
||||
"use strict";
|
||||
|
||||
function Code39VINReader() {
|
||||
function Code39VINReader() {
|
||||
Code39Reader.call(this);
|
||||
}
|
||||
}
|
||||
|
||||
var patterns = {
|
||||
var patterns = {
|
||||
IOQ: /[IOQ]/g,
|
||||
AZ09: /[A-Z0-9]{17}/
|
||||
};
|
||||
};
|
||||
|
||||
Code39VINReader.prototype = Object.create(Code39Reader.prototype);
|
||||
Code39VINReader.prototype.constructor = Code39VINReader;
|
||||
Code39VINReader.prototype = Object.create(Code39Reader.prototype);
|
||||
Code39VINReader.prototype.constructor = Code39VINReader;
|
||||
|
||||
// Cribbed from:
|
||||
// https://github.com/zxing/zxing/blob/master/core/src/main/java/com/google/zxing/client/result/VINResultParser.java
|
||||
Code39VINReader.prototype._decode = function() {
|
||||
// Cribbed from:
|
||||
// https://github.com/zxing/zxing/blob/master/core/src/main/java/com/google/zxing/client/result/VINResultParser.java
|
||||
Code39VINReader.prototype._decode = function() {
|
||||
var result = Code39Reader.prototype._decode.apply(this);
|
||||
if (!result) {
|
||||
return null;
|
||||
@@ -31,7 +23,7 @@ define(
|
||||
var code = result.code;
|
||||
|
||||
if (!code) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
code = code.replace(patterns.IOQ, '');
|
||||
@@ -47,13 +39,11 @@ define(
|
||||
|
||||
result.code = code;
|
||||
return result;
|
||||
};
|
||||
};
|
||||
|
||||
Code39VINReader.prototype._checkChecksum = function(code) {
|
||||
Code39VINReader.prototype._checkChecksum = function(code) {
|
||||
// TODO
|
||||
return !!code;
|
||||
};
|
||||
};
|
||||
|
||||
return (Code39VINReader);
|
||||
}
|
||||
);
|
||||
export default Code39VINReader;
|
||||
|
||||
+5
-12
@@ -1,10 +1,6 @@
|
||||
/**
|
||||
* The basic configuration
|
||||
*/
|
||||
|
||||
define(function(){
|
||||
var config = {
|
||||
inputStream: { name: "Live",
|
||||
export default {
|
||||
inputStream: {
|
||||
name: "Live",
|
||||
type: "LiveStream",
|
||||
constraints: {
|
||||
width: 640,
|
||||
@@ -29,7 +25,7 @@ define(function(){
|
||||
visual: {
|
||||
show: true
|
||||
},
|
||||
decoder:{
|
||||
decoder: {
|
||||
drawBoundingBox: false,
|
||||
showFrequency: false,
|
||||
drawScanline: false,
|
||||
@@ -54,7 +50,4 @@ define(function(){
|
||||
showBB: false
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
return config;
|
||||
});
|
||||
};
|
||||
|
||||
+170
-139
@@ -1,52 +1,38 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import Cluster2 from './cluster';
|
||||
import ArrayHelper from './array_helper';
|
||||
import {vec2, vec3} from 'gl-matrix';
|
||||
|
||||
define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper, glMatrix) {
|
||||
var CVUtils = {};
|
||||
|
||||
"use strict";
|
||||
/*
|
||||
* cv_utils.js
|
||||
* Collection of CV functions and libraries
|
||||
*/
|
||||
|
||||
/**
|
||||
* Namespace for various CV alorithms
|
||||
* @class Represents a collection of useful CV algorithms/functions
|
||||
*/
|
||||
|
||||
var CVUtils = {},
|
||||
vec2 = glMatrix.vec2,
|
||||
vec3 = glMatrix.vec3;
|
||||
|
||||
/**
|
||||
/**
|
||||
* @param x x-coordinate
|
||||
* @param y y-coordinate
|
||||
* @return ImageReference {x,y} Coordinate
|
||||
*/
|
||||
CVUtils.imageRef = function(x, y) {
|
||||
CVUtils.imageRef = function(x, y) {
|
||||
var that = {
|
||||
x : x,
|
||||
y : y,
|
||||
toVec2 : function() {
|
||||
x: x,
|
||||
y: y,
|
||||
toVec2: function() {
|
||||
return vec2.clone([this.x, this.y]);
|
||||
},
|
||||
toVec3 : function() {
|
||||
toVec3: function() {
|
||||
return vec3.clone([this.x, this.y, 1]);
|
||||
},
|
||||
round : function() {
|
||||
round: function() {
|
||||
this.x = this.x > 0.0 ? Math.floor(this.x + 0.5) : Math.floor(this.x - 0.5);
|
||||
this.y = this.y > 0.0 ? Math.floor(this.y + 0.5) : Math.floor(this.y - 0.5);
|
||||
return this;
|
||||
}
|
||||
};
|
||||
return that;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Computes an integral image of a given grayscale image.
|
||||
* @param imageDataContainer {ImageDataContainer} the image to be integrated
|
||||
*/
|
||||
CVUtils.computeIntegralImage2 = function(imageWrapper, integralWrapper) {
|
||||
CVUtils.computeIntegralImage2 = function(imageWrapper, integralWrapper) {
|
||||
var imageData = imageWrapper.data;
|
||||
var width = imageWrapper.size.x;
|
||||
var height = imageWrapper.size.y;
|
||||
@@ -79,16 +65,17 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
posC = y * width;
|
||||
posD = (y - 1) * width;
|
||||
for ( x = 1; x < width; x++) {
|
||||
integralImageData[posA] += imageData[posA] + integralImageData[posB] + integralImageData[posC] - integralImageData[posD];
|
||||
integralImageData[posA] +=
|
||||
imageData[posA] + integralImageData[posB] + integralImageData[posC] - integralImageData[posD];
|
||||
posA++;
|
||||
posB++;
|
||||
posC++;
|
||||
posD++;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.computeIntegralImage = function(imageWrapper, integralWrapper) {
|
||||
CVUtils.computeIntegralImage = function(imageWrapper, integralWrapper) {
|
||||
var imageData = imageWrapper.data;
|
||||
var width = imageWrapper.size.x;
|
||||
var height = imageWrapper.size.y;
|
||||
@@ -108,9 +95,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
integralImageData[((v) * width) + u] = sum + integralImageData[(v - 1) * width + u];
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.thresholdImage = function(imageWrapper, threshold, targetWrapper) {
|
||||
CVUtils.thresholdImage = function(imageWrapper, threshold, targetWrapper) {
|
||||
if (!targetWrapper) {
|
||||
targetWrapper = imageWrapper;
|
||||
}
|
||||
@@ -119,9 +106,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
while (length--) {
|
||||
targetData[length] = imageData[length] < threshold ? 1 : 0;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.computeHistogram = function(imageWrapper, bitsPerPixel) {
|
||||
CVUtils.computeHistogram = function(imageWrapper, bitsPerPixel) {
|
||||
if (!bitsPerPixel) {
|
||||
bitsPerPixel = 8;
|
||||
}
|
||||
@@ -135,9 +122,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
hist[imageData[length] >> bitShift]++;
|
||||
}
|
||||
return hist;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.sharpenLine = function(line) {
|
||||
CVUtils.sharpenLine = function(line) {
|
||||
var i,
|
||||
length = line.length,
|
||||
left = line[0],
|
||||
@@ -147,14 +134,14 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
for (i = 1; i < length - 1; i++) {
|
||||
right = line[i + 1];
|
||||
// -1 4 -1 kernel
|
||||
line[i-1] = (((center * 2) - left - right)) & 255;
|
||||
line[i - 1] = (((center * 2) - left - right)) & 255;
|
||||
left = center;
|
||||
center = right;
|
||||
}
|
||||
return line;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.determineOtsuThreshold = function(imageWrapper, bitsPerPixel) {
|
||||
CVUtils.determineOtsuThreshold = function(imageWrapper, bitsPerPixel) {
|
||||
if (!bitsPerPixel) {
|
||||
bitsPerPixel = 8;
|
||||
}
|
||||
@@ -202,17 +189,17 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
|
||||
threshold = determineThreshold();
|
||||
return threshold << bitShift;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.otsuThreshold = function(imageWrapper, targetWrapper) {
|
||||
CVUtils.otsuThreshold = function(imageWrapper, targetWrapper) {
|
||||
var threshold = CVUtils.determineOtsuThreshold(imageWrapper);
|
||||
|
||||
CVUtils.thresholdImage(imageWrapper, threshold, targetWrapper);
|
||||
return threshold;
|
||||
};
|
||||
};
|
||||
|
||||
// local thresholding
|
||||
CVUtils.computeBinaryImage = function(imageWrapper, integralWrapper, targetWrapper) {
|
||||
// local thresholding
|
||||
CVUtils.computeBinaryImage = function(imageWrapper, integralWrapper, targetWrapper) {
|
||||
CVUtils.computeIntegralImage(imageWrapper, integralWrapper);
|
||||
|
||||
if (!targetWrapper) {
|
||||
@@ -252,21 +239,21 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
targetData[v * width + u] = imageData[v * width + u] > (avg + 5) ? 0 : 1;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.cluster = function(points, threshold, property) {
|
||||
CVUtils.cluster = function(points, threshold, property) {
|
||||
var i, k, cluster, point, clusters = [];
|
||||
|
||||
if (!property) {
|
||||
property = "rad";
|
||||
}
|
||||
|
||||
function addToCluster(point) {
|
||||
function addToCluster(newPoint) {
|
||||
var found = false;
|
||||
for ( k = 0; k < clusters.length; k++) {
|
||||
cluster = clusters[k];
|
||||
if (cluster.fits(point)) {
|
||||
cluster.add(point);
|
||||
if (cluster.fits(newPoint)) {
|
||||
cluster.add(newPoint);
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
@@ -280,20 +267,21 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
clusters.push(Cluster2.create(point, threshold));
|
||||
}
|
||||
}
|
||||
|
||||
return clusters;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
CVUtils.Tracer = {
|
||||
trace : function(points, vec) {
|
||||
CVUtils.Tracer = {
|
||||
trace: function(points, vec) {
|
||||
var iteration, maxIterations = 10, top = [], result = [], centerPos = 0, currentPos = 0;
|
||||
|
||||
function trace(idx, forward) {
|
||||
var from, to, toIdx, predictedPos, thresholdX = 1, thresholdY = Math.abs(vec[1] / 10), found = false;
|
||||
|
||||
function match(pos, predicted) {
|
||||
if (pos.x > (predicted.x - thresholdX) && pos.x < (predicted.x + thresholdX) && pos.y > (predicted.y - thresholdY) && pos.y < (predicted.y + thresholdY)) {
|
||||
if (pos.x > (predicted.x - thresholdX)
|
||||
&& pos.x < (predicted.x + thresholdX)
|
||||
&& pos.y > (predicted.y - thresholdY)
|
||||
&& pos.y < (predicted.y + thresholdY)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
@@ -306,13 +294,13 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
from = points[idx];
|
||||
if (forward) {
|
||||
predictedPos = {
|
||||
x : from.x + vec[0],
|
||||
y : from.y + vec[1]
|
||||
x: from.x + vec[0],
|
||||
y: from.y + vec[1]
|
||||
};
|
||||
} else {
|
||||
predictedPos = {
|
||||
x : from.x - vec[0],
|
||||
y : from.y - vec[1]
|
||||
x: from.x - vec[0],
|
||||
y: from.y - vec[1]
|
||||
};
|
||||
}
|
||||
|
||||
@@ -348,17 +336,25 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
result = top;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.DILATE = 1;
|
||||
CVUtils.ERODE = 2;
|
||||
CVUtils.DILATE = 1;
|
||||
CVUtils.ERODE = 2;
|
||||
|
||||
CVUtils.dilate = function(inImageWrapper, outImageWrapper) {
|
||||
var v, u, inImageData = inImageWrapper.data, outImageData = outImageWrapper.data, height = inImageWrapper.size.y, width = inImageWrapper.size.x, sum, yStart1, yStart2, xStart1, xStart2;
|
||||
CVUtils.dilate = function(inImageWrapper, outImageWrapper) {
|
||||
var v,
|
||||
u,
|
||||
inImageData = inImageWrapper.data,
|
||||
outImageData = outImageWrapper.data,
|
||||
height = inImageWrapper.size.y,
|
||||
width = inImageWrapper.size.x,
|
||||
sum,
|
||||
yStart1,
|
||||
yStart2,
|
||||
xStart1,
|
||||
xStart2;
|
||||
|
||||
for ( v = 1; v < height - 1; v++) {
|
||||
for ( u = 1; u < width - 1; u++) {
|
||||
@@ -366,17 +362,26 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
yStart2 = v + 1;
|
||||
xStart1 = u - 1;
|
||||
xStart2 = u + 1;
|
||||
sum = inImageData[yStart1 * width + xStart1]/* + inImageData[yStart1*width+u] */ + inImageData[yStart1 * width + xStart2] +
|
||||
/* inImageData[v*width+xStart1] + */
|
||||
inImageData[v * width + u] + /* inImageData[v*width+xStart2] +*/
|
||||
inImageData[yStart2 * width + xStart1]/* + inImageData[yStart2*width+u]*/ + inImageData[yStart2 * width + xStart2];
|
||||
sum = inImageData[yStart1 * width + xStart1] + inImageData[yStart1 * width + xStart2] +
|
||||
inImageData[v * width + u] +
|
||||
inImageData[yStart2 * width + xStart1] + inImageData[yStart2 * width + xStart2];
|
||||
outImageData[v * width + u] = sum > 0 ? 1 : 0;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.erode = function(inImageWrapper, outImageWrapper) {
|
||||
var v, u, inImageData = inImageWrapper.data, outImageData = outImageWrapper.data, height = inImageWrapper.size.y, width = inImageWrapper.size.x, sum, yStart1, yStart2, xStart1, xStart2;
|
||||
CVUtils.erode = function(inImageWrapper, outImageWrapper) {
|
||||
var v,
|
||||
u,
|
||||
inImageData = inImageWrapper.data,
|
||||
outImageData = outImageWrapper.data,
|
||||
height = inImageWrapper.size.y,
|
||||
width = inImageWrapper.size.x,
|
||||
sum,
|
||||
yStart1,
|
||||
yStart2,
|
||||
xStart1,
|
||||
xStart2;
|
||||
|
||||
for ( v = 1; v < height - 1; v++) {
|
||||
for ( u = 1; u < width - 1; u++) {
|
||||
@@ -384,53 +389,58 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
yStart2 = v + 1;
|
||||
xStart1 = u - 1;
|
||||
xStart2 = u + 1;
|
||||
sum = inImageData[yStart1 * width + xStart1]/* + inImageData[yStart1*width+u] */ + inImageData[yStart1 * width + xStart2] +
|
||||
/* inImageData[v*width+xStart1] + */
|
||||
inImageData[v * width + u] + /* inImageData[v*width+xStart2] +*/
|
||||
inImageData[yStart2 * width + xStart1]/* + inImageData[yStart2*width+u]*/ + inImageData[yStart2 * width + xStart2];
|
||||
sum = inImageData[yStart1 * width + xStart1] + inImageData[yStart1 * width + xStart2] +
|
||||
inImageData[v * width + u] +
|
||||
inImageData[yStart2 * width + xStart1] + inImageData[yStart2 * width + xStart2];
|
||||
outImageData[v * width + u] = sum === 5 ? 1 : 0;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.subtract = function(aImageWrapper, bImageWrapper, resultImageWrapper) {
|
||||
CVUtils.subtract = function(aImageWrapper, bImageWrapper, resultImageWrapper) {
|
||||
if (!resultImageWrapper) {
|
||||
resultImageWrapper = aImageWrapper;
|
||||
}
|
||||
var length = aImageWrapper.data.length, aImageData = aImageWrapper.data, bImageData = bImageWrapper.data, cImageData = resultImageWrapper.data;
|
||||
var length = aImageWrapper.data.length,
|
||||
aImageData = aImageWrapper.data,
|
||||
bImageData = bImageWrapper.data,
|
||||
cImageData = resultImageWrapper.data;
|
||||
|
||||
while (length--) {
|
||||
cImageData[length] = aImageData[length] - bImageData[length];
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.bitwiseOr = function(aImageWrapper, bImageWrapper, resultImageWrapper) {
|
||||
CVUtils.bitwiseOr = function(aImageWrapper, bImageWrapper, resultImageWrapper) {
|
||||
if (!resultImageWrapper) {
|
||||
resultImageWrapper = aImageWrapper;
|
||||
}
|
||||
var length = aImageWrapper.data.length, aImageData = aImageWrapper.data, bImageData = bImageWrapper.data, cImageData = resultImageWrapper.data;
|
||||
var length = aImageWrapper.data.length,
|
||||
aImageData = aImageWrapper.data,
|
||||
bImageData = bImageWrapper.data,
|
||||
cImageData = resultImageWrapper.data;
|
||||
|
||||
while (length--) {
|
||||
cImageData[length] = aImageData[length] || bImageData[length];
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.countNonZero = function(imageWrapper) {
|
||||
CVUtils.countNonZero = function(imageWrapper) {
|
||||
var length = imageWrapper.data.length, data = imageWrapper.data, sum = 0;
|
||||
|
||||
while (length--) {
|
||||
sum += data[length];
|
||||
}
|
||||
return sum;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.topGeneric = function(list, top, scoreFunc) {
|
||||
CVUtils.topGeneric = function(list, top, scoreFunc) {
|
||||
var i, minIdx = 0, min = 0, queue = [], score, hit, pos;
|
||||
|
||||
for ( i = 0; i < top; i++) {
|
||||
queue[i] = {
|
||||
score : 0,
|
||||
item : null
|
||||
score: 0,
|
||||
item: null
|
||||
};
|
||||
}
|
||||
|
||||
@@ -451,20 +461,20 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
}
|
||||
|
||||
return queue;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.grayArrayFromImage = function(htmlImage, offsetX, ctx, array) {
|
||||
CVUtils.grayArrayFromImage = function(htmlImage, offsetX, ctx, array) {
|
||||
ctx.drawImage(htmlImage, offsetX, 0, htmlImage.width, htmlImage.height);
|
||||
var ctxData = ctx.getImageData(offsetX, 0, htmlImage.width, htmlImage.height).data;
|
||||
CVUtils.computeGray(ctxData, array);
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.grayArrayFromContext = function(ctx, size, offset, array) {
|
||||
CVUtils.grayArrayFromContext = function(ctx, size, offset, array) {
|
||||
var ctxData = ctx.getImageData(offset.x, offset.y, size.x, size.y).data;
|
||||
CVUtils.computeGray(ctxData, array);
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.grayAndHalfSampleFromCanvasData = function(canvasData, size, outArray) {
|
||||
CVUtils.grayAndHalfSampleFromCanvasData = function(canvasData, size, outArray) {
|
||||
var topRowIdx = 0;
|
||||
var bottomRowIdx = size.x;
|
||||
var endIdx = Math.floor(canvasData.length / 4);
|
||||
@@ -475,7 +485,19 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
|
||||
while (bottomRowIdx < endIdx) {
|
||||
for ( i = 0; i < outWidth; i++) {
|
||||
outArray[outImgIdx] = Math.floor(((0.299 * canvasData[topRowIdx * 4 + 0] + 0.587 * canvasData[topRowIdx * 4 + 1] + 0.114 * canvasData[topRowIdx * 4 + 2]) + (0.299 * canvasData[(topRowIdx + 1) * 4 + 0] + 0.587 * canvasData[(topRowIdx + 1) * 4 + 1] + 0.114 * canvasData[(topRowIdx + 1) * 4 + 2]) + (0.299 * canvasData[(bottomRowIdx) * 4 + 0] + 0.587 * canvasData[(bottomRowIdx) * 4 + 1] + 0.114 * canvasData[(bottomRowIdx) * 4 + 2]) + (0.299 * canvasData[(bottomRowIdx + 1) * 4 + 0] + 0.587 * canvasData[(bottomRowIdx + 1) * 4 + 1] + 0.114 * canvasData[(bottomRowIdx + 1) * 4 + 2])) / 4);
|
||||
outArray[outImgIdx] = Math.floor((
|
||||
(0.299 * canvasData[topRowIdx * 4 + 0] +
|
||||
0.587 * canvasData[topRowIdx * 4 + 1] +
|
||||
0.114 * canvasData[topRowIdx * 4 + 2]) +
|
||||
(0.299 * canvasData[(topRowIdx + 1) * 4 + 0] +
|
||||
0.587 * canvasData[(topRowIdx + 1) * 4 + 1] +
|
||||
0.114 * canvasData[(topRowIdx + 1) * 4 + 2]) +
|
||||
(0.299 * canvasData[(bottomRowIdx) * 4 + 0] +
|
||||
0.587 * canvasData[(bottomRowIdx) * 4 + 1] +
|
||||
0.114 * canvasData[(bottomRowIdx) * 4 + 2]) +
|
||||
(0.299 * canvasData[(bottomRowIdx + 1) * 4 + 0] +
|
||||
0.587 * canvasData[(bottomRowIdx + 1) * 4 + 1] +
|
||||
0.114 * canvasData[(bottomRowIdx + 1) * 4 + 2])) / 4);
|
||||
outImgIdx++;
|
||||
topRowIdx = topRowIdx + 2;
|
||||
bottomRowIdx = bottomRowIdx + 2;
|
||||
@@ -483,10 +505,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
topRowIdx = topRowIdx + inWidth;
|
||||
bottomRowIdx = bottomRowIdx + inWidth;
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
CVUtils.computeGray = function(imageData, outArray, config) {
|
||||
CVUtils.computeGray = function(imageData, outArray, config) {
|
||||
var l = (imageData.length / 4) | 0,
|
||||
i,
|
||||
singleChannel = config && config.singleChannel === true;
|
||||
@@ -497,14 +518,16 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < l; i++) {
|
||||
outArray[i] = Math.floor(0.299 * imageData[i * 4 + 0] + 0.587 * imageData[i * 4 + 1] + 0.114 * imageData[i * 4 + 2]);
|
||||
outArray[i] = Math.floor(
|
||||
0.299 * imageData[i * 4 + 0] + 0.587 * imageData[i * 4 + 1] + 0.114 * imageData[i * 4 + 2]);
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.loadImageArray = function(src, callback, canvas) {
|
||||
if (!canvas)
|
||||
CVUtils.loadImageArray = function(src, callback, canvas) {
|
||||
if (!canvas) {
|
||||
canvas = document.createElement('canvas');
|
||||
}
|
||||
var img = new Image();
|
||||
img.callback = callback;
|
||||
img.onload = function() {
|
||||
@@ -517,18 +540,18 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
var data = ctx.getImageData(0, 0, this.width, this.height).data;
|
||||
CVUtils.computeGray(data, array);
|
||||
this.callback(array, {
|
||||
x : this.width,
|
||||
y : this.height
|
||||
x: this.width,
|
||||
y: this.height
|
||||
}, this);
|
||||
};
|
||||
img.src = src;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* @param inImg {ImageWrapper} input image to be sampled
|
||||
* @param outImg {ImageWrapper} to be stored in
|
||||
*/
|
||||
CVUtils.halfSample = function(inImgWrapper, outImgWrapper) {
|
||||
CVUtils.halfSample = function(inImgWrapper, outImgWrapper) {
|
||||
var inImg = inImgWrapper.data;
|
||||
var inWidth = inImgWrapper.size.x;
|
||||
var outImg = outImgWrapper.data;
|
||||
@@ -539,7 +562,8 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
var outImgIdx = 0;
|
||||
while (bottomRowIdx < endIdx) {
|
||||
for (var i = 0; i < outWidth; i++) {
|
||||
outImg[outImgIdx] = Math.floor((inImg[topRowIdx] + inImg[topRowIdx + 1] + inImg[bottomRowIdx] + inImg[bottomRowIdx + 1]) / 4);
|
||||
outImg[outImgIdx] = Math.floor(
|
||||
(inImg[topRowIdx] + inImg[topRowIdx + 1] + inImg[bottomRowIdx] + inImg[bottomRowIdx + 1]) / 4);
|
||||
outImgIdx++;
|
||||
topRowIdx = topRowIdx + 2;
|
||||
bottomRowIdx = bottomRowIdx + 2;
|
||||
@@ -547,10 +571,19 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
topRowIdx = topRowIdx + inWidth;
|
||||
bottomRowIdx = bottomRowIdx + inWidth;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.hsv2rgb = function(hsv, rgb) {
|
||||
var h = hsv[0],
|
||||
s = hsv[1],
|
||||
v = hsv[2],
|
||||
c = v * s,
|
||||
x = c * (1 - Math.abs((h / 60) % 2 - 1)),
|
||||
m = v - c,
|
||||
r = 0,
|
||||
g = 0,
|
||||
b = 0;
|
||||
|
||||
CVUtils.hsv2rgb = function(hsv, rgb) {
|
||||
var h = hsv[0], s = hsv[1], v = hsv[2], c = v * s, x = c * (1 - Math.abs((h / 60) % 2 - 1)), m = v - c, r = 0, g = 0, b = 0;
|
||||
rgb = rgb || [0, 0, 0];
|
||||
|
||||
if (h < 60) {
|
||||
@@ -576,9 +609,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
rgb[1] = ((g + m) * 255) | 0;
|
||||
rgb[2] = ((b + m) * 255) | 0;
|
||||
return rgb;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils._computeDivisors = function(n) {
|
||||
CVUtils._computeDivisors = function(n) {
|
||||
var largeDivisors = [],
|
||||
divisors = [],
|
||||
i;
|
||||
@@ -586,15 +619,15 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
for (i = 1; i < Math.sqrt(n) + 1; i++) {
|
||||
if (n % i === 0) {
|
||||
divisors.push(i);
|
||||
if (i !== n/i) {
|
||||
largeDivisors.unshift(Math.floor(n/i));
|
||||
if (i !== n / i) {
|
||||
largeDivisors.unshift(Math.floor(n / i));
|
||||
}
|
||||
}
|
||||
}
|
||||
return divisors.concat(largeDivisors);
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils._computeIntersection = function(arr1, arr2) {
|
||||
CVUtils._computeIntersection = function(arr1, arr2) {
|
||||
var i = 0,
|
||||
j = 0,
|
||||
result = [];
|
||||
@@ -611,9 +644,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
}
|
||||
}
|
||||
return result;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.calculatePatchSize = function(patchSize, imgSize) {
|
||||
CVUtils.calculatePatchSize = function(patchSize, imgSize) {
|
||||
var divisorsX = this._computeDivisors(imgSize.x),
|
||||
divisorsY = this._computeDivisors(imgSize.y),
|
||||
wideSide = Math.max(imgSize.x, imgSize.y),
|
||||
@@ -628,25 +661,25 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
},
|
||||
nrOfPatchesIdx = nrOfPatchesMap[patchSize] || nrOfPatchesMap.medium,
|
||||
nrOfPatches = nrOfPatchesList[nrOfPatchesIdx],
|
||||
desiredPatchSize = Math.floor(wideSide/nrOfPatches),
|
||||
desiredPatchSize = Math.floor(wideSide / nrOfPatches),
|
||||
optimalPatchSize;
|
||||
|
||||
function findPatchSizeForDivisors(divisors) {
|
||||
var i = 0,
|
||||
found = divisors[Math.floor(divisors.length/2)];
|
||||
found = divisors[Math.floor(divisors.length / 2)];
|
||||
|
||||
while(i < (divisors.length - 1) && divisors[i] < desiredPatchSize) {
|
||||
while (i < (divisors.length - 1) && divisors[i] < desiredPatchSize) {
|
||||
i++;
|
||||
}
|
||||
if (i > 0) {
|
||||
if (Math.abs(divisors[i] - desiredPatchSize) > Math.abs(divisors[i-1] - desiredPatchSize)) {
|
||||
found = divisors[i-1];
|
||||
if (Math.abs(divisors[i] - desiredPatchSize) > Math.abs(divisors[i - 1] - desiredPatchSize)) {
|
||||
found = divisors[i - 1];
|
||||
} else {
|
||||
found = divisors[i];
|
||||
}
|
||||
}
|
||||
if (desiredPatchSize / found < nrOfPatchesList[nrOfPatchesIdx+1] / nrOfPatchesList[nrOfPatchesIdx] &&
|
||||
desiredPatchSize / found > nrOfPatchesList[nrOfPatchesIdx-1]/nrOfPatchesList[nrOfPatchesIdx] ) {
|
||||
if (desiredPatchSize / found < nrOfPatchesList[nrOfPatchesIdx + 1] / nrOfPatchesList[nrOfPatchesIdx] &&
|
||||
desiredPatchSize / found > nrOfPatchesList[nrOfPatchesIdx - 1] / nrOfPatchesList[nrOfPatchesIdx] ) {
|
||||
return {x: found, y: found};
|
||||
}
|
||||
return null;
|
||||
@@ -660,18 +693,18 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
}
|
||||
}
|
||||
return optimalPatchSize;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils._parseCSSDimensionValues = function(value) {
|
||||
CVUtils._parseCSSDimensionValues = function(value) {
|
||||
var dimension = {
|
||||
value: parseFloat(value),
|
||||
unit: value.indexOf("%") === value.length-1 ? "%" : "%"
|
||||
unit: value.indexOf("%") === value.length - 1 ? "%" : "%"
|
||||
};
|
||||
|
||||
return dimension;
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils._dimensionsConverters = {
|
||||
CVUtils._dimensionsConverters = {
|
||||
top: function(dimension, context) {
|
||||
if (dimension.unit === "%") {
|
||||
return Math.floor(context.height * (dimension.value / 100));
|
||||
@@ -692,9 +725,9 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
return Math.floor(context.width * (dimension.value / 100));
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
CVUtils.computeImageArea = function(inputWidth, inputHeight, area) {
|
||||
CVUtils.computeImageArea = function(inputWidth, inputHeight, area) {
|
||||
var context = {width: inputWidth, height: inputHeight};
|
||||
|
||||
var parsedArea = Object.keys(area).reduce(function(result, key) {
|
||||
@@ -712,8 +745,6 @@ define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper,
|
||||
sw: parsedArea.right - parsedArea.left,
|
||||
sh: parsedArea.bottom - parsedArea.top
|
||||
};
|
||||
};
|
||||
|
||||
return (CVUtils);
|
||||
});
|
||||
};
|
||||
|
||||
export default CVUtils;
|
||||
|
||||
+10
-20
@@ -1,25 +1,17 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import EANReader from './ean_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./ean_reader"
|
||||
],
|
||||
function(EANReader) {
|
||||
"use strict";
|
||||
|
||||
function EAN8Reader() {
|
||||
function EAN8Reader() {
|
||||
EANReader.call(this);
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
var properties = {
|
||||
FORMAT: {value: "ean_8", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
EAN8Reader.prototype = Object.create(EANReader.prototype, properties);
|
||||
EAN8Reader.prototype.constructor = EAN8Reader;
|
||||
EAN8Reader.prototype = Object.create(EANReader.prototype, properties);
|
||||
EAN8Reader.prototype.constructor = EAN8Reader;
|
||||
|
||||
EAN8Reader.prototype._decodePayload = function(code, result, decodedCodes) {
|
||||
EAN8Reader.prototype._decodePayload = function(code, result, decodedCodes) {
|
||||
var i,
|
||||
self = this;
|
||||
|
||||
@@ -48,8 +40,6 @@ define(
|
||||
}
|
||||
|
||||
return code;
|
||||
};
|
||||
};
|
||||
|
||||
return (EAN8Reader);
|
||||
}
|
||||
);
|
||||
export default EAN8Reader;
|
||||
|
||||
+52
-62
@@ -1,25 +1,17 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import BarcodeReader from './barcode_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./barcode_reader"
|
||||
],
|
||||
function(BarcodeReader) {
|
||||
"use strict";
|
||||
|
||||
function EANReader(opts) {
|
||||
function EANReader(opts) {
|
||||
BarcodeReader.call(this, opts);
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
CODE_L_START : {value: 0},
|
||||
MODULO : {value: 7},
|
||||
CODE_G_START : {value: 10},
|
||||
START_PATTERN : {value: [1 / 3 * 7, 1 / 3 * 7, 1 / 3 * 7]},
|
||||
STOP_PATTERN : {value: [1 / 3 * 7, 1 / 3 * 7, 1 / 3 * 7]},
|
||||
MIDDLE_PATTERN : {value: [1 / 5 * 7, 1 / 5 * 7, 1 / 5 * 7, 1 / 5 * 7, 1 / 5 * 7]},
|
||||
CODE_PATTERN : {value: [
|
||||
var properties = {
|
||||
CODE_L_START: {value: 0},
|
||||
MODULO: {value: 7},
|
||||
CODE_G_START: {value: 10},
|
||||
START_PATTERN: {value: [1 / 3 * 7, 1 / 3 * 7, 1 / 3 * 7]},
|
||||
STOP_PATTERN: {value: [1 / 3 * 7, 1 / 3 * 7, 1 / 3 * 7]},
|
||||
MIDDLE_PATTERN: {value: [1 / 5 * 7, 1 / 5 * 7, 1 / 5 * 7, 1 / 5 * 7, 1 / 5 * 7]},
|
||||
CODE_PATTERN: {value: [
|
||||
[3, 2, 1, 1],
|
||||
[2, 2, 2, 1],
|
||||
[2, 1, 2, 2],
|
||||
@@ -41,16 +33,16 @@ define(
|
||||
[3, 1, 2, 1],
|
||||
[2, 1, 1, 3]
|
||||
]},
|
||||
CODE_FREQUENCY : {value: [0, 11, 13, 14, 19, 25, 28, 21, 22, 26]},
|
||||
CODE_FREQUENCY: {value: [0, 11, 13, 14, 19, 25, 28, 21, 22, 26]},
|
||||
SINGLE_CODE_ERROR: {value: 0.67},
|
||||
AVG_CODE_ERROR: {value: 0.27},
|
||||
FORMAT: {value: "ean_13", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
EANReader.prototype.constructor = EANReader;
|
||||
EANReader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
EANReader.prototype.constructor = EANReader;
|
||||
|
||||
EANReader.prototype._decodeCode = function(start, coderange) {
|
||||
EANReader.prototype._decodeCode = function(start, coderange) {
|
||||
var counter = [0, 0, 0, 0],
|
||||
i,
|
||||
self = this,
|
||||
@@ -58,10 +50,10 @@ define(
|
||||
isWhite = !self._row[offset],
|
||||
counterPos = 0,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : start,
|
||||
end : start
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: start,
|
||||
end: start
|
||||
},
|
||||
code,
|
||||
error,
|
||||
@@ -99,18 +91,18 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._findPattern = function(pattern, offset, isWhite, tryHarder, epsilon) {
|
||||
EANReader.prototype._findPattern = function(pattern, offset, isWhite, tryHarder, epsilon) {
|
||||
var counter = [],
|
||||
self = this,
|
||||
i,
|
||||
counterPos = 0,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : 0,
|
||||
end : 0
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: 0,
|
||||
end: 0
|
||||
},
|
||||
error,
|
||||
j,
|
||||
@@ -175,15 +167,15 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._findStart = function() {
|
||||
EANReader.prototype._findStart = function() {
|
||||
var self = this,
|
||||
leadingWhitespaceStart,
|
||||
offset = self._nextSet(self._row),
|
||||
startInfo;
|
||||
|
||||
while(!startInfo) {
|
||||
while (!startInfo) {
|
||||
startInfo = self._findPattern(self.START_PATTERN, offset);
|
||||
if (!startInfo) {
|
||||
return null;
|
||||
@@ -197,9 +189,9 @@ define(
|
||||
offset = startInfo.end;
|
||||
startInfo = null;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
EANReader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
var self = this,
|
||||
trailingWhitespaceEnd;
|
||||
|
||||
@@ -210,16 +202,16 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._findEnd = function(offset, isWhite) {
|
||||
EANReader.prototype._findEnd = function(offset, isWhite) {
|
||||
var self = this,
|
||||
endInfo = self._findPattern(self.STOP_PATTERN, offset, isWhite, false);
|
||||
|
||||
return endInfo !== null ? self._verifyTrailingWhitespace(endInfo) : null;
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._calculateFirstDigit = function(codeFrequency) {
|
||||
EANReader.prototype._calculateFirstDigit = function(codeFrequency) {
|
||||
var i,
|
||||
self = this;
|
||||
|
||||
@@ -229,9 +221,9 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._decodePayload = function(code, result, decodedCodes) {
|
||||
EANReader.prototype._decodePayload = function(code, result, decodedCodes) {
|
||||
var i,
|
||||
self = this,
|
||||
codeFrequency = 0x0,
|
||||
@@ -274,9 +266,9 @@ define(
|
||||
}
|
||||
|
||||
return code;
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._decode = function() {
|
||||
EANReader.prototype._decode = function() {
|
||||
var startInfo,
|
||||
self = this,
|
||||
code,
|
||||
@@ -288,9 +280,9 @@ define(
|
||||
return null;
|
||||
}
|
||||
code = {
|
||||
code : startInfo.code,
|
||||
start : startInfo.start,
|
||||
end : startInfo.end
|
||||
code: startInfo.code,
|
||||
start: startInfo.start,
|
||||
end: startInfo.end
|
||||
};
|
||||
decodedCodes.push(code);
|
||||
code = self._decodePayload(code, result, decodedCodes);
|
||||
@@ -310,16 +302,16 @@ define(
|
||||
}
|
||||
|
||||
return {
|
||||
code : result.join(""),
|
||||
start : startInfo.start,
|
||||
end : code.end,
|
||||
codeset : "",
|
||||
startInfo : startInfo,
|
||||
decodedCodes : decodedCodes
|
||||
};
|
||||
code: result.join(""),
|
||||
start: startInfo.start,
|
||||
end: code.end,
|
||||
codeset: "",
|
||||
startInfo: startInfo,
|
||||
decodedCodes: decodedCodes
|
||||
};
|
||||
};
|
||||
|
||||
EANReader.prototype._checksum = function(result) {
|
||||
EANReader.prototype._checksum = function(result) {
|
||||
var sum = 0, i;
|
||||
|
||||
for ( i = result.length - 2; i >= 0; i -= 2) {
|
||||
@@ -330,8 +322,6 @@ define(
|
||||
sum += result[i];
|
||||
}
|
||||
return sum % 10 === 0;
|
||||
};
|
||||
};
|
||||
|
||||
return (EANReader);
|
||||
}
|
||||
);
|
||||
export default (EANReader);
|
||||
|
||||
+7
-16
@@ -1,16 +1,10 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(function() {
|
||||
"use strict";
|
||||
|
||||
var _events = function() {
|
||||
export default (function() {
|
||||
var events = {};
|
||||
|
||||
function getEvent(eventName) {
|
||||
if (!events[eventName]) {
|
||||
events[eventName] = {
|
||||
subscribers : []
|
||||
subscribers: []
|
||||
};
|
||||
}
|
||||
return events[eventName];
|
||||
@@ -35,8 +29,8 @@ define(function() {
|
||||
|
||||
if ( typeof callback === "function") {
|
||||
subscription = {
|
||||
callback : callback,
|
||||
async : async
|
||||
callback: callback,
|
||||
async: async
|
||||
};
|
||||
} else {
|
||||
subscription = callback;
|
||||
@@ -49,10 +43,10 @@ define(function() {
|
||||
}
|
||||
|
||||
return {
|
||||
subscribe : function(event, callback, async) {
|
||||
subscribe: function(event, callback, async) {
|
||||
return subscribe(event, callback, async);
|
||||
},
|
||||
publish : function(eventName, data) {
|
||||
publish: function(eventName, data) {
|
||||
var event = getEvent(eventName),
|
||||
subscribers = event.subscribers;
|
||||
|
||||
@@ -85,7 +79,4 @@ define(function() {
|
||||
}
|
||||
}
|
||||
};
|
||||
}();
|
||||
|
||||
return _events;
|
||||
});
|
||||
})();
|
||||
|
||||
+6
-11
@@ -1,12 +1,8 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import CVUtils from './cv_utils';
|
||||
|
||||
define(["cv_utils"], function(CVUtils) {
|
||||
"use strict";
|
||||
var FrameGrabber = {};
|
||||
|
||||
var FrameGrabber = {};
|
||||
|
||||
FrameGrabber.create = function(inputStream, canvas) {
|
||||
FrameGrabber.create = function(inputStream, canvas) {
|
||||
var _that = {},
|
||||
_streamConfig = inputStream.getConfig(),
|
||||
_video_size = CVUtils.imageRef(inputStream.getRealWidth(), inputStream.getRealHeight()),
|
||||
@@ -56,7 +52,7 @@ define(["cv_utils"], function(CVUtils) {
|
||||
if (frame) {
|
||||
_ctx.drawImage(frame, 0, 0, _canvasSize.x, _canvasSize.y);
|
||||
ctxData = _ctx.getImageData(_sx, _sy, _size.x, _size.y).data;
|
||||
if(doHalfSample){
|
||||
if (doHalfSample){
|
||||
CVUtils.grayAndHalfSampleFromCanvasData(ctxData, _size, _data);
|
||||
} else {
|
||||
CVUtils.computeGray(ctxData, _data, _streamConfig);
|
||||
@@ -72,7 +68,6 @@ define(["cv_utils"], function(CVUtils) {
|
||||
};
|
||||
|
||||
return _that;
|
||||
};
|
||||
};
|
||||
|
||||
return (FrameGrabber);
|
||||
});
|
||||
export default FrameGrabber;
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define([], function() {
|
||||
"use strict";
|
||||
|
||||
function createNode(htmlStr) {
|
||||
var temp = document.createElement('div');
|
||||
|
||||
temp.innerHTML = htmlStr;
|
||||
while (temp.firstChild) {
|
||||
return temp.firstChild;
|
||||
}
|
||||
}
|
||||
|
||||
function mergeObjects(obj1, obj2) {
|
||||
for (var p in obj2) {
|
||||
try {
|
||||
if (obj2[p].constructor == Object) {
|
||||
obj1[p] = mergeObjects(obj1[p], obj2[p]);
|
||||
} else {
|
||||
obj1[p] = obj2[p];
|
||||
}
|
||||
} catch(e) {
|
||||
obj1[p] = obj2[p];
|
||||
}
|
||||
}
|
||||
|
||||
return obj1;
|
||||
}
|
||||
|
||||
return {
|
||||
createNode : function(htmlStr) {
|
||||
return createNode(htmlStr);
|
||||
},
|
||||
mergeObjects : function(obj1, obj2) {
|
||||
return mergeObjects(obj1, obj2);
|
||||
}
|
||||
};
|
||||
});
|
||||
+55
-65
@@ -1,40 +1,32 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import BarcodeReader from './barcode_reader';
|
||||
const merge = require('lodash/object/merge');
|
||||
|
||||
define(
|
||||
[
|
||||
"./barcode_reader",
|
||||
"./html_utils"
|
||||
],
|
||||
function(BarcodeReader, HTMLUtils) {
|
||||
"use strict";
|
||||
|
||||
function I2of5Reader(opts) {
|
||||
opts = HTMLUtils.mergeObjects(getDefaulConfig(), opts);
|
||||
function I2of5Reader(opts) {
|
||||
opts = merge(getDefaulConfig(), opts);
|
||||
BarcodeReader.call(this, opts);
|
||||
this.barSpaceRatio = [1, 1];
|
||||
if (opts.normalizeBarSpaceWidth) {
|
||||
this.SINGLE_CODE_ERROR = 0.38;
|
||||
this.AVG_CODE_ERROR = 0.09;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getDefaulConfig() {
|
||||
function getDefaulConfig() {
|
||||
var config = {};
|
||||
|
||||
Object.keys(I2of5Reader.CONFIG_KEYS).forEach(function(key) {
|
||||
config[key] = I2of5Reader.CONFIG_KEYS[key]['default'];
|
||||
config[key] = I2of5Reader.CONFIG_KEYS[key].default;
|
||||
});
|
||||
return config;
|
||||
}
|
||||
}
|
||||
|
||||
var N = 1,
|
||||
var N = 1,
|
||||
W = 3,
|
||||
properties = {
|
||||
MODULO : {value: 10},
|
||||
START_PATTERN : {value: [N*2.5, N*2.5, N*2.5, N*2.5]},
|
||||
STOP_PATTERN : {value: [N*2, N*2, W*2]},
|
||||
CODE_PATTERN : {value: [
|
||||
MODULO: {value: 10},
|
||||
START_PATTERN: {value: [N * 2.5, N * 2.5, N * 2.5, N * 2.5]},
|
||||
STOP_PATTERN: {value: [N * 2, N * 2, W * 2]},
|
||||
CODE_PATTERN: {value: [
|
||||
[N, N, W, W, N],
|
||||
[W, N, N, N, W],
|
||||
[N, W, N, N, W],
|
||||
@@ -52,10 +44,10 @@ define(
|
||||
FORMAT: {value: "i2of5"}
|
||||
};
|
||||
|
||||
I2of5Reader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
I2of5Reader.prototype.constructor = I2of5Reader;
|
||||
I2of5Reader.prototype = Object.create(BarcodeReader.prototype, properties);
|
||||
I2of5Reader.prototype.constructor = I2of5Reader;
|
||||
|
||||
I2of5Reader.prototype._matchPattern = function(counter, code) {
|
||||
I2of5Reader.prototype._matchPattern = function(counter, code) {
|
||||
if (this.config.normalizeBarSpaceWidth) {
|
||||
var i,
|
||||
counterSum = [0, 0],
|
||||
@@ -79,18 +71,18 @@ define(
|
||||
}
|
||||
}
|
||||
return BarcodeReader.prototype._matchPattern.call(this, counter, code);
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._findPattern = function(pattern, offset, isWhite, tryHarder) {
|
||||
I2of5Reader.prototype._findPattern = function(pattern, offset, isWhite, tryHarder) {
|
||||
var counter = [],
|
||||
self = this,
|
||||
i,
|
||||
counterPos = 0,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : 0,
|
||||
end : 0
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: 0,
|
||||
end: 0
|
||||
},
|
||||
error,
|
||||
j,
|
||||
@@ -147,22 +139,22 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._findStart = function() {
|
||||
I2of5Reader.prototype._findStart = function() {
|
||||
var self = this,
|
||||
leadingWhitespaceStart,
|
||||
offset = self._nextSet(self._row),
|
||||
startInfo,
|
||||
narrowBarWidth = 1;
|
||||
|
||||
while(!startInfo) {
|
||||
while (!startInfo) {
|
||||
startInfo = self._findPattern(self.START_PATTERN, offset, false, true);
|
||||
if (!startInfo) {
|
||||
return null;
|
||||
}
|
||||
narrowBarWidth = Math.floor((startInfo.end - startInfo.start) / 4);
|
||||
leadingWhitespaceStart = startInfo.start - narrowBarWidth*10;
|
||||
leadingWhitespaceStart = startInfo.start - narrowBarWidth * 10;
|
||||
if (leadingWhitespaceStart >= 0) {
|
||||
if (self._matchRange(leadingWhitespaceStart, startInfo.start, 0)) {
|
||||
return startInfo;
|
||||
@@ -171,9 +163,9 @@ define(
|
||||
offset = startInfo.end;
|
||||
startInfo = null;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
I2of5Reader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
var self = this,
|
||||
trailingWhitespaceEnd;
|
||||
|
||||
@@ -184,9 +176,9 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._findEnd = function() {
|
||||
I2of5Reader.prototype._findEnd = function() {
|
||||
var self = this,
|
||||
endInfo,
|
||||
tmp;
|
||||
@@ -205,9 +197,9 @@ define(
|
||||
endInfo.end = self._row.length - tmp;
|
||||
|
||||
return endInfo !== null ? self._verifyTrailingWhitespace(endInfo) : null;
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._decodePair = function(counterPair) {
|
||||
I2of5Reader.prototype._decodePair = function(counterPair) {
|
||||
var i,
|
||||
code,
|
||||
codes = [],
|
||||
@@ -221,9 +213,9 @@ define(
|
||||
codes.push(code);
|
||||
}
|
||||
return codes;
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._decodeCode = function(counter) {
|
||||
I2of5Reader.prototype._decodeCode = function(counter) {
|
||||
var j,
|
||||
self = this,
|
||||
sum = 0,
|
||||
@@ -232,10 +224,10 @@ define(
|
||||
epsilon = self.AVG_CODE_ERROR,
|
||||
code,
|
||||
bestMatch = {
|
||||
error : Number.MAX_VALUE,
|
||||
code : -1,
|
||||
start : 0,
|
||||
end : 0
|
||||
error: Number.MAX_VALUE,
|
||||
code: -1,
|
||||
start: 0,
|
||||
end: 0
|
||||
};
|
||||
|
||||
for ( j = 0; j < counter.length; j++) {
|
||||
@@ -255,9 +247,9 @@ define(
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._decodePayload = function(counters, result, decodedCodes) {
|
||||
I2of5Reader.prototype._decodePayload = function(counters, result, decodedCodes) {
|
||||
var i,
|
||||
self = this,
|
||||
pos = 0,
|
||||
@@ -267,8 +259,8 @@ define(
|
||||
|
||||
while (pos < counterLength) {
|
||||
for (i = 0; i < 5; i++) {
|
||||
counterPair[0][i] = counters[pos]*this.barSpaceRatio[0];
|
||||
counterPair[1][i] = counters[pos + 1]*this.barSpaceRatio[1];
|
||||
counterPair[0][i] = counters[pos] * this.barSpaceRatio[0];
|
||||
counterPair[1][i] = counters[pos + 1] * this.barSpaceRatio[1];
|
||||
pos += 2;
|
||||
}
|
||||
codes = self._decodePair(counterPair);
|
||||
@@ -281,13 +273,13 @@ define(
|
||||
}
|
||||
}
|
||||
return codes;
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._verifyCounterLength = function(counters) {
|
||||
I2of5Reader.prototype._verifyCounterLength = function(counters) {
|
||||
return (counters.length % 10 === 0);
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.prototype._decode = function() {
|
||||
I2of5Reader.prototype._decode = function() {
|
||||
var startInfo,
|
||||
endInfo,
|
||||
self = this,
|
||||
@@ -322,23 +314,21 @@ define(
|
||||
|
||||
decodedCodes.push(endInfo);
|
||||
return {
|
||||
code : result.join(""),
|
||||
start : startInfo.start,
|
||||
end : endInfo.end,
|
||||
startInfo : startInfo,
|
||||
decodedCodes : decodedCodes
|
||||
};
|
||||
code: result.join(""),
|
||||
start: startInfo.start,
|
||||
end: endInfo.end,
|
||||
startInfo: startInfo,
|
||||
decodedCodes: decodedCodes
|
||||
};
|
||||
};
|
||||
|
||||
I2of5Reader.CONFIG_KEYS = {
|
||||
I2of5Reader.CONFIG_KEYS = {
|
||||
normalizeBarSpaceWidth: {
|
||||
'type': 'boolean',
|
||||
'default': false,
|
||||
'description': 'If true, the reader tries to normalize the' +
|
||||
'width-difference between bars and spaces'
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
return (I2of5Reader);
|
||||
}
|
||||
);
|
||||
export default I2of5Reader;
|
||||
|
||||
+4
-12
@@ -1,10 +1,4 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(function() {
|
||||
"use strict";
|
||||
|
||||
return {
|
||||
export default {
|
||||
drawRect: function(pos, size, ctx, style){
|
||||
ctx.strokeStyle = style.color;
|
||||
ctx.fillStyle = style.color;
|
||||
@@ -31,10 +25,10 @@ define(function() {
|
||||
canvasDataPos = data.length,
|
||||
value;
|
||||
|
||||
if (canvasDataPos/imageDataPos !== 4) {
|
||||
if (canvasDataPos / imageDataPos !== 4) {
|
||||
return false;
|
||||
}
|
||||
while(imageDataPos--){
|
||||
while (imageDataPos--){
|
||||
value = imageData[imageDataPos];
|
||||
data[--canvasDataPos] = 255;
|
||||
data[--canvasDataPos] = value;
|
||||
@@ -44,6 +38,4 @@ define(function() {
|
||||
ctx.putImageData(canvasData, 0, 0);
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
};
|
||||
|
||||
+10
-17
@@ -1,11 +1,5 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(function() {
|
||||
"use strict";
|
||||
|
||||
var ImageLoader = {};
|
||||
ImageLoader.load = function(directory, callback, offset, size, sequence) {
|
||||
var ImageLoader = {};
|
||||
ImageLoader.load = function(directory, callback, offset, size, sequence) {
|
||||
var htmlImagesSrcArray = new Array(size),
|
||||
htmlImagesArray = new Array(htmlImagesSrcArray.length),
|
||||
i,
|
||||
@@ -21,17 +15,17 @@ define(function() {
|
||||
}
|
||||
}
|
||||
htmlImagesArray.notLoaded = [];
|
||||
htmlImagesArray.addImage = function(img) {
|
||||
htmlImagesArray.notLoaded.push(img);
|
||||
htmlImagesArray.addImage = function(image) {
|
||||
htmlImagesArray.notLoaded.push(image);
|
||||
};
|
||||
htmlImagesArray.loaded = function(loadedImg) {
|
||||
var notloadedImgs = htmlImagesArray.notLoaded;
|
||||
for (var x = 0; x < notloadedImgs.length; x++) {
|
||||
if (notloadedImgs[x] == loadedImg) {
|
||||
if (notloadedImgs[x] === loadedImg) {
|
||||
notloadedImgs.splice(x, 1);
|
||||
for (var y = 0; y < htmlImagesSrcArray.length; y++) {
|
||||
var imgName = htmlImagesSrcArray[y].substr(htmlImagesSrcArray[y].lastIndexOf("/"));
|
||||
if (loadedImg.src.lastIndexOf(imgName) != -1) {
|
||||
if (loadedImg.src.lastIndexOf(imgName) !== -1) {
|
||||
htmlImagesArray[y] = loadedImg;
|
||||
break;
|
||||
}
|
||||
@@ -51,13 +45,12 @@ define(function() {
|
||||
addOnloadHandler(img, htmlImagesArray);
|
||||
img.src = htmlImagesSrcArray[i];
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
function addOnloadHandler(img, htmlImagesArray) {
|
||||
function addOnloadHandler(img, htmlImagesArray) {
|
||||
img.onload = function() {
|
||||
htmlImagesArray.loaded(this);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return (ImageLoader);
|
||||
});
|
||||
export default (ImageLoader);
|
||||
|
||||
+65
-145
@@ -1,19 +1,9 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import SubImage from './subImage';
|
||||
import CVUtils from './cv_utils';
|
||||
import ArrayHelper from './array_helper';
|
||||
import {vec2} from 'gl-matrix';
|
||||
|
||||
define([
|
||||
"subImage",
|
||||
"cv_utils",
|
||||
"array_helper",
|
||||
"gl-matrix"
|
||||
],
|
||||
function(SubImage, CVUtils, ArrayHelper, glMatrix) {
|
||||
|
||||
'use strict';
|
||||
var vec2 = glMatrix.vec2,
|
||||
mat2 = glMatrix.mat2;
|
||||
|
||||
/**
|
||||
/**
|
||||
* Represents a basic image combining the data and size.
|
||||
* In addition, some methods for manipulation are contained.
|
||||
* @param size {x,y} The size of the image in pixel
|
||||
@@ -22,7 +12,7 @@ define([
|
||||
* @param initialize {Boolean} Indicating if the array should be initialized on creation.
|
||||
* @returns {ImageWrapper}
|
||||
*/
|
||||
function ImageWrapper(size, data, ArrayType, initialize) {
|
||||
function ImageWrapper(size, data, ArrayType, initialize) {
|
||||
if (!data) {
|
||||
if (ArrayType) {
|
||||
this.data = new ArrayType(size.x * size.y);
|
||||
@@ -35,95 +25,27 @@ define([
|
||||
ArrayHelper.init(this.data, 0);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
this.data = data;
|
||||
}
|
||||
this.size = size;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* tests if a position is within the image with a given offset
|
||||
* @param imgRef {x, y} The location to test
|
||||
* @param border Number the padding value in pixel
|
||||
* @returns {Boolean} true if location inside the image's border, false otherwise
|
||||
* @see cvd/image.h
|
||||
*/
|
||||
ImageWrapper.prototype.inImageWithBorder = function(imgRef, border) {
|
||||
return (imgRef.x >= border) && (imgRef.y >= border) && (imgRef.x < (this.size.x - border)) && (imgRef.y < (this.size.y - border));
|
||||
};
|
||||
ImageWrapper.prototype.inImageWithBorder = function(imgRef, border) {
|
||||
return (imgRef.x >= border)
|
||||
&& (imgRef.y >= border)
|
||||
&& (imgRef.x < (this.size.x - border))
|
||||
&& (imgRef.y < (this.size.y - border));
|
||||
};
|
||||
|
||||
/**
|
||||
* Transforms an image according to the given affine-transformation matrix.
|
||||
* @param inImg ImageWrapper a image containing the information to be extracted.
|
||||
* @param outImg ImageWrapper the image to be filled. The whole image out image is filled by the in image.
|
||||
* @param M mat2 the matrix used to map point in the out matrix to those in the in matrix
|
||||
* @param inOrig vec2 origin in the in image
|
||||
* @param outOrig vec2 origin in the out image
|
||||
* @returns Number the number of pixels not in the in image
|
||||
* @see cvd/vision.h
|
||||
*/
|
||||
ImageWrapper.transform = function(inImg, outImg, M, inOrig, outOrig) {
|
||||
var w = outImg.size.x, h = outImg.size.y, iw = inImg.size.x, ih = inImg.size.y;
|
||||
var across = vec2.clone([M[0], M[2]]);
|
||||
var down = vec2.clone([M[1], M[3]]);
|
||||
var defaultValue = 0;
|
||||
|
||||
var p0 = vec2.subtract(inOrig, mat2.xVec2(M, outOrig, vec2.clone()), vec2.clone());
|
||||
|
||||
var min_x = p0[0], min_y = p0[1];
|
||||
var max_x = min_x, max_y = min_y;
|
||||
var p, i, j;
|
||||
|
||||
var sampleFunc = ImageWrapper.sample;
|
||||
|
||||
if (across[0] < 0)
|
||||
min_x += w * across[0];
|
||||
else
|
||||
max_x += w * across[0];
|
||||
|
||||
if (down[0] < 0)
|
||||
min_x += h * down[0];
|
||||
else
|
||||
max_x += h * down[0];
|
||||
|
||||
if (across[1] < 0)
|
||||
min_y += w * across[1];
|
||||
else
|
||||
max_y += w * across[1];
|
||||
|
||||
if (down[1] < 0)
|
||||
min_y += h * down[1];
|
||||
else
|
||||
max_y += h * down[1];
|
||||
|
||||
var carrigeReturn = vec2.subtract(down, vec2.scale(across, w, vec2.clone()), vec2.clone());
|
||||
|
||||
if (min_x >= 0 && min_y >= 0 && max_x < iw - 1 && max_y < ih - 1) {
|
||||
p = p0;
|
||||
for ( i = 0; i < h; ++i, vec2.add(p, carrigeReturn))
|
||||
for ( j = 0; j < w; ++j, vec2.add(p, across))
|
||||
outImg.set(j, i, sampleFunc(inImg, p[0], p[1]));
|
||||
return 0;
|
||||
} else {
|
||||
var x_bound = iw - 1;
|
||||
var y_bound = ih - 1;
|
||||
var count = 0;
|
||||
p = p0;
|
||||
for ( i = 0; i < h; ++i, vec2.add(p, carrigeReturn)) {
|
||||
for ( j = 0; j < w; ++j, vec2.add(p, across)) {
|
||||
if (0 <= p[0] && 0 <= p[1] && p[0] < x_bound && p[1] < y_bound) {
|
||||
outImg.set(j, i, sampleFunc(inImg, p[0], p[1]));
|
||||
} else {
|
||||
outImg.set(j, i, defaultValue); ++count;
|
||||
}
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Performs bilinear sampling
|
||||
* @param inImg Image to extract sample from
|
||||
* @param x the x-coordinate
|
||||
@@ -131,7 +53,7 @@ define([
|
||||
* @returns the sampled value
|
||||
* @see cvd/vision.h
|
||||
*/
|
||||
ImageWrapper.sample = function(inImg, x, y) {
|
||||
ImageWrapper.sample = function(inImg, x, y) {
|
||||
var lx = Math.floor(x);
|
||||
var ly = Math.floor(y);
|
||||
var w = inImg.size.x;
|
||||
@@ -146,35 +68,35 @@ define([
|
||||
|
||||
var result = Math.floor(x * (y * (e - c + d) - e) + y * (c - a) + a);
|
||||
return result;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Initializes a given array. Sets each element to zero.
|
||||
* @param array {Array} The array to initialize
|
||||
*/
|
||||
ImageWrapper.clearArray = function(array) {
|
||||
ImageWrapper.clearArray = function(array) {
|
||||
var l = array.length;
|
||||
while (l--) {
|
||||
array[l] = 0;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Creates a {SubImage} from the current image ({this}).
|
||||
* @param from {ImageRef} The position where to start the {SubImage} from. (top-left corner)
|
||||
* @param size {ImageRef} The size of the resulting image
|
||||
* @returns {SubImage} A shared part of the original image
|
||||
*/
|
||||
ImageWrapper.prototype.subImage = function(from, size) {
|
||||
ImageWrapper.prototype.subImage = function(from, size) {
|
||||
return new SubImage(from, size, this);
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Creates an {ImageWrapper) and copies the needed underlying image-data area
|
||||
* @param imageWrapper {ImageWrapper} The target {ImageWrapper} where the data should be copied
|
||||
* @param from {ImageRef} The location where to copy from (top-left location)
|
||||
*/
|
||||
ImageWrapper.prototype.subImageAsCopy = function(imageWrapper, from) {
|
||||
ImageWrapper.prototype.subImageAsCopy = function(imageWrapper, from) {
|
||||
var sizeY = imageWrapper.size.y, sizeX = imageWrapper.size.x;
|
||||
var x, y;
|
||||
for ( x = 0; x < sizeX; x++) {
|
||||
@@ -182,39 +104,39 @@ define([
|
||||
imageWrapper.data[y * sizeX + x] = this.data[(from.y + y) * this.size.x + from.x + x];
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
ImageWrapper.prototype.copyTo = function(imageWrapper) {
|
||||
ImageWrapper.prototype.copyTo = function(imageWrapper) {
|
||||
var length = this.data.length, srcData = this.data, dstData = imageWrapper.data;
|
||||
|
||||
while (length--) {
|
||||
dstData[length] = srcData[length];
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Retrieves a given pixel position from the image
|
||||
* @param x {Number} The x-position
|
||||
* @param y {Number} The y-position
|
||||
* @returns {Number} The grayscale value at the pixel-position
|
||||
*/
|
||||
ImageWrapper.prototype.get = function(x, y) {
|
||||
ImageWrapper.prototype.get = function(x, y) {
|
||||
return this.data[y * this.size.x + x];
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Retrieves a given pixel position from the image
|
||||
* @param x {Number} The x-position
|
||||
* @param y {Number} The y-position
|
||||
* @returns {Number} The grayscale value at the pixel-position
|
||||
*/
|
||||
ImageWrapper.prototype.getSafe = function(x, y) {
|
||||
ImageWrapper.prototype.getSafe = function(x, y) {
|
||||
var i;
|
||||
|
||||
if (!this.indexMapping) {
|
||||
this.indexMapping = {
|
||||
x : [],
|
||||
y : []
|
||||
x: [],
|
||||
y: []
|
||||
};
|
||||
for (i = 0; i < this.size.x; i++) {
|
||||
this.indexMapping.x[i] = i;
|
||||
@@ -226,24 +148,24 @@ define([
|
||||
}
|
||||
}
|
||||
return this.data[(this.indexMapping.y[y + this.size.y]) * this.size.x + this.indexMapping.x[x + this.size.x]];
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Sets a given pixel position in the image
|
||||
* @param x {Number} The x-position
|
||||
* @param y {Number} The y-position
|
||||
* @param value {Number} The grayscale value to set
|
||||
* @returns {ImageWrapper} The Image itself (for possible chaining)
|
||||
*/
|
||||
ImageWrapper.prototype.set = function(x, y, value) {
|
||||
ImageWrapper.prototype.set = function(x, y, value) {
|
||||
this.data[y * this.size.x + x] = value;
|
||||
return this;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Sets the border of the image (1 pixel) to zero
|
||||
*/
|
||||
ImageWrapper.prototype.zeroBorder = function() {
|
||||
ImageWrapper.prototype.zeroBorder = function() {
|
||||
var i, width = this.size.x, height = this.size.y, data = this.data;
|
||||
for ( i = 0; i < width; i++) {
|
||||
data[i] = data[(height - 1) * width + i] = 0;
|
||||
@@ -251,36 +173,35 @@ define([
|
||||
for ( i = 1; i < height - 1; i++) {
|
||||
data[i * width] = data[i * width + (width - 1)] = 0;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Inverts a binary image in place
|
||||
*/
|
||||
ImageWrapper.prototype.invert = function() {
|
||||
ImageWrapper.prototype.invert = function() {
|
||||
var data = this.data, length = data.length;
|
||||
|
||||
while (length--) {
|
||||
data[length] = data[length] ? 0 : 1;
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
ImageWrapper.prototype.convolve = function(kernel) {
|
||||
ImageWrapper.prototype.convolve = function(kernel) {
|
||||
var x, y, kx, ky, kSize = (kernel.length / 2) | 0, accu = 0;
|
||||
for ( y = 0; y < this.size.y; y++) {
|
||||
for ( x = 0; x < this.size.x; x++) {
|
||||
accu = 0;
|
||||
for ( ky = -kSize; ky <= kSize; ky++) {
|
||||
for ( kx = -kSize; kx <= kSize; kx++) {
|
||||
accu += kernel[ky+kSize][kx + kSize] * this.getSafe(x + kx, y + ky);
|
||||
accu += kernel[ky + kSize][kx + kSize] * this.getSafe(x + kx, y + ky);
|
||||
}
|
||||
}
|
||||
this.data[y * this.size.x + x] = accu;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
ImageWrapper.prototype.moments = function(labelcount) {
|
||||
ImageWrapper.prototype.moments = function(labelcount) {
|
||||
var data = this.data,
|
||||
x,
|
||||
y,
|
||||
@@ -307,14 +228,14 @@ define([
|
||||
|
||||
for ( i = 0; i < labelcount; i++) {
|
||||
labelsum[i] = {
|
||||
m00 : 0,
|
||||
m01 : 0,
|
||||
m10 : 0,
|
||||
m11 : 0,
|
||||
m02 : 0,
|
||||
m20 : 0,
|
||||
theta : 0,
|
||||
rad : 0
|
||||
m00: 0,
|
||||
m01: 0,
|
||||
m10: 0,
|
||||
m11: 0,
|
||||
m02: 0,
|
||||
m20: 0,
|
||||
theta: 0,
|
||||
rad: 0
|
||||
};
|
||||
}
|
||||
|
||||
@@ -355,14 +276,14 @@ define([
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Displays the {ImageWrapper} in a given canvas
|
||||
* @param canvas {Canvas} The canvas element to write to
|
||||
* @param scale {Number} Scale which is applied to each pixel-value
|
||||
*/
|
||||
ImageWrapper.prototype.show = function(canvas, scale) {
|
||||
ImageWrapper.prototype.show = function(canvas, scale) {
|
||||
var ctx,
|
||||
frame,
|
||||
data,
|
||||
@@ -392,14 +313,14 @@ define([
|
||||
}
|
||||
//frame.data = data;
|
||||
ctx.putImageData(frame, 0, 0);
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Displays the {SubImage} in a given canvas
|
||||
* @param canvas {Canvas} The canvas element to write to
|
||||
* @param scale {Number} Scale which is applied to each pixel-value
|
||||
*/
|
||||
ImageWrapper.prototype.overlay = function(canvas, scale, from) {
|
||||
ImageWrapper.prototype.overlay = function(canvas, scale, from) {
|
||||
if (!scale || scale < 0 || scale > 360) {
|
||||
scale = 360;
|
||||
}
|
||||
@@ -421,7 +342,6 @@ define([
|
||||
data[length * 4 + 3] = 255;
|
||||
}
|
||||
ctx.putImageData(frame, from.x, from.y);
|
||||
};
|
||||
};
|
||||
|
||||
return (ImageWrapper);
|
||||
});
|
||||
export default ImageWrapper;
|
||||
|
||||
+26
-26
@@ -1,11 +1,7 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import ImageLoader from './image_loader';
|
||||
|
||||
define(["image_loader"], function(ImageLoader) {
|
||||
"use strict";
|
||||
|
||||
var InputStream = {};
|
||||
InputStream.createVideoStream = function(video) {
|
||||
var InputStream = {};
|
||||
InputStream.createVideoStream = function(video) {
|
||||
var that = {},
|
||||
_config = null,
|
||||
_eventNames = ['canrecord', 'ended'],
|
||||
@@ -19,8 +15,10 @@ define(["image_loader"], function(ImageLoader) {
|
||||
var width = video.videoWidth,
|
||||
height = video.videoHeight;
|
||||
|
||||
_calculatedWidth = _config.size ? width/height > 1 ? _config.size : Math.floor((width/height) * _config.size) : width;
|
||||
_calculatedHeight = _config.size ? width/height > 1 ? Math.floor((height/width) * _config.size) : _config.size : height;
|
||||
_calculatedWidth =
|
||||
_config.size ? width / height > 1 ? _config.size : Math.floor((width / height) * _config.size) : width;
|
||||
_calculatedHeight =
|
||||
_config.size ? width / height > 1 ? Math.floor((height / width) * _config.size) : _config.size : height;
|
||||
|
||||
_canvasSize.x = _calculatedWidth;
|
||||
_canvasSize.y = _calculatedHeight;
|
||||
@@ -76,8 +74,9 @@ define(["image_loader"], function(ImageLoader) {
|
||||
};
|
||||
|
||||
that.setCurrentTime = function(time) {
|
||||
if (_config.type !== "LiveStream")
|
||||
if (_config.type !== "LiveStream") {
|
||||
video.currentTime = time;
|
||||
}
|
||||
};
|
||||
|
||||
that.addEventListener = function(event, f, bool) {
|
||||
@@ -139,9 +138,9 @@ define(["image_loader"], function(ImageLoader) {
|
||||
};
|
||||
|
||||
return that;
|
||||
};
|
||||
};
|
||||
|
||||
InputStream.createLiveStream = function(video) {
|
||||
InputStream.createLiveStream = function(video) {
|
||||
video.setAttribute("autoplay", true);
|
||||
var that = InputStream.createVideoStream(video);
|
||||
|
||||
@@ -150,9 +149,9 @@ define(["image_loader"], function(ImageLoader) {
|
||||
};
|
||||
|
||||
return that;
|
||||
};
|
||||
};
|
||||
|
||||
InputStream.createImageStream = function() {
|
||||
InputStream.createImageStream = function() {
|
||||
var that = {};
|
||||
var _config = null;
|
||||
|
||||
@@ -179,8 +178,10 @@ define(["image_loader"], function(ImageLoader) {
|
||||
imgArray = imgs;
|
||||
width = imgs[0].width;
|
||||
height = imgs[0].height;
|
||||
calculatedWidth = _config.size ? width/height > 1 ? _config.size : Math.floor((width/height) * _config.size) : width;
|
||||
calculatedHeight = _config.size ? width/height > 1 ? Math.floor((height/width) * _config.size) : _config.size : height;
|
||||
calculatedWidth =
|
||||
_config.size ? width / height > 1 ? _config.size : Math.floor((width / height) * _config.size) : width;
|
||||
calculatedHeight =
|
||||
_config.size ? width / height > 1 ? Math.floor((height / width) * _config.size) : _config.size : height;
|
||||
_canvasSize.x = calculatedWidth;
|
||||
_canvasSize.y = calculatedHeight;
|
||||
loaded = true;
|
||||
@@ -213,12 +214,12 @@ define(["image_loader"], function(ImageLoader) {
|
||||
return calculatedHeight;
|
||||
};
|
||||
|
||||
that.setWidth = function(width) {
|
||||
calculatedWidth = width;
|
||||
that.setWidth = function(newWidth) {
|
||||
calculatedWidth = newWidth;
|
||||
};
|
||||
|
||||
that.setHeight = function(height) {
|
||||
calculatedHeight = height;
|
||||
that.setHeight = function(newHeight) {
|
||||
calculatedHeight = newHeight;
|
||||
};
|
||||
|
||||
that.getRealWidth = function() {
|
||||
@@ -281,9 +282,9 @@ define(["image_loader"], function(ImageLoader) {
|
||||
return _topRight;
|
||||
};
|
||||
|
||||
that.setCanvasSize = function(size) {
|
||||
_canvasSize.x = size.x;
|
||||
_canvasSize.y = size.y;
|
||||
that.setCanvasSize = function(canvasSize) {
|
||||
_canvasSize.x = canvasSize.x;
|
||||
_canvasSize.y = canvasSize.y;
|
||||
};
|
||||
|
||||
that.getCanvasSize = function() {
|
||||
@@ -311,7 +312,6 @@ define(["image_loader"], function(ImageLoader) {
|
||||
};
|
||||
|
||||
return that;
|
||||
};
|
||||
};
|
||||
|
||||
return (InputStream);
|
||||
});
|
||||
export default InputStream;
|
||||
|
||||
+92
-104
@@ -1,43 +1,29 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true, evil: true */
|
||||
/* global define */
|
||||
define([
|
||||
"input_stream",
|
||||
"image_wrapper",
|
||||
"barcode_locator",
|
||||
"barcode_decoder",
|
||||
"frame_grabber",
|
||||
"html_utils",
|
||||
"config",
|
||||
"events",
|
||||
"camera_access",
|
||||
"image_debug",
|
||||
"gl-matrix",
|
||||
"result_collector"],
|
||||
function(InputStream,
|
||||
ImageWrapper,
|
||||
BarcodeLocator,
|
||||
BarcodeDecoder,
|
||||
FrameGrabber,
|
||||
HtmlUtils,
|
||||
_config,
|
||||
Events,
|
||||
CameraAccess,
|
||||
ImageDebug,
|
||||
glMatrix,
|
||||
ResultCollector) {
|
||||
"use strict";
|
||||
import TypeDefs from './typedefs'; // eslint-disable-line no-unused-vars
|
||||
import ImageWrapper from './image_wrapper';
|
||||
import BarcodeLocator from './barcode_locator';
|
||||
import BarcodeDecoder from './barcode_decoder';
|
||||
import Config from './config';
|
||||
import Events from './events';
|
||||
import CameraAccess from './camera_access';
|
||||
import ImageDebug from './image_debug';
|
||||
import {vec2} from 'gl-matrix';
|
||||
import ResultCollector from './result_collector';
|
||||
|
||||
var _inputStream,
|
||||
const merge = require('lodash/object/merge');
|
||||
const InputStream = require('input_stream');
|
||||
const FrameGrabber = require('frame_grabber');
|
||||
|
||||
var _inputStream,
|
||||
_framegrabber,
|
||||
_stopped,
|
||||
_canvasContainer = {
|
||||
ctx : {
|
||||
image : null,
|
||||
overlay : null
|
||||
ctx: {
|
||||
image: null,
|
||||
overlay: null
|
||||
},
|
||||
dom : {
|
||||
image : null,
|
||||
overlay : null
|
||||
dom: {
|
||||
image: null,
|
||||
overlay: null
|
||||
}
|
||||
},
|
||||
_inputImageWrapper,
|
||||
@@ -45,15 +31,15 @@ function(InputStream,
|
||||
_decoder,
|
||||
_workerPool = [],
|
||||
_onUIThread = true,
|
||||
vec2 = glMatrix.vec2,
|
||||
_resultCollector;
|
||||
_resultCollector,
|
||||
_config = {};
|
||||
|
||||
function initializeData(imageWrapper) {
|
||||
function initializeData(imageWrapper) {
|
||||
initBuffers(imageWrapper);
|
||||
_decoder = BarcodeDecoder.create(_config.decoder, _inputImageWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
function initConfig() {
|
||||
function initConfig() {
|
||||
if (typeof document !== "undefined") {
|
||||
var vis = [{
|
||||
node: document.querySelector("div[data-controls]"),
|
||||
@@ -73,16 +59,16 @@ function(InputStream,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function initInputStream(cb) {
|
||||
function initInputStream(cb) {
|
||||
var video;
|
||||
if (_config.inputStream.type == "VideoStream") {
|
||||
if (_config.inputStream.type === "VideoStream") {
|
||||
video = document.createElement("video");
|
||||
_inputStream = InputStream.createVideoStream(video);
|
||||
} else if (_config.inputStream.type == "ImageStream") {
|
||||
} else if (_config.inputStream.type === "ImageStream") {
|
||||
_inputStream = InputStream.createImageStream();
|
||||
} else if (_config.inputStream.type == "LiveStream") {
|
||||
} else if (_config.inputStream.type === "LiveStream") {
|
||||
var $viewport = document.querySelector("#interactive.viewport");
|
||||
if ($viewport) {
|
||||
video = $viewport.querySelector("video");
|
||||
@@ -105,9 +91,9 @@ function(InputStream,
|
||||
_inputStream.setAttribute("autoplay", true);
|
||||
_inputStream.setInputStream(_config.inputStream);
|
||||
_inputStream.addEventListener("canrecord", canRecord.bind(undefined, cb));
|
||||
}
|
||||
}
|
||||
|
||||
function canRecord(cb) {
|
||||
function canRecord(cb) {
|
||||
BarcodeLocator.checkImageConstraints(_inputStream, _config.locator);
|
||||
initCanvas();
|
||||
_framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image);
|
||||
@@ -122,21 +108,21 @@ function(InputStream,
|
||||
initializeData();
|
||||
ready(cb);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function ready(cb){
|
||||
function ready(cb){
|
||||
_inputStream.play();
|
||||
cb();
|
||||
}
|
||||
}
|
||||
|
||||
function initCanvas() {
|
||||
function initCanvas() {
|
||||
if (typeof document !== "undefined") {
|
||||
var $viewport = document.querySelector("#interactive.viewport");
|
||||
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
|
||||
if (!_canvasContainer.dom.image) {
|
||||
_canvasContainer.dom.image = document.createElement("canvas");
|
||||
_canvasContainer.dom.image.className = "imgBuffer";
|
||||
if ($viewport && _config.inputStream.type == "ImageStream") {
|
||||
if ($viewport && _config.inputStream.type === "ImageStream") {
|
||||
$viewport.appendChild(_canvasContainer.dom.image);
|
||||
}
|
||||
}
|
||||
@@ -161,15 +147,15 @@ function(InputStream,
|
||||
_canvasContainer.dom.overlay.width = _inputStream.getCanvasSize().x;
|
||||
_canvasContainer.dom.overlay.height = _inputStream.getCanvasSize().y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function initBuffers(imageWrapper) {
|
||||
function initBuffers(imageWrapper) {
|
||||
if (imageWrapper) {
|
||||
_inputImageWrapper = imageWrapper;
|
||||
} else {
|
||||
_inputImageWrapper = new ImageWrapper({
|
||||
x : _inputStream.getWidth(),
|
||||
y : _inputStream.getHeight()
|
||||
x: _inputStream.getWidth(),
|
||||
y: _inputStream.getHeight()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -181,9 +167,9 @@ function(InputStream,
|
||||
vec2.clone([_inputImageWrapper.size.x, 0])
|
||||
];
|
||||
BarcodeLocator.init(_inputImageWrapper, _config.locator);
|
||||
}
|
||||
}
|
||||
|
||||
function getBoundingBoxes() {
|
||||
function getBoundingBoxes() {
|
||||
if (_config.locate) {
|
||||
return BarcodeLocator.locate();
|
||||
} else {
|
||||
@@ -193,9 +179,9 @@ function(InputStream,
|
||||
vec2.clone(_boxSize[2]),
|
||||
vec2.clone(_boxSize[3])]];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function transformResult(result) {
|
||||
function transformResult(result) {
|
||||
var topRight = _inputStream.getTopRight(),
|
||||
xOffset = topRight.x,
|
||||
yOffset = topRight.y,
|
||||
@@ -218,7 +204,7 @@ function(InputStream,
|
||||
function moveBox(box) {
|
||||
var corner = box.length;
|
||||
|
||||
while(corner--) {
|
||||
while (corner--) {
|
||||
box[corner][0] += xOffset;
|
||||
box[corner][1] += yOffset;
|
||||
}
|
||||
@@ -230,9 +216,9 @@ function(InputStream,
|
||||
line[1].x += xOffset;
|
||||
line[1].y += yOffset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function publishResult(result, imageData) {
|
||||
function publishResult(result, imageData) {
|
||||
if (_onUIThread) {
|
||||
transformResult(result);
|
||||
if (imageData && result && result.codeResult) {
|
||||
@@ -246,9 +232,9 @@ function(InputStream,
|
||||
if (result && result.codeResult) {
|
||||
Events.publish("detected", result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function locateAndDecode() {
|
||||
function locateAndDecode() {
|
||||
var result,
|
||||
boxes;
|
||||
|
||||
@@ -261,9 +247,9 @@ function(InputStream,
|
||||
} else {
|
||||
publishResult();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function update() {
|
||||
function update() {
|
||||
var availableWorker;
|
||||
|
||||
if (_onUIThread) {
|
||||
@@ -293,21 +279,21 @@ function(InputStream,
|
||||
} else {
|
||||
locateAndDecode();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function start() {
|
||||
function start() {
|
||||
_stopped = false;
|
||||
( function frame() {
|
||||
if (!_stopped) {
|
||||
update();
|
||||
if (_onUIThread && _config.inputStream.type == "LiveStream") {
|
||||
if (_onUIThread && _config.inputStream.type === "LiveStream") {
|
||||
window.requestAnimFrame(frame);
|
||||
}
|
||||
}
|
||||
}());
|
||||
}
|
||||
}
|
||||
|
||||
function initWorkers(cb) {
|
||||
function initWorkers(cb) {
|
||||
var i;
|
||||
_workerPool = [];
|
||||
|
||||
@@ -321,9 +307,9 @@ function(InputStream,
|
||||
cb();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function initWorker(cb) {
|
||||
function initWorker(cb) {
|
||||
var blobURL,
|
||||
workerThread = {
|
||||
worker: undefined,
|
||||
@@ -356,20 +342,18 @@ function(InputStream,
|
||||
imageData: workerThread.imageData,
|
||||
config: _config
|
||||
}, [workerThread.imageData.buffer]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function workerInterface(factory) {
|
||||
function workerInterface(factory) {
|
||||
/* eslint-disable no-undef*/
|
||||
if (factory) {
|
||||
/* jshint ignore:start */
|
||||
var Quagga = factory();
|
||||
if (!Quagga) {
|
||||
self.postMessage({'event': 'error', message: 'Quagga could not be created'});
|
||||
return;
|
||||
}
|
||||
/* jshint ignore:end */
|
||||
}
|
||||
/* jshint ignore:start */
|
||||
var imageWrapper;
|
||||
|
||||
self.onmessage = function(e) {
|
||||
@@ -377,8 +361,8 @@ function(InputStream,
|
||||
var config = e.data.config;
|
||||
config.numOfWorkers = 0;
|
||||
imageWrapper = new Quagga.ImageWrapper({
|
||||
x : e.data.size.x,
|
||||
y : e.data.size.y
|
||||
x: e.data.size.x,
|
||||
y: e.data.size.y
|
||||
}, new Uint8Array(e.data.imageData));
|
||||
Quagga.init(config, ready, imageWrapper);
|
||||
Quagga.onProcessed(onProcessed);
|
||||
@@ -391,32 +375,37 @@ function(InputStream,
|
||||
};
|
||||
|
||||
function onProcessed(result) {
|
||||
self.postMessage({'event': 'processed', imageData: imageWrapper.data, result: result}, [imageWrapper.data.buffer]);
|
||||
self.postMessage({
|
||||
'event': 'processed',
|
||||
imageData: imageWrapper.data,
|
||||
result: result
|
||||
}, [imageWrapper.data.buffer]);
|
||||
}
|
||||
|
||||
function ready() {
|
||||
function ready() { // eslint-disable-line
|
||||
self.postMessage({'event': 'initialized', imageData: imageWrapper.data}, [imageWrapper.data.buffer]);
|
||||
}
|
||||
/* jshint ignore:end */
|
||||
}
|
||||
|
||||
function generateWorkerBlob() {
|
||||
/* eslint-enable */
|
||||
}
|
||||
|
||||
function generateWorkerBlob() {
|
||||
var blob,
|
||||
factorySource;
|
||||
|
||||
/* jshint ignore:start */
|
||||
if (typeof __factorySource__ !== 'undefined') {
|
||||
factorySource = __factorySource__;
|
||||
factorySource = __factorySource__; // eslint-disable-line no-undef
|
||||
}
|
||||
/* jshint ignore:end */
|
||||
|
||||
blob = new Blob(['(' + workerInterface.toString() + ')(' + factorySource + ');'],
|
||||
{type : 'text/javascript'});
|
||||
{type: 'text/javascript'});
|
||||
|
||||
return window.URL.createObjectURL(blob);
|
||||
}
|
||||
}
|
||||
|
||||
function setReaders(readers) {
|
||||
function setReaders(readers) {
|
||||
if (_decoder) {
|
||||
_decoder.setReaders(readers);
|
||||
} else if (_onUIThread && _workerPool.length > 0) {
|
||||
@@ -424,11 +413,11 @@ function(InputStream,
|
||||
workerThread.worker.postMessage({cmd: 'setReaders', readers: readers});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
init : function(config, cb, imageWrapper) {
|
||||
_config = HtmlUtils.mergeObjects(_config, config);
|
||||
export default {
|
||||
init: function(config, cb, imageWrapper) {
|
||||
_config = merge({}, Config, config);
|
||||
if (imageWrapper) {
|
||||
_onUIThread = false;
|
||||
initializeData(imageWrapper);
|
||||
@@ -437,10 +426,10 @@ function(InputStream,
|
||||
initInputStream(cb);
|
||||
}
|
||||
},
|
||||
start : function() {
|
||||
start: function() {
|
||||
start();
|
||||
},
|
||||
stop : function() {
|
||||
stop: function() {
|
||||
_stopped = true;
|
||||
_workerPool.forEach(function(workerThread) {
|
||||
workerThread.worker.terminate();
|
||||
@@ -455,7 +444,7 @@ function(InputStream,
|
||||
pause: function() {
|
||||
_stopped = true;
|
||||
},
|
||||
onDetected : function(callback) {
|
||||
onDetected: function(callback) {
|
||||
Events.subscribe("detected", callback);
|
||||
},
|
||||
offDetected: function(callback) {
|
||||
@@ -475,12 +464,12 @@ function(InputStream,
|
||||
_resultCollector = resultCollector;
|
||||
}
|
||||
},
|
||||
canvas : _canvasContainer,
|
||||
decodeSingle : function(config, resultCallback) {
|
||||
config = HtmlUtils.mergeObjects({
|
||||
canvas: _canvasContainer,
|
||||
decodeSingle: function(config, resultCallback) {
|
||||
config = merge({
|
||||
inputStream: {
|
||||
type : "ImageStream",
|
||||
sequence : false,
|
||||
type: "ImageStream",
|
||||
sequence: false,
|
||||
size: 800,
|
||||
src: config.src
|
||||
},
|
||||
@@ -500,5 +489,4 @@ function(InputStream,
|
||||
ImageWrapper: ImageWrapper,
|
||||
ImageDebug: ImageDebug,
|
||||
ResultCollector: ResultCollector
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
+29
-32
@@ -1,33 +1,29 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import Tracer from './tracer';
|
||||
|
||||
/**
|
||||
* http://www.codeproject.com/Tips/407172/Connected-Component-Labeling-and-Vectorization
|
||||
*/
|
||||
define(["tracer"], function(Tracer) {
|
||||
"use strict";
|
||||
|
||||
var Rasterizer = {
|
||||
createContour2D : function() {
|
||||
var Rasterizer = {
|
||||
createContour2D: function() {
|
||||
return {
|
||||
dir : null,
|
||||
index : null,
|
||||
firstVertex : null,
|
||||
insideContours : null,
|
||||
nextpeer : null,
|
||||
prevpeer : null
|
||||
dir: null,
|
||||
index: null,
|
||||
firstVertex: null,
|
||||
insideContours: null,
|
||||
nextpeer: null,
|
||||
prevpeer: null
|
||||
};
|
||||
},
|
||||
CONTOUR_DIR : {
|
||||
CW_DIR : 0,
|
||||
CCW_DIR : 1,
|
||||
UNKNOWN_DIR : 2
|
||||
CONTOUR_DIR: {
|
||||
CW_DIR: 0,
|
||||
CCW_DIR: 1,
|
||||
UNKNOWN_DIR: 2
|
||||
},
|
||||
DIR : {
|
||||
OUTSIDE_EDGE : -32767,
|
||||
INSIDE_EDGE : -32766
|
||||
DIR: {
|
||||
OUTSIDE_EDGE: -32767,
|
||||
INSIDE_EDGE: -32766
|
||||
},
|
||||
create : function(imageWrapper, labelWrapper) {
|
||||
create: function(imageWrapper, labelWrapper) {
|
||||
var imageData = imageWrapper.data,
|
||||
labelData = labelWrapper.data,
|
||||
width = imageWrapper.size.x,
|
||||
@@ -35,7 +31,7 @@ define(["tracer"], function(Tracer) {
|
||||
tracer = Tracer.create(imageWrapper, labelWrapper);
|
||||
|
||||
return {
|
||||
rasterize : function(depthlabel) {
|
||||
rasterize: function(depthlabel) {
|
||||
var color,
|
||||
bc,
|
||||
lc,
|
||||
@@ -85,7 +81,8 @@ define(["tracer"], function(Tracer) {
|
||||
cc = p;
|
||||
}
|
||||
} else {
|
||||
vertex = tracer.contourTracing(cy, cx, Rasterizer.DIR.INSIDE_EDGE, color, labelindex);
|
||||
vertex = tracer
|
||||
.contourTracing(cy, cx, Rasterizer.DIR.INSIDE_EDGE, color, labelindex);
|
||||
if (vertex !== null) {
|
||||
p = Rasterizer.createContour2D();
|
||||
p.firstVertex = vertex;
|
||||
@@ -112,7 +109,8 @@ define(["tracer"], function(Tracer) {
|
||||
} else {
|
||||
labelData[pos] = labelindex;
|
||||
}
|
||||
} else if (labelData[pos] === Rasterizer.DIR.OUTSIDE_EDGE || labelData[pos] === Rasterizer.DIR.INSIDE_EDGE) {
|
||||
} else if (labelData[pos] === Rasterizer.DIR.OUTSIDE_EDGE
|
||||
|| labelData[pos] === Rasterizer.DIR.INSIDE_EDGE) {
|
||||
labelindex = 0;
|
||||
if (labelData[pos] === Rasterizer.DIR.INSIDE_EDGE) {
|
||||
bc = imageData[pos];
|
||||
@@ -131,12 +129,12 @@ define(["tracer"], function(Tracer) {
|
||||
sc = sc.nextpeer;
|
||||
}
|
||||
return {
|
||||
cc : cc,
|
||||
count : connectedCount
|
||||
cc: cc,
|
||||
count: connectedCount
|
||||
};
|
||||
},
|
||||
debug: {
|
||||
drawContour : function(canvas, firstContour) {
|
||||
drawContour: function(canvas, firstContour) {
|
||||
var ctx = canvas.getContext("2d"),
|
||||
pq = firstContour,
|
||||
iq,
|
||||
@@ -167,7 +165,7 @@ define(["tracer"], function(Tracer) {
|
||||
}
|
||||
}
|
||||
|
||||
switch(q.dir) {
|
||||
switch (q.dir) {
|
||||
case Rasterizer.CONTOUR_DIR.CW_DIR:
|
||||
ctx.strokeStyle = "red";
|
||||
break;
|
||||
@@ -185,14 +183,13 @@ define(["tracer"], function(Tracer) {
|
||||
do {
|
||||
p = p.next;
|
||||
ctx.lineTo(p.x, p.y);
|
||||
} while(p !== q.firstVertex);
|
||||
} while (p !== q.firstVertex);
|
||||
ctx.stroke();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
return (Rasterizer);
|
||||
});
|
||||
export default Rasterizer;
|
||||
|
||||
+11
-13
@@ -1,10 +1,6 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import ImageDebug from './image_debug';
|
||||
|
||||
define(["image_debug"], function(ImageDebug) {
|
||||
"use strict";
|
||||
|
||||
function contains(codeResult, list) {
|
||||
function contains(codeResult, list) {
|
||||
if (list) {
|
||||
return list.some(function (item) {
|
||||
return Object.keys(item).every(function (key) {
|
||||
@@ -13,16 +9,16 @@ define(["image_debug"], function(ImageDebug) {
|
||||
});
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function passesFilter(codeResult, filter) {
|
||||
function passesFilter(codeResult, filter) {
|
||||
if (typeof filter === 'function') {
|
||||
return filter(codeResult);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
export default {
|
||||
create: function(config) {
|
||||
var canvas = document.createElement("canvas"),
|
||||
ctx = canvas.getContext("2d"),
|
||||
@@ -31,7 +27,10 @@ define(["image_debug"], function(ImageDebug) {
|
||||
capture = config.capture === true;
|
||||
|
||||
function matchesConstraints(codeResult) {
|
||||
return capacity && codeResult && !contains(codeResult, config.blacklist) && passesFilter(codeResult, config.filter);
|
||||
return capacity
|
||||
&& codeResult
|
||||
&& !contains(codeResult, config.blacklist)
|
||||
&& passesFilter(codeResult, config.filter);
|
||||
}
|
||||
|
||||
return {
|
||||
@@ -55,5 +54,4 @@ define(["image_debug"], function(ImageDebug) {
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
+23
-18
@@ -1,11 +1,6 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true, -W041: false */
|
||||
/* global define */
|
||||
|
||||
define(function() {
|
||||
"use strict";
|
||||
|
||||
/* @preserve ASM BEGIN */
|
||||
function Skeletonizer(stdlib, foreign, buffer) {
|
||||
/* @preserve ASM BEGIN */
|
||||
/* eslint-disable eqeqeq*/
|
||||
function Skeletonizer(stdlib, foreign, buffer) {
|
||||
"use asm";
|
||||
|
||||
var images = new stdlib.Uint8Array(buffer),
|
||||
@@ -32,7 +27,11 @@ define(function() {
|
||||
yStart2 = (offset + size) | 0;
|
||||
xStart1 = (u - 1) | 0;
|
||||
xStart2 = (u + 1) | 0;
|
||||
sum = ((images[(inImagePtr + yStart1 + xStart1) | 0] | 0) + (images[(inImagePtr + yStart1 + xStart2) | 0] | 0) + (images[(inImagePtr + offset + u) | 0] | 0) + (images[(inImagePtr + yStart2 + xStart1) | 0] | 0) + (images[(inImagePtr + yStart2 + xStart2) | 0] | 0)) | 0;
|
||||
sum = ((images[(inImagePtr + yStart1 + xStart1) | 0] | 0)
|
||||
+ (images[(inImagePtr + yStart1 + xStart2) | 0] | 0)
|
||||
+ (images[(inImagePtr + offset + u) | 0] | 0)
|
||||
+ (images[(inImagePtr + yStart2 + xStart1) | 0] | 0)
|
||||
+ (images[(inImagePtr + yStart2 + xStart2) | 0] | 0)) | 0;
|
||||
if ((sum | 0) == (5 | 0)) {
|
||||
images[(outImagePtr + offset + u) | 0] = 1;
|
||||
} else {
|
||||
@@ -54,7 +53,8 @@ define(function() {
|
||||
|
||||
while ((length | 0) > 0) {
|
||||
length = (length - 1) | 0;
|
||||
images[(outImagePtr + length) | 0] = ((images[(aImagePtr + length) | 0] | 0) - (images[(bImagePtr + length) | 0] | 0)) | 0;
|
||||
images[(outImagePtr + length) | 0] =
|
||||
((images[(aImagePtr + length) | 0] | 0) - (images[(bImagePtr + length) | 0] | 0)) | 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,8 @@ define(function() {
|
||||
|
||||
while ((length | 0) > 0) {
|
||||
length = (length - 1) | 0;
|
||||
images[(outImagePtr + length) | 0] = ((images[(aImagePtr + length) | 0] | 0) | (images[(bImagePtr + length) | 0] | 0)) | 0;
|
||||
images[(outImagePtr + length) | 0] =
|
||||
((images[(aImagePtr + length) | 0] | 0) | (images[(bImagePtr + length) | 0] | 0)) | 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,7 +124,11 @@ define(function() {
|
||||
yStart2 = (offset + size) | 0;
|
||||
xStart1 = (u - 1) | 0;
|
||||
xStart2 = (u + 1) | 0;
|
||||
sum = ((images[(inImagePtr + yStart1 + xStart1) | 0] | 0) + (images[(inImagePtr + yStart1 + xStart2) | 0] | 0) + (images[(inImagePtr + offset + u) | 0] | 0) + (images[(inImagePtr + yStart2 + xStart1) | 0] | 0) + (images[(inImagePtr + yStart2 + xStart2) | 0] | 0)) | 0;
|
||||
sum = ((images[(inImagePtr + yStart1 + xStart1) | 0] | 0)
|
||||
+ (images[(inImagePtr + yStart1 + xStart2) | 0] | 0)
|
||||
+ (images[(inImagePtr + offset + u) | 0] | 0)
|
||||
+ (images[(inImagePtr + yStart2 + xStart1) | 0] | 0)
|
||||
+ (images[(inImagePtr + yStart2 + xStart2) | 0] | 0)) | 0;
|
||||
if ((sum | 0) > (0 | 0)) {
|
||||
images[(outImagePtr + offset + u) | 0] = 1;
|
||||
} else {
|
||||
@@ -191,14 +196,14 @@ define(function() {
|
||||
memcpy(erodedImagePtr, subImagePtr);
|
||||
sum = countNonZero(subImagePtr) | 0;
|
||||
done = ((sum | 0) == 0 | 0);
|
||||
} while(!done);
|
||||
} while (!done);
|
||||
}
|
||||
|
||||
return {
|
||||
skeletonize : skeletonize
|
||||
skeletonize: skeletonize
|
||||
};
|
||||
}
|
||||
/* @preserve ASM END */
|
||||
}
|
||||
|
||||
return Skeletonizer;
|
||||
});
|
||||
export default Skeletonizer;
|
||||
/* eslint-enable eqeqeq*/
|
||||
/* @preserve ASM END */
|
||||
|
||||
+18
-25
@@ -1,10 +1,4 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
define(["typedefs"], function() {
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
/**
|
||||
* Construct representing a part of another {ImageWrapper}. Shares data
|
||||
* between the parent and the child.
|
||||
* @param from {ImageRef} The position where to start the {SubImage} from. (top-left corner)
|
||||
@@ -12,11 +6,11 @@ define(["typedefs"], function() {
|
||||
* @param I {ImageWrapper} The {ImageWrapper} to share from
|
||||
* @returns {SubImage} A shared part of the original image
|
||||
*/
|
||||
function SubImage(from, size, I) {
|
||||
function SubImage(from, size, I) {
|
||||
if (!I) {
|
||||
I = {
|
||||
data : null,
|
||||
size : size
|
||||
data: null,
|
||||
size: size
|
||||
};
|
||||
}
|
||||
this.data = I.data;
|
||||
@@ -25,14 +19,14 @@ define(["typedefs"], function() {
|
||||
|
||||
this.from = from;
|
||||
this.size = size;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Displays the {SubImage} in a given canvas
|
||||
* @param canvas {Canvas} The canvas element to write to
|
||||
* @param scale {Number} Scale which is applied to each pixel-value
|
||||
*/
|
||||
SubImage.prototype.show = function(canvas, scale) {
|
||||
SubImage.prototype.show = function(canvas, scale) {
|
||||
var ctx,
|
||||
frame,
|
||||
data,
|
||||
@@ -62,36 +56,35 @@ define(["typedefs"], function() {
|
||||
}
|
||||
frame.data = data;
|
||||
ctx.putImageData(frame, 0, 0);
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Retrieves a given pixel position from the {SubImage}
|
||||
* @param x {Number} The x-position
|
||||
* @param y {Number} The y-position
|
||||
* @returns {Number} The grayscale value at the pixel-position
|
||||
*/
|
||||
SubImage.prototype.get = function(x, y) {
|
||||
SubImage.prototype.get = function(x, y) {
|
||||
return this.data[(this.from.y + y) * this.originalSize.x + this.from.x + x];
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Updates the underlying data from a given {ImageWrapper}
|
||||
* @param image {ImageWrapper} The updated image
|
||||
*/
|
||||
SubImage.prototype.updateData = function(image) {
|
||||
SubImage.prototype.updateData = function(image) {
|
||||
this.originalSize = image.size;
|
||||
this.data = image.data;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Updates the position of the shared area
|
||||
* @param from {x,y} The new location
|
||||
* @returns {SubImage} returns {this} for possible chaining
|
||||
*/
|
||||
SubImage.prototype.updateFrom = function(from) {
|
||||
SubImage.prototype.updateFrom = function(from) {
|
||||
this.from = from;
|
||||
return this;
|
||||
};
|
||||
};
|
||||
|
||||
return (SubImage);
|
||||
});
|
||||
export default (SubImage);
|
||||
|
||||
+17
-24
@@ -1,15 +1,9 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
|
||||
/**
|
||||
* http://www.codeproject.com/Tips/407172/Connected-Component-Labeling-and-Vectorization
|
||||
*/
|
||||
define(function() {
|
||||
"use strict";
|
||||
|
||||
var Tracer = {
|
||||
searchDirections : [[0, 1], [1, 1], [1, 0], [1, -1], [0, -1], [-1, -1], [-1, 0], [-1, 1]],
|
||||
create : function(imageWrapper, labelWrapper) {
|
||||
var Tracer = {
|
||||
searchDirections: [[0, 1], [1, 1], [1, 0], [1, -1], [0, -1], [-1, -1], [-1, 0], [-1, 1]],
|
||||
create: function(imageWrapper, labelWrapper) {
|
||||
var imageData = imageWrapper.data,
|
||||
labelData = labelWrapper.data,
|
||||
searchDirections = this.searchDirections,
|
||||
@@ -42,11 +36,11 @@ define(function() {
|
||||
|
||||
function vertex2D(x, y, dir) {
|
||||
return {
|
||||
dir : dir,
|
||||
x : x,
|
||||
y : y,
|
||||
next : null,
|
||||
prev : null
|
||||
dir: dir,
|
||||
x: x,
|
||||
y: y,
|
||||
next: null,
|
||||
prev: null
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,9 +50,9 @@ define(function() {
|
||||
P,
|
||||
ldir,
|
||||
current = {
|
||||
cx : sx,
|
||||
cy : sy,
|
||||
dir : 0
|
||||
cx: sx,
|
||||
cy: sy,
|
||||
dir: 0
|
||||
};
|
||||
|
||||
if (trace(current, color, label, edgelabel)) {
|
||||
@@ -73,7 +67,7 @@ define(function() {
|
||||
do {
|
||||
current.dir = (current.dir + 6) % 8;
|
||||
trace(current, color, label, edgelabel);
|
||||
if (ldir != current.dir) {
|
||||
if (ldir !== current.dir) {
|
||||
Cv.dir = current.dir;
|
||||
P = vertex2D(current.cx, current.cy, 0);
|
||||
P.prev = Cv;
|
||||
@@ -86,7 +80,7 @@ define(function() {
|
||||
Cv.y = current.cy;
|
||||
}
|
||||
ldir = current.dir;
|
||||
} while(current.cx != sx || current.cy != sy);
|
||||
} while (current.cx !== sx || current.cy !== sy);
|
||||
Fv.prev = Cv.prev;
|
||||
Cv.prev.next = Fv;
|
||||
}
|
||||
@@ -94,15 +88,14 @@ define(function() {
|
||||
}
|
||||
|
||||
return {
|
||||
trace : function(current, color, label, edgelabel) {
|
||||
trace: function(current, color, label, edgelabel) {
|
||||
return trace(current, color, label, edgelabel);
|
||||
},
|
||||
contourTracing : function(sy, sx, label, color, edgelabel) {
|
||||
contourTracing: function(sy, sx, label, color, edgelabel) {
|
||||
return contourTracing(sy, sx, label, color, edgelabel);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
return (Tracer);
|
||||
});
|
||||
export default (Tracer);
|
||||
|
||||
+4
-4
@@ -3,7 +3,6 @@
|
||||
* Normalizes browser-specific prefixes
|
||||
*/
|
||||
|
||||
glMatrixArrayType = Float32Array;
|
||||
if (typeof window !== 'undefined') {
|
||||
window.requestAnimFrame = (function () {
|
||||
return window.requestAnimationFrame ||
|
||||
@@ -11,12 +10,13 @@ if (typeof window !== 'undefined') {
|
||||
window.mozRequestAnimationFrame ||
|
||||
window.oRequestAnimationFrame ||
|
||||
window.msRequestAnimationFrame ||
|
||||
function (/* function FrameRequestCallback */ callback, /* DOMElement Element */ element) {
|
||||
function (/* function FrameRequestCallback */ callback) {
|
||||
window.setTimeout(callback, 1000 / 60);
|
||||
};
|
||||
})();
|
||||
|
||||
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
|
||||
navigator.getUserMedia = navigator.getUserMedia ||
|
||||
navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
|
||||
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
|
||||
}
|
||||
Math.imul = Math.imul || function(a, b) {
|
||||
@@ -26,5 +26,5 @@ Math.imul = Math.imul || function(a, b) {
|
||||
bl = b & 0xffff;
|
||||
// the shift by 0 fixes the sign on the high part
|
||||
// the final |0 converts the unsigned value into a signed value
|
||||
return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0)|0);
|
||||
return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0) | 0);
|
||||
};
|
||||
+28
-39
@@ -1,29 +1,21 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import EANReader from './ean_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./ean_reader"
|
||||
],
|
||||
function(EANReader) {
|
||||
"use strict";
|
||||
|
||||
function UPCEReader() {
|
||||
function UPCEReader() {
|
||||
EANReader.call(this);
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
CODE_FREQUENCY : {value: [
|
||||
var properties = {
|
||||
CODE_FREQUENCY: {value: [
|
||||
[ 56, 52, 50, 49, 44, 38, 35, 42, 41, 37 ],
|
||||
[7, 11, 13, 14, 19, 25, 28, 21, 22, 26]]},
|
||||
STOP_PATTERN: { value: [1 / 6 * 7, 1 / 6 * 7, 1 / 6 * 7, 1 / 6 * 7, 1 / 6 * 7, 1 / 6 * 7]},
|
||||
FORMAT: {value: "upc_e", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
UPCEReader.prototype = Object.create(EANReader.prototype, properties);
|
||||
UPCEReader.prototype.constructor = UPCEReader;
|
||||
UPCEReader.prototype = Object.create(EANReader.prototype, properties);
|
||||
UPCEReader.prototype.constructor = UPCEReader;
|
||||
|
||||
UPCEReader.prototype._decodePayload = function(code, result, decodedCodes) {
|
||||
UPCEReader.prototype._decodePayload = function(code, result, decodedCodes) {
|
||||
var i,
|
||||
self = this,
|
||||
codeFrequency = 0x0;
|
||||
@@ -45,16 +37,15 @@ define(
|
||||
}
|
||||
|
||||
return code;
|
||||
};
|
||||
};
|
||||
|
||||
UPCEReader.prototype._determineParity = function(codeFrequency, result) {
|
||||
var self =this,
|
||||
i,
|
||||
UPCEReader.prototype._determineParity = function(codeFrequency, result) {
|
||||
var i,
|
||||
nrSystem;
|
||||
|
||||
for (nrSystem = 0; nrSystem < self.CODE_FREQUENCY.length; nrSystem++){
|
||||
for ( i = 0; i < self.CODE_FREQUENCY[nrSystem].length; i++) {
|
||||
if (codeFrequency === self.CODE_FREQUENCY[nrSystem][i]) {
|
||||
for (nrSystem = 0; nrSystem < this.CODE_FREQUENCY.length; nrSystem++){
|
||||
for ( i = 0; i < this.CODE_FREQUENCY[nrSystem].length; i++) {
|
||||
if (codeFrequency === this.CODE_FREQUENCY[nrSystem][i]) {
|
||||
result.unshift(nrSystem);
|
||||
result.push(i);
|
||||
return true;
|
||||
@@ -62,9 +53,9 @@ define(
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
};
|
||||
|
||||
UPCEReader.prototype._convertToUPCA = function(result) {
|
||||
UPCEReader.prototype._convertToUPCA = function(result) {
|
||||
var upca = [result[0]],
|
||||
lastDigit = result[result.length - 2];
|
||||
|
||||
@@ -74,8 +65,8 @@ define(
|
||||
.concat(result.slice(3, 6));
|
||||
} else if (lastDigit === 3) {
|
||||
upca = upca.concat(result.slice(1, 4))
|
||||
.concat([0 ,0, 0, 0, 0])
|
||||
.concat(result.slice(4,6));
|
||||
.concat([0, 0, 0, 0, 0])
|
||||
.concat(result.slice(4, 6));
|
||||
} else if (lastDigit === 4) {
|
||||
upca = upca.concat(result.slice(1, 5))
|
||||
.concat([0, 0, 0, 0, 0, result[5]]);
|
||||
@@ -86,29 +77,27 @@ define(
|
||||
|
||||
upca.push(result[result.length - 1]);
|
||||
return upca;
|
||||
};
|
||||
};
|
||||
|
||||
UPCEReader.prototype._checksum = function(result) {
|
||||
UPCEReader.prototype._checksum = function(result) {
|
||||
return EANReader.prototype._checksum.call(this, this._convertToUPCA(result));
|
||||
};
|
||||
};
|
||||
|
||||
UPCEReader.prototype._findEnd = function(offset, isWhite) {
|
||||
UPCEReader.prototype._findEnd = function(offset, isWhite) {
|
||||
isWhite = true;
|
||||
return EANReader.prototype._findEnd.call(this, offset, isWhite);
|
||||
};
|
||||
};
|
||||
|
||||
UPCEReader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
UPCEReader.prototype._verifyTrailingWhitespace = function(endInfo) {
|
||||
var self = this,
|
||||
trailingWhitespaceEnd;
|
||||
|
||||
trailingWhitespaceEnd = endInfo.end + ((endInfo.end - endInfo.start)/2);
|
||||
trailingWhitespaceEnd = endInfo.end + ((endInfo.end - endInfo.start) / 2);
|
||||
if (trailingWhitespaceEnd < self._row.length) {
|
||||
if (self._matchRange(endInfo.end, trailingWhitespaceEnd, 0)) {
|
||||
return endInfo;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
return (UPCEReader);
|
||||
}
|
||||
);
|
||||
export default UPCEReader;
|
||||
|
||||
+10
-21
@@ -1,35 +1,24 @@
|
||||
/* jshint undef: true, unused: true, browser:true, devel: true */
|
||||
/* global define */
|
||||
import EANReader from './ean_reader';
|
||||
|
||||
define(
|
||||
[
|
||||
"./ean_reader"
|
||||
],
|
||||
function(EANReader) {
|
||||
"use strict";
|
||||
|
||||
function UPCReader() {
|
||||
function UPCReader() {
|
||||
EANReader.call(this);
|
||||
}
|
||||
}
|
||||
|
||||
var properties = {
|
||||
var properties = {
|
||||
FORMAT: {value: "upc_a", writeable: false}
|
||||
};
|
||||
};
|
||||
|
||||
UPCReader.prototype = Object.create(EANReader.prototype, properties);
|
||||
UPCReader.prototype.constructor = UPCReader;
|
||||
UPCReader.prototype = Object.create(EANReader.prototype, properties);
|
||||
UPCReader.prototype.constructor = UPCReader;
|
||||
|
||||
UPCReader.prototype._decode = function() {
|
||||
UPCReader.prototype._decode = function() {
|
||||
var result = EANReader.prototype._decode.call(this);
|
||||
|
||||
if (result && result.code && result.code.length === 13 && result.code.charAt(0) === "0") {
|
||||
|
||||
result.code = result.code.substring(1);
|
||||
return result;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
};
|
||||
|
||||
return (UPCReader);
|
||||
}
|
||||
);
|
||||
export default UPCReader;
|
||||
|
||||
+23
-16
@@ -11,14 +11,17 @@ module.exports = function(grunt) {
|
||||
var code = fs.readFileSync('dist/quagga.js', 'utf-8'),
|
||||
minifiedCode = fs.readFileSync('dist/quagga.min.js', 'utf-8'),
|
||||
commentEnd = '/* @preserve ASM END */',
|
||||
asmStartIdx = code.indexOf('/* @preserve ASM BEGIN */'),
|
||||
asmEndIdx = code.indexOf(commentEnd),
|
||||
asmCode = code.substring(asmStartIdx, asmEndIdx + commentEnd.length),
|
||||
asmFunctionRegex = /function (\w+)\(\w+,\s*\w+,\s*\w+\)\s*\{\s*"use asm";/,
|
||||
moduleFunctionRegex = /function\s*\((\w+,\s*\w+)\)\s*\{\s*\/\* \@preserve ASM BEGIN \*\//,
|
||||
commentStartIdx = code.indexOf("/* @preserve ASM BEGIN */"),
|
||||
asmEndIdxTmp = code.indexOf(commentEnd),
|
||||
asmEndIdx = code.indexOf("}", asmEndIdxTmp),
|
||||
asmCodeTmp = code.substring(commentStartIdx - Math.min(500, commentStartIdx),
|
||||
asmEndIdx + 1),
|
||||
asmStartIdx = asmCodeTmp.search(moduleFunctionRegex),
|
||||
asmCode = asmCodeTmp.substring(asmStartIdx),
|
||||
asmModule,
|
||||
asmModuleName,
|
||||
asmCodeMinified,
|
||||
asmMinifiedModuleName;
|
||||
moduleArg1,
|
||||
asmCodeMinified;
|
||||
|
||||
asmCodeMinified = asmCode
|
||||
.replace(/\s*\/\/.*/g, '') // remove single-line comments
|
||||
@@ -29,27 +32,31 @@ module.exports = function(grunt) {
|
||||
|
||||
grunt.log.debug(asmCodeMinified);
|
||||
|
||||
asmModule = asmCode.match(asmFunctionRegex);
|
||||
asmModule = moduleFunctionRegex.exec(asmCode);
|
||||
if (!asmModule) {
|
||||
grunt.log.error("No ASM module found");
|
||||
return;
|
||||
}
|
||||
|
||||
asmModuleName = asmModule[1];
|
||||
grunt.log.debug(asmModuleName);
|
||||
moduleArg1 = asmModule[1];
|
||||
grunt.log.debug(moduleArg1);
|
||||
|
||||
asmModule = minifiedCode.match(asmFunctionRegex);
|
||||
if (!asmModule) {
|
||||
var insertionPoint = minifiedCode.search(moduleFunctionRegex);
|
||||
if (insertionPoint === -1) {
|
||||
grunt.log.error("No ASM module found in minified file");
|
||||
return;
|
||||
}
|
||||
grunt.log.debug(insertionPoint);
|
||||
|
||||
asmMinifiedModuleName = asmModule[1];
|
||||
grunt.log.debug(asmMinifiedModuleName);
|
||||
var insertionPointEnd = minifiedCode.indexOf(commentEnd, insertionPoint);
|
||||
insertionPointEnd = minifiedCode.indexOf("}", insertionPointEnd) + 1;
|
||||
|
||||
asmCodeMinified = asmCodeMinified.replace(asmModuleName, asmMinifiedModuleName);
|
||||
grunt.log.debug(insertionPointEnd);
|
||||
|
||||
minifiedCode = minifiedCode.substring(0, insertionPoint)
|
||||
+ asmCodeMinified
|
||||
+ minifiedCode.substring(insertionPointEnd);
|
||||
|
||||
minifiedCode = minifiedCode.replace(/\/\* @preserve ASM BEGIN \*\/[^]*?\/\* @preserve ASM END \*\//, asmCodeMinified);
|
||||
fs.writeFileSync('dist/quagga.min.js', minifiedCode);
|
||||
grunt.log.ok('dist/quagga.min.js written');
|
||||
});
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
var allTestFiles = [];
|
||||
var TEST_REGEXP = /(spec|test)\.js$/i;
|
||||
|
||||
var pathToModule = function(path) {
|
||||
return path.replace(/^\/base\//, '').replace(/\.js$/, '');
|
||||
};
|
||||
|
||||
Object.keys(window.__karma__.files).forEach(function(file) {
|
||||
if (TEST_REGEXP.test(file)) {
|
||||
allTestFiles.push(pathToModule(file));
|
||||
}
|
||||
});
|
||||
|
||||
require.config({
|
||||
baseUrl: '/base',
|
||||
|
||||
paths: {
|
||||
'array_helper': 'src/array_helper',
|
||||
'cv_utils': 'src/cv_utils',
|
||||
'typedefs': 'src/typedefs',
|
||||
'cluster': 'src/cluster',
|
||||
'camera_access': 'src/camera_access',
|
||||
'events': 'src/events',
|
||||
'html_utils': 'src/html_utils',
|
||||
'quagga': 'src/quagga',
|
||||
'barcode_decoder': 'src/barcode_decoder',
|
||||
'barcode_locator': 'src/barcode_locator',
|
||||
'barcode_reader': 'src/barcode_reader',
|
||||
'bresenham': 'src/bresenham',
|
||||
'codabar_reader': 'src/codabar_reader',
|
||||
'code_39_reader': 'src/code_39_reader',
|
||||
'code_39_vin_reader': 'src/code_39_vin_reader',
|
||||
'code_128_reader': 'src/code_128_reader',
|
||||
'config': 'src/config',
|
||||
'ean_8_reader': 'src/ean_8_reader',
|
||||
'ean_reader': 'src/ean_reader',
|
||||
'frame_grabber': 'src/frame_grabber',
|
||||
'image_debug': 'src/image_debug',
|
||||
'image_loader': 'src/image_loader',
|
||||
'image_wrapper': 'src/image_wrapper',
|
||||
'input_stream': 'src/input_stream',
|
||||
'rasterizer': 'src/rasterizer',
|
||||
'skeletonizer': 'src/skeletonizer',
|
||||
'subImage': 'src/subImage',
|
||||
'tracer': 'src/tracer',
|
||||
'upc_e_reader': 'src/upc_e_reader',
|
||||
'upc_reader': 'src/upc_reader',
|
||||
'async': 'node_modules/async/lib/async',
|
||||
'gl-matrix': 'node_modules/gl-matrix/dist/gl-matrix-min',
|
||||
'result_collector': 'src/result_collector',
|
||||
'i2of5_reader': 'src/i2of5_reader'
|
||||
},
|
||||
deps: allTestFiles,
|
||||
callback: window.__karma__.start
|
||||
});
|
||||
@@ -0,0 +1,245 @@
|
||||
const Quagga = require('../../src/quagga');
|
||||
const async = require('async');
|
||||
|
||||
describe('decodeSingle', function () {
|
||||
var baseFolder = "base/test/fixtures/";
|
||||
|
||||
function generateConfig() {
|
||||
return {
|
||||
inputStream: {
|
||||
size: 640
|
||||
},
|
||||
locator: {
|
||||
patchSize: "medium",
|
||||
halfSample: true
|
||||
},
|
||||
numOfWorkers: 0,
|
||||
decoder: {
|
||||
readers: ["ean_reader"]
|
||||
},
|
||||
locate: true,
|
||||
src: null
|
||||
};
|
||||
}
|
||||
|
||||
this.timeout(10000);
|
||||
|
||||
function _runTestSet(testSet, config) {
|
||||
var readers = config.decoder.readers.slice(),
|
||||
format,
|
||||
folder;
|
||||
|
||||
if (typeof readers[0] === 'string'){
|
||||
format = readers[0];
|
||||
} else {
|
||||
format = readers[0].format;
|
||||
}
|
||||
|
||||
folder = baseFolder + format.split('_').slice(0, -1).join('_') + "/";
|
||||
|
||||
it('should decode ' + folder + " correctly", function(done) {
|
||||
async.eachSeries(testSet, function (sample, callback) {
|
||||
config.src = folder + sample.name;
|
||||
config.readers = readers;
|
||||
Quagga.decodeSingle(config, function(result) {
|
||||
console.log(sample.name);
|
||||
expect(result.codeResult.code).to.equal(sample.result);
|
||||
expect(result.codeResult.format).to.equal(sample.format);
|
||||
callback();
|
||||
});
|
||||
}, function() {
|
||||
done();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
describe("EAN", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "3574660239843"},
|
||||
{"name": "image-002.jpg", "result": "8032754490297"},
|
||||
{"name": "image-003.jpg", "result": "4006209700068"},
|
||||
/* {"name": "image-004.jpg", "result": "9002233139084"}, */
|
||||
/* {"name": "image-005.jpg", "result": "8004030044005"}, */
|
||||
{"name": "image-006.jpg", "result": "4003626011159"},
|
||||
{"name": "image-007.jpg", "result": "2111220009686"},
|
||||
{"name": "image-008.jpg", "result": "9000275609022"},
|
||||
{"name": "image-009.jpg", "result": "9004593978587"},
|
||||
{"name": "image-010.jpg", "result": "9002244845578"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "ean_13";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['ean_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("Code128", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "0001285112001000040801"},
|
||||
// {"name": "image-002.jpg", "result": "FANAVF1461710"},
|
||||
// {"name": "image-003.jpg", "result": "673023"},
|
||||
// {"name": "image-004.jpg", "result": "010210150301625334"},
|
||||
{"name": "image-005.jpg", "result": "419055603900009001012999"},
|
||||
{"name": "image-006.jpg", "result": "419055603900009001012999"},
|
||||
{"name": "image-007.jpg", "result": "T 000003552345"},
|
||||
{"name": "image-008.jpg", "result": "FANAVF1461710"},
|
||||
{"name": "image-009.jpg", "result": "0001285112001000040801"},
|
||||
{"name": "image-010.jpg", "result": "673023"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "code_128";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['code_128_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("Code39", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "B3% $DAD$"},
|
||||
{"name": "image-003.jpg", "result": "CODE39"},
|
||||
{"name": "image-004.jpg", "result": "QUAGGAJS"},
|
||||
/* {"name": "image-005.jpg", "result": "CODE39"}, */
|
||||
{"name": "image-006.jpg", "result": "2/4-8/16-32"},
|
||||
{"name": "image-007.jpg", "result": "2/4-8/16-32"},
|
||||
{"name": "image-008.jpg", "result": "CODE39"},
|
||||
{"name": "image-009.jpg", "result": "2/4-8/16-32"},
|
||||
{"name": "image-010.jpg", "result": "CODE39"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "code_39";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['code_39_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("EAN-8", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "42191605"},
|
||||
{"name": "image-002.jpg", "result": "42191605"},
|
||||
{"name": "image-003.jpg", "result": "90311208"},
|
||||
{"name": "image-004.jpg", "result": "24057257"},
|
||||
{"name": "image-005.jpg", "result": "90162602"},
|
||||
{"name": "image-006.jpg", "result": "24036153"},
|
||||
{"name": "image-007.jpg", "result": "42176817"},
|
||||
{"name": "image-008.jpg", "result": "42191605"},
|
||||
{"name": "image-009.jpg", "result": "42242215"},
|
||||
{"name": "image-010.jpg", "result": "42184799"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "ean_8";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['ean_8_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("UPC", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "882428015268"},
|
||||
{"name": "image-002.jpg", "result": "882428015268"},
|
||||
{"name": "image-003.jpg", "result": "882428015084"},
|
||||
{"name": "image-004.jpg", "result": "882428015343"},
|
||||
{"name": "image-005.jpg", "result": "882428015343"},
|
||||
/* {"name": "image-006.jpg", "result": "882428015046"}, */
|
||||
{"name": "image-007.jpg", "result": "882428015084"},
|
||||
{"name": "image-008.jpg", "result": "882428015046"},
|
||||
{"name": "image-009.jpg", "result": "039047013551"},
|
||||
{"name": "image-010.jpg", "result": "039047013551"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "upc_a";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['upc_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("UPC-E", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "04965802"},
|
||||
{"name": "image-002.jpg", "result": "04965802"},
|
||||
{"name": "image-003.jpg", "result": "03897425"},
|
||||
{"name": "image-004.jpg", "result": "05096893"},
|
||||
{"name": "image-005.jpg", "result": "05096893"},
|
||||
{"name": "image-006.jpg", "result": "05096893"},
|
||||
{"name": "image-007.jpg", "result": "03897425"},
|
||||
{"name": "image-008.jpg", "result": "01264904"},
|
||||
/*{"name": "image-009.jpg", "result": "01264904"},*/
|
||||
{"name": "image-010.jpg", "result": "01264904"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "upc_e";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['upc_e_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("Codabar", function() {
|
||||
var config = generateConfig(),
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "A10/53+17-70D"},
|
||||
{"name": "image-002.jpg", "result": "B546745735B"},
|
||||
{"name": "image-003.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-004.jpg", "result": "B546745735B"},
|
||||
{"name": "image-005.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-006.jpg", "result": "B546745735B"},
|
||||
{"name": "image-007.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-008.jpg", "result": "A16:9/4:3/3:2D"},
|
||||
{"name": "image-009.jpg", "result": "C$399.95A"},
|
||||
{"name": "image-010.jpg", "result": "C$399.95A"}
|
||||
];
|
||||
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "codabar";
|
||||
});
|
||||
|
||||
config.decoder.readers = ['codabar_reader'];
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
|
||||
describe("I2of5 with localization", function() {
|
||||
var config = {
|
||||
inputStream: {
|
||||
size: 800,
|
||||
singleChannel: false
|
||||
},
|
||||
locator: {
|
||||
patchSize: "small",
|
||||
halfSample: false
|
||||
},
|
||||
numOfWorkers: 0,
|
||||
decoder: {
|
||||
readers: ["i2of5_reader"]
|
||||
},
|
||||
locate: true,
|
||||
src: null
|
||||
},
|
||||
testSet = [
|
||||
{"name": "image-001.jpg", "result": "2167361334"},
|
||||
{"name": "image-002.jpg", "result": "2167361334"},
|
||||
{"name": "image-003.jpg", "result": "2167361334"},
|
||||
{"name": "image-004.jpg", "result": "2167361334"},
|
||||
{"name": "image-005.jpg", "result": "2167361334"}
|
||||
];
|
||||
testSet.forEach(function(sample) {
|
||||
sample.format = "i2of5";
|
||||
});
|
||||
_runTestSet(testSet, config);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,53 @@
|
||||
const ArrayHelper = require('../../src/array_helper');
|
||||
|
||||
describe('init', function() {
|
||||
it('initializes an array with the given value', function() {
|
||||
var input = [0, 0, 0];
|
||||
ArrayHelper.init(input, 5);
|
||||
expect(input).to.deep.equal([5, 5, 5]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('shuffle', function() {
|
||||
before(function() {
|
||||
sinon.stub(Math, 'random').returns(0.5);
|
||||
});
|
||||
|
||||
after(function() {
|
||||
sinon.restore(Math);
|
||||
});
|
||||
it('shuffles the content of an array', function() {
|
||||
var input = [1, 2, 3];
|
||||
expect(ArrayHelper.shuffle(input)).to.deep.equal([3, 1, 2]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('toPointList', function() {
|
||||
it('converts an Array to a List of poitns', function() {
|
||||
var input = [[1, 2], [2, 2], [3, 2]];
|
||||
expect(ArrayHelper.toPointList(input)).to.equal("[[1,2],\r\n[2,2],\r\n[3,2]]");
|
||||
});
|
||||
});
|
||||
|
||||
describe('threshold', function() {
|
||||
it('returns all elements above the given threshold', function() {
|
||||
var input = [1, 2, 3];
|
||||
expect(ArrayHelper.threshold(input, 2, function(score) {
|
||||
return score * 1.5;
|
||||
})).to.deep.equal([2, 3]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('maxIndex', function() {
|
||||
it('gets the index of the biggest element in the array', function() {
|
||||
var input = [1, 2, 3];
|
||||
expect(ArrayHelper.maxIndex(input)).to.equal(2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('max', function() {
|
||||
it('gets the biggest element in the array', function() {
|
||||
var input = [1, 3, 2];
|
||||
expect(ArrayHelper.max(input)).to.equal(3);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,130 @@
|
||||
const BarcodeLocator = require('../../src/barcode_locator');
|
||||
const Config = require('../../src/config');
|
||||
const merge = require('lodash/object/merge');
|
||||
|
||||
describe('checkImageConstraints', function() {
|
||||
var config,
|
||||
inputStream,
|
||||
imageSize,
|
||||
streamConfig = {};
|
||||
|
||||
beforeEach(function() {
|
||||
imageSize = {
|
||||
x: 640, y: 480
|
||||
};
|
||||
config = merge({}, Config);
|
||||
inputStream = {
|
||||
getWidth: function() {
|
||||
return imageSize.x;
|
||||
},
|
||||
getHeight: function() {
|
||||
return imageSize.y;
|
||||
},
|
||||
setWidth: function() {},
|
||||
setHeight: function() {},
|
||||
setTopRight: function() {},
|
||||
setCanvasSize: function() {},
|
||||
getConfig: function() {
|
||||
return streamConfig;
|
||||
}
|
||||
};
|
||||
sinon.stub(inputStream, "setWidth", function(width) {
|
||||
imageSize.x = width;
|
||||
});
|
||||
sinon.stub(inputStream, "setHeight", function(height) {
|
||||
imageSize.y = height;
|
||||
});
|
||||
sinon.stub(inputStream, "setTopRight");
|
||||
sinon.stub(inputStream, "setCanvasSize");
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
inputStream.setWidth.restore();
|
||||
inputStream.setHeight.restore();
|
||||
});
|
||||
|
||||
it('should not adjust the image-size if not needed', function() {
|
||||
var expected = {x: imageSize.x, y: imageSize.y};
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getWidth()).to.be.equal(expected.x);
|
||||
expect(inputStream.getHeight()).to.be.equal(expected.y);
|
||||
});
|
||||
|
||||
it('should adjust the image-size', function() {
|
||||
var expected = {x: imageSize.x, y: imageSize.y};
|
||||
|
||||
config.locator.halfSample = true;
|
||||
imageSize.y += 1;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getWidth()).to.be.equal(expected.x);
|
||||
expect(inputStream.getHeight()).to.be.equal(expected.y);
|
||||
});
|
||||
|
||||
it('should adjust the image-size', function() {
|
||||
var expected = {x: imageSize.x, y: imageSize.y};
|
||||
|
||||
imageSize.y += 1;
|
||||
config.locator.halfSample = false;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getHeight()).to.be.equal(expected.y);
|
||||
expect(inputStream.getWidth()).to.be.equal(expected.x);
|
||||
});
|
||||
|
||||
it("should take the defined area into account", function() {
|
||||
var expectedSize = {
|
||||
x: 420,
|
||||
y: 315
|
||||
},
|
||||
expectedTopRight = {
|
||||
x: 115,
|
||||
y: 52
|
||||
},
|
||||
expectedCanvasSize = {
|
||||
x: 640,
|
||||
y: 480
|
||||
};
|
||||
|
||||
streamConfig.area = {
|
||||
top: "11%",
|
||||
right: "15%",
|
||||
bottom: "20%",
|
||||
left: "18%"
|
||||
};
|
||||
|
||||
config.locator.halfSample = false;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getHeight()).to.be.equal(expectedSize.y);
|
||||
expect(inputStream.getWidth()).to.be.equal(expectedSize.x);
|
||||
expect(inputStream.setTopRight.getCall(0).args[0]).to.deep.equal(expectedTopRight);
|
||||
expect(inputStream.setCanvasSize.getCall(0).args[0]).to.deep.equal(expectedCanvasSize);
|
||||
});
|
||||
|
||||
it("should return the original size if set to full image", function() {
|
||||
var expectedSize = {
|
||||
x: 640,
|
||||
y: 480
|
||||
},
|
||||
expectedTopRight = {
|
||||
x: 0,
|
||||
y: 0
|
||||
},
|
||||
expectedCanvasSize = {
|
||||
x: 640,
|
||||
y: 480
|
||||
};
|
||||
|
||||
streamConfig.area = {
|
||||
top: "0%",
|
||||
right: "0%",
|
||||
bottom: "0%",
|
||||
left: "0%"
|
||||
};
|
||||
|
||||
config.locator.halfSample = false;
|
||||
BarcodeLocator.checkImageConstraints(inputStream, config.locator);
|
||||
expect(inputStream.getHeight()).to.be.equal(expectedSize.y);
|
||||
expect(inputStream.getWidth()).to.be.equal(expectedSize.x);
|
||||
expect(inputStream.setTopRight.getCall(0).args[0]).to.deep.equal(expectedTopRight);
|
||||
expect(inputStream.setCanvasSize.getCall(0).args[0]).to.deep.equal(expectedCanvasSize);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,116 @@
|
||||
const CameraAccess = require('../../src/camera_access');
|
||||
|
||||
var originalURL,
|
||||
originalMediaStreamTrack,
|
||||
video,
|
||||
stream;
|
||||
|
||||
beforeEach(function() {
|
||||
var tracks = [{
|
||||
stop: function() {}
|
||||
}];
|
||||
|
||||
originalURL = window.URL;
|
||||
originalMediaStreamTrack = window.MediaStreamTrack;
|
||||
window.MediaStreamTrack = {};
|
||||
window.URL = null;
|
||||
|
||||
stream = {
|
||||
getVideoTracks: function() {
|
||||
return tracks;
|
||||
}
|
||||
};
|
||||
sinon.spy(tracks[0], "stop");
|
||||
|
||||
video = {
|
||||
src: null,
|
||||
addEventListener: function() {},
|
||||
removeEventListener: function() {},
|
||||
play: function() {},
|
||||
videoWidth: 320,
|
||||
videoHeight: 480
|
||||
};
|
||||
sinon.stub(video, "addEventListener", function(event, cb) {
|
||||
cb();
|
||||
});
|
||||
sinon.stub(video, "play");
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
window.URL = originalURL;
|
||||
window.MediaStreamTrack = originalMediaStreamTrack;
|
||||
});
|
||||
|
||||
describe('success', function() {
|
||||
beforeEach(function() {
|
||||
sinon.stub(navigator, "getUserMedia", function(constraints, success) {
|
||||
success(stream);
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
navigator.getUserMedia.restore();
|
||||
});
|
||||
describe('request', function () {
|
||||
it('should request the camera', function (done) {
|
||||
CameraAccess.request(video, {}, function () {
|
||||
expect(navigator.getUserMedia.calledOnce).to.equal(true);
|
||||
expect(video.src).to.deep.equal(stream);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('release', function () {
|
||||
it('should release the camera', function (done) {
|
||||
CameraAccess.request(video, {}, function () {
|
||||
expect(video.src).to.deep.equal(stream);
|
||||
CameraAccess.release();
|
||||
expect(video.src.getVideoTracks()).to.have.length(1);
|
||||
expect(video.src.getVideoTracks()[0].stop.calledOnce).to.equal(true);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('failure', function() {
|
||||
describe("permission denied", function(){
|
||||
before(function() {
|
||||
sinon.stub(navigator, "getUserMedia", function(constraints, success, failure) {
|
||||
failure(new Error());
|
||||
});
|
||||
});
|
||||
|
||||
after(function() {
|
||||
navigator.getUserMedia.restore();
|
||||
});
|
||||
|
||||
it('should throw if getUserMedia not available', function(done) {
|
||||
CameraAccess.request(video, {}, function(err) {
|
||||
expect(err).to.be.defined;
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("not available", function(){
|
||||
var originalGetUserMedia;
|
||||
|
||||
before(function() {
|
||||
originalGetUserMedia = navigator.getUserMedia;
|
||||
navigator.getUserMedia = undefined;
|
||||
});
|
||||
|
||||
after(function() {
|
||||
navigator.getUserMedia = originalGetUserMedia;
|
||||
});
|
||||
|
||||
it('should throw if getUserMedia not available', function(done) {
|
||||
CameraAccess.request(video, {}, function(err) {
|
||||
expect(err).to.be.defined;
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,144 @@
|
||||
const CVUtils = require('../../src/cv_utils');
|
||||
|
||||
describe('imageRef', function() {
|
||||
it('gets the image Reference for a coordinate', function() {
|
||||
var res = CVUtils.imageRef(1, 2);
|
||||
expect(res.x).to.equal(1);
|
||||
expect(res.y).to.equal(2);
|
||||
expect(res.toVec2()[0]).to.equal(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('calculatePatchSize', function() {
|
||||
it('should not throw an error in case of valid image size', function() {
|
||||
var expected = {x: 32, y: 32},
|
||||
patchSize = CVUtils.calculatePatchSize("medium", {x: 640, y: 480});
|
||||
|
||||
expect(patchSize).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it('should thow an error if image size it not valid', function() {
|
||||
var expected = {x: 32, y: 32},
|
||||
patchSize = CVUtils.calculatePatchSize("medium", {x: 640, y: 480});
|
||||
|
||||
expect(patchSize).to.be.deep.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('_parseCSSDimensionValues', function() {
|
||||
it("should convert a percentual value correctly", function() {
|
||||
var expected = {
|
||||
value: 10,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("10%");
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a 0% value correctly", function() {
|
||||
var expected = {
|
||||
value: 100,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("100%");
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a 100% value correctly", function() {
|
||||
var expected = {
|
||||
value: 0,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("0%");
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a pixel value to percentage", function() {
|
||||
var expected = {
|
||||
value: 26.3,
|
||||
unit: "%"
|
||||
},
|
||||
result = CVUtils._parseCSSDimensionValues("26.3px");
|
||||
|
||||
console.log(result);
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe("_dimensionsConverters", function(){
|
||||
var context;
|
||||
|
||||
beforeEach(function() {
|
||||
context = {
|
||||
width: 640,
|
||||
height: 480
|
||||
};
|
||||
});
|
||||
|
||||
it("should convert a top-value correclty", function() {
|
||||
var expected = 48,
|
||||
result = CVUtils._dimensionsConverters.top({value: 10, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a right-value correclty", function() {
|
||||
var expected = 640 - 128,
|
||||
result = CVUtils._dimensionsConverters.right({value: 20, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a bottom-value correclty", function() {
|
||||
var expected = 480 - 77,
|
||||
result = CVUtils._dimensionsConverters.bottom({value: 16, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
|
||||
it("should convert a left-value correclty", function() {
|
||||
var expected = 57,
|
||||
result = CVUtils._dimensionsConverters.left({value: 9, unit: "%"}, context);
|
||||
|
||||
expect(result).to.be.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe("computeImageArea", function() {
|
||||
it("should calculate an image-area", function() {
|
||||
var expected = {
|
||||
sx: 115,
|
||||
sy: 48,
|
||||
sw: 429,
|
||||
sh: 336
|
||||
},
|
||||
result = CVUtils.computeImageArea(640, 480, {
|
||||
top: "10%",
|
||||
right: "15%",
|
||||
bottom: "20%",
|
||||
left: "18%"
|
||||
});
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
it("should calculate full image-area", function() {
|
||||
var expected = {
|
||||
sx: 0,
|
||||
sy: 0,
|
||||
sw: 640,
|
||||
sh: 480
|
||||
},
|
||||
result = CVUtils.computeImageArea(640, 480, {
|
||||
top: "0%",
|
||||
right: "0%",
|
||||
bottom: "0%",
|
||||
left: "0%"
|
||||
});
|
||||
|
||||
expect(result).to.be.deep.equal(expected);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,114 @@
|
||||
const Events = require('../../src/events');
|
||||
|
||||
beforeEach(function() {
|
||||
Events.unsubscribe();
|
||||
});
|
||||
describe("subscribe", function() {
|
||||
|
||||
|
||||
it("should call one callback for a single event", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
});
|
||||
|
||||
it("should call one callback twice if published twice", function() {
|
||||
var callback = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callback);
|
||||
|
||||
Events.publish("test");
|
||||
Events.publish("test");
|
||||
|
||||
expect(callback.calledTwice).to.be.equal(true);
|
||||
});
|
||||
|
||||
it("should call the callback asynchronuously", function(done) {
|
||||
var test = {
|
||||
callback: function() {
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
sinon.stub(test, "callback", function() {
|
||||
expect(test.callback.calledOnce).to.be.true;
|
||||
done();
|
||||
});
|
||||
Events.subscribe("test", test.callback, true);
|
||||
Events.publish("test");
|
||||
expect(test.callback.called).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
describe("once", function() {
|
||||
it("should call the callback once, even when published twice", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub();
|
||||
|
||||
Events.once("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
|
||||
Events.publish("test");
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledTwice).to.be.equal(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("unsubscribe", function() {
|
||||
it("should unsubscribe all callbacks from a single event", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub(),
|
||||
callbackC = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
Events.subscribe("testC", callbackC);
|
||||
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackC.called).to.be.equal(false);
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
|
||||
Events.publish("testC");
|
||||
|
||||
expect(callbackC.calledOnce).to.be.equal(true);
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
|
||||
Events.unsubscribe("test");
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackC.calledOnce).to.be.equal(true);
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
});
|
||||
|
||||
it("should unsubscribe a single callback from a single event", function() {
|
||||
var callbackA = sinon.stub(),
|
||||
callbackB = sinon.stub();
|
||||
|
||||
Events.subscribe("test", callbackA);
|
||||
Events.subscribe("test", callbackB);
|
||||
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledOnce).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
|
||||
|
||||
Events.unsubscribe("test", callbackB);
|
||||
Events.publish("test");
|
||||
|
||||
expect(callbackA.calledTwice).to.be.equal(true);
|
||||
expect(callbackB.calledOnce).to.be.equal(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,103 @@
|
||||
const ResultCollector = require('../../src/result_collector');
|
||||
const ImageDebug = require('../../src/image_debug');
|
||||
|
||||
var canvasMock,
|
||||
imageSize,
|
||||
config;
|
||||
|
||||
beforeEach(function() {
|
||||
imageSize = {x: 320, y: 240};
|
||||
config = {
|
||||
capture: true,
|
||||
capacity: 20,
|
||||
blacklist: [{code: "3574660239843", format: "ean_13"}],
|
||||
filter: function() {
|
||||
return true;
|
||||
}
|
||||
};
|
||||
canvasMock = {
|
||||
getContext: function() {
|
||||
return {};
|
||||
},
|
||||
toDataURL: sinon.spy(),
|
||||
width: 0,
|
||||
height: 0
|
||||
};
|
||||
sinon.stub(document, "createElement", function(type) {
|
||||
if (type === "canvas") {
|
||||
return canvasMock;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
document.createElement.restore();
|
||||
});
|
||||
|
||||
|
||||
describe('create', function () {
|
||||
it("should return a new collector", function() {
|
||||
ResultCollector.create(config);
|
||||
expect(document.createElement.calledOnce).to.be.equal(true);
|
||||
expect(document.createElement.getCall(0).args[0]).to.equal("canvas");
|
||||
});
|
||||
});
|
||||
|
||||
describe('addResult', function() {
|
||||
beforeEach(function() {
|
||||
sinon.stub(ImageDebug, "drawImage", function() {});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
ImageDebug.drawImage.restore();
|
||||
});
|
||||
|
||||
it("should not add result if capacity is full", function(){
|
||||
config.capacity = 1;
|
||||
var collector = ResultCollector.create(config);
|
||||
collector.addResult([], imageSize, {});
|
||||
collector.addResult([], imageSize, {});
|
||||
collector.addResult([], imageSize, {});
|
||||
expect(collector.getResults()).to.have.length(1);
|
||||
});
|
||||
|
||||
it("should only add results which match constraints", function(){
|
||||
var collector = ResultCollector.create(config),
|
||||
results;
|
||||
|
||||
collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
|
||||
collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
|
||||
collector.addResult([], imageSize, {code: "3574660239843", format: "code_128"});
|
||||
|
||||
results = collector.getResults();
|
||||
expect(results).to.have.length(2);
|
||||
|
||||
results.forEach(function(result) {
|
||||
expect(result).not.to.deep.equal(config.blacklist[0]);
|
||||
});
|
||||
});
|
||||
|
||||
it("should add result if no filter is set", function() {
|
||||
delete config.filter;
|
||||
var collector = ResultCollector.create(config);
|
||||
|
||||
collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
|
||||
expect(collector.getResults()).to.have.length(1);
|
||||
});
|
||||
|
||||
it("should not add results if filter returns false", function() {
|
||||
config.filter = () => (false);
|
||||
var collector = ResultCollector.create(config);
|
||||
|
||||
collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
|
||||
expect(collector.getResults()).to.have.length(0);
|
||||
});
|
||||
|
||||
it("should add result if no blacklist is set", function() {
|
||||
delete config.blacklist;
|
||||
var collector = ResultCollector.create(config);
|
||||
|
||||
collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
|
||||
expect(collector.getResults()).to.have.length(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,8 @@
|
||||
require('events').EventEmitter.prototype._maxListeners = 0;
|
||||
require('core-js/es5');
|
||||
|
||||
const testsContext = require.context("./integration", true, /.*js$/);
|
||||
testsContext.keys().forEach(testsContext);
|
||||
|
||||
const componentsContext = require.context('../src/', true, /\.*js$/);
|
||||
componentsContext.keys().forEach(componentsContext);
|
||||
@@ -0,0 +1,8 @@
|
||||
require('events').EventEmitter.prototype._maxListeners = 0;
|
||||
require('core-js/es5');
|
||||
|
||||
const testsContext = require.context("./spec", true, /.*js$/);
|
||||
testsContext.keys().forEach(testsContext);
|
||||
|
||||
const componentsContext = require.context('../src/', true, /\.*js$/);
|
||||
componentsContext.keys().forEach(componentsContext);
|
||||
@@ -0,0 +1,39 @@
|
||||
var webpack = require('webpack'),
|
||||
MyUmdPlugin = require('./plugins/umd'),
|
||||
path = require('path');
|
||||
|
||||
module.exports = {
|
||||
entry: [
|
||||
'./src/quagga.js'
|
||||
],
|
||||
devtool: 'source-map',
|
||||
module: {
|
||||
loaders: [{
|
||||
test: /\.jsx?$/,
|
||||
exclude: /node_modules/,
|
||||
loader: 'babel'
|
||||
}]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['', '.js', '.jsx'],
|
||||
alias: {
|
||||
'input_stream$': path.resolve(__dirname, 'src/input_stream'),
|
||||
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber')
|
||||
}
|
||||
},
|
||||
output: {
|
||||
path: __dirname + '/dist',
|
||||
publicPath: '/',
|
||||
filename: 'quagga.js',
|
||||
sourceMapFilename: 'quagga.map'
|
||||
},
|
||||
devServer: {
|
||||
contentBase: './',
|
||||
hot: true
|
||||
},
|
||||
plugins: [
|
||||
new MyUmdPlugin({
|
||||
library: 'Quagga'
|
||||
})
|
||||
]
|
||||
};
|
||||
Vendored
+11
@@ -0,0 +1,11 @@
|
||||
var webpack = require('webpack');
|
||||
module.exports = require('./webpack.config.js');
|
||||
|
||||
module.exports.plugins.unshift(
|
||||
new webpack.optimize.UglifyJsPlugin()
|
||||
);
|
||||
|
||||
module.exports.output.filename = 'quagga.min.js';
|
||||
|
||||
module.exports.output.sourceMapFilename = null;
|
||||
module.exports.devtool = null;
|
||||
@@ -0,0 +1,24 @@
|
||||
var webpack = require('webpack'),
|
||||
path = require('path');
|
||||
|
||||
module.exports = require('./webpack.config.js');
|
||||
|
||||
module.exports.resolve = {
|
||||
extensions: ['', '.js', '.jsx'],
|
||||
alias: {
|
||||
'input_stream$': path.resolve(__dirname, 'lib/input_stream'),
|
||||
'frame_grabber$': path.resolve(__dirname, 'lib/frame_grabber')
|
||||
}
|
||||
};
|
||||
|
||||
module.exports.externals = [
|
||||
"get-pixels",
|
||||
"gl-matrix",
|
||||
"lodash",
|
||||
"ndarray",
|
||||
"ndarray-linear-interpolate"
|
||||
];
|
||||
module.exports.output.libraryTarget = "commonjs2";
|
||||
module.exports.plugins = [];
|
||||
module.exports.output.path = __dirname + '/lib';
|
||||
module.exports.output.filename = 'quagga.js';
|
||||
Reference in New Issue
Block a user