r/guest_worker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
mt 2019-11-03 16:26:14 +01:00
commit f26c92175d
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sorteerhoed/HITStore.py
View file

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

6
sorteerhoed/central_management.py
View file

@ -342,7 +342,11 @@ class CentralManagement():
self.eventQueue.put(Signal('scan.start')) self.eventQueue.put(Signal('scan.start'))
# Scan to reset # Scan to reset
cmd = [ 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) proc = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
# opens connection to scanner, but only starts scanning when output becomes ready: # opens connection to scanner, but only starts scanning when output becomes ready: