Skip to content

Commit f63fe37

Browse files
authored
Merge pull request #633 from ztyyLV/Jackson-branch
Jackson branch
2 parents 3815745 + 722c5b7 commit f63fe37

File tree

9 files changed

+41
-71
lines changed

9 files changed

+41
-71
lines changed

_data/full_tree.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ tree_list:
4040
- name: Barcode Recognition
4141
path: /indepth/features/barcode.html
4242
- name: PDF Handling
43-
path: /indepth/features/pdf.html
43+
path: /indepth/features/pdf.html
44+
- name: Remote Scan
45+
path: https://www.dynamsoft.com/remote-scan/docs/introduction/
4446
- name: Samples and Demos
4547
childList:
4648
- name: Use Web TWAIN in Angular

assets/js/setLatestVersion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var versionNoteLatestVersion = "18.1"
1+
var versionNoteLatestVersion = "18.2"
22

33
$(function() {
44
$("#versionNoteLatestVersion").text(" (" + versionNoteLatestVersion + ")")

indepth/features/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,6 @@ This section covers how to implement the key capabilities of Dynamic Web TWAIN (
4747
* [Handle PDFs]({{site.indepth}}features/PDF.html)
4848

4949
Learn about PDF reading & writing capabilities.
50+
51+
* [Remote Scan](https://www.dynamsoft.com/remote-scan/docs/introduction/)
52+
Learn about how to use Remote Scan.

info/api/Addon_PDF.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ permalink: /info/api/Addon_PDF.html
1212

1313
> {WebTwainObject} denotes the `WebTwain` instance.
1414
15+
> All APIs on this page support Android Service from version 18.2.
16+
1517
**Methods**
1618

1719
| |

info/api/Dynamsoft_Enum.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,6 @@ Note: IT_MULTIPAGE_PDF & IT_MULTIPAGE_TIF are only applicable to the ImageType o
288288

289289
## `Dynamsoft.DWT.EnumDWT_PDFCompressionType`
290290

291-
<div class="sample-code-prefix template-table"></div>
292-
>- v17.3
293-
>- v17.2.5
294-
>
295-
>1.
296291
| Label | Value|
297292
|:-|:-|
298293
| PDF_AUTO | 0 |
@@ -301,16 +296,6 @@ Note: IT_MULTIPAGE_PDF & IT_MULTIPAGE_TIF are only applicable to the ImageType o
301296
| PDF_JPEG | 5 |
302297
| PDF_JP2000 | 6 |
303298
| PDF_JBIG2 | 7 |
304-
>2.
305-
| Label | Value|
306-
|:-|:-|
307-
| PDF_AUTO | 0 |
308-
| PDF_FAX4 | 2 |
309-
| PDF_LZW | 3 |
310-
| PDF_JPEG | 5 |
311-
| PDF_JP2000 | 6 |
312-
| PDF_JBig2 | 7 |
313-
314299

315300
## `Dynamsoft.DWT.EnumDWT_ShowMode`
316301

info/api/Dynamsoft_WebTwainEnv.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ interface Dynamsoft.DWT {
2121
readonly ServerLinuxVersionInfo: string;
2222
readonly ServerMacVersionInfo: string;
2323
readonly ServerVersionInfo: string;
24+
/**
25+
* Whether to load UI related js files.
26+
*/
27+
UseDefaultViewer: boolean;
28+
/**
29+
* Attach the callback function to the specified event.
30+
* @param event Specify the event.
31+
* @param callback Specify the callback.
32+
*/
33+
RegisterEvent(event: string, callback: (...args: any[]) => void): void;
2434
/**
2535
* Whether to create a WebTwain instance automatically.
2636
*/
@@ -57,8 +67,8 @@ interface Dynamsoft.DWT {
5767
asyncFailureFunc: (errorString: string) => {}
5868
): void;
5969
DeleteDWTObject(Id?: string): boolean;
60-
GetWebTwain(ContainerId?: string): WebTwain;
61-
GetWebTwainEx(WebTwainId: string): WebTwain;
70+
GetWebTwain(ContainerIdOrWebTwainId?: string): WebTwain;
71+
GetWebTwainEx(ContainerIdOrWebTwainId: string): WebTwain;
6272
Load(): void;
6373
Unload(): void;
6474
OnWebTwainPostExecute: function () {};

info/api/WebTwain_Acquire.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ interface DeviceConfiguration {
105105
extendedImageInfoQueryLevel?: Dynamsoft.DWT.EnumDWT_ExtImageInfo | number; //How much extended information is retrieved. Only valid when {IfGetExtImageInfo} is true.
106106
SelectSourceByIndex?: number; //Specify a source by its index.
107107
IfCloseSourceAfterAcquire?: boolean; //Whether to close the data source after aquisition. Default: false.
108+
PageSize?: Dynamsoft.DWT.EnumDWT_CapSupportedSizes | number; //Specify page size
108109
}
109110
```
110111

@@ -2433,6 +2434,10 @@ Return or set the page size the data source uses to acquire images.
24332434
PageSize: Dynamsoft.DWT.EnumDWT_CapSupportedSizes | number;
24342435
```
24352436

2437+
**Parameters**
2438+
2439+
`PageSize`: Please refer to [EnumDWT_CapSupportedSizes]({{site.info}}api/Dynamsoft_Enum.html#dynamsoftdwtenumdwt_capsupportedsizes)
2440+
24362441
**Availability**
24372442

24382443
<div class="availability">
@@ -2473,6 +2478,10 @@ Return or set the pixel type used when acquiring images.
24732478
PixelType: Dynamsoft.DWT.EnumDWT_PixelType | number;
24742479
```
24752480

2481+
**Parameters**
2482+
2483+
`PixelType`: Please refer to [EnumDWT_PixelType]({{site.info}}api/Dynamsoft_Enum.html#dynamsoftdwtenumdwt_pixeltype)
2484+
24762485
**Availability**
24772486

24782487
<div class="availability">
@@ -3277,7 +3286,7 @@ Check this property after [OpenSource()](#opensource) is called.
32773286

32783287
## IfUseTwainDSM
32793288

3280-
Return or set whether the new TWAIN DSM (data source Manager) is used for acquisitions. The new TWAIN DSM is a DLL called 'TWAINDSM.dll' while the default | old DSM is called 'twain_32.dll'.
3289+
Return or set whether the new TWAIN DSM (data source Manager) is used for acquisitions. The new TWAIN DSM is a DLL called 'TWAINDSM.dll' while the default or old DSM is called 'twain_32.dll'.
32813290

32823291
**Syntax**
32833292

@@ -4599,7 +4608,7 @@ GetDevicesAsync(deviceType?: Dynamsoft.DWT.EnumDWT_DeviceType | number, refresh?
45994608

46004609
**Parameters**
46014610

4602-
`deviceType`: The device type
4611+
`deviceType`: The device type. Please refere to [EnumDWT_DeviceType]({{site.info}}api/Dynamsoft_Enum.html#dynamsoftdwtenumdwt_borderstyle)
46034612

46044613
`refresh`: Default value is **false**
46054614

@@ -4671,7 +4680,7 @@ DWObject.GetDevicesAsync().then((deviceList)=>{
46714680

46724681
**Parameters**
46734682

4674-
`device`: the device
4683+
`device`: the device object. Please refer to [Device]({{site.info}}api/Interfaces.html#device)
46754684

46764685
**Availability**
46774686

info/api/WebTwain_Viewer.md

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permalink: /info/api/WebTwain_Viewer.html
2121
| [`hide()`](#hide) | [`last()`](#last) | [`next()`](#next) | [`off()`](#off) |
2222
| [`on()`](#on) | [`previous()`](#previous) | [`render()`](#render) | [`setButtonClass()`](#setbuttonclass) |
2323
| [`setSelectedAreas()`](#setselectedareas) | [`setViewMode()`](#setviewmode) | [`show()`](#show) | [`unbind()`](#unbind) |
24-
| [`updateCheckboxStyle()`](#updatecheckboxstyle) | [`updatePageNumberStyle()`](#updatepagenumberstyle) | [`save()`](#save) |
24+
| [`updateCheckboxStyle()`](#updatecheckboxstyle) | [`updatePageNumberStyle()`](#updatepagenumberstyle) |
2525

2626
**Properties**
2727

@@ -254,7 +254,7 @@ interface ImageEditor {
254254
/**
255255
* Keeps the image data in the browser editor in sync with the buffer.
256256
**/
257-
save(): boolean;
257+
save(): Promise<void>;
258258
/**
259259
* Hide the ImageEditor object.
260260
*/
@@ -317,7 +317,7 @@ interface EditorSettings {
317317
/**
318318
     * Default is normal, value: normal=0, balance=1.
319319
     */
320-
workMode?: number | DynamsoftEnumsDWT.EnumDWT_WorkMode;
320+
workMode?: number | Dynamsoft.DWT.EnumDWT_WorkMode;
321321
}
322322
```
323323

@@ -460,6 +460,7 @@ var editorSettings = {
460460
"There is no source available",
461461
],
462462
},
463+
workMode:Dynamsoft.DWT.EnumDWT_WorkMode.balance,
463464
};
464465

465466
var imageEditor = DWObject.Viewer.createImageEditor(editorSettings);
@@ -2509,48 +2510,6 @@ interface pageNumberSettings {
25092510
</table>
25102511
</div>
25112512

2512-
---
2513-
2514-
## save
2515-
2516-
Keeps the image data in the browser editor in sync with the buffer.
2517-
2518-
**Syntax**
2519-
```typescript
2520-
save():Promise<void>;
2521-
```
2522-
2523-
**Availability**
2524-
2525-
<div class="availability">
2526-
<table>
2527-
2528-
<tr>
2529-
<td align="center">ActiveX</td>
2530-
<td align="center">H5(Windows)</td>
2531-
<td align="center">H5(macOS/TWAIN)</td>
2532-
<td align="center">H5(macOS/ICA)</td>
2533-
<td align="center">H5(Linux)</td>
2534-
</tr>
2535-
2536-
<tr>
2537-
<td align="center">not supported </td>
2538-
<td align="center">v18.2+ </td>
2539-
<td align="center">v18.2+ </td>
2540-
<td align="center">v18.2+ </td>
2541-
<td align="center">v18.2+ </td>
2542-
</tr>
2543-
2544-
</table>
2545-
</div>
2546-
2547-
**Example**
2548-
2549-
```javascript
2550-
var ImageEditor = DWObject.Viewer.createImageEditor(editorSettings);
2551-
ImageEditor.save();
2552-
```
2553-
25542513

25552514
---
25562515

@@ -2939,7 +2898,7 @@ on('resize',
29392898
DWObject.Viewer.on("resize", function (width, height) {
29402899
console.log(width, height);
29412900
});
2942-
DWObject.Viewer.width += 100;
2901+
DWObject.Viewer.width = 100;
29432902
```
29442903

29452904
---

info/schedule/Stable.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ permalink: /info/schedule/Stable.html
2525
- Expanded the capabilities of the Android platform. <!--See the APIs supported on Android service. -->
2626

2727
#### Remote Scan
28-
- The remote scan solution powered by Dynamic Web TWAIN is now officially available. With it, you can turn any of your transitional document scanners into a network-able scanner and allow your end users to use it without installing anything on the client device. Read <a href="https://www.dynamsoft.com/remote-scan/docs/introduction/" target="_blank">this documentation</a> to learn the Remote Scan solution works.
28+
- The remote scan solution powered by Dynamic Web TWAIN is now officially available. With it, you can turn any of your tranditional document scanners into a network-able scanner and allow your end users to use it without installing anything on the client device. Read <a href="https://www.dynamsoft.com/remote-scan/docs/introduction/" target="_blank">this documentation</a> to learn how the Remote Scan solution works.
2929

3030

3131
### Improvements
3232

3333
#### Image Viewer
3434
- The Viewer component has been migrated to a dedicated resource file. This will allow for viewerless implementations of Dynamic Web TWAIN to reduce the load by removing the necessity of loading the Viewer resources into memory even when the Viewer is not being used. See the property [Dynamsoft.DWT.UseDefaultViewer]({{site.info}}api/Dynamsoft_WebTwainEnv.html#usedefaultviewer).
35-
- Added the enum [EnumDWT_WorkMode]({{site.info}}api/Dynamsoft_Enum.html#dynamsoftdwtenumdwt_workmode) with a new option for image editing
36-
- Added [save()]({{site.info}}api/WebTwain_Viewer.html#save) to the ImageEditor object
35+
- Added the enum [EnumDWT_WorkMode]({{site.info}}api/Dynamsoft_Enum.html#dynamsoftdwtenumdwt_workmode) with a new option for image editor setting, please refer to [createImageEditor]({{site.info}}api/WebTwain_Viewer.html#createimageeditor).
36+
- Added new method `save()` to the ImageEditor object, please refer to [createImageEditor]({{site.info}}api/WebTwain_Viewer.html#createimageeditor).
3737

3838
#### Optimized error handling during web twain initialization
3939
- Added an [OnWebTwainError]({{site.info}}api/Dynamsoft_WebTwainEnv.html#onwebtwainerror) event for better capturing errors during the web twain object initialization.

0 commit comments

Comments
 (0)