From 7926ab34553b5ae338ccf099b4abdda19b7cd38b Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Thu, 29 Jul 2021 21:42:58 +1000 Subject: [PATCH] allowed view prev/next to remember settings (fname, faces, distance) --- files.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/files.py b/files.py index a0683fa..009a0b2 100644 --- a/files.py +++ b/files.py @@ -454,30 +454,44 @@ def move_files(): @app.route("/viewnext", methods=["GET","POST"]) @login_required def viewnext(): + sels={} + sels['fname']='true' + sels['faces']='true' + sels['distance']='true' if request.method=="POST": id = request.form['current'] eids=request.form['eids'] + sels['fname']=request.form['fname'] + sels['faces']=request.form['faces'] + sels['distance']=request.form['distance'] lst = eids.split(',') new_id = lst[lst.index(id)+1] obj = Entry.query.join(File).filter(Entry.id==new_id).first() # put locn data back into array format for face in obj.file_details.faces: face.locn = json.loads(face.locn) - return render_template("viewer.html", obj=obj, eids=eids) + return render_template("viewer.html", obj=obj, eids=eids, sels=sels ) @app.route("/viewprev", methods=["GET","POST"]) @login_required def viewprev(): + sels={} + sels['fname']='true' + sels['faces']='true' + sels['distance']='true' if request.method=="POST": id = request.form['current'] eids=request.form['eids'] + sels['fname']=request.form['fname'] + sels['faces']=request.form['faces'] + sels['distance']=request.form['distance'] lst = eids.split(',') new_id = lst[lst.index(id)-1] obj = Entry.query.join(File).filter(Entry.id==new_id).first() # put locn data back into array format for face in obj.file_details.faces: face.locn = json.loads(face.locn) - return render_template("viewer.html", obj=obj, eids=eids) + return render_template("viewer.html", obj=obj, eids=eids, sels=sels ) @app.route("/view/", methods=["GET","POST"]) @login_required @@ -491,7 +505,11 @@ def view_img(id): eids=request.form['eids'] else: eids='' - return render_template("viewer.html", obj=obj, eids=eids) + sels={} + sels['fname']='true' + sels['faces']='true' + sels['distance']='true' + return render_template("viewer.html", obj=obj, eids=eids, sels=sels ) # route called from front/end - if multiple images are being rotated, each rotation == a separate call # to this route (and therefore a separate rotate job. Each reponse allows the f/e to check the