Changeset 1935 for www


Ignore:
Timestamp:
Nov 11, 2007, 1:27:54 PM (13 years ago)
Author:
Sam Hocevar
Message:
  • Renamed figures and images after sections so that it's easier to insert new stuff without having to renumber everything.
Location:
www/study
Files:
2 edited
48 moved

Legend:

Unmodified
Added
Removed
  • www/study/fig2-3-1.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig001.svg"
     17   sodipodi:docname="fig2-3-1.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig001.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig2-3-1.png"
    2020   inkscape:export-xdpi="94.019997"
    2121   inkscape:export-ydpi="94.019997">
  • www/study/fig2-3-2.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig002.svg"
     17   sodipodi:docname="fig2-3-2.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig002.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig2-3-2.png"
    2020   inkscape:export-xdpi="59.389999"
    2121   inkscape:export-ydpi="59.389999">
  • www/study/fig2-3-3.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig003.svg"
     17   sodipodi:docname="fig2-3-3.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig003.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig2-3-3.png"
    2020   inkscape:export-xdpi="59.389999"
    2121   inkscape:export-ydpi="59.389999">
  • www/study/fig2-3-4.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig004.svg"
     17   sodipodi:docname="fig2-3-4.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig004.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig2-3-4.png"
    2020   inkscape:export-xdpi="59.389999"
    2121   inkscape:export-ydpi="59.389999">
  • www/study/fig3-1-1.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig005.svg"
     17   sodipodi:docname="fig3-1-1.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig005.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig3-1-1.png"
    2020   inkscape:export-xdpi="59.189999"
    2121   inkscape:export-ydpi="59.189999">
  • www/study/fig3-2-1.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig006.svg"
     17   sodipodi:docname="fig3-2-1.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig006.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig3-2-1.png"
    2020   inkscape:export-xdpi="59.19083"
    2121   inkscape:export-ydpi="59.19083">
  • www/study/fig3-2-2.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig007.svg"
     17   sodipodi:docname="fig3-2-2.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig007.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig3-2-2.png"
    2020   inkscape:export-xdpi="59.509998"
    2121   inkscape:export-ydpi="59.509998">
  • www/study/fig3-2-3.svg

    r1934 r1935  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig008.svg"
     17   sodipodi:docname="fig3-2-3.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig008.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig3-2-3.png"
    2020   inkscape:export-xdpi="59.509998"
    2121   inkscape:export-ydpi="59.509998">
  • www/study/index.html

    r1934 r1935  
    8686
    8787<p style="text-align: center;">
    88   <img src="out001.png" width="256" height="256"
     88  <img src="out1-1-1.png" width="256" height="256"
    8989       class="inline" alt="50% threshold" />
    90   <img src="grad001.png" width="32" height="256"
     90  <img src="grad1-1-1.png" width="32" height="256"
    9191       class="inline" alt="50% threshold gradient" />
    9292</p>
     
    9898
    9999<p style="text-align: center;">
    100   <img src="out002.png" width="256" height="256"
     100  <img src="out1-1-2.png" width="256" height="256"
    101101       class="inline" alt="40% threshold" />
    102   <img src="grad002.png" width="32" height="256"
     102  <img src="grad1-1-2.png" width="32" height="256"
    103103       class="inline" alt="40% threshold gradient" />
    104   <img src="out003.png" width="256" height="256"
     104  <img src="out1-1-3.png" width="256" height="256"
    105105       class="inline" alt="60% threshold" />
    106   <img src="grad003.png" width="32" height="256"
     106  <img src="grad1-1-3.png" width="32" height="256"
    107107       class="inline" alt="60% threshold gradient" />
    108108</p>
     
    118118
    119119<p style="text-align: center;">
    120   <img src="out004.png" width="256" height="256"
     120  <img src="out1-2-1.png" width="256" height="256"
    121121       class="inline" alt="3-colour threshold" />
    122   <img src="grad004.png" width="32" height="256"
     122  <img src="grad1-2-1.png" width="32" height="256"
    123123       class="inline" alt="3-colour threshold gradient" />
    124   <img src="out005.png" width="256" height="256"
     124  <img src="out1-2-2.png" width="256" height="256"
    125125       class="inline" alt="4-colour threshold" />
    126   <img src="grad005.png" width="32" height="256"
     126  <img src="grad1-2-2.png" width="32" height="256"
    127127       class="inline" alt="4-colour threshold gradient" />
    128128</p>
     
    137137
    138138<p style="text-align: center;">
    139   <img src="pat001.png" width="320" height="80"
     139  <img src="pat2-1-1.png" width="320" height="80"
    140140       class="inline" alt="50% pattern" />
    141141</p>
     
    145145
    146146<p style="text-align: center;">
    147   <img src="pat002.png" width="320" height="80"
     147  <img src="pat2-1-2.png" width="320" height="80"
    148148       class="inline" alt="25% and 75% patterns" />
    149149</p>
     
    154154
    155155<p style="text-align: center;">
    156   <img src="out006.png" width="256" height="256"
     156  <img src="out2-1-1.png" width="256" height="256"
    157157       class="inline" alt="25%, 50% and 75% halftoning" />
    158   <img src="grad006.png" width="32" height="256"
     158  <img src="grad2-1-1.png" width="32" height="256"
    159159       class="inline" alt="25%, 50% and 75% halftoning gradient" />
    160160</p>
     
    172172
    173173<p style="text-align: center;">
    174   <img src="pat003.png" width="240" height="80"
     174  <img src="pat2-2-1.png" width="240" height="80"
    175175       class="inline" alt="screen imperfections" />
    176176</p>
     
    183183
    184184<p style="text-align: center;">
    185   <img src="pat004.png" width="320" height="80"
     185  <img src="pat2-2-2.png" width="320" height="80"
    186186       class="inline" alt="two different 25% patterns" />
    187187</p>
     
    194194
    195195<p style="text-align: center;">
    196   <img src="fig001.png" width="128" height="128" alt="2x2 dither matrix" />
     196  <img src="fig2-3-1.png" width="128" height="128" alt="2x2 dither matrix" />
    197197</p>
    198198
     
    207207
    208208<p style="text-align: center;">
    209   <img src="fig002.png" width="160" height="160"
     209  <img src="fig2-3-2.png" width="160" height="160"
    210210       style="margin-right: 30px;" alt="4x4 Bayer matrix" />
    211   <img src="out007.png" width="256" height="256"
     211  <img src="out2-3-1.png" width="256" height="256"
    212212       class="inline" alt="4x4 Bayer dithering" />
    213   <img src="grad007.png" width="32" height="256"
     213  <img src="grad2-3-1.png" width="32" height="256"
    214214       class="inline" alt="4x4 Bayer dithering gradient" />
    215215</p>
     
    219219
    220220<p style="text-align: center;">
    221   <img src="fig003.png" width="160" height="160"
     221  <img src="fig2-3-3.png" width="160" height="160"
    222222       style="margin-right: 30px;" alt="4x4 cluster dot matrix" />
    223   <img src="out008.png" width="256" height="256"
     223  <img src="out2-3-2.png" width="256" height="256"
    224224       class="inline" alt="4x4 cluster dot dithering" />
    225   <img src="grad008.png" width="32" height="256"
     225  <img src="grad2-3-2.png" width="32" height="256"
    226226       class="inline" alt="4x4 cluster dot dithering gradient" />
    227227</p>
     
    230230
    231231<p style="text-align: center;">
    232   <img src="fig004.png" width="200" height="120"
     232  <img src="fig2-3-4.png" width="200" height="120"
    233233       style="margin-right: 30px;" alt="4x4 cluster dot matrix" />
    234   <img src="out009.png" width="256" height="256"
     234  <img src="out2-3-3.png" width="256" height="256"
    235235       class="inline" alt="4x4 cluster dot dithering" />
    236   <img src="grad009.png" width="32" height="256"
     236  <img src="grad2-3-3.png" width="32" height="256"
    237237       class="inline" alt="4x4 cluster dot dithering gradient" />
    238238</p>
     
    265265
    266266<p style="text-align: center;">
    267   <img src="fig005.png" width="120" height="120" alt="Floyd-Steinberg" />
     267  <img src="fig3-1-1.png" width="120" height="120" alt="Floyd-Steinberg" />
    268268</p>
    269269
     
    274274
    275275<p style="text-align: center;">
    276   <img src="out010.png" width="256" height="256"
     276  <img src="out3-1-1.png" width="256" height="256"
    277277       class="inline" alt="Floyd-Steinberg error diffusion" />
    278   <img src="grad010.png" width="32" height="256"
     278  <img src="grad3-1-1.png" width="32" height="256"
    279279       class="inline" alt="Floyd-Steinberg error diffusion gradient" />
    280280</p>
     
    286286
    287287<p style="text-align: center;">
    288   <img src="out011.png" width="256" height="256"
     288  <img src="out3-1-2.png" width="256" height="256"
    289289       class="inline" alt="Floyd-Steinberg error diffusion" />
    290   <img src="grad011.png" width="32" height="256"
     290  <img src="grad3-1-2.png" width="32" height="256"
    291291       class="inline" alt="Floyd-Steinberg error diffusion gradient" />
    292292</p>
     
    298298
    299299<p style="text-align: center;">
    300   <img src="fig006.png" width="160" height="120"
     300  <img src="fig3-2-1.png" width="160" height="120"
    301301       style="margin-right: 30px;" alt="Fan" />
    302   <img src="out012.png" width="256" height="256"
     302  <img src="out3-2-1.png" width="256" height="256"
    303303       class="inline" alt="Fan error diffusion" />
    304   <img src="grad012.png" width="32" height="256"
     304  <img src="grad3-2-1.png" width="32" height="256"
    305305       class="inline" alt="Fan error diffusion gradient" />
    306306</p>
     
    310310
    311311<p style="text-align: center;">
    312   <img src="fig007.png" width="200" height="160"
     312  <img src="fig3-2-2.png" width="200" height="160"
    313313       style="margin-right: 30px;" alt="Jarvis, Judice and Ninke" />
    314   <img src="out013.png" width="256" height="256"
     314  <img src="out3-2-2.png" width="256" height="256"
    315315       class="inline" alt="Jarvis, Judice and Ninke error diffusion" />
    316   <img src="grad013.png" width="32" height="256"
     316  <img src="grad3-2-2.png" width="32" height="256"
    317317       class="inline" alt="Jarvis, Judice and Ninke error diffusion gradient" />
    318318</p>
     
    322322
    323323<p style="text-align: center;">
    324   <img src="fig008.png" width="200" height="160"
     324  <img src="fig3-2-3.png" width="200" height="160"
    325325       style="margin-right: 30px;" alt="Stucki" />
    326   <img src="out014.png" width="256" height="256"
     326  <img src="out3-2-3.png" width="256" height="256"
    327327       class="inline" alt="Stucki error diffusion" />
    328   <img src="grad014.png" width="32" height="256"
     328  <img src="grad3-2-3.png" width="32" height="256"
    329329       class="inline" alt="Stucki error diffusion gradient" />
    330330</p>
  • www/study/study.py

    r1933 r1935  
    4949gradient256bw.writePng("gradient256bw.png")
    5050
    51 # Output 1: 50% threshold
    52 # Output 2: 40% threshold
    53 # Output 3: 60% threshold
     51# Output 1.1.1: 50% threshold
     52# Output 1.1.2: 40% threshold
     53# Output 1.1.3: 60% threshold
    5454def test1(src, threshold, name):
    5555    (w, h) = src.size()
     
    6161    dest.writePng(name)
    6262
    63 test1(lenna256bw, 0.5, "out001.png")
    64 test1(lenna256bw, 0.4, "out002.png")
    65 test1(lenna256bw, 0.6, "out003.png")
    66 test1(gradient256bw, 0.5, "grad001.png")
    67 test1(gradient256bw, 0.4, "grad002.png")
    68 test1(gradient256bw, 0.6, "grad003.png")
    69 
    70 # Output 4: 3-colour threshold
    71 # Output 5: 5-colour threshold
     63test1(lenna256bw, 0.5, "out1-1-1.png")
     64test1(lenna256bw, 0.4, "out1-1-2.png")
     65test1(lenna256bw, 0.6, "out1-1-3.png")
     66test1(gradient256bw, 0.5, "grad1-1-1.png")
     67test1(gradient256bw, 0.4, "grad1-1-2.png")
     68test1(gradient256bw, 0.6, "grad1-1-3.png")
     69
     70# Output 1.2.1: 3-colour threshold
     71# Output 1.2.2: 5-colour threshold
    7272def test2(src, colors, name):
    7373    (w, h) = src.size()
     
    8282    dest.writePng(name)
    8383
    84 test2(lenna256bw, 3, "out004.png")
    85 test2(lenna256bw, 5, "out005.png")
    86 test2(gradient256bw, 3, "grad004.png")
    87 test2(gradient256bw, 5, "grad005.png")
    88 
    89 # Pattern 1: a 50% halftone pattern with various block sizes
     84test2(lenna256bw, 3, "out1-2-1.png")
     85test2(lenna256bw, 5, "out1-2-2.png")
     86test2(gradient256bw, 3, "grad1-2-1.png")
     87test2(gradient256bw, 5, "grad1-2-2.png")
     88
     89# Pattern 2.1.1: a 50% halftone pattern with various block sizes
    9090dest = Image((320, 80))
    9191for x in range(320):
     
    9494        c = (x / d + y / d) & 1
    9595        dest.setGray(x, y, c)
    96 dest.writePng("pat001.png")
    97 
    98 # Pattern 2: 25% and 75% halftone patterns with various block sizes
     96dest.writePng("pat2-1-1.png")
     97
     98# Pattern 2.1.2: 25% and 75% halftone patterns with various block sizes
    9999dest = Image((320, 80))
    100100for x in range(320):
     
    106106        c = ((x / d + y / d) & 1) and (y / d & 1)
    107107        dest.setGray(x, y, c)
    108 dest.writePng("pat002.png")
    109 
    110 # Output 6: 20/40/60/80% threshold with 25/50/75% halftone patterns inbetween:
     108dest.writePng("pat2-1-2.png")
     109
     110# Output 2.1.1: 20/40/60/80% threshold with 25/50/75% patterns inbetween:
    111111def test3(src, name):
    112112    (w, h) = src.size()
     
    128128    dest.writePng(name)
    129129
    130 test3(lenna256bw, "out006.png")
    131 test3(gradient256bw, "grad006.png")
    132 
    133 # Pattern 3: vertical, mixed and horizontal black-white halftones
     130test3(lenna256bw, "out2-1-1.png")
     131test3(gradient256bw, "grad2-1-1.png")
     132
     133# Pattern 2.2.1: vertical, mixed and horizontal black-white halftones
    134134dest = Image((240, 80))
    135135for y in range(80):
     
    143143        c = y & 1
    144144        dest.setGray(x, y, c)
    145 dest.writePng("pat003.png")
    146 
    147 # Pattern 4: two different 25% patterns
     145dest.writePng("pat2-2-1.png")
     146
     147# Pattern 2.2.2: two different 25% patterns
    148148dest = Image((320, 80))
    149149for y in range(80):
     
    160160        c = (x / 2 & 1) and ((y / 2 + x / 4) & 1)
    161161        dest.setGray(x, y, c)
    162 dest.writePng("pat004.png")
    163 
    164 # Output 7: 4x4 Bayer dithering
    165 # Output 8: 4x4 cluster dot
    166 # Output 9: 5x3 line dithering
     162dest.writePng("pat2-2-2.png")
     163
     164# Output 2.3.1: 4x4 Bayer dithering
     165# Output 2.3.2: 4x4 cluster dot
     166# Output 2.3.3: 5x3 line dithering
    167167def test4(src, mat, name):
    168168    (w, h) = src.size()
     
    182182       [  2, 10,  1,  9],
    183183       [ 13,  6, 14,  5]]
    184 test4(lenna256bw, mat, "out007.png")
    185 test4(gradient256bw, mat, "grad007.png")
     184test4(lenna256bw, mat, "out2-3-1.png")
     185test4(gradient256bw, mat, "grad2-3-1.png")
    186186
    187187mat = [[ 12,  5,  6, 13],
     
    189189       [ 11,  3,  2,  8],
    190190       [ 15, 10,  9, 14]]
    191 test4(lenna256bw, mat, "out008.png")
    192 test4(gradient256bw, mat, "grad008.png")
     191test4(lenna256bw, mat, "out2-3-2.png")
     192test4(gradient256bw, mat, "grad2-3-2.png")
    193193
    194194mat = [[ 13,  7,  0,  4, 10],
    195195       [  9,  3,  1,  8, 14],
    196196       [ 11,  5,  2,  6, 12],]
    197 test4(lenna256bw, mat, "out009.png")
    198 test4(gradient256bw, mat, "grad009.png")
    199 
    200 # Output 10: standard Floyd-Steinberg
     197test4(lenna256bw, mat, "out2-3-3.png")
     198test4(gradient256bw, mat, "grad2-3-3.png")
     199
     200# Output 3.1.1: standard Floyd-Steinberg
    201201def test5(src, name):
    202202    (w, h) = src.size()
     
    218218    dest.writePng(name)
    219219
    220 test5(lenna256bw, "out010.png")
    221 test5(gradient256bw, "grad010.png")
    222 
    223 # Output 11: serpentine Floyd-Steinberg
     220test5(lenna256bw, "out3-1-1.png")
     221test5(gradient256bw, "grad3-1-1.png")
     222
     223# Output 3.1.2: serpentine Floyd-Steinberg
    224224def test6(src, name):
    225225    (w, h) = src.size()
     
    255255    dest.writePng(name)
    256256
    257 test6(lenna256bw, "out011.png")
    258 test6(gradient256bw, "grad011.png")
    259 
    260 # Output 12: Fan (modified Floyd-Steinberg)
     257test6(lenna256bw, "out3-1-2.png")
     258test6(gradient256bw, "grad3-1-2.png")
     259
     260# Output 3.2.1: Fan (modified Floyd-Steinberg)
    261261def test7(src, name):
    262262    (w, h) = src.size()
     
    278278    dest.writePng(name)
    279279
    280 test7(lenna256bw, "out012.png")
    281 test7(gradient256bw, "grad012.png")
    282 
    283 # Output 13: Jarvis, Judice and Ninke
     280test7(lenna256bw, "out3-2-1.png")
     281test7(gradient256bw, "grad3-2-1.png")
     282
     283# Output 3.2.2: Jarvis, Judice and Ninke
    284284def test8(src, name):
    285285    (w, h) = src.size()
     
    312312    dest.writePng(name)
    313313
    314 test8(lenna256bw, "out013.png")
    315 test8(gradient256bw, "grad013.png")
    316 
    317 # Output 14: Stucki
     314test8(lenna256bw, "out3-2-2.png")
     315test8(gradient256bw, "grad3-2-2.png")
     316
     317# Output 3-2-3: Stucki
    318318# TODO: merge with Jarvis, Judice and Ninke
    319319def test9(src, name):
     
    347347    dest.writePng(name)
    348348
    349 test9(lenna256bw, "out014.png")
    350 test9(gradient256bw, "grad014.png")
     349test9(lenna256bw, "out3-2-3.png")
     350test9(gradient256bw, "grad3-2-3.png")
    351351
    352352##############################################################################
Note: See TracChangeset for help on using the changeset viewer.