Merge branch 'master' of gitlab.com:rubenvandeven/sorteerhoed

sorteerhoed/HITStore.py

@@ -56,6 +56,7 @@ class HIT(Base):
     turk_screen_height = Column(Integer, default = None)
     scanned_at = Column(DateTime, default=None)
     fee = Column(Float(precision=2), default=None)
+    abandoned = False
     
     
     def getImagePath(self):
@@ -81,7 +82,10 @@ class HIT(Base):
             return "working"
         if self.accept_time:
             return "accepted by worker"
-        return "created"
+        # on abandon:
+        if self.worker_id:
+            return "abandoned / awaiting worker"
+        return "awaiting worker"
         
 
 

sorteerhoed/central_management.py

@@ -342,7 +342,11 @@ class CentralManagement():
             self.eventQueue.put(Signal('scan.start'))
             # Scan to reset
             cmd = [
-                'sudo', 'scanimage', '-d', 'epkowa'
+                'sudo', 'scanimage', '-d', 'epkowa','--resolution=100',
+                '-l','25' #y axis, margin from top of the scanner, hence increasing this, moves the scanned image upwards
+                ,'-t','22', # x axis, margin from left side scanner (seen from the outside)
+        '-x',str(181),
+            '-y',str(245)
             ]
             proc = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
             # opens connection to scanner, but only starts scanning when output becomes ready: