saberbud/ptrans
1
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/E164955Z/ptrans.git synced 2026-08-30 00:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
251 Commits 8 Branches 0 Tags
aedf3933ff4850c33c8af31982cb86c8f4587f93
Commit Graph

251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu LETRONE aedf3933ff Merge branch 'features/ToneMapping' into 'develop' 
patch ui

See merge request E164955Z/ptrans!6
 2020-05-07 11:24:41 +02:00
Mathieu Letrone 30e7108f83 patch ui 2020-05-07 11:20:12 +02:00
Mathieu LETRONE 893896069e correctifs mineurs 2020-05-06 21:54:19 +02:00
valorun 23bc993799 relecture + fix fautes 2020-05-06 21:03:25 +02:00
Tri-Thien TRUONG fee6ce95de mise en page 2020-05-06 20:16:29 +02:00
Tri-Thien TRUONG ca0319b93c mise en page 2020-05-06 19:54:57 +02:00
Tri-Thien TRUONG 60290242cb relecture + conclusion 2020-05-06 19:33:44 +02:00
Tri-Thien TRUONG 5cb9a2322e relecture 2020-05-06 19:16:01 +02:00
Tri-Thien TRUONG 21aa5680ca Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-05-06 19:05:42 +02:00
Tri-Thien TRUONG f851a13d6c modif explication tableau d'avancement 2020-05-06 19:05:39 +02:00
valorun 100cc22aa3 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-05-06 19:01:00 +02:00
valorun fcf407fb4c modif filtrage scalaire 2020-05-06 19:00:36 +02:00
Tri-Thien TRUONG 2c76b0b067 correction 2020-05-06 18:56:53 +02:00
Tri-Thien TRUONG a6514fe775 modification image scalaire 2020-05-06 18:49:55 +02:00
Tri-Thien TRUONG 64db6a8a9c fix merge 2020-05-06 18:42:00 +02:00
Tri-Thien TRUONG 8829cf9b7b ajout choix sous-scans + ui hsv 2020-05-06 18:39:43 +02:00
Mathieu Letrone 36dece1d66 maj taches + correctif tonemapping 2020-05-06 15:36:04 +02:00
valorun 9930c15a5c Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-05-06 14:10:32 +02:00
valorun 25a89abc16 fix bornes scalaires, + ajout images 2020-05-06 14:09:40 +02:00
valorun dbbcee3c59 ajout partie filtrage scalaire 2020-05-06 12:30:56 +02:00
Tri-Thien TRUONG 50a46f47c7 relecture 2020-05-06 12:09:41 +02:00
Tri-Thien TRUONG aff358608b Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-05-06 11:38:08 +02:00
Tri-Thien TRUONG af6f9a6b2b update hsv 2020-05-06 11:37:58 +02:00
valorun 6b85c0e14b Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-05-06 11:32:23 +02:00
valorun 671e8405c4 fix nom img + ajout biblio 2020-05-06 11:31:19 +02:00
Tri-Thien TRUONG 97d422872d iteration 6 2020-05-06 11:17:48 +02:00
Ronan COLLIER d20b9a15c8 Merge branch 'features/ToneMapping' into 'develop' 
Features/tone mapping

See merge request E164955Z/ptrans!5
 2020-05-04 15:33:18 +02:00
Mathieu Letrone 6408e6b32c correctifs 2020-05-02 11:04:24 +02:00
Mathieu Letrone a53bfa35d3 Ajout contenu branch ToonMapping 2020-05-02 10:27:30 +02:00
Tri-Thien TRUONG 58371c57c9 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-04-30 16:34:47 +02:00
Tri-Thien TRUONG 1357dfcb6d modif rgb + ui 2020-04-30 16:34:44 +02:00
valorun 12136cf260 Merge branch 'develop' of https://gitlab.univ-nantes.fr/E164955Z/ptrans into develop 2020-04-30 14:50:17 +02:00
valorun 8c0f50c7b2 fix knnResult 2020-04-30 14:49:43 +02:00
Ronan COLLIER 63a09839d9 Merge branch 'features/segmenter' into 'develop' 
Features/segmenter

See merge request E164955Z/ptrans!4
 2020-04-29 21:02:13 +02:00
valorun 09b6c82577 scalar color 2020-04-29 20:59:13 +02:00
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