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
141
Merge Requests
141
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
3e855080
Commit
3e855080
authored
Feb 27, 2020
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: Fix orientation
* Display intermediate image after get orientation
parent
a347f1b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
113 additions
and
19 deletions
+113
-19
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
...ateItem/web_page_module/rjs_gadget_document_scanner_js.js
+111
-17
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 @
3e855080
/*jslint indent: 2, unparam: true */
/*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
)
{
/*jslint indent: 2, unparam: true
, bitwise: true
*/
/*global rJS, RSVP, window, document, navigator, Cropper, Promise, JSON, jIO, promiseEventListener, domsugar, createImageBitmap, FormData, Caman
, FileReader, DataView
*/
(
function
(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
,
caman
,
FileReader
,
DataView
)
{
"
use strict
"
;
//////////////////////////////////////////////////
...
...
@@ -17,6 +17,57 @@
});
}
function
getOrientationFromDataUrl
(
data_url
)
{
var
view
=
new
DataView
(
data_url
),
length
=
view
.
byteLength
,
offset
=
2
,
marker
,
little
,
tags
,
i
;
if
(
view
.
getUint16
(
0
,
false
)
!==
0xFFD8
)
{
return
-
2
;
}
while
(
offset
<
length
)
{
if
(
view
.
getUint16
(
offset
+
2
,
false
)
<=
8
)
{
return
-
1
;
}
marker
=
view
.
getUint16
(
offset
,
false
);
offset
+=
2
;
if
(
marker
===
0xFFE1
)
{
offset
+=
2
;
if
(
view
.
getUint32
(
offset
,
false
)
!==
0x45786966
)
{
return
-
1
;
}
offset
+=
6
;
little
=
view
.
getUint16
(
offset
,
false
)
===
0x4949
;
offset
+=
view
.
getUint32
(
offset
+
4
,
little
);
tags
=
view
.
getUint16
(
offset
,
little
);
offset
+=
2
;
for
(
i
=
0
;
i
<
tags
;
i
=
i
+
1
)
{
if
(
view
.
getUint16
(
offset
+
(
i
*
12
),
little
)
===
0x0112
)
{
return
view
.
getUint16
(
offset
+
(
i
*
12
)
+
8
,
little
);
}
}
}
else
if
((
marker
&
0xFF00
)
!==
0xFF00
)
{
break
;
}
offset
+=
view
.
getUint16
(
offset
,
false
);
}
return
-
1
;
}
function
getOrientation
(
blob
)
{
return
RSVP
.
Queue
()
.
push
(
function
()
{
return
jIO
.
util
.
readBlobAsArrayBuffer
(
blob
);
})
.
push
(
function
(
evt
)
{
return
getOrientationFromDataUrl
(
evt
.
target
.
result
);
});
}
function
handleUserMedia
(
device_id
,
callback
)
{
// Do not modify this function!
// There is no need to add the gadget logic inside
...
...
@@ -103,9 +154,10 @@
viewMode
:
3
,
// Avoid any cropper calculation or guessing
scalable
:
false
,
// By default rotatable is true, if you remove it.
// Make sure, it is set on data.
rotatable
:
false
,
// Please, DON'T touch on rotatable and checkOrientation. Removing it,
// we will not be able to fix orientation before crop.
rotatable
:
true
,
checkOrientation
:
true
,
zoomable
:
false
,
movable
:
false
,
data
:
data
,
...
...
@@ -349,6 +401,7 @@
image_capture
=
new
window
.
ImageCapture
(
gadget
.
element
.
querySelector
(
'
video
'
).
srcObject
.
getVideoTracks
()[
0
]
),
canvas
=
domsugar
(
'
canvas
'
,
{
'
class
'
:
'
canvas
'
}),
div
;
return
new
RSVP
.
Queue
()
...
...
@@ -363,29 +416,70 @@
.
push
(
function
(
blob
)
{
return
RSVP
.
all
([
createImageBitmap
(
blob
),
jIO
.
util
.
readBlobAsDataURL
(
blob
)
getOrientation
(
blob
)
]);
})
.
push
(
function
(
result_list
)
{
var
bitmap
=
result_list
[
0
],
img
=
domsugar
(
"
img
"
,
{
"
src
"
:
result_list
[
1
].
target
.
result
}),
canvas
=
domsugar
(
'
canvas
'
,
{
'
class
'
:
'
canvas
'
});
orientation
=
result_list
[
1
],
height
=
bitmap
.
height
,
width
=
bitmap
.
width
,
ctx
;
if
(
4
<
orientation
&&
orientation
<
9
)
{
canvas
.
width
=
height
;
canvas
.
height
=
width
;
}
else
{
canvas
.
width
=
width
;
canvas
.
height
=
height
;
}
div
=
gadget
.
element
.
querySelector
(
"
.camera-input
"
);
ctx
=
canvas
.
getContext
(
'
2d
'
);
// transform context before drawing image
switch
(
orientation
)
{
case
2
:
ctx
.
transform
(
-
1
,
0
,
0
,
1
,
width
,
0
);
break
;
case
3
:
ctx
.
transform
(
-
1
,
0
,
0
,
-
1
,
width
,
height
);
break
;
case
4
:
ctx
.
transform
(
1
,
0
,
0
,
-
1
,
0
,
height
);
break
;
case
5
:
ctx
.
transform
(
0
,
1
,
1
,
0
,
0
,
0
);
break
;
case
6
:
ctx
.
transform
(
0
,
1
,
-
1
,
0
,
height
,
0
);
break
;
case
7
:
ctx
.
transform
(
0
,
-
1
,
-
1
,
0
,
height
,
width
);
break
;
case
8
:
ctx
.
transform
(
0
,
-
1
,
1
,
0
,
0
,
width
);
break
;
default
:
break
;
}
ctx
.
drawImage
(
bitmap
,
0
,
0
);
return
canvas
.
toDataURL
(
"
image/jpeg
"
);
})
.
push
(
function
(
result
)
{
var
img
=
domsugar
(
"
img
"
,
{
"
src
"
:
result
});
gadget
.
detached_promise_dict
.
media_stream
.
cancel
(
'
Not needed anymore, as captured
'
);
div
=
gadget
.
element
.
querySelector
(
"
.camera-input
"
);
div
.
replaceChild
(
img
,
div
.
firstElementChild
);
canvas
.
width
=
bitmap
.
width
;
canvas
.
height
=
bitmap
.
height
;
canvas
.
getContext
(
'
2d
'
).
drawImage
(
bitmap
,
0
,
0
);
})
.
push
(
function
(
result_list
)
{
if
(
settings
.
brightness
||
settings
.
contrast
||
settings
.
enable_greyscale
||
settings
.
compression
)
{
return
handleCaman
(
canvas
,
settings
);
}
return
[
canvas
,
settings
.
compression
];
})
.
push
(
function
(
result_list
)
{
var
canvas
=
result_list
[
0
],
compression
=
settings
.
compression
||
1
;
var
compression
=
settings
.
compression
||
1
;
canvas
=
result_list
[
0
];
return
RSVP
.
all
([
gadget
.
getTranslationList
([
"
Delete
"
,
"
Save
"
,
"
Page
"
]),
new
Promise
(
function
(
resolve
)
{
...
...
@@ -783,4 +877,4 @@
.
declareAcquiredMethod
(
"
getTranslationList
"
,
"
getTranslationList
"
);
}(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
,
Caman
));
\ No newline at end of file
}(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
,
Caman
,
FileReader
,
DataView
));
\ No newline at end of file
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
View file @
3e855080
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.
7372.6060.34525
</string>
</value>
<value>
<string>
982.
17499.47378.54016
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
158
2764289.53
</float>
<float>
158
3199160.84
</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