Commit Graph

779 Commits

Author SHA1 Message Date
1bd30e106e arrow keys now switches viewed image 2021-07-17 23:55:27 +10:00
ffa2dd91f5 made refimg <-> person connection viewonly to avoid ORM confusion 2021-07-17 23:55:12 +10:00
ae39c26b8f removed debugs, added faces to class File, use f print string format, hacky json.loads of face locn data to put it back to being an array -- and of course storing that in the class 2021-07-17 16:38:50 +10:00
24c4b962e5 now draws green rectangle and person.tag for matches on faces -- need to fix interface, but it works - lots of "plumbing" across database/classes and this viewer.html to get this to work 2021-07-17 16:37:43 +10:00
1df519ee37 remove own copy of GenThumb, and use the one from shared.py. Also use zip() to merge face locations and encodings for AddFaceToFile() 2021-07-17 16:36:34 +10:00
08ef9ea224 added locan data to face 2021-07-17 16:35:40 +10:00
d4964948e1 add todo for being smarter with json.loads column types 2021-07-17 16:35:29 +10:00
3827836381 added person to refimg class so it can be used in viewer.html 2021-07-17 16:33:16 +10:00
6737664c4c remove debug 2021-07-17 16:32:45 +10:00
46d79ddc6a added location and refimg connections face class 2021-07-17 16:30:58 +10:00
bba68dfb36 reminder to show faces in viewer once we redo scanning 2021-07-16 22:30:22 +10:00
e1a3ad388c added small spaces before first row of images to stop squishing into navbar, added flipping / made that work, and now show thumbnail after rotation/flip is finished - all works, and removed debugs 2021-07-16 22:28:44 +10:00
99e99da340 return thumbnail when successful rotation 2021-07-16 22:27:30 +10:00
3ac6f143f4 first pass of rotation sub-menu on images. It only posts on Image. For each selection it turns thumbnail gray, overlays a centered color spinning wheel, posts to the f/e to create a rotation job, gets the job id back, keeps checking the f/e to see when the job id is done, and when it is (for now) undoes the spinning wheel/grayscale - will return new thumb once done and pa_job_mgr has no code to handle job as yet 2021-07-16 21:08:16 +10:00
d42ac8c8b5 string / int strictness issue causing default size to not highlight button - fixed 2021-07-16 17:52:31 +10:00
6e6f59fdd5 more cases of not using px explicitly not working, fixed for icon overlays on search/file view 2021-07-16 17:16:19 +10:00
f30ca16552 added viewnext and viewprev routes and plumbed these in to the file viewer code. Viewer code now works has a prev/next button, and handles videos 2021-07-15 20:23:02 +10:00
d03f5c99b0 added <!DOCTYPE html> 2021-07-15 20:21:52 +10:00
Damien De Paoli
46ac6869a3 Merge branch 'master' of 192.168.0.2:photoassistant 2021-07-12 19:24:09 +10:00
Damien De Paoli
5d6ea32ec5 added flask_login 2021-07-12 19:24:00 +10:00
f394e39c2f refimgs now contain face, orig_w, orig_h and face_locns. This is done via json.* to allow arrays to be saved/loaded back into face_locn - not useful for refimg as there has to be only 1, but tested for images where there will be many faces. This commit has a fair few changes. So overall, no more refimg menus/creation. You now create a person (the add button is hidden until you save), when you save you go back to the person you created rather than the list of persons. From there you can click add ref img, and it will create a thumbnail, and draw a green box around the face locations based on the data. Persons can have many refimgs, and they will all work the same, be formatted prettily no matter how many you have. Each refimg "tab" not only has the thumbnail, but also a red X click to delete button that will remove all refimg data and connection to the person table too. This all works/is tested. 2021-07-11 22:35:59 +10:00
ce81898a07 another useful sql for finding usable list of filenames that equate to a search 2021-07-11 22:32:03 +10:00
e622774c0f made GenThumb return thumb and orig_w, orig_h - not sure this stays, but for optimising it prob. will -- its not being used in pa_job_mgr yet, and that will see the final version of this 2021-07-11 22:31:37 +10:00
955df598ee remove encodings, add face, orig_w, orig_h, face_locn to refimg table AND remove DEV refimg data, it needs to be done in the UI now 2021-07-11 22:30:57 +10:00
32209d9ba6 added tiny thumbnails to person list 2021-07-11 22:30:01 +10:00
cd6a42088d remove old refimg.encodings generation, we now do this when we make a person/refimg, so its always done before an AI job needs to use it 2021-07-11 22:29:38 +10:00
3dbcf68dad force session commit in AddLogForJob() if no recent commit - 5 seconds 2021-07-07 18:05:24 +10:00
fbd9e72f28 updated TODO to remove AI job count issues, and added optimised AI searching code to reduce DB queries on recursion into dirs 2021-07-07 17:42:00 +10:00
8b857bf994 Fixed: BUG-40: RunAI file counts broken 2021-07-06 17:45:15 +10:00
17180d9f24 removed debugs 2021-07-06 17:44:26 +10:00
3c56cac1ef fix up selections to work with ctrl/shift and right-click -- its a bit clunky but works, redid numbering to make that work and condensed down to 1 common code block for context menu for figures and dirs now 2021-07-06 17:40:53 +10:00
95303fafac fixed BUG-41 and 43, via new refimg -> person code changes 2021-07-05 16:53:00 +10:00
2e06c0b285 moved class Refimg to person, and ditched all other routes/direct access to ref images, they are only a part of Person in UI now 2021-07-05 16:51:44 +10:00
aabf4b2c8f more thoughts 2021-07-04 20:22:27 +10:00
65d781c1d6 use r.face now, instead of r.encodings - prep for big cutover to new refimg DB and thumb/face creation 2021-07-04 20:20:20 +10:00
95b8b4e17b use r.face now, instead of r.encodings - prep for big cutover to new refimg DB and thumb/face creation 2021-07-04 20:20:02 +10:00
9fe8289239 make this at least work with new DB structures, remove dead code - BUT prob. delete routes? 2021-07-04 20:19:27 +10:00
6f95260ce2 remove new from fname, doh! 2021-07-04 20:18:58 +10:00
9e3612578c use new shared version of GenThumb, add face / thumb into refimg class - still need much more to optimise refimg usage/creation in AI jobs, but it works 2021-07-04 20:08:18 +10:00
e26c992c0f make it clear if we are on DEV or PROD -> pass env thru app.config to base.html 2021-07-04 20:06:53 +10:00
d608531cab reference images are now added in person.py (and removed) as buttons on person page. Will need to re-think the whole of refimg.py 2021-07-04 20:06:17 +10:00
d3df3ad754 make it clear if we are on DEV or PROD 2021-07-04 20:06:04 +10:00
ddc9b18e3e reference images now create thumb and face on first association, so have DB for that 2021-07-04 20:05:47 +10:00
388c3eed9b reference images are now added in person.py (and removed) as buttons on person page. Will need to re-think the whole of refimg.py 2021-07-04 20:05:15 +10:00
b811f8710e moved GenFace and GenThumb common code into shared, and hook it in both f/e and b/e where needed 2021-07-04 20:04:25 +10:00
518df7ee10 removed all remnants of FILE_REFIMG_LINK 2021-07-03 12:43:25 +10:00
a916fb8192 minor update 2021-07-03 12:30:01 +10:00
aa826f6933 if > 100 logs, truncate them and add button to show all logs, and stop auto-refresh too 2021-07-03 12:29:19 +10:00
c1177b7c0f if > 100 logs, truncate them and add button to show all logs, and stop auto-refresh too 2021-07-03 12:29:01 +10:00
91322d438c dont chown -R the whole of static, as the build process will follow symlinks -- we dont want that, so just do the top-level of static 2021-07-03 12:03:56 +10:00