Skip to content

Commit 475779d

Browse files
committed
-
1 parent c02ce94 commit 475779d

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

cpu.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
def cpu(x):
2-
import tempfile, piio, os
2+
import tempfile, iio, os
33

44
f = f"{tempfile.NamedTemporaryFile().name}.tiff"
55
c = f"(cpu {f} 2>/dev/null ; rm {f}) &"
66

7-
piio.write(f, x)
7+
iio.write(f, x)
88
os.system(c)

demtk.tex

+48-48
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ \section{Sources of DEM}
1616

1717
\begin{quote}
1818
\begin{verbatim}
19-
import piio
20-
x = piio.read("i/terrassa.tif")
19+
import iio
20+
x = iio.read("i/terrassa.tif")
2121
X = (255.0 * (x - x.min())/(x.max() - x.min())).clip(0,255)
22-
piio.write("o/terrassa.png", X)
22+
iio.write("o/terrassa.png", X)
2323
\end{verbatim}
2424
\includegraphics{o/terrassa.png}~\verb+terrassa.png+
2525
\end{quote}
@@ -65,10 +65,10 @@ \section{DEM Rendering}
6565

6666
\begin{quote}
6767
\begin{verbatim}
68-
import piio
69-
x = piio.read("i/fuji.tif")
68+
import iio
69+
x = iio.read("i/fuji.tif")
7070
X = qauto(x)
71-
piio.write("o/fuji.png", X)
71+
iio.write("o/fuji.png", X)
7272
\end{verbatim}
7373
\includegraphics{o/fuji.png}~\verb+fuji.png+
7474
\end{quote}
@@ -136,12 +136,12 @@ \subsection{Hillshading}
136136
And now we display the Fuji DEM using this function
137137

138138

139-
%import piio
139+
%import iio
140140
\begin{quote}
141141
\begin{verbatim}
142-
x = piio.read("i/fuji.tif").squeeze()
142+
x = iio.read("i/fuji.tif").squeeze()
143143
X = render_shading(x)
144-
piio.write("o/fuji_shading.png", qauto(X) )
144+
iio.write("o/fuji_shading.png", qauto(X) )
145145
\end{verbatim}
146146
\includegraphics{o/fuji_shading.png}~\verb+fuji_shading.png+
147147
\end{quote}
@@ -190,9 +190,9 @@ \subsection{Hillshading}
190190

