Commit Graph

66 Commits

Author SHA1 Message Date
VanillaHellen
681f434386 now adding timestamp 2021-01-25 16:25:31 +01:00
VanillaHellen
5ecd3cc79c Merge branch 'master' of https://git.wmi.amu.edu.pl/s406917/VisionScore into VIS-48 2021-01-25 15:47:35 +01:00
bednarco
c20509f16f help font resized 2021-01-25 15:00:58 +01:00
bednarco
a6a80f409c added link to detect.py 2021-01-25 13:35:24 +01:00
bednarco
b4d08d6d4e Merge branch 'VIS-29' 2021-01-23 11:13:53 +01:00
352a952d74 Merge branch 'VIS-39' 2021-01-18 17:01:45 +01:00
2e9af39f60 formatted help 2021-01-18 17:00:04 +01:00
VanillaHellen
5e24b10198 Merge remote-tracking branch 'origin/master' into VIS-40-VIS-41 2021-01-18 16:23:11 +01:00
cee755a4d6 Merge branch 'VIS-28' 2021-01-18 16:20:06 +01:00
a7a63366d9 added analyze button 2021-01-18 16:18:56 +01:00
e099f35953 Merge branch 'master' of https://git.wmi.amu.edu.pl/s406917/VisionScore 2021-01-18 16:15:46 +01:00
f812d68b36 Merge branch 'VIS-28' 2021-01-18 16:15:11 +01:00
8f98740280 Merge pull request 'VIS-40-VIS-41' (#9) from VIS-40-VIS-41 into master
Reviewed-on: #9
2021-01-18 16:14:37 +01:00
VanillaHellen
3156842621 Merge branch 'master' of https://git.wmi.amu.edu.pl/s406917/VisionScore into VIS-40-VIS-41 2021-01-18 16:14:22 +01:00
4544c8f398 Merge branch 'master' into VIS-40-VIS-41 2021-01-18 16:14:12 +01:00
e1a2b81a7f added analize button 2021-01-18 16:13:52 +01:00
VanillaHellen
1c7aa28ed0 fix 2021-01-18 16:13:21 +01:00
VanillaHellen
a4b04c7c8f added the view after uploading the file 2021-01-18 16:10:17 +01:00
bednarco
27136567d4 color_detect 2021-01-17 20:55:54 +01:00
0dd70ee9b7 Merge pull request 'VIS-37' (#8) from VIS-37 into master
Reviewed-on: #8
2021-01-11 16:25:46 +01:00
VanillaHellen
98c1768d4f fix 2021-01-11 16:24:30 +01:00
VanillaHellen
47a0a52475 refreshes the table after deleting the file 2021-01-11 16:22:46 +01:00
5cceb7c77f Merge branch 'VIS-38' 2021-01-11 10:25:27 +01:00
cf29bdc68b Added Help tab, changed Home to File 2021-01-11 10:24:05 +01:00
bednarco
f3b0d78b65 input/output folder 2021-01-11 09:11:40 +01:00
bednarco
954619b0a5 deep_sort tracking 2021-01-11 09:08:31 +01:00
bednarco
4d842583f0 clean-up 2021-01-04 16:50:41 +01:00
bednarco
60f51dcb25 object detection 2021-01-04 16:43:22 +01:00
a19168fc05 Merge pull request 'VIS-34' (#7) from VIS-34 into master
Reviewed-on: #7
2021-01-04 13:02:59 +01:00
VanillaHellen
2ef84b5fb3 Merge remote-tracking branch 'origin/master' into VIS-34 2021-01-04 13:01:40 +01:00
VanillaHellen
0ef2278faf changed Upload view 2021-01-04 12:58:04 +01:00
6ea143b46f Merge pull request 'created Visualisations tab with the same table' (#6) from VIS-32 into master
Reviewed-on: #6
2021-01-04 12:48:38 +01:00
VanillaHellen
5a37492188 created Visualisations tab with the same table 2021-01-04 12:47:36 +01:00
cbd200ea98 Merge pull request 'added popup confirmation' (#5) from VIS-26 into master
Reviewed-on: #5
2021-01-04 12:26:50 +01:00
VanillaHellen
5c7912aeab Merge remote-tracking branch 'origin/master' into VIS-26 2021-01-04 12:26:21 +01:00
e25ea9936d Merge pull request 'deleting the file' (#4) from VIS-24 into master
Reviewed-on: #4
2021-01-04 12:24:22 +01:00
ebba0059e2 Merge branch 'master' into VIS-24 2021-01-04 12:24:16 +01:00
VanillaHellen
36d5a30be0 added popup confirmation 2021-01-04 12:23:17 +01:00
VanillaHellen
f75fb1f333 deleting the file 2021-01-04 12:22:19 +01:00
2c19e7f472 added test output file 2020-12-21 23:47:55 +01:00
21b49e425d added 2nd test 2020-12-21 23:45:46 +01:00
467f8e5578 Merge branch 'TESTS' 2020-12-21 23:12:23 +01:00
59fb733468 added save_input unittest 2020-12-21 23:10:17 +01:00
d02d0e53d1 Merge branch 'TESTS' 2020-12-21 22:43:51 +01:00
fcb6d5f225 fixed uploading file 2020-12-21 22:42:37 +01:00
ec69d2df9d Merge branch 'master' into TESTS 2020-12-21 21:45:09 +01:00
6f22a62e91 Merge branch 'master' of https://git.wmi.amu.edu.pl/s406917/VisionScore 2020-12-21 21:41:01 +01:00
ffdb50f07f changed format of main window to class 2020-12-21 21:39:56 +01:00
a0790ead09 Merge pull request 'added View function and a txt file to test it' (#3) from VIS-23 into master
Reviewed-on: #3
2020-12-21 18:20:16 +01:00
VanillaHellen
ece0e50d51 added View function and a txt file to test it 2020-12-21 18:18:47 +01:00