From d34c14b05d42576b62071e87a10f53c20e15cc16 Mon Sep 17 00:00:00 2001 From: Chris Rorden Date: Sat, 15 Jul 2017 08:54:09 -0400 Subject: [PATCH] Update notes --- .DS_Store | Bin 12292 -> 12292 bytes Distro/lut/montserrat.fnt | 30 +++++++++--------- Distro/lut/ubuntu.fnt | 8 ++--- .../Contents/Resources/lut/montserrat.fnt | 30 +++++++++--------- .../Contents/Resources/lut/ubuntu.fnt | 8 ++--- README.md | 2 ++ lut/montserrat.fnt | 30 +++++++++--------- lut/ubuntu.fnt | 8 ++--- 8 files changed, 59 insertions(+), 57 deletions(-) diff --git a/.DS_Store b/.DS_Store index 195ed7a9ca88514c532955b455d30e1e10fea0cb..16dcfde2bedcc8894bf49d092cacaae3c6478ee2 100644 GIT binary patch delta 181 zcmV;m080OaV1!_>JOq=*6u1EovwszW0kd}o!3hBllfNUC1ypWfZDo_)5F`&?WMOn= zOks0$PjF>!Wn_~97(xjO3J?Gh0S^fYlS>#<2n!1k2oT5!2$L}-Jqxh_y#T@h$N7qj}jcS*AguqqHr*m delta 650 zcmZ{h&ubGw9L49w8fRvunM8wWO;bxCMAK-gNHtbWTYsQ!6)`c5Ez)gfY*&+wWs_4{Gry;?06ygo3Cj-aL3!&(3BGo}9zL_r00#eBWnQ=U3;Sjdlg179`s$A}pTN@qQNqM`Ke%Y48{GGWq!W8L0tk>Y74+72sRx9rWk8J?v= zvSQU-P*uO(5Fe&ul9gJj;aGLs7Z33f8pa@-snlyVJ)+~wIb)QHb$Z2ne9Cm1=Wi(c z-&lD{%bqhPrIN{fnt03o6x>&NN?wpx{3O4~Z}JBL7}$<( zgs>BRNMH{Jkir2BVHgK-1ml>%Nu0ttlrV!?%t66M9XHXy9X!M%JYKsH{K4GU$?t6= z&J+IwUeqMiN++7wwy`VL(`#sMUM4~PGG(Nx<}L!Al4p#pM^$X`-3~0t#8%(cn3!;w z=Fu#8){i+i|_2kvyFhTZOyNPO*MB-{5F67QLU diff --git a/Distro/lut/montserrat.fnt b/Distro/lut/montserrat.fnt index 2ce51cc..32653c5 100644 --- a/Distro/lut/montserrat.fnt +++ b/Distro/lut/montserrat.fnt @@ -2,18 +2,18 @@ info face="Montserrat-Regular" size=47 bold=0 italic=0 charset="" unicode=0 stre common lineHeight=58 base=46 scaleW=128 scaleH=128 pages=1 packed=0 page id=0 file="numbers.png" chars count=15 -char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=0 page=0 chnl=0 -char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=12 page=0 chnl=0 -char id=45 x=103 y=43 width=21 height=12 xoffset=-2 yoffset=26 xadvance=17 page=0 chnl=0 -char id=46 x=102 y=86 width=14 height=14 xoffset=-2 yoffset=37 xadvance=10 page=0 chnl=0 -char id=48 x=0 y=43 width=36 height=43 xoffset=-1 yoffset=8 xadvance=33 page=0 chnl=0 -char id=49 x=102 y=0 width=21 height=41 xoffset=-4 yoffset=9 xadvance=17 page=0 chnl=0 -char id=50 x=36 y=43 width=33 height=42 xoffset=-3 yoffset=8 xadvance=27 page=0 chnl=0 -char id=51 x=69 y=43 width=34 height=42 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 -char id=52 x=33 y=86 width=35 height=41 xoffset=-4 yoffset=9 xadvance=28 page=0 chnl=0 -char id=53 x=0 y=86 width=33 height=42 xoffset=-2 yoffset=9 xadvance=29 page=0 chnl=0 -char id=54 x=0 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=55 x=68 y=86 width=34 height=41 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 -char id=56 x=34 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=57 x=68 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=101 x=0 y=128 width=33 height=35 xoffset=-3 yoffset=16 xadvance=28 page=0 chnl=0 +char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=12 page=0 chnl=0 +char id=45 x=103 y=43 width=21 height=12 xoffset=-2 yoffset=26 xadvance=17 page=0 chnl=0 +char id=46 x=102 y=86 width=14 height=14 xoffset=-2 yoffset=37 xadvance=10 page=0 chnl=0 +char id=48 x=0 y=43 width=36 height=43 xoffset=-1 yoffset=8 xadvance=33 page=0 chnl=0 +char id=49 x=102 y=0 width=21 height=41 xoffset=-4 yoffset=9 xadvance=18 page=0 chnl=0 +char id=50 x=36 y=43 width=33 height=42 xoffset=-3 yoffset=8 xadvance=27 page=0 chnl=0 +char id=51 x=69 y=43 width=34 height=42 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 +char id=52 x=33 y=86 width=35 height=41 xoffset=-4 yoffset=9 xadvance=28 page=0 chnl=0 +char id=53 x=0 y=86 width=33 height=42 xoffset=-2 yoffset=9 xadvance=29 page=0 chnl=0 +char id=54 x=0 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=55 x=68 y=86 width=34 height=41 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 +char id=56 x=34 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=57 x=68 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=101 x=0 y=128 width=33 height=35 xoffset=-3 yoffset=16 xadvance=28 page=0 chnl=0 diff --git a/Distro/lut/ubuntu.fnt b/Distro/lut/ubuntu.fnt index 7686f18..2968130 100644 --- a/Distro/lut/ubuntu.fnt +++ b/Distro/lut/ubuntu.fnt @@ -6,13 +6,13 @@ char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 x char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=11 page=0 chnl=0 char id=45 x=92 y=85 width=20 height=13 xoffset=-3 yoffset=21 xadvance=14 page=0 chnl=0 char id=46 x=112 y=43 width=15 height=15 xoffset=-2 yoffset=34 xadvance=9 page=0 chnl=0 -char id=48 x=89 y=0 width=31 height=43 xoffset=-2 yoffset=6 xadvance=27 page=0 chnl=0 -char id=49 x=90 y=43 width=22 height=41 xoffset=-3 yoffset=7 xadvance=17 page=0 chnl=0 +char id=48 x=89 y=0 width=31 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 +char id=49 x=90 y=43 width=22 height=41 xoffset=-3 yoffset=7 xadvance=18 page=0 chnl=0 char id=50 x=0 y=43 width=30 height=42 xoffset=-2 yoffset=6 xadvance=27 page=0 chnl=0 char id=51 x=0 y=0 width=29 height=43 xoffset=-2 yoffset=6 xadvance=25 page=0 chnl=0 char id=52 x=0 y=85 width=32 height=41 xoffset=-3 yoffset=7 xadvance=27 page=0 chnl=0 -char id=53 x=30 y=43 width=29 height=42 xoffset=-1 yoffset=7 xadvance=25 page=0 chnl=0 -char id=54 x=59 y=43 width=31 height=42 xoffset=-2 yoffset=7 xadvance=27 page=0 chnl=0 +char id=53 x=30 y=43 width=29 height=42 xoffset=-1 yoffset=7 xadvance=24 page=0 chnl=0 +char id=54 x=59 y=43 width=31 height=42 xoffset=-2 yoffset=7 xadvance=26 page=0 chnl=0 char id=55 x=32 y=85 width=30 height=41 xoffset=-2 yoffset=7 xadvance=26 page=0 chnl=0 char id=56 x=29 y=0 width=30 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 char id=57 x=59 y=0 width=30 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 diff --git a/MRIcroGL.app/Contents/Resources/lut/montserrat.fnt b/MRIcroGL.app/Contents/Resources/lut/montserrat.fnt index 2ce51cc..32653c5 100644 --- a/MRIcroGL.app/Contents/Resources/lut/montserrat.fnt +++ b/MRIcroGL.app/Contents/Resources/lut/montserrat.fnt @@ -2,18 +2,18 @@ info face="Montserrat-Regular" size=47 bold=0 italic=0 charset="" unicode=0 stre common lineHeight=58 base=46 scaleW=128 scaleH=128 pages=1 packed=0 page id=0 file="numbers.png" chars count=15 -char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=0 page=0 chnl=0 -char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=12 page=0 chnl=0 -char id=45 x=103 y=43 width=21 height=12 xoffset=-2 yoffset=26 xadvance=17 page=0 chnl=0 -char id=46 x=102 y=86 width=14 height=14 xoffset=-2 yoffset=37 xadvance=10 page=0 chnl=0 -char id=48 x=0 y=43 width=36 height=43 xoffset=-1 yoffset=8 xadvance=33 page=0 chnl=0 -char id=49 x=102 y=0 width=21 height=41 xoffset=-4 yoffset=9 xadvance=17 page=0 chnl=0 -char id=50 x=36 y=43 width=33 height=42 xoffset=-3 yoffset=8 xadvance=27 page=0 chnl=0 -char id=51 x=69 y=43 width=34 height=42 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 -char id=52 x=33 y=86 width=35 height=41 xoffset=-4 yoffset=9 xadvance=28 page=0 chnl=0 -char id=53 x=0 y=86 width=33 height=42 xoffset=-2 yoffset=9 xadvance=29 page=0 chnl=0 -char id=54 x=0 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=55 x=68 y=86 width=34 height=41 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 -char id=56 x=34 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=57 x=68 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=101 x=0 y=128 width=33 height=35 xoffset=-3 yoffset=16 xadvance=28 page=0 chnl=0 +char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=12 page=0 chnl=0 +char id=45 x=103 y=43 width=21 height=12 xoffset=-2 yoffset=26 xadvance=17 page=0 chnl=0 +char id=46 x=102 y=86 width=14 height=14 xoffset=-2 yoffset=37 xadvance=10 page=0 chnl=0 +char id=48 x=0 y=43 width=36 height=43 xoffset=-1 yoffset=8 xadvance=33 page=0 chnl=0 +char id=49 x=102 y=0 width=21 height=41 xoffset=-4 yoffset=9 xadvance=18 page=0 chnl=0 +char id=50 x=36 y=43 width=33 height=42 xoffset=-3 yoffset=8 xadvance=27 page=0 chnl=0 +char id=51 x=69 y=43 width=34 height=42 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 +char id=52 x=33 y=86 width=35 height=41 xoffset=-4 yoffset=9 xadvance=28 page=0 chnl=0 +char id=53 x=0 y=86 width=33 height=42 xoffset=-2 yoffset=9 xadvance=29 page=0 chnl=0 +char id=54 x=0 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=55 x=68 y=86 width=34 height=41 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 +char id=56 x=34 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=57 x=68 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=101 x=0 y=128 width=33 height=35 xoffset=-3 yoffset=16 xadvance=28 page=0 chnl=0 diff --git a/MRIcroGL.app/Contents/Resources/lut/ubuntu.fnt b/MRIcroGL.app/Contents/Resources/lut/ubuntu.fnt index 7686f18..2968130 100644 --- a/MRIcroGL.app/Contents/Resources/lut/ubuntu.fnt +++ b/MRIcroGL.app/Contents/Resources/lut/ubuntu.fnt @@ -6,13 +6,13 @@ char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 x char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=11 page=0 chnl=0 char id=45 x=92 y=85 width=20 height=13 xoffset=-3 yoffset=21 xadvance=14 page=0 chnl=0 char id=46 x=112 y=43 width=15 height=15 xoffset=-2 yoffset=34 xadvance=9 page=0 chnl=0 -char id=48 x=89 y=0 width=31 height=43 xoffset=-2 yoffset=6 xadvance=27 page=0 chnl=0 -char id=49 x=90 y=43 width=22 height=41 xoffset=-3 yoffset=7 xadvance=17 page=0 chnl=0 +char id=48 x=89 y=0 width=31 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 +char id=49 x=90 y=43 width=22 height=41 xoffset=-3 yoffset=7 xadvance=18 page=0 chnl=0 char id=50 x=0 y=43 width=30 height=42 xoffset=-2 yoffset=6 xadvance=27 page=0 chnl=0 char id=51 x=0 y=0 width=29 height=43 xoffset=-2 yoffset=6 xadvance=25 page=0 chnl=0 char id=52 x=0 y=85 width=32 height=41 xoffset=-3 yoffset=7 xadvance=27 page=0 chnl=0 -char id=53 x=30 y=43 width=29 height=42 xoffset=-1 yoffset=7 xadvance=25 page=0 chnl=0 -char id=54 x=59 y=43 width=31 height=42 xoffset=-2 yoffset=7 xadvance=27 page=0 chnl=0 +char id=53 x=30 y=43 width=29 height=42 xoffset=-1 yoffset=7 xadvance=24 page=0 chnl=0 +char id=54 x=59 y=43 width=31 height=42 xoffset=-2 yoffset=7 xadvance=26 page=0 chnl=0 char id=55 x=32 y=85 width=30 height=41 xoffset=-2 yoffset=7 xadvance=26 page=0 chnl=0 char id=56 x=29 y=0 width=30 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 char id=57 x=59 y=0 width=30 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 diff --git a/README.md b/README.md index afed699..970dfb1 100755 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ http://www.mccauslandcenter.sc.edu/mricrogl/ 14-July-2017 - [Display/Radiological menuitem](https://www.nitrc.org/forum/message.php?msg_id=21719) flips between neurological and radiological convention. The "L" and "R" symbols change in the "2D Slices" panel to remind user of current setting. Slices coordinates reflect MNI space (e.g. left side of brain is negative regardless of viewing convention). Rendering view not influenced: radiological view assumes camera is anterior/inferior to object for coronal/sagittal views while neurological assumes camera is posterior/superior. + - Preference window allows user to select between fonts installed in the LUT folder, and create their own fonts using [Hiero](https://github.com/libgdx/libgdx/wiki/Distance-field-fonts). + 24-June-2017 - [Smooth](https://github.com/neurolabusc/OpenGLCoreTutorials) numbers in colorbars diff --git a/lut/montserrat.fnt b/lut/montserrat.fnt index 2ce51cc..32653c5 100644 --- a/lut/montserrat.fnt +++ b/lut/montserrat.fnt @@ -2,18 +2,18 @@ info face="Montserrat-Regular" size=47 bold=0 italic=0 charset="" unicode=0 stre common lineHeight=58 base=46 scaleW=128 scaleH=128 pages=1 packed=0 page id=0 file="numbers.png" chars count=15 -char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=0 page=0 chnl=0 -char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=12 page=0 chnl=0 -char id=45 x=103 y=43 width=21 height=12 xoffset=-2 yoffset=26 xadvance=17 page=0 chnl=0 -char id=46 x=102 y=86 width=14 height=14 xoffset=-2 yoffset=37 xadvance=10 page=0 chnl=0 -char id=48 x=0 y=43 width=36 height=43 xoffset=-1 yoffset=8 xadvance=33 page=0 chnl=0 -char id=49 x=102 y=0 width=21 height=41 xoffset=-4 yoffset=9 xadvance=17 page=0 chnl=0 -char id=50 x=36 y=43 width=33 height=42 xoffset=-3 yoffset=8 xadvance=27 page=0 chnl=0 -char id=51 x=69 y=43 width=34 height=42 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 -char id=52 x=33 y=86 width=35 height=41 xoffset=-4 yoffset=9 xadvance=28 page=0 chnl=0 -char id=53 x=0 y=86 width=33 height=42 xoffset=-2 yoffset=9 xadvance=29 page=0 chnl=0 -char id=54 x=0 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=55 x=68 y=86 width=34 height=41 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 -char id=56 x=34 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=57 x=68 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 -char id=101 x=0 y=128 width=33 height=35 xoffset=-3 yoffset=16 xadvance=28 page=0 chnl=0 +char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=12 page=0 chnl=0 +char id=45 x=103 y=43 width=21 height=12 xoffset=-2 yoffset=26 xadvance=17 page=0 chnl=0 +char id=46 x=102 y=86 width=14 height=14 xoffset=-2 yoffset=37 xadvance=10 page=0 chnl=0 +char id=48 x=0 y=43 width=36 height=43 xoffset=-1 yoffset=8 xadvance=33 page=0 chnl=0 +char id=49 x=102 y=0 width=21 height=41 xoffset=-4 yoffset=9 xadvance=18 page=0 chnl=0 +char id=50 x=36 y=43 width=33 height=42 xoffset=-3 yoffset=8 xadvance=27 page=0 chnl=0 +char id=51 x=69 y=43 width=34 height=42 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 +char id=52 x=33 y=86 width=35 height=41 xoffset=-4 yoffset=9 xadvance=28 page=0 chnl=0 +char id=53 x=0 y=86 width=33 height=42 xoffset=-2 yoffset=9 xadvance=29 page=0 chnl=0 +char id=54 x=0 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=55 x=68 y=86 width=34 height=41 xoffset=-4 yoffset=9 xadvance=27 page=0 chnl=0 +char id=56 x=34 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=57 x=68 y=0 width=34 height=43 xoffset=-2 yoffset=8 xadvance=30 page=0 chnl=0 +char id=101 x=0 y=128 width=33 height=35 xoffset=-3 yoffset=16 xadvance=28 page=0 chnl=0 diff --git a/lut/ubuntu.fnt b/lut/ubuntu.fnt index 7686f18..2968130 100644 --- a/lut/ubuntu.fnt +++ b/lut/ubuntu.fnt @@ -6,13 +6,13 @@ char id=0 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 x char id=32 x=0 y=0 width=0 height=0 xoffset=-4 yoffset=0 xadvance=11 page=0 chnl=0 char id=45 x=92 y=85 width=20 height=13 xoffset=-3 yoffset=21 xadvance=14 page=0 chnl=0 char id=46 x=112 y=43 width=15 height=15 xoffset=-2 yoffset=34 xadvance=9 page=0 chnl=0 -char id=48 x=89 y=0 width=31 height=43 xoffset=-2 yoffset=6 xadvance=27 page=0 chnl=0 -char id=49 x=90 y=43 width=22 height=41 xoffset=-3 yoffset=7 xadvance=17 page=0 chnl=0 +char id=48 x=89 y=0 width=31 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 +char id=49 x=90 y=43 width=22 height=41 xoffset=-3 yoffset=7 xadvance=18 page=0 chnl=0 char id=50 x=0 y=43 width=30 height=42 xoffset=-2 yoffset=6 xadvance=27 page=0 chnl=0 char id=51 x=0 y=0 width=29 height=43 xoffset=-2 yoffset=6 xadvance=25 page=0 chnl=0 char id=52 x=0 y=85 width=32 height=41 xoffset=-3 yoffset=7 xadvance=27 page=0 chnl=0 -char id=53 x=30 y=43 width=29 height=42 xoffset=-1 yoffset=7 xadvance=25 page=0 chnl=0 -char id=54 x=59 y=43 width=31 height=42 xoffset=-2 yoffset=7 xadvance=27 page=0 chnl=0 +char id=53 x=30 y=43 width=29 height=42 xoffset=-1 yoffset=7 xadvance=24 page=0 chnl=0 +char id=54 x=59 y=43 width=31 height=42 xoffset=-2 yoffset=7 xadvance=26 page=0 chnl=0 char id=55 x=32 y=85 width=30 height=41 xoffset=-2 yoffset=7 xadvance=26 page=0 chnl=0 char id=56 x=29 y=0 width=30 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0 char id=57 x=59 y=0 width=30 height=43 xoffset=-2 yoffset=6 xadvance=26 page=0 chnl=0