[Greater-commits] r3820 - trunk/greater-pre-processing/doc
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 21 16:25:33 CET 2011
Author: frank
Date: 2011-11-21 16:25:31 +0100 (Mon, 21 Nov 2011)
New Revision: 3820
Added:
trunk/greater-pre-processing/doc/flow_final_att.fig
trunk/greater-pre-processing/doc/flow_final_geo.fig
Removed:
trunk/greater-pre-processing/doc/flow.final.att.fig
trunk/greater-pre-processing/doc/flow.final.geo.fig
Modified:
trunk/greater-pre-processing/doc/Makefile
trunk/greater-pre-processing/doc/theory.tex
Log:
Renamed flow_final_geo.pdf and flow_final_att.pdf,
includegraphics doesn't work well with dots in filenames.
Modified: trunk/greater-pre-processing/doc/Makefile
===================================================================
--- trunk/greater-pre-processing/doc/Makefile 2011-11-21 11:50:12 UTC (rev 3819)
+++ trunk/greater-pre-processing/doc/Makefile 2011-11-21 15:25:31 UTC (rev 3820)
@@ -9,28 +9,39 @@
DOCUMENTS = greater-preprocessing-manual.pdf
+IMAGES = DigitialRiverNetwork.pdf \
+ flow_final_geo.pdf flow_final_att.pdf \
+ triple_confl.pdf ocean_segments.pdf bifurcation.pdf \
+ unconsidered.pdf
+
%.eps: %.jpg
convert jpg:$*.jpg eps:$*.eps
%.eps: %.fig
fig2dev -L eps $*.fig > $*.eps
+%.pdf: %.fig
+ fig2dev -L pdf $*.fig > $*.pdf
+
%.pdf: %.tex
$(LATEX) $*.tex && $(LATEX) $*.tex
%.ps: %.dvi
dvips -o $*.ps $*.dvi
-all: $(DOCUMENTS)
+images: $(IMAGES)
+ make -C images images
-greater-preprocessing-manual.dvi: theory.tex sourcefiles.tex resultfiles.tex \
- howto.tex gnufdl.tex \
- river.digital.eps DigitialRiverNetwork.eps flow.final.geo.eps \
- flow.final.att.eps triple_confl.eps ocean_segments.eps bifurcation.eps \
- unconsidered.eps
+all: images $(DOCUMENTS)
+greater-preprocessing-manual.pdf: theory.tex sourcefiles.tex resultfiles.tex \
+ howto.tex gnufdl.tex
+ $(LATEX) $*.tex && $(LATEX) $*.tex
+
clean:
rm -f *.log *.toc *.aux *.eps *.dvi *.ps *.bak
+ make -C images clean
very_clean: clean
rm -f *.dvi *.pdf
+ make -C images very_clean
Deleted: trunk/greater-pre-processing/doc/flow.final.att.fig
===================================================================
--- trunk/greater-pre-processing/doc/flow.final.att.fig 2011-11-21 11:50:12 UTC (rev 3819)
+++ trunk/greater-pre-processing/doc/flow.final.att.fig 2011-11-21 15:25:31 UTC (rev 3820)
@@ -1,122 +0,0 @@
-#FIG 3.2
-Portrait
-Center
-Metric
-A4
-100.00
-Single
--2
-1200 2
-6 3375 900 6615 1215
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3377 1082 3737 1082
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4457 1082 5852 1082
-4 0 -1 0 0 0 12 0.0000 4 150 675 3827 1127 wwtp.att\001
-4 0 -1 0 0 0 12 0.0000 4 135 540 4907 1037 txt2dbf\001
-4 0 -1 0 0 0 12 0.0000 4 180 705 5897 1127 wwtp.dbf\001
--6
-6 3375 1305 6615 1575
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3377 1487 3737 1487
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4457 1487 5853 1488
-4 0 -1 0 0 0 12 0.0000 4 135 660 3827 1532 disch.att\001
-4 0 -1 0 0 0 12 0.0000 4 135 690 5942 1532 disch.dbf\001
-4 0 -1 0 0 0 12 0.0000 4 135 540 4907 1442 txt2dbf\001
--6
-6 3375 1709 6570 1979
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3377 1891 3737 1891
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4457 1891 5853 1892
-4 0 -1 0 0 0 12 0.0000 4 135 600 3827 1936 river.att\001
-4 0 -1 0 0 0 12 0.0000 4 135 630 5942 1936 river.dbf\001
-4 0 -1 0 0 0 12 0.0000 4 135 540 4907 1846 txt2dbf\001
--6
-6 855 2970 6615 3555
-6 3780 2970 4410 3555
-2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
- 3780 2970 4410 2970 4410 3555 3780 3555 3780 2970
-4 0 0 100 0 0 12 0.0000 4 135 345 3915 3240 Text\001
-4 0 0 100 0 0 12 0.0000 4 135 375 3915 3465 Files\001
--6
-6 855 2970 1485 3555
-2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
- 855 2970 1485 2970 1485 3555 855 3555 855 2970
-4 0 0 100 0 0 12 0.0000 4 135 345 990 3240 Text\001
-4 0 0 100 0 0 12 0.0000 4 135 375 990 3465 Files\001
--6
-6 2295 3105 2835 3420
-2 4 0 1 0 7 100 0 -1 0.000 0 0 7 0 0 5
- 2835 3420 2835 3105 2295 3105 2295 3420 2835 3420
-4 0 0 100 0 0 12 0.0000 4 180 405 2385 3330 gawk\001
--6
-6 5895 2970 6615 3510
-2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
- 5895 2970 6615 2970 6615 3510 5895 3510 5895 2970
-4 0 0 100 0 0 12 0.0000 4 135 525 5985 3195 DBase\001
-4 0 0 100 0 0 12 0.0000 4 135 375 6075 3420 Files\001
--6
-6 4815 3105 5535 3420
-2 4 0 1 0 7 100 0 -1 0.000 0 0 7 0 0 5
- 5535 3420 5535 3105 4815 3105 4815 3420 5535 3420
-4 0 0 100 0 0 12 0.0000 4 135 540 4905 3330 txt2dbf\001
--6
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 1530 3285 2205 3285
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 2880 3285 3735 3285
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4455 3285 4725 3285
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 5580 3285 5850 3285
--6
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 1170 720 1935 720
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 1170 945 1935 945
-2 1 2 1 -1 7 0 0 -1 3.000 0 0 -1 0 0 2
- 900 495 1845 495
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 1846 496 1936 496
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 1936 496 1936 946
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 1936 721 3736 721
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4591 721 5851 721
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 3376 721 3375 1890
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 585 495 855 495
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 2161 2340 2835 2340
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4456 2340 5760 2340
-4 0 -1 0 0 0 12 0.0000 4 180 1785 1981 676 generateAttTables.awk\001
-4 0 -1 0 0 0 12 0.0000 4 135 855 3781 766 rivclass.att\001
-4 0 -1 0 0 0 12 0.0000 4 135 540 4861 676 txt2dbf\001
-4 0 -1 0 0 0 12 0.0000 4 135 885 5896 766 rivclass.dbf\001
-4 0 -1 0 0 0 12 0.0000 4 135 315 855 765 .dsd\001
-4 0 -1 0 0 0 12 0.0000 4 90 285 855 990 .rna\001
-4 0 -1 0 0 0 12 0.0000 4 135 285 225 540 .drn\001
-4 0 -1 0 0 0 12 0.0000 4 180 1230 720 360 topology.awk, ...\001
-4 0 -1 0 0 0 12 0.0000 4 135 1200 900 2385 catchment.desc\001
-4 0 -1 0 0 0 12 0.0000 4 180 1455 2925 2385 catchbound.att.tmp\001
-4 0 -1 0 0 0 12 0.0000 4 135 1155 5850 2385 catchbound.dbf\001
-4 0 -1 0 0 0 12 0.0000 4 135 540 4815 2250 txt2dbf\001
Deleted: trunk/greater-pre-processing/doc/flow.final.geo.fig
===================================================================
--- trunk/greater-pre-processing/doc/flow.final.geo.fig 2011-11-21 11:50:12 UTC (rev 3819)
+++ trunk/greater-pre-processing/doc/flow.final.geo.fig 2011-11-21 15:25:31 UTC (rev 3820)
@@ -1,95 +0,0 @@
-#FIG 3.2
-Portrait
-Center
-Metric
-A4
-100.00
-Single
--2
-1200 2
-6 225 2115 6660 2700
-6 225 2115 855 2700
-2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
- 225 2115 855 2115 855 2700 225 2700 225 2115
-4 0 0 100 0 0 12 0.0000 4 135 345 360 2385 Text\001
-4 0 0 100 0 0 12 0.0000 4 135 375 360 2610 Files\001
--6
-6 1350 2250 1890 2565
-2 4 0 1 0 7 100 0 -1 0.000 0 0 7 0 0 5
- 1890 2565 1890 2250 1350 2250 1350 2565 1890 2565
-4 0 0 100 0 0 12 0.0000 4 180 405 1440 2475 gawk\001
--6
-6 2520 2115 3150 2700
-2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
- 2520 2115 3150 2115 3150 2700 2520 2700 2520 2115
-4 0 0 100 0 0 12 0.0000 4 135 345 2655 2385 Text\001
-4 0 0 100 0 0 12 0.0000 4 135 375 2655 2610 Files\001
--6
-6 4140 2205 5175 2610
-2 4 0 1 0 7 100 0 -1 0.000 0 0 7 0 0 5
- 5175 2610 5175 2205 4140 2205 4140 2610 5175 2610
-4 0 0 100 0 0 12 0.0000 4 180 630 4320 2475 gen2shp\001
--6
-6 5715 2115 6660 2655
-2 2 0 1 0 7 100 0 -1 0.000 0 0 -1 0 0 5
- 5715 2115 6660 2115 6660 2655 5715 2655 5715 2115
-4 0 0 100 0 0 12 0.0000 4 180 795 5805 2430 Shapefiles\001
--6
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 900 2430 1260 2430
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 1935 2430 2475 2430
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3195 2430 4095 2430
-2 1 0 1 0 7 100 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 5220 2430 5670 2430
--6
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 496 1306 2250 1305
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 541 1756 2250 1755
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 3
- 0 0 1.00 60.00 120.00
- 540 315 720 720 2250 720
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 497 317 2250 315
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 2
- 540 1305 720 720
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3825 720 5580 720
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3600 1305 5580 1305
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3870 1755 5580 1755
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3780 315 5580 315
-4 0 -1 0 0 0 12 0.0000 4 135 285 226 1351 .drn\001
-4 0 -1 0 0 0 12 0.0000 4 180 315 226 1801 .cbp\001
-4 0 -1 0 0 0 12 0.0000 4 180 1320 855 675 drn_dsd2gen.awk\001
-4 0 -1 0 0 0 12 0.0000 4 180 1035 3915 675 gen2shp lines\001
-4 0 -1 0 0 0 12 0.0000 4 135 315 227 362 .dsd\001
-4 0 -1 0 0 0 12 0.0000 4 180 1350 4095 1710 gen2shp polygons\001
-4 0 -1 0 0 0 12 0.0000 4 180 1035 4095 1260 gen2shp lines\001
-4 0 -1 0 0 0 12 0.0000 4 180 1140 4005 270 gen2shp points\001
-4 0 -1 0 0 0 12 0.0000 4 180 1470 2295 360 discharges.gen.tmp\001
-4 0 -1 0 0 0 12 0.0000 4 180 1230 2295 1350 rivernet.gen.tmp\001
-4 0 -1 0 0 0 12 0.0000 4 180 990 900 1710 cbp2gen.awk\001
-4 0 -1 0 0 0 12 0.0000 4 180 960 855 1260 drn2gen.awk\001
-4 0 -1 0 0 0 12 0.0000 4 180 990 855 270 dsd2gen.awk\001
-4 0 -1 0 0 0 12 0.0000 4 180 1485 2295 765 disch_river.gen.tmp\001
-4 0 -1 0 0 0 12 0.0000 4 180 1515 2295 1800 catchbound.gen.tmp\001
-4 0 -1 0 0 0 12 0.0000 4 180 1140 5625 360 discharges.shp\001
-4 0 -1 0 0 0 12 0.0000 4 180 1155 5625 765 disch_river.shp\001
-4 0 -1 0 0 0 12 0.0000 4 180 900 5625 1350 rivernet.shp\001
-4 0 -1 0 0 0 12 0.0000 4 180 1185 5625 1800 catchbound.shp\001
Copied: trunk/greater-pre-processing/doc/flow_final_att.fig (from rev 3819, trunk/greater-pre-processing/doc/flow.final.att.fig)
Copied: trunk/greater-pre-processing/doc/flow_final_geo.fig (from rev 3819, trunk/greater-pre-processing/doc/flow.final.geo.fig)
Modified: trunk/greater-pre-processing/doc/theory.tex
===================================================================
--- trunk/greater-pre-processing/doc/theory.tex 2011-11-21 11:50:12 UTC (rev 3819)
+++ trunk/greater-pre-processing/doc/theory.tex 2011-11-21 15:25:31 UTC (rev 3820)
@@ -95,7 +95,7 @@
The two-step approach is therefore choosen for the GREAT-ER data processing.
\begin{center}
- \Fig{\epsfxsize130mm \epsffile{images/puzzle_en.eps}}{
+ \Fig{\includegraphics[width=130mm]{./images/puzzle_en.pdf}}{
Two steps of data processing}
\end{center}
@@ -132,7 +132,7 @@
visual interface available to the user.
\begin{center}
- \Fig{\epsfxsize140mm \epsffile{images/layer.eps}}{
+ \Fig{\includegraphics[width=140mm]{./images/layer.pdf}}{
Layered view of data groups}
\end{center}
@@ -211,7 +211,7 @@
such maps now exist in digital format.
\begin{center}
- \FigExplanation{\epsfxsize100mm \epsffile{DigitialRiverNetwork.eps}}{
+ \Fig{\includegraphics[width=100mm]{./DigitialRiverNetwork.pdf}}{
Steps to create a digital river network}{
\begin{minipage}[t]{10cm}
Steps of creating a digital river network: (a) Reality (i.e. aerial
@@ -613,7 +613,7 @@
regions by abstracting data and to calibrate actually needed scales of data.
\begin{center}
- \Fig{\epsfxsize140mm \epsffile{images/scales.eps}}{
+ \Fig{\includegraphics[width=140mm]{./images/scales.pdf}}{
Geographic units (GU): scale independent}
\end{center}
@@ -754,7 +754,7 @@
handles the Shapefile format.
\begin{center}
- \Fig{\epsfxsize=12cm \epsffile{flow.final.geo.eps}}{
+ \Fig{\includegraphics[width=120mm]{./flow_final_geo.pdf}}{
Command sequence for automatic processing of geographic data}
\end{center}
@@ -780,7 +780,7 @@
basically describe generic treatment plants and rivers.
\begin{center}
- \Fig{\epsfxsize=12cm \epsffile{flow.final.att.eps}}{
+ \Fig{\includegraphics[width=120mm]{./flow_final_att.pdf}}{
Command sequence for automatic preparation of attribute data}
\end{center}
@@ -886,7 +886,7 @@
a new (virtual) segment is inserted as shown in figure 5.7.
\begin{center}
- \FigExplanation{\epsfxsize=10cm \epsffile{triple_confl.eps}}{
+ \FigExplanation{\includegraphics[width=100mm]{./triple_confl.pdf}}{
Resolving confluence of three segments}{
\begin{minipage}[t]{10cm}
Resolving confluence of three segments (a)
@@ -905,7 +905,7 @@
one-to-one to the next downstream segment.
\begin{center}
- \FigExplanation{\epsfxsize=12cm \epsffile{ocean_segments.eps}}{
+ \FigExplanation{\includegraphics[width=120mm]{./ocean_segments.pdf}}{
Resolving multiple end segments (multiple catchments)}{
\begin{minipage}[t]{10cm}
Resolving multiple end segments (multiple catchments) (a)
@@ -937,7 +937,7 @@
{\tt up2} will contain the ID of the neighboring segment.
\begin{center}
- \Fig{\epsfxsize=8cm \epsffile{bifurcation.eps}}{
+ \Fig{\includegraphics[width=80mm]{./bifurcation.pdf}}{
Handling of bifurcations (a) in the binary presentation (b).}
\end{center}
@@ -960,7 +960,7 @@
of using wrong base data is much more probable.
\begin{center}
- \FigExplanation{\epsfxsize=8cm \epsffile{unconsidered.eps}}{
+ \FigExplanation{\includegraphics[width=80mm]{./unconsidered.pdf}}{
Unconsidered situations}{
\begin{minipage}[t]{10cm}
Unconsidered situations: Multiple confluence (a),
More information about the Greater-commits
mailing list