diff --git a/Pipfile b/Pipfile index 55338d7..4956af7 100644 --- a/Pipfile +++ b/Pipfile @@ -13,6 +13,9 @@ httpagentparser = "*" geoip2 = "*" ink-extensions = "*" python-magic = "*" +serial = "*" +pillow = "*" +pyserial = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index fc2bfe8..6c67caa 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "df61b6d8cd9643defac48d6d6af45a3bd9d850ab284b04e7ff001b95f591d8a3" + "sha256": "89332bbe3bba257b19a9566bd526d79af55c9ea4671357aab103126c35b67797" }, "pipfile-spec": 6, "requires": { @@ -21,18 +21,18 @@ }, "boto3": { "hashes": [ - "sha256:03130f43e15f02af7040946f7d4ebbba410fba5ee210b48ca8ba8407d2960b87", - "sha256:0b294a58635ed882a3821854f00264e6b3e65f2114c85c64109ad2280c7d5608" + "sha256:2945d8246e4c8875e3ae4aafffd028330ef681efc33e1475c1a805ed42540403", + "sha256:3d84311ce0f2fba83810f0e840b08e2b66246fc80dbb0a71fb992116f47b95bd" ], "index": "pypi", - "version": "==1.10.5" + "version": "==1.10.6" }, "botocore": { "hashes": [ - "sha256:13bf9d0d9b9cda278349c9ba0c35c96570795438d5bd29e5188e110b3f5a5183", - "sha256:cfce2c7d6a218d693ed6daa8a41040761e35d7a728d1cf43ae14c4132fb146f3" + "sha256:ac1a5caa10e3c4452714b17e6f30f05b4b6e57e0c80b19c1f4d72b234edf6646", + "sha256:fa6b9e619423f3891e7c11b98f2183da8173e3fed995271e93fd4a712ef45777" ], - "version": "==1.13.5" + "version": "==1.13.6" }, "certifi": { "hashes": [ @@ -64,6 +64,12 @@ ], "version": "==0.15.2" }, + "future": { + "hashes": [ + "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" + ], + "version": "==0.18.2" + }, "geoip2": { "hashes": [ "sha256:a37ddac2d200ffb97c736da8b8ba9d5d8dc47da6ec0f162a461b681ecac53a14", @@ -101,6 +107,14 @@ "index": "pypi", "version": "==1.0.2" }, + "iso8601": { + "hashes": [ + "sha256:210e0134677cc0d02f6028087fee1df1e1d76d372ee1db0bf30bf66c5c1c89a3", + "sha256:49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82", + "sha256:bbbae5fb4a7abfe71d4688fd64bff70b91bbd74ef6a99d964bab18f7fdf286dd" + ], + "version": "==0.1.12" + }, "jmespath": { "hashes": [ "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", @@ -145,6 +159,50 @@ ], "version": "==1.5.1" }, + "pillow": { + "hashes": [ + "sha256:047d9473cf68af50ac85f8ee5d5f21a60f849bc17d348da7fc85711287a75031", + "sha256:0f66dc6c8a3cc319561a633b6aa82c44107f12594643efa37210d8c924fc1c71", + "sha256:12c9169c4e8fe0a7329e8658c7e488001f6b4c8e88740e76292c2b857af2e94c", + "sha256:248cffc168896982f125f5c13e9317c059f74fffdb4152893339f3be62a01340", + "sha256:27faf0552bf8c260a5cee21a76e031acaea68babb64daf7e8f2e2540745082aa", + "sha256:285edafad9bc60d96978ed24d77cdc0b91dace88e5da8c548ba5937c425bca8b", + "sha256:384b12c9aa8ef95558abdcb50aada56d74bc7cc131dd62d28c2d0e4d3aadd573", + "sha256:38950b3a707f6cef09cd3cbb142474357ad1a985ceb44d921bdf7b4647b3e13e", + "sha256:4aad1b88933fd6dc2846552b89ad0c74ddbba2f0884e2c162aa368374bf5abab", + "sha256:4ac6148008c169603070c092e81f88738f1a0c511e07bd2bb0f9ef542d375da9", + "sha256:4deb1d2a45861ae6f0b12ea0a786a03d19d29edcc7e05775b85ec2877cb54c5e", + "sha256:59aa2c124df72cc75ed72c8d6005c442d4685691a30c55321e00ed915ad1a291", + "sha256:5a47d2123a9ec86660fe0e8d0ebf0aa6bc6a17edc63f338b73ea20ba11713f12", + "sha256:5cc901c2ab9409b4b7ac7b5bcc3e86ac14548627062463da0af3b6b7c555a871", + "sha256:6c1db03e8dff7b9f955a0fb9907eb9ca5da75b5ce056c0c93d33100a35050281", + "sha256:7ce80c0a65a6ea90ef9c1f63c8593fcd2929448613fc8da0adf3e6bfad669d08", + "sha256:809c19241c14433c5d6135e1b6c72da4e3b56d5c865ad5736ab99af8896b8f41", + "sha256:83792cb4e0b5af480588601467c0764242b9a483caea71ef12d22a0d0d6bdce2", + "sha256:846fa202bd7ee0f6215c897a1d33238ef071b50766339186687bd9b7a6d26ac5", + "sha256:9f5529fc02009f96ba95bea48870173426879dc19eec49ca8e08cd63ecd82ddb", + "sha256:a423c2ea001c6265ed28700df056f75e26215fd28c001e93ef4380b0f05f9547", + "sha256:ac4428094b42907aba5879c7c000d01c8278d451a3b7cccd2103e21f6397ea75", + "sha256:b1ae48d87f10d1384e5beecd169c77502fcc04a2c00a4c02b85f0a94b419e5f9", + "sha256:bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1", + "sha256:c6414f6aad598364aaf81068cabb077894eb88fed99c6a65e6e8217bab62ae7a", + "sha256:c710fcb7ee32f67baf25aa9ffede4795fd5d93b163ce95fdc724383e38c9df96", + "sha256:c7be4b8a09852291c3c48d3c25d1b876d2494a0a674980089ac9d5e0d78bd132", + "sha256:c9e5ffb910b14f090ac9c38599063e354887a5f6d7e6d26795e916b4514f2c1a", + "sha256:e0697b826da6c2472bb6488db4c0a7fa8af0d52fa08833ceb3681358914b14e5", + "sha256:e9a3edd5f714229d41057d56ac0f39ad9bdba6767e8c888c951869f0bdd129b0" + ], + "index": "pypi", + "version": "==6.2.1" + }, + "pyserial": { + "hashes": [ + "sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627", + "sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8" + ], + "index": "pypi", + "version": "==3.4" + }, "python-dateutil": { "hashes": [ "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", @@ -194,6 +252,14 @@ ], "version": "==0.2.1" }, + "serial": { + "hashes": [ + "sha256:542150a127ddbf5ed2acc3a6ac4ce807cbcdae3b197acf785bbda6565c94f848", + "sha256:e887f06e07e190e39174b694eee6724e3c48bd361be1d97964caef5d5b61c73b" + ], + "index": "pypi", + "version": "==0.0.97" + }, "six": { "hashes": [ "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", @@ -226,6 +292,7 @@ "sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398", "sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86" ], + "markers": "python_version >= '3.4'", "version": "==1.25.6" } }, diff --git a/sorteerhoed/central_management.py b/sorteerhoed/central_management.py index 0f9a2b5..fa1e6db 100644 --- a/sorteerhoed/central_management.py +++ b/sorteerhoed/central_management.py @@ -308,8 +308,8 @@ class CentralManagement(): self.eventQueue.put(Signal('scan.start')) cmd = [ 'sudo', 'scanimage', '-d', 'epkowa', '--format', 'jpeg', - '--resolution=100', '-l','20','-t','30','-x',str(self.config['scanner']['height']), - '-y',str(self.config['scanner']['width']) + '--resolution=100', '-l','20','-t','30','-x',str(255), + '-y',str(185) ] self.logger.info(f"{cmd}") filename = self.currentHit.getImagePath() diff --git a/www/backend.css b/www/backend.css index 771db0b..7b7c764 100644 --- a/www/backend.css +++ b/www/backend.css @@ -1,8 +1,3 @@ -@font-face { - font-family: 'bebas'; - src: url('font/BebasNeue-Regular.ttf'); -} - @font-face { font-family: 'freesans'; src: url('font/FreeSans.ttf') @@ -21,9 +16,9 @@ /* ////// GAT ACHTERKANT PLEK & POSITIE /////// */ /* */ /* */ - /* */ --pos-x: 20px; /* */ - /* */ --pos-y: 20px; /* */ - /* */ --width: 90%; /* 115mm */ + /* */ --pos-x: 0px; /* */ + /* */ --pos-y: 50px; /* */ + /* */ --width: 100%; /* 285mm */ /* */ --height: 100%; /* 500mm */ /* */ /* */ /* //////////////////////////////////////////// */ @@ -43,15 +38,33 @@ html, body{ overflow: hidden; } -#logo{ + + +#header{ background: #555; width: 100%; - padding: 2% 0% 1% 0%; - text-align: right; + padding: 2% 0% 30px 0%; + + +} + +#aai{ +position:absolute; + color: #fefefe; + padding-left: 50px; + font-size: 18px; + +} + +#header img{ +position: relative; +top: -5px; + padding-right: 50px; + float:right; + } #wrapper{ - position: absolute; left: var(--pos-x); top: var(--pos-y); @@ -68,7 +81,7 @@ table{ display: grid; border-collapse: collapse; min-width: 100%; - grid-template-columns: repeat(6, 1fr); + grid-template-columns: 50px repeat(6, 1fr) 50px; } thead, tbody, tr{ @@ -108,3 +121,5 @@ td { tr:nth-child(even) td { background: #f8f6f9; } + +