scanner.onFrameRead = results => {
console.log("Barcodes on one frame:");
for (let result of results) {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
console.log(format + ": " + result.barcodeText);
}
};
diff --git a/1.hello-world/11.read-video-requirejs.html b/1.hello-world/11.read-video-requirejs.html
index c0fc95a04..a3a8fd84f 100644
--- a/1.hello-world/11.read-video-requirejs.html
+++ b/1.hello-world/11.read-video-requirejs.html
@@ -38,7 +38,7 @@
Hello World for RequireJS
scanner.onFrameRead = results => {
console.log("Barcodes on one frame:");
for (let result of results) {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
console.log(format + ": " + result.barcodeText);
}
};
diff --git a/1.hello-world/12.read-video-es6.html b/1.hello-world/12.read-video-es6.html
index 139b7a6ec..9c50f35fe 100644
--- a/1.hello-world/12.read-video-es6.html
+++ b/1.hello-world/12.read-video-es6.html
@@ -40,7 +40,7 @@
Hello World for ES6
scanner.onFrameRead = results => {
console.log("Barcodes on one frame:");
for (let result of results) {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
console.log(format + ": " + result.barcodeText);
}
};
diff --git a/1.hello-world/2.read-an-image.html b/1.hello-world/2.read-an-image.html
index 7d9b1676b..73d1b7c56 100644
--- a/1.hello-world/2.read-an-image.html
+++ b/1.hello-world/2.read-an-image.html
@@ -95,7 +95,7 @@
Read Barcode from Images
divResults.appendChild(createEl('p', "No Barcode Found!"));
}
for (let result of results) {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
iptReadonlyLastResult.value = format + ": " + result.barcodeText; // show last txt result
const p = document.createElement('p');
p.appendChild(createEl('span', format + ": "));
diff --git a/2.ui-tweaking/1.read-video-show-result.html b/2.ui-tweaking/1.read-video-show-result.html
index d8ec644f9..30f4afb2e 100644
--- a/2.ui-tweaking/1.read-video-show-result.html
+++ b/2.ui-tweaking/1.read-video-show-result.html
@@ -69,7 +69,7 @@
Use the Default Built-in UI
scanner.onFrameRead = (_results) => {
for (let result of _results) {
let newElements = [];
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
newElements.push(createASpan(format + ": "));
newElements.push(createASpan(result.barcodeText, "resultText"));
newElements.push(document.createElement('br'));
@@ -84,7 +84,7 @@
let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
await scanner.setUIElement(document.getElementById('div-ui-container'));
scanner.onUniqueRead = (txt, result) => {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
document.getElementById('result').value = format + ": " + txt;
if (fitPage.hidden)
exitFullPage();
diff --git a/2.ui-tweaking/5.read-video-with-custom-default-ui.html b/2.ui-tweaking/5.read-video-with-custom-default-ui.html
index a81a0ebb3..41b6be3a1 100644
--- a/2.ui-tweaking/5.read-video-with-custom-default-ui.html
+++ b/2.ui-tweaking/5.read-video-with-custom-default-ui.html
@@ -90,7 +90,7 @@
Customized Default UI
let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
document.getElementById('UIElement').appendChild(scanner.getUIElement());
scanner.onUniqueRead = (txt, result) => {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
document.getElementById('result').value = format + ": " + txt;
document.getElementById('result').focus();
setTimeout(() => {
diff --git a/3.settings/6.dense-barcodes.html b/3.settings/6.dense-barcodes.html
index 38b5ba1a7..f7257022d 100644
--- a/3.settings/6.dense-barcodes.html
+++ b/3.settings/6.dense-barcodes.html
@@ -60,9 +60,7 @@
scanner.onFrameRead = (results) => {
textareaResults.value = "";
for (let result of results) {
- const format = result.barcodeFormat
- ? result.barcodeFormatString
- : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
const text = result.barcodeText;
textareaResults.value += `${format}: ${text}\n`;
}
diff --git a/3.settings/initScanner.js b/3.settings/initScanner.js
index 55aeb6761..5e374e160 100644
--- a/3.settings/initScanner.js
+++ b/3.settings/initScanner.js
@@ -78,7 +78,7 @@ async function startReading() {
let scanner = await pScanner;
scanner.onFrameRead = (_results) => {
for (let result of _results) {
- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+ const format = result.barcodeFormatString;
resultBox.value = format + ": " + result.barcodeText;
}
};
From 21ba5d7a7c095bc920e4b497fe70d1e653922f5f Mon Sep 17 00:00:00 2001
From: Cube <877211593@qq.com>
Date: Tue, 13 Dec 2022 10:15:15 +0800
Subject: [PATCH 2/3] Update 4.deformed-incomplete-barcodes.html
---
3.settings/4.deformed-incomplete-barcodes.html | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/3.settings/4.deformed-incomplete-barcodes.html b/3.settings/4.deformed-incomplete-barcodes.html
index bad5d1ec9..5c4ad7a39 100644
--- a/3.settings/4.deformed-incomplete-barcodes.html
+++ b/3.settings/4.deformed-incomplete-barcodes.html
@@ -49,6 +49,12 @@
Settings for Deformed or Incomplete codes
+
+
+
+
+
+
@@ -103,6 +109,15 @@
Settings for Deformed or Incomplete codes
case "DRM_GENERAL":
settings.furtherModes.deformationResistingModes[DRMCount] = Dynamsoft.DBR.EnumDeformationResistingMode.DRM_GENERAL;
break;
+ case "DRM_BROAD_WARP":
+ settings.furtherModes.deformationResistingModes[DRMCount] = Dynamsoft.DBR.EnumDeformationResistingMode.DRM_BROAD_WARP;
+ break;
+ case "DRM_LOCAL_REFERENCE":
+ settings.furtherModes.deformationResistingModes[DRMCount] = Dynamsoft.DBR.EnumDeformationResistingMode.DRM_LOCAL_REFERENCE;
+ break;
+ case "DRM_DEWRINKLE":
+ settings.furtherModes.deformationResistingModes[DRMCount] = Dynamsoft.DBR.EnumDeformationResistingMode.DRM_DEWRINKLE;
+ break;
case "DRM_SKIP":
settings.furtherModes.deformationResistingModes[DRMCount] = Dynamsoft.DBR.EnumDeformationResistingMode.DRM_SKIP;
break;
From fbb87a5d056b2cf22ba90b3934c5e631722a3ab8 Mon Sep 17 00:00:00 2001
From: Cube <877211593@qq.com>
Date: Tue, 13 Dec 2022 10:22:24 +0800
Subject: [PATCH 3/3] update version to 9.6.0;
---
1.hello-world/1.hello-world.html | 4 ++--
1.hello-world/10.read-video-pwa/helloworld-pwa.html | 4 ++--
1.hello-world/11.read-video-requirejs.html | 6 +++---
1.hello-world/12.read-video-es6.html | 6 +++---
1.hello-world/13.read-video-react-ts/package.json | 2 +-
1.hello-world/13.read-video-react-ts/src/dbr.ts | 4 ++--
1.hello-world/2.read-an-image.html | 4 ++--
1.hello-world/3.read-video-angular/package.json | 2 +-
1.hello-world/3.read-video-angular/src/app/dbr.ts | 4 ++--
1.hello-world/4.read-video-react/package.json | 2 +-
1.hello-world/4.read-video-react/src/dbr.js | 4 ++--
1.hello-world/5.read-video-vue/package.json | 2 +-
1.hello-world/5.read-video-vue/src/dbr.js | 4 ++--
1.hello-world/6.read-video-vue3/package.json | 2 +-
1.hello-world/6.read-video-vue3/src/dbr.js | 4 ++--
1.hello-world/7.read-video-nextjs/dbr.js | 4 ++--
1.hello-world/7.read-video-nextjs/package.json | 2 +-
1.hello-world/8.read-video-nuxtjs/dbr.js | 4 ++--
1.hello-world/8.read-video-nuxtjs/package.json | 2 +-
1.hello-world/9.read-video-electron/action.js | 2 +-
1.hello-world/9.read-video-electron/package.json | 2 +-
2.ui-tweaking/1.read-video-show-result.html | 4 ++--
2.ui-tweaking/2.read-video-no-extra-control.html | 4 ++--
2.ui-tweaking/3.read-video-with-external-control.html | 4 ++--
2.ui-tweaking/4.difference-video-size.html | 4 ++--
2.ui-tweaking/5.read-video-with-custom-default-ui.html | 4 ++--
3.settings/1.barcodeFormats-expectedBarcodes.html | 2 +-
3.settings/2.localizationModes-binarizationModes.html | 2 +-
3.settings/3.blurred-small-barcodes.html | 2 +-
3.settings/4.deformed-incomplete-barcodes.html | 2 +-
3.settings/5.regionOfInterest-regionPredetection.html | 2 +-
3.settings/6.dense-barcodes.html | 4 ++--
3.settings/initScanner.js | 2 +-
4.use-case/1.fill-a-form-with-barcode-reading.html | 4 ++--
4.use-case/2.read-a-drivers-license.html | 4 ++--
5.others/debug/public/index.html | 4 ++--
36 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/1.hello-world/1.hello-world.html b/1.hello-world/1.hello-world.html
index c9b3ae369..b63de1372 100644
--- a/1.hello-world/1.hello-world.html
+++ b/1.hello-world/1.hello-world.html
@@ -12,7 +12,7 @@
Loading...
-
+
+
+
+
+
+
+
+
+
diff --git a/3.settings/2.localizationModes-binarizationModes.html b/3.settings/2.localizationModes-binarizationModes.html
index 2085e4245..8b457b2b0 100644
--- a/3.settings/2.localizationModes-binarizationModes.html
+++ b/3.settings/2.localizationModes-binarizationModes.html
@@ -13,7 +13,7 @@
library offline. Please see the guide on how to host the library:
https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=latest#host-the-library-yourself-recommended
-->
-
+
diff --git a/3.settings/3.blurred-small-barcodes.html b/3.settings/3.blurred-small-barcodes.html
index 79febccca..57a3387f3 100644
--- a/3.settings/3.blurred-small-barcodes.html
+++ b/3.settings/3.blurred-small-barcodes.html
@@ -13,7 +13,7 @@
library offline. Please see the guide on how to host the library:
https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=latest#host-the-library-yourself-recommended
-->
-
+
diff --git a/3.settings/4.deformed-incomplete-barcodes.html b/3.settings/4.deformed-incomplete-barcodes.html
index 5c4ad7a39..a621db7bb 100644
--- a/3.settings/4.deformed-incomplete-barcodes.html
+++ b/3.settings/4.deformed-incomplete-barcodes.html
@@ -13,7 +13,7 @@
library offline. Please see the guide on how to host the library:
https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=latest#host-the-library-yourself-recommended
-->
-
+
diff --git a/3.settings/5.regionOfInterest-regionPredetection.html b/3.settings/5.regionOfInterest-regionPredetection.html
index f720c3397..368a43f50 100644
--- a/3.settings/5.regionOfInterest-regionPredetection.html
+++ b/3.settings/5.regionOfInterest-regionPredetection.html
@@ -13,7 +13,7 @@
library offline. Please see the guide on how to host the library:
https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=latest#host-the-library-yourself-recommended
-->
-
+
diff --git a/3.settings/6.dense-barcodes.html b/3.settings/6.dense-barcodes.html
index f7257022d..45d556eb5 100644
--- a/3.settings/6.dense-barcodes.html
+++ b/3.settings/6.dense-barcodes.html
@@ -18,7 +18,7 @@
library offline. Please see the guide on how to host the library:
https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=latest#host-the-library-yourself-recommended
-->
-
+
@@ -36,7 +36,7 @@
/**
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
- * For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.3.1&utm_source=github#specify-the-license or contact support@dynamsoft.com.
+ * For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.0&utm_source=github#specify-the-license or contact support@dynamsoft.com.
* LICENSE ALERT - THE END
*/
diff --git a/3.settings/initScanner.js b/3.settings/initScanner.js
index 5e374e160..1e8bcdb84 100644
--- a/3.settings/initScanner.js
+++ b/3.settings/initScanner.js
@@ -20,7 +20,7 @@ window.onload = async function () {
/**
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
- * For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.3.1&utm_source=github#specify-the-license or contact support@dynamsoft.com.
+ * For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.0&utm_source=github#specify-the-license or contact support@dynamsoft.com.
* LICENSE ALERT - THE END
*/
diff --git a/4.use-case/1.fill-a-form-with-barcode-reading.html b/4.use-case/1.fill-a-form-with-barcode-reading.html
index e9b608ac7..cdba0237d 100644
--- a/4.use-case/1.fill-a-form-with-barcode-reading.html
+++ b/4.use-case/1.fill-a-form-with-barcode-reading.html
@@ -13,7 +13,7 @@
library offline. Please see the guide on how to host the library:
https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=latest#host-the-library-yourself-recommended
-->
-
+
@@ -35,7 +35,7 @@
Click each input box to fill in!
/**
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
- * For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.3.1&utm_source=github#specify-the-license or contact support@dynamsoft.com.
+ * For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.0&utm_source=github#specify-the-license or contact support@dynamsoft.com.
* LICENSE ALERT - THE END
*/
diff --git a/4.use-case/2.read-a-drivers-license.html b/4.use-case/2.read-a-drivers-license.html
index b30f3ee46..75ba86c2e 100644
--- a/4.use-case/2.read-a-drivers-license.html
+++ b/4.use-case/2.read-a-drivers-license.html
@@ -36,7 +36,7 @@