191191
\begin{quote}
192192
\begin{verbatim}
193-
x = piio.read("i/fuji.tif").squeeze()
193+
x = iio.read("i/fuji.tif").squeeze()
194194
X = filter_riesz(render_shading(x), -0.5)
195-
piio.write("o/fuji_smooth.png", qauto(X) )
195+
iio.write("o/fuji_smooth.png", qauto(X) )
196196
\end{verbatim}
197197
\includegraphics{o/fuji_smooth.png}~\verb+fuji_smooth.png+
198198
\end{quote}
@@ -223,10 +223,10 @@ \subsection{Shadows}
223223
\begin{quote}
224224
\begin{verbatim}
225225
# cast shadows over Fuji
226-
x = piio.read("i/fuji.tif").squeeze()
226+
x = iio.read("i/fuji.tif").squeeze()
227227
import demtk
228228
z = demtk.render_shadows(x, (1,1,25))
229-
piio.write("o/fuji_shadows.png", qauto(z) )
229+
iio.write("o/fuji_shadows.png", qauto(z) )
230230
\end{verbatim}
231231
\includegraphics{o/fuji_shadows.png}~\verb+fuji_shadows.png+
232232
\end{quote}
@@ -258,7 +258,7 @@ \subsection{Ambient occlusion}
258258
\begin{quote}
259259
\begin{verbatim}
260260
# coarse approximation of ambient occlusion
261-
x = piio.read("i/fuji.tif").squeeze()
261+
x = iio.read("i/fuji.tif").squeeze()
262262
z = 0*x
263263
z += demtk.render_shadows(x, ( 1, 0, 25) )
264264
z += demtk.render_shadows(x, ( 1, 1, 25) )
@@ -268,7 +268,7 @@ \subsection{Ambient occlusion}
268268
z += demtk.render_shadows(x, (-1,-1, 25) )
269269
z += demtk.render_shadows(x, ( 0,-1, 25) )
270270
z += demtk.render_shadows(x, ( 1,-1, 25) )
271-
piio.write("o/fuji_aaaprox.png", qauto(z/8) )
271+
iio.write("o/fuji_aaaprox.png", qauto(z/8) )
272272
\end{verbatim}
273273
\includegraphics{o/fuji_aaaprox.png}~\verb+fuji_aaaprox.png+
274274
\end{quote}
@@ -278,7 +278,7 @@ \subsection{Ambient occlusion}
278278
\begin{quote}
279279
\begin{verbatim}
280280
# coarse approximation of ambient occlusion
281-
x = piio.read("i/terrassa.tif").squeeze()
281+
x = iio.read("i/terrassa.tif").squeeze()
282282
z = 0*x
283283
z += demtk.render_shadows(x, ( 1, 0, 2) )
284284
z += demtk.render_shadows(x, ( 1, 1, 2) )
@@ -288,7 +288,7 @@ \subsection{Ambient occlusion}
288288
z += demtk.render_shadows(x, (-1,-1, 2) )
289289
z += demtk.render_shadows(x, ( 0,-1, 2) )
290290
z += demtk.render_shadows(x, ( 1,-1, 2) )
291-
piio.write("o/terrassa_aaaprox.png", qauto(z/8) )
291+
iio.write("o/terrassa_aaaprox.png", qauto(z/8) )
292292
\end{verbatim}
293293
\includegraphics{o/terrassa_aaaprox.png}~\verb+terrassa_aaaprox.png+
294294
\end{quote}
@@ -307,9 +307,9 @@ \subsection{Ambient occlusion}
307307
\begin{quote}
308308
\begin{verbatim}
309309
# linear approximation of ambient occlusion
310-
x = piio.read("i/terrassa.tif").squeeze()
310+
x = iio.read("i/terrassa.tif").squeeze()
311311
z = filter_riesz(x, 1)
312-
piio.write("o/terrassa_aalin.png", qauto(z.clip(-1000,0)) )
312+
iio.write("o/terrassa_aalin.png", qauto(z.clip(-1000,0)) )
313313
\end{verbatim}
314314
\includegraphics{o/terrassa_aalin.png}~\verb+terrassa_aalin.png+
315315
\end{quote}
@@ -329,7 +329,7 @@ \subsection{Color palette}
329329
\begin{quote}
330330
\begin{verbatim}
331331
# read palette from file
332-
img_terrain = piio.read("i/DEM_poster.png")
332+
img_terrain = iio.read("i/DEM_poster.png")
333333
pal_terrain = img_terrain[0][0:256]
334334
\end{verbatim}
335335
\includegraphics{i/DEM_poster.png}~\verb+DEM_poster.png+
@@ -338,9 +338,9 @@ \subsection{Color palette}
338338
\begin{quote}
339339
\begin{verbatim}
340340
# apply palette to DEM
341-
x = piio.read("i/fuji.tif").squeeze()
341+
x = iio.read("i/fuji.tif").squeeze()
342342
X = pal_terrain[qauto(x)]
343-
piio.write("o/fuji_palette.png", X )
343+
iio.write("o/fuji_palette.png", X )
344344
\end{verbatim}
345345
\includegraphics{o/fuji_palette.png}~\verb+fuji_palette.png+
346346
\end{quote}
@@ -361,9 +361,9 @@ \subsection{Color palette}
361361
\begin{quote}
362362
\begin{verbatim}
363363
# render a urban DEM using a "terrain" palette
364-
x = piio.read("i/terrassa.tif").squeeze()
364+
x = iio.read("i/terrassa.tif").squeeze()
365365
X = pal_terrain[qauto(x)]
366-
piio.write("o/terrassa_pal.png", X )
366+
iio.write("o/terrassa_pal.png", X )
367367
\end{verbatim}
368368
\includegraphics{o/terrassa_pal.png}~\verb+terrassa_pal.png+
369369
\end{quote}
@@ -378,12 +378,12 @@ \subsection{Color palette}
378378

