Merge pull request #196 from serratus/feature/194

Added basic support for 2of5 barcodes Closes #194
serratus · May 22, 2017 · 2e4b14b · 2e4b14b
2 parents f9a19e0 + 55d2eb9
commit 2e4b14b
Show file tree

Hide file tree

Showing 28 changed files with 1,866 additions and 1,037 deletions.
diff --git a/dist/quagga.js b/dist/quagga.js
diff --git a/dist/quagga.min.js b/dist/quagga.min.js
diff --git a/example/file_input.html b/example/file_input.html
@@ -51,7 +51,8 @@ <h3>Working with file-input</h3>
                     <option value="upc">UPC</option>
                     <option value="upc_e">UPC-E</option>
                     <option value="codabar">Codabar</option>
-                    <option value="i2of5">ITF</option>
+                    <option value="i2of5">Interleaved 2 of 5</option>
+                    <option value="2of5">Standard 2 of 5</option>
                 </select>
             </label>
             <label>

diff --git a/example/live_w_locator.html b/example/live_w_locator.html
@@ -43,7 +43,8 @@ <h3>The user's camera</h3>
                         <option value="upc">UPC</option>
                         <option value="upc_e">UPC-E</option>
                         <option value="codabar">Codabar</option>
-                        <option value="i2of5">ITF</option>
+                        <option value="i2of5">Interleaved 2 of 5</option>
+                        <option value="2of5">Standard 2 of 5</option>
                     </select>
                 </label>
                 <label>

diff --git a/example/live_w_locator.js b/example/live_w_locator.js
@@ -2,7 +2,19 @@ $(function() {
     var resultCollector = Quagga.ResultCollector.create({
         capture: true,
         capacity: 20,
-        blacklist: [{code: "2167361334", format: "i2of5"}],
+        blacklist: [{
+            code: "9577149002", format: "2of5"
+        }, {
+            code: "5776158811", format: "2of5"
+        }, {
+            code: "0463381455", format: "2of5"
+        }, {
+            code: "3261594101", format: "2of5"
+        }, {
+            code: "6730705801", format: "2of5"
+        }, {
+            code: "8568166929", format: "2of5"
+        }],
         filter: function(codeResult) {
             // only store results which match this constraint
             // e.g.: codeResult
@@ -169,7 +181,8 @@ $(function() {
                 patchSize: "medium",
                 halfSample: true
             },
-            numOfWorkers: 4,
+            numOfWorkers: 2,
+            frequency: 10,
             decoder: {
                 readers : [{
                     format: "code_128_reader",

diff --git a/example/static_images.html b/example/static_images.html
@@ -45,6 +45,8 @@ <h3>Working with static images</h3>
                   <option value="upc_e">UPC-E</option>
                   <option value="codabar">Codabar</option>
                   <option value="i2of5">I2of5</option>
+                  <option value="i2of5">Interleaved 2 of 5</option>
+                  <option value="2of5">Standard 2 of 5</option>
               </select>
           </fieldset>
       </div>

diff --git a/karma-integration.conf.js b/karma-integration.conf.js
@@ -14,6 +14,9 @@ module.exports = function(config) {
             'test/test-main-integration.js': ['webpack']
         },
         webpack: {
+            entry: [
+                './src/quagga.js'
+            ],
             module: {
                 loaders: [{
                     test: /\.jsx?$/,
@@ -45,7 +48,7 @@ module.exports = function(config) {
         reporters: ['progress'],
         port: 9876,
         colors: true,
-        logLevel: config.LOG_INFO,
+        logLevel: config.LOG_INFO, // LOG_DEBUG
         autoWatch: true,
         browsers: ['Chrome'],
         singleRun: false

diff --git a/karma.conf.js b/karma.conf.js
@@ -13,6 +13,9 @@ module.exports = function(config) {
             'test/test-main.js': ['webpack']
         },
         webpack: {
+            entry: [
+                './src/quagga.js'
+            ],
             module: {
                 loaders: [{
                     test: /\.jsx?$/,