From f329f602bf8453224f55b6f60d717287b4ef25dc Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Sun, 3 Nov 2019 16:11:34 +0100 Subject: [PATCH 1/2] Reset now full speed --- sorteerhoed/central_management.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sorteerhoed/central_management.py b/sorteerhoed/central_management.py index 14e30bc..ff61b5f 100644 --- a/sorteerhoed/central_management.py +++ b/sorteerhoed/central_management.py @@ -338,7 +338,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: From f356723d5a3b59c2dc9528eded3977b915403d0c Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Sun, 3 Nov 2019 16:21:08 +0100 Subject: [PATCH 2/2] Message on abandon --- sorteerhoed/HITStore.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sorteerhoed/HITStore.py b/sorteerhoed/HITStore.py index 986e7d1..20ed307 100644 --- a/sorteerhoed/HITStore.py +++ b/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"