Skip to content

Commit d241cef

Browse files
authored
Merge pull request #525 from ztyyLV/Jackson-branch
Jackson branch
2 parents a7c3a96 + b288817 commit d241cef

22 files changed

+23
-2017
lines changed

_data/full_tree.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ tree_list:
5050
- name: Use Web TWAIN in Vue
5151
path: /indepth/development/vue.html
5252
- name: Simple Demo
53-
path: /getstarted/Helloworld.html
53+
path: https://www.dynamsoft.com/web-twain/resources/code-gallery/
5454
- name: API Reference
5555
path: /info/api/
5656
childList:
@@ -76,8 +76,8 @@ tree_list:
7676
path: /info/api/WebTwain_Util.html
7777
- name: Addon_BarcodeReader
7878
path: /info/api/Addon_BarcodeReader.html
79-
- name: Addon_Camera
80-
path: /info/api/Addon_Camera.html
79+
# - name: Addon_Camera
80+
# path: /info/api/Addon_Camera.html
8181
- name: Addon_PDF
8282
path: /info/api/Addon_PDF.html
8383
- name: Addon_Webcam

about/hardware.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ permalink: /getstarted/hardware.html
1212

1313
Dynamic Web TWAIN's main feature is interacting with imaging devices like scanners and cameras. In this section, we'll look at the supported devices.
1414

15-
- [TWAIN Scanners](#twain-scanners)
16-
- [ICA Scanners](#ica-scanners)
17-
- [SANE Scanners](#sane-scanners)
18-
- [DirectShow Cameras](#directshow-cameras)
19-
- [MediaDevices Cameras](#mediadevices-cameras)
15+
- [Imaging Hardware](#imaging-hardware)
16+
- [TWAIN Scanners](#twain-scanners)
17+
- [Facts about TWAIN](#facts-about-twain)
18+
- [ICA Scanners](#ica-scanners)
19+
- [Facts about ICA](#facts-about-ica)
20+
- [SANE Scanners](#sane-scanners)
21+
- [Facts about SANE](#facts-about-sane)
22+
- [DirectShow Cameras](#directshow-cameras)
2023

2124
## TWAIN Scanners
2225

@@ -72,12 +75,4 @@ See more: <a href="{{site.faq}}how-to-test-if-your-device-is-SANE-compliant.html
7275

7376
`DirectShow Cameras` refer to the cameras which can be accessed via the [Microsoft DirectShow architecture](https://docs.microsoft.com/en-us/windows/win32/directshow/introduction-to-directshow). These cameras are either built into desktops / laptops or connected via USB.
7477

75-
See more: <a href="{{site.faq}}how-to-test-if-your-camera-is-DirectShow-compliant.html" target="_blank">Is my Camera DirectShow Compliant?</a>
76-
77-
## MediaDevices Cameras
78-
79-
`MediaDevices Cameras` refers to the cameras accessible via the [MediaDevices interface](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices). These cameras are either built into desktops/laptops/mobile devices, including phones and tablets, or connected via USB.
80-
81-
> `DirectShow Cameras` and `MediaDevices Cameras` could refer to the same devices which can be accessed either way.
82-
83-
See more: <a href="{{site.faq}}how-to-test-if-your-camera-is-MediaDevices-compliant.html" target="_blank">Is my Camera MediaDevices Compliant?</a>
78+
See more: <a href="{{site.faq}}how-to-test-if-your-camera-is-DirectShow-compliant.html" target="_blank">Is my Camera DirectShow Compliant?</a>

faq/general-troubleshooting-steps.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ permalink: /faq/general-troubleshooting-steps.html
2525
- Linux, `/opt/dynamsoft/DynamsoftService/log`
2626

2727
2. Set the log level
28-
- For only one client machine, add the line `LogLevel=14` to `DSConfiguration.ini` on that specific machine.
28+
- For only one client machine, go to the application with Dynamic Web TWAIN integrated, press F12 to open the development tools, switch to "console" tab and enter the command "DWObject.LogLevel = 1" to enable the debugger mode.
2929
- For all client machines, set [ `LogLevel` ]({{site.info}}api/WebTwain_Util.html#loglevel) to 1 in your code. This property should be set as soon as the `WebTwain` instance is created. For example, in the event `Dynamsoft_OnReady`
3030
```javascript
3131
function Dynamsoft_OnReady() {
@@ -40,3 +40,5 @@ permalink: /faq/general-troubleshooting-steps.html
4040
- On Windows, the log files are in `C:\Windows\SysWOW64\Dynamsoft\DynamsoftServicex64_17\log` or `C:\Users\{UserName}\AppData\Roaming\Dynamsoft\DynamsoftService\log`
4141
- On macOS, the log files are in `Go > Applications > Dynamsoft > DynamsoftServicex64_17 > {installed version No.} > log`
4242
- On Linux, the log files are in `/opt/dynamsoft/DynamsoftServicex64_17/log`
43+
44+
5. Set log level back to the default value (0) to disable the debugger mode, otherwise the operation speed will be affected.

getstarted/platform.md

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,10 @@ permalink: /getstarted/platform.html
1212

1313
## Supported systems and browsers
1414

15-
Dynamic Web TWAIN is designed to be cross-platform, thus, it works in all major browsers across all major operating systems, including Windows, macOS, Linux and mobile.
15+
Dynamic Web TWAIN is designed to be cross-platform, thus, it works in all major browsers across all major operating systems, including Windows, macOS, Linux.
1616

1717
[See the list of supported systems and browsers >](https://www.dynamsoft.com/web-twain/features/)
1818

19-
## Additional notes
20-
21-
Besides the mainstream systems, here are some additional notes on WASM browsers, ActiveX browsers and more:
22-
23-
**WASM browsers**
24-
25-
WASM browsers refer to the browsers with the following advanced features.
26-
27-
- [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) - [More info](https://caniuse.com/#feat=blobbuilder)
28-
29-
- [URL/createObjectURL](https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL) - [More info](https://caniuse.com/#feat=bloburls)
30-
31-
- [Web Workers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) - [More info](https://caniuse.com/#feat=webworkers)
32-
33-
- [WebAssembly](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_objects/WebAssembly) -
34-
[More info](https://caniuse.com/#feat=wasm)
35-
36-
- [MediaDevices/getUserMedia](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia) - [More info](https://caniuse.com/#feat=stream)
37-
3819
**ActiveX browsers**
3920

4021
ActiveX browsers refers to Internet Explorer 9 ~ 11. They are not included in the above lists. By default, IE 10 ~ 11 runs in HTML5 mode. Setting the global API `Dynamsoft.DWT.IfUseActiveXForIE10Plus` to true can turn ActiveX mode on in IE 10 ~ 11.

getstarted/server.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ The deployment of Dynamic Web TWAIN is easy. Simply copy the Resources folder to
4141

4242
If you need to use any of the following features, you must enable HTTPS on the server.
4343

44-
* Use the new [Camera module]({{site.indepth}}features/Input.html#use-mediadevices-cameras)
4544
* Upload or Download via SSL
4645
* Any other features that require a secure connection
4746

indepth/features/barcode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ With the increasing use of barcode reading in document management systems, the B
1818
1919
## Environment
2020

21-
* [Desktop]({{site.getstarted}}platform.html#browsers-on-desktop-devices) and [Mobile]({{site.getstarted}}platform.html#browsers-on-mobile-devices).
21+
* Windows
2222

2323
## How to use
2424

indepth/features/initialize.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ Dynamsoft.DWT.CreateDWTObject(
119119
);
120120
```
121121

122-
The method can also do something that [Load](#dynamsoftdwtload) can't. The following code creates a `WebTwain` instance that connects to the Dynamsoft Service running on another machine. Check out [how to enable remote scan]({{site.faq}}how-to-enable-remote-scan.html).
123-
124122
### [`Dynamsoft.DWT.CreateDWTObjectEx()`]({{site.info}}api/Dynamsoft_WebTwainEnv.html#createdwtobjectex)
125123

126124
This method manually creates a `WebTwain` instance without a default built-in viewer.
@@ -174,8 +172,6 @@ Dynamsoft.DWT.CreateDWTObjectEx({
174172
);
175173
```
176174

177-
Similar to [`CreateDWTObject`](#dynamsoftwebtwainenvcreatedwtobject), `CreateDWTObjectEx` can also connect to the Dynamsoft Service running on another machine. Check out [how to enable remote scan]({{site.faq}}how-to-enable-remote-scan.html).
178-
179175
## Customizing the instances
180176

181177
The instances are defined in `dynamsoft.webtwain.config.js`:

indepth/features/input.md

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,57 +22,8 @@ A local scanner refers to a scanner that is plugged in the same desktop via USB
2222

2323
> As far as `Dynamic Web TWAIN` is concerned, a network scanner is just like a local scanner because its driver has taken care of the network connection behind the scene.
2424
25-
### Scan From a Remote Scanner
26-
27-
Please refer to [this article](#) for more information on remote scanning. (Link TBC)
28-
2925
## Capture from cameras
3026

31-
### Use [MediaDevices Cameras]({{site.getstarted}}hardware.html#mediadevices-cameras)
32-
33-
Dynamic Web TWAIN also comes with a Camera add-on for you to capture images or documents using MediaDevices cameras, auto crop and adjust perspective.
34-
35-
To include the Camera add-on, simply add a reference to the corresponding camera JS file which is included in the [resources folder]({{site.faq}}what-are-the-resources-files.html).
36-
37-
``` html
38-
<script src="Resources/addon/dynamsoft.webtwain.addon.camera.js"></script>
39-
```
40-
41-
[Try an online demo](https://demo.dynamsoft.com/web-twain/mobile-online-camera-scanner/) | [Get sample code](https://download.dynamsoft.com/Samples/DWT/SourceCode-DWT-Mobile-Camera-Scanner.zip)
42-
43-
Notes:
44-
45-
Make sure you deploy the sample to a web server that
46-
- runs HTTPS
47-
- serves the `*.wasm` file with `Content-Type: application/wasm`
48-
49-
The following code snippet shows how to use the camera add-on:
50-
51-
``` javascript
52-
function CaptureImage() {
53-
if (DWObject) {
54-
var showVideoConfigs = {
55-
scannerViewer: {
56-
autoDetect: {
57-
enableAutoDetect: true
58-
}
59-
},
60-
filterViewer: {
61-
exitDocumentScanAfterSave: true
62-
}
63-
};
64-
65-
DWObject.Addon.Camera.scanDocument(showVideoConfigs).then(
66-
function () {
67-
console.log("OK");
68-
},
69-
function (error) {
70-
console.log(error.message);
71-
});
72-
}
73-
}
74-
```
75-
7627
### Use [DirectShow Cameras]({{site.getstarted}}hardware.html#directshow-cameras)
7728

7829
To include the Webcam add-on, simply add a reference to the corresponding webcam JS file which is included in the [resources folder]({{site.faq}}what-are-the-resources-files.html).

indepth/features/output.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -345,26 +345,6 @@ DWObject.SaveAsJPEG("Sample.jpg", 0,
345345
);
346346
```
347347

348-
### Save files from MediaDevices camera capture
349-
350-
When using the Camera add-on, DWT runs its entire operations within desktop/mobile browsers. As a result, files are always saved in the system's Downloads folder by default, regardless of the absolute path specified. And the API [`IfShowFileDialog`]({{site.info}}api/WebTwain_IO.html#ifshowfiledialog) has no effect in this case.
351-
352-
``` javascript
353-
// The following line will be ignored and
354-
// no file dialog will be shown in WASM mode
355-
DWObject.IfShowFileDialog = true;
356-
// The absolute path specified will be ignored and
357-
// the file is saved to the Downloads folder
358-
DWObject.SaveAllAsPDF("D:\\Sample.pdf",
359-
function() {
360-
console.log('Successful!');
361-
},
362-
function(errCode, errString) {
363-
console.log(errString);
364-
}
365-
);
366-
```
367-
368348
## Convert
369349

370350
In some cases, you want to process the data yourself and want to extract it from the `Dynamic Web TWAIN` buffer. `Dynamic Web TWAIN` offers two approaches.

indepth/features/pdf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PDFs are widely used in many and various industries, and presently are the only
1414

1515
## Environment
1616

17-
* Supported on [Desktop]({{site.getstarted}}platform.html#browsers-on-desktop-devices) and [Mobile]({{site.getstarted}}platform.html#browsers-on-mobile-devices).
17+
* Supported on [Desktop]({{site.getstarted}}platform.html#browsers-on-desktop-devices).
1818

1919
## Including the PDF addon
2020

0 commit comments

Comments
 (0)