Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
139
Merge Requests
139
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
1454d77f
Commit
1454d77f
authored
Feb 12, 2020
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: Introduce Caman to manipulate image before crop
parent
fcb69b03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
10 deletions
+61
-10
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
...ateItem/web_page_module/rjs_gadget_document_scanner_js.js
+59
-8
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
...teItem/web_page_module/rjs_gadget_document_scanner_js.xml
+2
-2
No files found.
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
View file @
1454d77f
/*jslint indent: 2, unparam: true */
/*global rJS, RSVP, window, document, navigator, Cropper, Promise, JSON, jIO, promiseEventListener, domsugar, createImageBitmap, FormData*/
(
function
(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
)
{
/*global rJS, RSVP, window, document, navigator, Cropper, Promise, JSON, jIO, promiseEventListener, domsugar, createImageBitmap, FormData
, Caman
*/
(
function
(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
,
Caman
)
{
"
use strict
"
;
//////////////////////////////////////////////////
...
...
@@ -50,13 +50,60 @@
return
new
RSVP
.
Promise
(
waitForStream
,
canceller
);
}
function
handleCropper
(
element
,
data
,
callback
)
{
var
cropper
;
function
handleCropper
(
gadget
,
element
,
data
,
settings
,
callback
)
{
var
cropper
,
queue
=
new
RSVP
.
Queue
(),
img
=
domsugar
(
"
img
"
),
canvas
=
domsugar
(
'
canvas
'
,
{
'
class
'
:
'
canvas
'
});
function
canceller
()
{
cropper
.
destroy
();
}
if
(
settings
.
brightness
||
settings
.
contrast
||
settings
.
enable_greyscale
||
settings
.
compression
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
new
Promise
(
function
(
resolve
)
{
Caman
(
canvas
,
element
,
function
()
{
if
(
settings
.
brightness
!==
0
)
{
this
.
brightness
(
data
.
brightness
);
}
if
(
settings
.
contrast
!==
0
)
{
this
.
contrast
(
data
.
contrast
);
}
if
(
settings
.
enable_greyscale
)
{
this
.
greyscale
();
}
this
.
render
(
function
()
{
resolve
(
canvas
.
toDataURL
(
"
image/jpeg
"
,
settings
.
compression
));
});
});
});
})
.
push
(
function
(
data_str
)
{
img
.
setAttribute
(
"
src
"
,
data_str
);
// creating Cropper is asynchronous
return
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
cropper
=
new
Cropper
(
img
,
{
data
:
data
,
ready
:
function
()
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
callback
(
cropper
);
})
.
push
(
undefined
,
function
(
error
)
{
if
(
!
(
error
instanceof
RSVP
.
CancellationError
))
{
canceller
();
reject
(
error
);
}
});
}
});
},
canceller
);
});
}
// creating Cropper is asynchronous
return
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
cropper
=
new
Cropper
(
element
,
{
...
...
@@ -291,9 +338,10 @@
// Capture the media stream
function
captureAndRenderPicture
(
gadget
)
{
var
image_capture
=
new
window
.
ImageCapture
(
gadget
.
element
.
querySelector
(
'
video
'
).
srcObject
.
getVideoTracks
()[
0
]
),
gadget
.
element
.
querySelector
(
'
video
'
).
srcObject
.
getVideoTracks
()[
0
]
),
div
;
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
image_capture
.
getPhotoCapabilities
();
...
...
@@ -345,8 +393,10 @@
gadget
.
element
.
replaceChild
(
div
,
gadget
.
element
.
firstElementChild
);
addDetachedPromise
(
gadget
,
'
cropper
'
,
handleCropper
(
canvas
,
handleCropper
(
gadget
,
canvas
,
gadget
.
state
.
preferred_cropped_canvas_data
,
gadget
.
state
.
preferred_image_settings_data
,
defer
.
resolve
));
return
defer
.
promise
;
})
...
...
@@ -445,6 +495,7 @@
active_process
:
default_value
.
active_process
,
image_list
:
default_value
.
image_list
,
preferred_cropped_canvas_data
:
JSON
.
parse
(
options
.
preferred_cropped_canvas_data
),
preferred_image_settings_data
:
JSON
.
parse
(
options
.
preferred_image_settings_data
),
device_id
:
device_id
,
key
:
options
.
key
,
first_render
:
true
...
...
@@ -661,4 +712,4 @@
.
declareAcquiredMethod
(
"
getTranslationList
"
,
"
getTranslationList
"
);
}(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
));
\ No newline at end of file
}(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
,
Caman
));
\ No newline at end of file
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
View file @
1454d77f
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
981.
43882.8130.35481
</string>
</value>
<value>
<string>
981.
51308.5350.25326
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
1581
025205.74
</float>
<float>
1581
468361.42
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment