Commit Graph

216 Commits

Author SHA1 Message Date
valorun ae93995a5d Filter scalar function 2020-04-29 19:19:46 +02:00
valorun 6d850ccc54 finalise merge 2020-04-29 16:59:33 +02:00
Ronan COLLIER 5e06433930 Merge branch 'features/segmenter' into 'develop'
Features/segmenter

See merge request E164955Z/ptrans!3
2020-04-29 16:55:44 +02:00
Ronan COLLIER 42cf7da8c5 Merge branch 'develop' into 'features/segmenter'
# Conflicts:
#   ColorimetricSegmenter.cpp
2020-04-29 16:55:26 +02:00
valorun c65d63aaae Merge branch 'develop' into features/segmenter 2020-04-29 16:46:22 +02:00
Tri-Thien TRUONG 380e186d86 commentaires 2020-04-29 16:15:26 +02:00
Tri-Thien TRUONG 59e6ec7417 ajout choix points HSV 2020-04-29 16:11:14 +02:00
Tri-Thien TRUONG 65448adc91 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-04-29 00:18:54 +02:00
Tri-Thien TRUONG 431882e054 dev retain/excude 2020-04-29 00:18:47 +02:00
Mathieu Letrone d0a87cab0f Ajout tone mapping + CIELAB 2020-04-28 14:19:13 +02:00
Tri-Thien TRUONG 191bb172d5 correction compilation 2020-04-27 20:59:37 +02:00
Tri-Thien TRUONG 161fd6b825 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164952Z/ptrans into develop 2020-04-27 20:51:44 +02:00
Tri-Thien TRUONG c5f6dafee2 gantt 4 et 5 2020-04-27 20:51:34 +02:00
valorun 50f8cd0a22 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164954Z/ptrans into develop 2020-04-27 19:27:15 +02:00
valorun 553d4977e2 ajout algo segmentation 2020-04-27 19:26:46 +02:00
Tri-Thien TRUONG 3ef3f04fa9 modif rapport description 2020-04-27 18:53:02 +02:00
Tri-Thien TRUONG bf060bb022 fin hsv 2020-04-27 17:31:51 +02:00
Tri-Thien Truong 48552961cb avancement hsv 2020-04-27 17:12:22 +02:00
valorun fcf2b01e06 doc 2020-04-27 13:14:50 +02:00
valorun a73d74d1c6 added some doc 2020-04-27 11:27:40 +02:00
Tri-Thien TRUONG df6f35968f modif ui 2020-04-25 18:57:11 +02:00
Tri-Thien TRUONG 35f3d0a6f0 desactivage filtre 2020-04-25 18:29:13 +02:00
Tri-Thien TRUONG 927e0eaf69 modif description systeme beta 2020-04-25 17:37:08 +02:00
Tri-Thien TRUONG 0417032bcb revet systeme alpha 2020-04-25 17:13:58 +02:00
Tri-Thien TRUONG 8515859848 description systeme beta 2020-04-25 17:10:33 +02:00
valorun d72f6ba6db utilisation nouvelle méthode KNN 2020-04-23 18:46:37 +02:00
Tri-Thien Truong f26b7098ac mise en page 2020-04-19 17:27:59 +02:00
valorun 57cb608e44 algo de ségmentation rapport d'itération 5 2020-04-19 17:21:50 +02:00
Mathieu LETRONE a2975d1be2 corrections 2020-04-19 16:33:36 +02:00
valorun 75b94119ae test debug 2020-04-19 15:57:39 +02:00
Tri-Thien Truong cfefc6b95d objectifs, commentaires 2020-04-19 15:33:53 +02:00
Tri-Thien Truong 48abbc09c4 ajout rgb 2020-04-19 15:16:28 +02:00
Tri-Thien TRUONG 98e2066084 fix bugs 2020-04-16 10:20:09 +02:00
Mathieu Letrone 9e22ef801f Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-04-15 16:01:33 +02:00
Mathieu Letrone eea71abbd5 Toon mapping rapport 2020-04-15 16:01:03 +02:00
Tri-Thien Truong 8eac9dc831 hsv 2020-04-15 14:52:16 +02:00
Tri-Thien Truong d21cd9cf67 ajout commentaires + exportation plugin 2020-04-15 13:54:36 +02:00
Tri-Thien Truong da29f3e068 iteration 5 2020-04-15 12:13:34 +02:00
Tri-Thien TRUONG e093dfc08a ajout commentaires 2020-03-20 16:52:31 +01:00
Tri-Thien TRUONG 7953d1d1cb comments ColorimetricSegmenter 2020-03-18 17:37:51 +01:00
Tri-Thien TRUONG 8fba1cabbc ajout rapport hebdo 2020-03-18 11:13:31 +01:00
Tri-Thien TRUONG cd795edbfd Merge branch 'newUiColorFilter' into 'develop'
Merge newUiColorFilter to develop

See merge request E164955Z/ptrans!2
2020-03-18 10:35:55 +01:00
Tri-Thien Truong e6c9b5d1d4 fin rapport 4 2020-03-15 13:53:48 +01:00
Mathieu LETRONE 40f50ced6e Objectifs 2020-03-15 12:33:27 +01:00
Tri-Thien Truong d3d86c5f33 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-03-14 17:13:24 +01:00
Tri-Thien Truong 9975787033 ajout objectifs 2020-03-14 17:13:20 +01:00
valorun 1f8fd7fbb4 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-03-14 17:12:00 +01:00
valorun d1c0ec04b5 risques + objectifs 2020-03-14 17:09:15 +01:00
Tri-Thien Truong b137c18afd ajout objectif 2020-03-14 17:06:57 +01:00
Tri-Thien Truong 521cbdcc85 ajout filtrage rgb 2020-03-14 16:56:12 +01:00