Commit Graph

619 Commits

Author SHA1 Message Date
6ce92c3398 remove debug 2021-07-29 21:47:27 +10:00
10b2c5cc34 more work on viewer 2021-07-29 21:45:11 +10:00
c0a8ab8f79 allowed view prev/next to remember settings (fname, faces, distance) and use new CreateSelect() for AI menu, also make fname toggle actually do that 2021-07-29 21:44:54 +10:00
7926ab3455 allowed view prev/next to remember settings (fname, faces, distance) 2021-07-29 21:42:58 +10:00
dc35417933 allowed CreateSelect to take list of values for options - used in cnn/hog AI model menu in viewer 2021-07-29 21:42:35 +10:00
566985a477 put face file link here so we can see model in viewer 2021-07-29 21:41:42 +10:00
ebeb085326 alter desc 2021-07-29 21:41:13 +10:00
e0802bc573 move to form toggles, made them bg-info colours give or take, made the fname, face & distance toggles work. The model drop-down is not set correctly, or taking action, but mara needs more rel mem to run cnn model anyway 2021-07-28 21:42:40 +10:00
220200f017 face_distance is a float, also pass model through correctly to FaceFileLink 2021-07-28 21:41:35 +10:00
bd28c0cf64 face_distance is a float 2021-07-28 21:35:12 +10:00
6fb0a0b5db fix up __repr__ for classes to cover model_used, face_distance fields, and viewonly used for refimg_link so we can print face_distance in viewer 2021-07-28 21:34:56 +10:00
b7d346c206 model_used is now per file, not per face, implemented split of default_model to default_refimg_model and default_scan_model in settings, and default_refimg_model actualy works when creating refimgs in person.py. The model_used in face_file_link is based on default settings model and will scan with cnn if chosen and store that in DB as needed. Need viewer to allow changing per file / not just default for future scans 2021-07-27 17:14:03 +10:00
50e28ed27c model_used is not per face, but really per file - well that is how the UI will allow this... for now 2021-07-27 17:11:45 +10:00
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