379379
\begin{quote}
380380
\begin{verbatim}
381-
x = piio.read("i/fuji.tif").squeeze()
381+
x = iio.read("i/fuji.tif").squeeze()
382382
from numpy import newaxis
383383
x_lam = qauto(render_shading(x))[:,:,newaxis] # lambertian shading of x
384384
x_pal = pal_terrain[qauto(x)] # color palette of x
385385
X = qauto(x_lam**.8 * x_pal) # combination (geometric mean)
386-
piio.write("o/fuji_combined.png", X)
386+
iio.write("o/fuji_combined.png", X)
387387
\end{verbatim}
388388
\includegraphics{o/fuji_combined.png}~\verb+fuji_combined.png+
389389
\end{quote}
@@ -406,16 +406,16 @@ \subsection{Curvature map}
406406
\begin{quote}
407407
\begin{verbatim}
408408
from numpy import fmax, dstack
409-
x = piio.read("i/fuji.tif").squeeze()
409+
x = iio.read("i/fuji.tif").squeeze()
410410
r = filter_riesz(x, 1)
411411
x_signed = qauto(r)
412412
x_ridges = 2.0*qauto(fmax(0,r)).clip(0,255)
413413
x_valleys = 255-2.0*qauto(fmax(0,-r)).clip(0,255)
414414
x_curv = dstack([x_valleys, x_valleys-x_ridges, 255.0-x_ridges])
415-
piio.write("o/fuji_signed.png" , x_signed )
416-
piio.write("o/fuji_ridges.png" , x_ridges )
417-
piio.write("o/fuji_valleys.png", x_valleys )
418-
piio.write("o/fuji_curv.png", x_curv )
415+
iio.write("o/fuji_signed.png" , x_signed )
416+
iio.write("o/fuji_ridges.png" , x_ridges )
417+
iio.write("o/fuji_valleys.png", x_valleys )
418+
iio.write("o/fuji_curv.png", x_curv )
419419
\end{verbatim}
420420
\includegraphics{o/fuji_signed.png}~\verb+fuji_signed.png+
421421
\includegraphics{o/fuji_ridges.png}~\verb+fuji_ridges.png+
@@ -434,10 +434,10 @@ \subsection{Curvature map}
434434
%
435435
%# render urban scene with sign of a Riesz filter
436436
%from numpy import uint8
437-
%x = piio.read("i/terrassa.tif").squeeze()
437+
%x = iio.read("i/terrassa.tif").squeeze()
438438
%t = filter_riesz(x, 1)
439439
%T = (127.5 + 60 * t / t.std()).clip(0.255).astype(uint8)
440-
%piio.write("o/terrassa_curv.png", pal_blue_yellow[T] )
440+
%iio.write("o/terrassa_curv.png", pal_blue_yellow[T] )
441441
%\end{verbatim}
442442
%\includegraphics{o/terrassa_curv.png}~\verb+terrassa_curv.png+
443443
%\end{quote}
@@ -451,12 +451,12 @@ \subsection{Combined rendering}
451451

452452
\begin{quote}
453453
\begin{verbatim}
454-
import demtk, piio
455-
x = piio.read("i/terrassa.tif").squeeze()
456-
piio.write("o/terrassa_full.png", demtk.render(x))
454+
import demtk, iio
455+
x = iio.read("i/terrassa.tif").squeeze()
456+
iio.write("o/terrassa_full.png", demtk.render(x))
457457
458-
x = piio.read("i/fuji.tif").squeeze()
459-
piio.write("o/fuji_full.png", demtk.render(x))
458+
x = iio.read("i/fuji.tif").squeeze()
459+
iio.write("o/fuji_full.png", demtk.render(x))
460460
\end{verbatim}
461461
\includegraphics{o/terrassa_full.png}~\verb+terrassa_full.png+
462462
\includegraphics{o/fuji_full.png}~\verb+fuji_full.png+
@@ -468,12 +468,12 @@ \section{DEM Denoising}
468468

469469
\begin{quote}
470470
\begin{verbatim}
471-
import demtk, piio
472-
x = piio.read("i/terrassa.tif").squeeze()
473-
piio.write("o/terrassa_erosion.png", demtk.render(demtk.cross_erosion(x)))
474-
piio.write("o/terrassa_dilation.png", demtk.render(demtk.cross_dilation(x)))
475-
piio.write("o/terrassa_median.png", demtk.render(demtk.cross_median(x)))
476-
piio.write("o/terrassa_median5.png", demtk.render(demtk.cross_median(x,5)))
471+
import demtk, iio
472+
x = iio.read("i/terrassa.tif").squeeze()
473+
iio.write("o/terrassa_erosion.png", demtk.render(demtk.cross_erosion(x)))
474+
iio.write("o/terrassa_dilation.png", demtk.render(demtk.cross_dilation(x)))
475+
iio.write("o/terrassa_median.png", demtk.render(demtk.cross_median(x)))
476+
iio.write("o/terrassa_median5.png", demtk.render(demtk.cross_median(x,5)))
477477
\end{verbatim}
478478
\includegraphics{o/terrassa_erosion.png}~\verb+terrassa_erosion.png+
479479
\includegraphics{o/terrassa_dilation.png}~\verb+terrassa_dilation.png+
@@ -482,10 +482,10 @@ \section{DEM Denoising}
482482

483483
%\begin{quote}
484484
%\begin{verbatim}
485-
%import demtk, piio
486-
%x = piio.read("i/fuji.tif").squeeze()
487-
%piio.write("o/fuji_erosion.png", demtk.render(demtk.cross_erosion(x)))
488-
%piio.write("o/fuji_dilation.png", demtk.render(demtk.cross_dilation(x)))
485+
%import demtk, iio
486+
%x = iio.read("i/fuji.tif").squeeze()
487+
%iio.write("o/fuji_erosion.png", demtk.render(demtk.cross_erosion(x)))
488+
%iio.write("o/fuji_dilation.png", demtk.render(demtk.cross_dilation(x)))
489489
%\end{verbatim}
490490
%\includegraphics{o/fuji_erosion.png}~\verb+fuji_erosion.png+
491491
%\includegraphics{o/fuji_dilation.png}~\verb+fuji_dilation.png+

o/.gitempty

Whitespace-only changes.

0 commit comments

Comments
 (0)