Commit Graph

606 Commits

Author SHA1 Message Date
cd51ea21bf quick add of default_{model|threshold} to settings, face_refimg_link now stores model_used and face_distance AND working implementation of own face_distance algorithm rather than compareAI(), removed older AI code it would no longer work with DB structures anyway, tweaked viewer to remove coords of unmatched faces for now 2021-07-26 18:39:36 +10:00
555ce70577 renamed AI_Model to AIModel for consistency, added it as a functioning drop-down select on settings page, added face_distance to db and code, put face_distance model_used into all classes ready for use 2021-07-25 15:13:39 +10:00
f6f67b8a69 move import order around, not needed in the end, but doesnt matter so keep it 2021-07-25 15:12:29 +10:00
b40ecbf208 put svgs in icons.svg and reference appropriately, still not happy with pa_logo, but otherwise all working 2021-07-25 13:19:01 +10:00
4f9e03f99e added ai model settings 2021-07-25 13:18:21 +10:00
c6a31f24e5 added ai model settings 2021-07-25 13:18:18 +10:00
04fa819a9a bootstrap 5 done 2021-07-22 21:29:09 +10:00
d25c4fae62 removed last font-awesome and obv. bootstrap5 items 2021-07-22 21:28:54 +10:00
ef6759c5ed use svg / remove -lg- / bootstrap 5 2021-07-22 20:44:10 +10:00
4f471ffa5a remove -lg- / bootstrap 5 2021-07-22 20:43:11 +10:00
bd51f86d82 remove -lg- / bootstrap 5 2021-07-22 20:42:50 +10:00
3757c942e6 more bootstrap 5 fixes 2021-07-22 19:54:18 +10:00
f3b0cc5ecc more bootstrap 5 fixes 2021-07-22 19:53:21 +10:00
07408278b1 more bootstrap 5 fixes 2021-07-22 19:53:09 +10:00
085dbcdf3a more bootstrap 5 fixes 2021-07-22 19:51:54 +10:00
e9020373c6 more bootstrap 5 fixes 2021-07-22 19:51:07 +10:00
2064e02ae8 clean up status message for when refimg removed from person 2021-07-22 19:49:09 +10:00
347532daef fix up exception to not crash with further unset variables 2021-07-22 19:48:02 +10:00
915063a7a7 semi fixed move dbox, the input group is still not right, but it will suffice, more use of svg and ditching font awesome 2021-07-22 00:50:45 +10:00
6b6e7bc901 bootstrap 5 grid "fixups" for viewer 2021-07-20 22:04:52 +10:00
f52ba689b7 more bootstrap 5 fixes, badge colors, data-bs-target, padding 2021-07-20 22:04:31 +10:00
678e18b89d disable next button when we have no more int he list -- doesnt deal with when we exactly land on the last image, and it seems we have 1 too many in the first set of images (have 10 on select, but see 11 on page - after next button though its 10 on the page 2021-07-20 19:08:32 +10:00
b9f05d64f8 okay this now works with bootstrap 5, I dont love the sz buttons / mixed black and white hover text needs love - probably own class with own styles, but I dont want to hard-code info color, need to work out how to do style / css using the right bs variable for info color 2021-07-20 19:03:14 +10:00
44620f1e18 viewer now has toggle to turn on face bounding box + nametag 2021-07-19 18:48:39 +10:00
6355cff98e quick update 2021-07-19 18:46:13 +10:00
7e360270a7 make use of row / col consistent to fix up odd title/buttons wrong left-hand margin / sizing 2021-07-19 18:45:57 +10:00
eddc00d4a9 fixup missing explicit px; 2021-07-19 18:45:23 +10:00
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