[Greater-commits] r3837 - trunk/GREAT-ER/doc
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 28 09:31:12 CET 2011
Author: frank
Date: 2011-11-28 09:31:12 +0100 (Mon, 28 Nov 2011)
New Revision: 3837
Modified:
trunk/GREAT-ER/doc/Makefile
trunk/GREAT-ER/doc/greater-manual.tex
trunk/GREAT-ER/doc/greater-sediment.tex
trunk/GREAT-ER/doc/greater-tutorial.tex
Log:
Update to new layout, processing changed to pdflatex.
Modified: trunk/GREAT-ER/doc/Makefile
===================================================================
--- trunk/GREAT-ER/doc/Makefile 2011-11-28 08:30:00 UTC (rev 3836)
+++ trunk/GREAT-ER/doc/Makefile 2011-11-28 08:31:12 UTC (rev 3837)
@@ -1,10 +1,10 @@
# just to make document processing a bit easier
-.SUFFIXES: .dvi .tex .jpg .eps .ps .fig .pdf .html
+.SUFFIXES: .dvi .tex .jpg .eps .ps .fig .pdf .html .sk
-LATEX = latex
+LATEX = pdflatex
# the following line may look strange, but it works!
-#TEXINPUTS = /home/intevation/doc/sty:$(TEXINPU)
+TEXINPUTS = ../../shared/:$(TEXINPU)
DOCUMENTS = greater-manual.pdf gui_styleguide.pdf greater-testplan.pdf
IMAGES =
@@ -15,23 +15,26 @@
%.eps: %.fig
fig2dev -L ps -p dummy_arg -z A4 $*.fig > $*.ps
-%.dvi: %.tex
+%.eps: %.sk
+ sk2ps $*.sk $*.eps
+
+%.png: %.sk
+ sk2ppm --bbox --resolution=600 --alpha-bits=2 $*.sk $*.ppm
+ convert ppm:$*.ppm png:$*.png
+ rm $*.ppm
+
+%.pdf: %.tex
$(LATEX) $*.tex && $(LATEX) $*.tex
%.ps: %.dvi
dvips -o $*.ps $*.dvi
-%.pdf: %.ps
- ( echo "<< /AutoFilterColorImages false"; \
- echo " /EncodeColorImages true"; \
- echo " /DownsampleColorImages false"; \
- echo " /ColorImageFilter /FlateEncode"; \
- echo ">> setdistillerparams" ) \
- | cat - $*.ps | ps2pdf - $*.pdf
-
all: $(DOCUMENTS)
greater-manual.dvi: greater-manual.tex \
greater-tutorial.tex greater-sediment.tex
clean:
- rm -f *.log *.toc *.aux
+ rm -f *.log *.toc *.aux *.dvi
+
+very_clean: clean
+ rm -f greater-manual.ps $(DOCUMENTS)
Modified: trunk/GREAT-ER/doc/greater-manual.tex
===================================================================
--- trunk/GREAT-ER/doc/greater-manual.tex 2011-11-28 08:30:00 UTC (rev 3836)
+++ trunk/GREAT-ER/doc/greater-manual.tex 2011-11-28 08:31:12 UTC (rev 3837)
@@ -8,7 +8,7 @@
\usepackage{fancyhdr}
\usepackage{natbib}
\usepackage{mdwlist}
-\usepackage{Manual}
+\usepackage{sty/Manual}
\usepackage{wasysym}
@@ -20,6 +20,7 @@
\newcommand{\documentversion}{1.0.2}
\newcommand{\softwareversion}{GREAT-ER 3.0.0}
\newcommand{\documentID}{SVN Development 3.0.0 all-models branch}
+\newcommand{\documentname}{GREAT-ER Desktop Manual}
\definecolor{stepBackground}{gray}{0.8}
@@ -45,7 +46,7 @@
% for some pages latex switches back to pagestyle plain :-(
\fancypagestyle{plain}{%
\fancyhf{} % clear all header and footer fields
- \fancyhead[RO,LE]{\footnotesize \GREATER\ Manual\\ \leftmark}
+ \fancyhead[RO,LE]{\footnotesize GREAT-ER 3.0 \documentname \\ \leftmark}
\fancyfoot[RO,LE]{\footnotesize Intevation GmbH} % Author
\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{LastPage}}
% set the document title for the footer here!
@@ -56,9 +57,7 @@
% and now define pagestyle fancy
\fancyhead{} % clear all fields
-\fancyhead[RO,LE]{\footnotesize \GREATER\ Manual\\ \leftmark}
-
-\fancyfoot{}% clear all fields
+\fancyhead[RO,LE]{\footnotesize GREAT-ER 3.0 \documentname \\ \leftmark}
\fancyfoot[RO,LE]{\footnotesize Intevation GmbH} % Author
\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{LastPage}}
% set the document title for the footer here!
@@ -73,34 +72,43 @@
\parindent0cm
+% TITLE PAGE
{
- \includegraphics[width=0.3\textwidth]{./intevation-logo.eps}\\[0.1cm]
- {\tt http://intevation.net}\\[2.0cm]
-}
+% Icon
+\includegraphics[width=\textwidth]{artwork/great-er3_0-title.png}\\[4.5cm]
-% reenter the TITLE here
-{
+% Title
+\begin{center}
\sffamily\bfseries\Large
-% e.g.:
- GREAT-ER\\[0.5cm]
- \huge GREAT-ER Desktop Manual\\[0.5cm]
- \large Geo-referenced Regional Exposure Assessment Tool for European Rivers\\[4cm]
+ \Huge \documentname \\[5.5cm]
+\end{center}
}
\thispagestyle{empty}
\vfill
+% Author
{\sffamily\small
- Intevation GmbH\\
- Neuer Graben 17\\
- D-49074 Osnabrück\\
- Germany\\
- \\
- Date: \documentdate
+\begin{tabular}{p{0.3\textwidth}p{0.3\textwidth}p{0.3\textwidth}}
+ \includegraphics[width=0.3\textwidth]{/home/intevation/logos/intevation/intevation_logo.png}
+&
+\parbox[b]{0.3\textwidth}{
+Intevation GmbH\\
+Neuer Graben 17\\
+49074 Osnabrück\\
+Germany\\
+www.intevation.de
}
+&
+{\sffamily\small
+\documentdate
+}
+\end{tabular}
+}
+
\newpage
\vfill
@@ -199,7 +207,7 @@
Title Bar, Menu Bar, Tool Bar, Map and Status Bar.
\begin{center}
-\Fig{\includegraphics[width=\textwidth]{screenshots/mainwindow-elements.eps}}{
+\Fig{\includegraphics[width=\textwidth]{screenshots/mainwindow-elements.pdf}}{
\GREATER\ Main Window}
\end{center}
@@ -264,7 +272,7 @@
an account yet, please read section \ref{setup}.\\
\begin{center}
-\Fig{\includegraphics[width=4cm]{screenshots/authenticate-dlg.eps}}{
+\Fig{\includegraphics[width=4cm]{screenshots/authenticate-dlg.pdf}}{
Authentication Dialog}
\end{center}
@@ -317,7 +325,7 @@
on the session name.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/opensession-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/opensession-dlg.pdf}}{
Open Session Dialog}
\end{center}
@@ -337,7 +345,7 @@
catchment, comment and privileges.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/editsession-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/editsession-dlg.pdf}}{
Edit Session Dialog}
\end{center}
@@ -412,7 +420,7 @@
% and show detailed information on the current session.
%
% \begin{center}
-% \Fig{\includegraphics[scale=\imagescale]{screenshots/sessioninfotree-win.eps}}{
+% \Fig{\includegraphics[scale=\imagescale]{screenshots/sessioninfotree-win.pdf}}{
% Session Tree Window}{Session Tree Window}
% \end{center}
%
@@ -466,7 +474,7 @@
on the substance name.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/opensubstance-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/opensubstance-dlg.pdf}}{
Open Substance Dialog}
\end{center}
@@ -504,7 +512,7 @@
\newcommand{\substanceimagescale}{0.4}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/substance-dlg-identification.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/substance-dlg-identification.pdf}}{
Edit Substance Dialog, page Identification
}
\end{center}
@@ -518,7 +526,7 @@
the related pages.
\begin{center}
-\Fig{\includegraphics[scale=0.4]{screenshots/substance-dlg-physicochemical.eps}}{
+\Fig{\includegraphics[scale=0.4]{screenshots/substance-dlg-physicochemical.pdf}}{
Edit Substance Dialog, page Physico-chemical Parameters
}
\end{center}
@@ -529,7 +537,7 @@
model.
\begin{center}
-\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-partitioning.eps}}{
+\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-partitioning.pdf}}{
Edit Substance Dialog, page Partitioning
}
\end{center}
@@ -543,7 +551,7 @@
treatment plants.
\begin{center}
-\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-wwtpremoval.eps}}{
+\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-wwtpremoval.pdf}}{
Edit Substance Dialog, page WWTP Removal
}
\end{center}
@@ -556,7 +564,7 @@
for a more detailed explanation of the parameters.
\begin{center}
-\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-degradation.eps}}{
+\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-degradation.pdf}}{
Edit Substance Dialog, page Bio-Degradation
}
\end{center}
@@ -568,7 +576,7 @@
the river sub-model.
\begin{center}
-\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-riverremoval.eps}}{
+\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-riverremoval.pdf}}{
Edit Substance Dialog, page River Removal}
\end{center}
@@ -578,7 +586,7 @@
of the substance assumed for any discharge site in the simulation area.
\begin{center}
-\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-emissiondata.eps}}{
+\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-emissiondata.pdf}}{
Edit Substance Dialog, page Emission Information}
\end{center}
@@ -589,7 +597,7 @@
menu).
\begin{center}
-\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-riskassessment.eps}}{
+\Fig{\includegraphics[scale=\substanceimagescale]{screenshots/substance-dlg-riskassessment.pdf}}{
Edit Substance Dialog, page Risk Assessment}
\end{center}
@@ -599,7 +607,7 @@
comment and privileges for the new substance entry.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/savesubstanceas-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/savesubstanceas-dlg.pdf}}{
Save Substance As Dialog
}
\end{center}
@@ -626,7 +634,7 @@
will be deleted.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/selectcatchment-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/selectcatchment-dlg.pdf}}{
Select Catchment Dialog}
\end{center}
@@ -651,7 +659,7 @@
volume.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/editemissiondata-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/editemissiondata-dlg.pdf}}{
Edit Emission Data Dialog}
\end{center}
@@ -696,7 +704,7 @@
should be entered as domestic flow.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/editdischargedata-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/editdischargedata-dlg.pdf}}{
Edit Discharge Data Dialog}
\end{center}
@@ -747,7 +755,7 @@
on the environment name.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/openenvironment-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/openenvironment-dlg.pdf}}{
Open Environment Dialog}
\end{center}
@@ -769,40 +777,40 @@
% TODO: rename the screenshot to editenvironment-dlg-...
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/editenvironmentparameters-dlg-environment.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/editenvironmentparameters-dlg-environment.pdf}}{
Edit Environment Dialog - page Environment}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-sewer.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-sewer.pdf}}{
Edit Environment Dialog - page Sewer}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-primary.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-primary.pdf}}{
Edit Environment Dialog - page Primary settler}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-secondary.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-secondary.pdf}}{
Edit Environment Dialog - page Secondary settler}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-as.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-as.pdf}}{
Edit Environment Dialog - page Activated sludge}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-wwtp.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-wwtp.pdf}}{
Edit Environment Dialog - page WWTP mass transfer}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-river.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editenvironmentparameters-dlg-river.pdf}}{
Edit Environment Dialog - page River}
\\
\end{center}
@@ -813,7 +821,7 @@
comment and privileges for the new environment entry.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/saveenvironmentas-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/saveenvironmentas-dlg.pdf}}{
Save Environment As Dialog
}
\end{center}
@@ -864,27 +872,27 @@
parameters the mean values are applied.
\begin{center}
-\Fig{\includegraphics[scale=0.45]{screenshots/editmodelparameters-dlg-general.eps}}{
+\Fig{\includegraphics[scale=0.45]{screenshots/editmodelparameters-dlg-general.pdf}}{
Edit Model Parameters Dialog - page General}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-sewer.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-sewer.pdf}}{
Edit Model Parameters Dialog - page Sewer}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-as.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-as.pdf}}{
Edit Model Parameters Dialog - page Activated Sludge WWTP}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-tf.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-tf.pdf}}{
Edit Model Parameters Dialog - page Trickling Filter WWTP}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-river.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editmodelparameters-dlg-river.pdf}}{
Edit Model Parameters Dialog - page River}
\end{center}
@@ -908,7 +916,7 @@
to perform a simulation.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/missingparameters-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/missingparameters-dlg.pdf}}{
Missing Parameters}
\end{center}
@@ -924,7 +932,7 @@
(see section \ref{missingparameters}) is raised.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/startsimulation-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/startsimulation-dlg.pdf}}{
Simulation Status Dialog}
\end{center}
@@ -941,7 +949,7 @@
connect to the database to retrieve parameters and write the results.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/selectsimulationserver-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/selectsimulationserver-dlg.pdf}}{
Select Simulation Server}
\\
\end{center}
@@ -966,13 +974,13 @@
listed. On failure an according error message is raised.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/simulationserversuccess-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/simulationserversuccess-dlg.pdf}}{
Select Simulation Server - Test Server Connection Success}
\\
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/simulationserverfailure-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/simulationserverfailure-dlg.pdf}}{
Select Simulation Server - Test Server Connection Failure}
\\
\end{center}
@@ -997,7 +1005,7 @@
layers attribute table.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/add-background-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/add-background-dlg.pdf}}{
Add Background Layers Dialog}
\\
\end{center}
@@ -1021,7 +1029,7 @@
displayed in the scenarios view, entitled "Csim xx [unit]". The coloring is the same as that used for the mean values.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/calculaterivercsim-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/calculaterivercsim-dlg.pdf}}{
Calculate River Csim}
\\
\end{center}
@@ -1032,7 +1040,7 @@
optionally on a new Csim percentile.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/csimclasses-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/csimclasses-dlg.pdf}}{
Csim Classes River}
\\
\end{center}
@@ -1052,7 +1060,7 @@
five classes for flow:
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/combine-csim-flow.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/combine-csim-flow.pdf}}{
Classification generated by {\em Combine Csim/Flow} tool }
\\
\end{center}
@@ -1070,7 +1078,7 @@
(compare \citep{Boeije2000}):
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/pecinitial-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/pecinitial-dlg.pdf}}{
PEC initial}
\\
\end{center}
@@ -1092,7 +1100,7 @@
and in the weighting of concentrations (compare \citep{Boeije2000}):
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/peccatchment-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/peccatchment-dlg.pdf}}{
PEC catchment}
\\
\end{center}
@@ -1113,7 +1121,7 @@
simulation results with a quantile classification.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/discharge-results.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/discharge-results.pdf}}{
Discharge results}
\\
\end{center}
@@ -1134,7 +1142,7 @@
other applications.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/massflux-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/massflux-dlg.pdf}}{
Mass Flux}
\\
\end{center}
@@ -1156,7 +1164,7 @@
highlighted.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/tutorial-concentrationprofile.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/tutorial-concentrationprofile.pdf}}{
Concentration Profile}
\\
\end{center}
@@ -1301,7 +1309,7 @@
traceback:
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/traceback.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/traceback.pdf}}{
Traceback \GREATER\ User Interface}
\end{center}
Modified: trunk/GREAT-ER/doc/greater-sediment.tex
===================================================================
--- trunk/GREAT-ER/doc/greater-sediment.tex 2011-11-28 08:30:00 UTC (rev 3836)
+++ trunk/GREAT-ER/doc/greater-sediment.tex 2011-11-28 08:31:12 UTC (rev 3837)
@@ -42,7 +42,7 @@
%(see section \ref{modelparameters}).
%
%\begin{center}
-%\Fig{\includegraphics[scale=0.5]{screenshots/editmodel-dlg-sediment.eps}}{
+%\Fig{\includegraphics[scale=0.5]{screenshots/editmodel-dlg-sediment.pdf}}{
% Edit Model Parameters Dialog - page Sediment}
%\end{center}
%
@@ -59,7 +59,7 @@
%a combination of River mode 2 and an activated Sediment extension.
%
%\begin{center}
-%\Fig{\includegraphics[scale=0.5]{screenshots/editmodel-sediment-warning.eps}}{
+%\Fig{\includegraphics[scale=0.5]{screenshots/editmodel-sediment-warning.pdf}}{
% Edit Model Parameters - Sediment extension disabled warning}
%\end{center}
%
@@ -73,7 +73,7 @@
%be displayed in the legend.
%
%\begin{center}
-%\Fig{\includegraphics[scale=\imagescale]{screenshots/sedimentresults-dlg.eps}}{
+%\Fig{\includegraphics[scale=\imagescale]{screenshots/sedimentresults-dlg.pdf}}{
% Sediment Extension Results Dialog}
%\\
%\end{center}
@@ -179,7 +179,7 @@
parameters editable through the GREAT-ER desktop client.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/editenvironmentparameters-dlg-river.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/editenvironmentparameters-dlg-river.pdf}}{
Edit Environment Dialog - page River\label{fig:envparam_river}}
\end{center}
@@ -200,12 +200,12 @@
existing file or exit the dialog with 'Cancel'.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-overwrite.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-overwrite.pdf}}{
Load TERRACE File - Overwrite Warning\label{fig:terrace_file_overwrite}}
\end{center}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-selection.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-selection.pdf}}{
Load TERRACE File - File Selection\label{fig:ss_file_selection}}
\end{center}
@@ -215,7 +215,7 @@
(see Fig. A.\ref{fig:ss_file_network_error}) and the sesssion is left unmodified.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-overwrite.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-overwrite.pdf}}{
Load TERRACE File - Network Mismatch\label{fig:ss_file_network_error}}
\end{center}
@@ -228,7 +228,7 @@
explicitely (Fig. A.\ref{fig:terrace_file_remove}).
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-remove.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/terrace-file-remove.pdf}}{
Remove TERRACE File - Confirmation Dialog\label{fig:terrace_file_remove}}
\end{center}
@@ -265,7 +265,7 @@
object values are not available.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/editmodelparameters-dlg-riversediment.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{screenshots/editmodelparameters-dlg-riversediment.pdf}}{
Edit Model Parameters - River / Sediment Card\label{fig:model_select_data}}
\end{center}
@@ -284,7 +284,7 @@
matching (Fig. A.\ref{fig:model_sediment-warning}).
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/editmodel-sediment-warning.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/editmodel-sediment-warning.pdf}}{
Edit Model Parameters -
Sediment extension disabled warning\label{fig:model_sediment-warning}}
\end{center}
@@ -299,7 +299,7 @@
selected (Fig. A.\ref{fig:sedimentresults-dlg}).
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/sedimentresults-dlg.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/sedimentresults-dlg.pdf}}{
Sediment Extension Results Dialog\label{fig:sedimentresults-dlg}}
\end{center}
Modified: trunk/GREAT-ER/doc/greater-tutorial.tex
===================================================================
--- trunk/GREAT-ER/doc/greater-tutorial.tex 2011-11-28 08:30:00 UTC (rev 3836)
+++ trunk/GREAT-ER/doc/greater-tutorial.tex 2011-11-28 08:31:12 UTC (rev 3837)
@@ -19,7 +19,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=1.1]{session-workflow.eps}}
+\Fig{\includegraphics[height=0.6\textheight]{session-workflow.png}}
{\GREATER\ Session Work-flow\label{FIGsessionWorkflow}}
\end{center}
@@ -230,7 +230,7 @@
After the start-up \GREATER\ presents the initial screen.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{screenshots/initial_screen.eps}}
+\Fig{\includegraphics[scale=\imagescale]{screenshots/initial_screen.pdf}}
{\GREATER\ - initial screen\label{FIGinitialScreen}}
\end{center}
@@ -275,7 +275,7 @@
If no database is specified, the user's profile default database is used.}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/authenticate-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/authenticate-dlg.pdf}}
{Authenticate Dialog}
\end{center}
@@ -290,7 +290,7 @@
\section{Setting up a session}
\parbox[b]{0.15\textwidth}
-{\includegraphics[scale=\imagescale]{./screenshots/menu-file.eps}
+{\includegraphics[scale=\imagescale]{./screenshots/menu-file.pdf}
}
\hfill
\parbox[b]{0.8\textwidth}{
@@ -310,7 +310,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/newsession-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/newsession-dlg.pdf}}
{New Session Dialog \label{FIGnewScenario}}
\end{center}
@@ -334,7 +334,7 @@
The \GREATER\ user interface now changes:
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial_session.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial_session.pdf}}
{Tutorial Session with Catchment Calder \label{FIGinitialAire}}
\end{center}
@@ -361,7 +361,7 @@
presents the attributes of selected geographic objects.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/identify-dlg.eps}}{
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/identify-dlg.pdf}}{
Identify Tool Dialog \label{FIGidentify}}
\end{center}
@@ -388,7 +388,7 @@
\menuitem{\underline{S}ubstance} / \menuitem{\underline{E}dit} menu.}
\parbox[b]{0.15\textwidth}{
-\includegraphics[scale=\imagescale]{./screenshots/menu-substance.eps}
+\includegraphics[scale=\imagescale]{./screenshots/menu-substance.pdf}
}
\hfill
\parbox[b]{0.8\textwidth}{
@@ -407,7 +407,7 @@
considered as distributed the distribution dialog can be raised.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/substance-dlg-identification.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/substance-dlg-identification.pdf}}
{Substance Dialog \label{FIGsubstanceDialog}}
\end{center}
@@ -444,7 +444,7 @@
are coded by the descriptive values separated by a semicolon.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/distribution-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/distribution-dlg.pdf}}
{Distribution Dialog \label{FIGsubstanceDialog}}
\end{center}
@@ -475,7 +475,7 @@
\subsection{Editing catchment data}
\parbox[b]{0.15\textwidth}{
-\includegraphics[scale=\imagescale]{./screenshots/menu-catchment.eps}}
+\includegraphics[scale=\imagescale]{./screenshots/menu-catchment.pdf}}
\hfill
\parbox[b]{0.8\textwidth}{
The catchment data consists mainly of spatial data sets which are not
@@ -504,7 +504,7 @@
the industrial input is processed by the treatment plant models.
\begin{center}
-\Fig{\includegraphics[scale=0.45]{./screenshots/editemission-tutorial-dlg.eps}}
+\Fig{\includegraphics[scale=0.45]{./screenshots/editemission-tutorial-dlg.pdf}}
{Edit Emission Data Dialog \label{FIGeditMarketData}}
\end{center}
@@ -534,14 +534,14 @@
e.g. activated sludge plants, and a fixed rate for a selected site.
\begin{center}
-\Fig{\includegraphics[scale=0.45]{./screenshots/editdischargedata-tutorial-dlg.eps}}
+\Fig{\includegraphics[scale=0.45]{./screenshots/editdischargedata-tutorial-dlg.pdf}}
{Edit Discharge-Site Data Dialog \label{FIGeditDischargesiteData}}
\end{center}
\section{Environmental Data}
\parbox[b]{0.15\textwidth}{
-\includegraphics[scale=\imagescale]{./screenshots/menu-environment.eps}}
+\includegraphics[scale=\imagescale]{./screenshots/menu-environment.pdf}}
\hfill
\parbox[b]{0.8\textwidth}{
Not all parameters needed by the \GREATER\ Models are related to the substance
@@ -553,7 +553,7 @@
the substance menu.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/editenvironmentparameters-dlg-environment.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/editenvironmentparameters-dlg-environment.pdf}}
{Edit Environmental Data Dialog \label{FIGeditEnvironmentalData}}
\end{center}
@@ -566,7 +566,7 @@
}
\parbox[b]{0.15\textwidth}{
-\includegraphics[scale=\imagescale]{./screenshots/menu-simulation.eps}}
+\includegraphics[scale=\imagescale]{./screenshots/menu-simulation.pdf}}
\hfill
\parbox[b]{0.8\textwidth}{
The {\em Edit Model Parameters} allows you to enter the number of Monte-Carlo
@@ -593,7 +593,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/editmodelparameters-dlg-general.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/editmodelparameters-dlg-general.pdf}}
{Edit Model Parameters Dialog \label{FIGmodelSelection}}
\end{center}
@@ -617,7 +617,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/editmodelparameters-dlg-river2.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/editmodelparameters-dlg-river2.pdf}}
{Model Parameters Dialog - River Model Selection}
\end{center}
@@ -631,7 +631,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/missingparameters-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/missingparameters-dlg.pdf}}
{Missing Parameters Dialog \label{FIGmissingParameters}}
\end{center}
@@ -644,7 +644,7 @@
cross according to the new model selection.}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/required-parameters-river2.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/required-parameters-river2.pdf}}
{Required Parameters River Model Mode 2 - River Removal\label{FIGrequiredParametersRiver2}}
\end{center}
@@ -675,7 +675,7 @@
}
\begin{center}
-\Fig{{\includegraphics[scale=\imagescale]{./screenshots/startsimulation-tutorial.eps}}}
+\Fig{{\includegraphics[scale=\imagescale]{./screenshots/startsimulation-tutorial.pdf}}}
{Running simulation on Calder catchment \label{FIGsimulation}}
\end{center}
@@ -700,7 +700,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-results.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-results.pdf}}
{Visualization of simulation results for the Calder catchment
\label{FIGsimulationResults}}
\end{center}
@@ -729,14 +729,14 @@
names are recommended. After saving, the new session is the current session.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-save-as.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-save-as.pdf}}
{Save As Dialog \label{FIGsaveAs}}
\end{center}
\section{Analyzing model results}
\parbox{0.15\textwidth}{
-\includegraphics[scale=\imagescale]{./screenshots/menu-analysis.eps}}
+\includegraphics[scale=\imagescale]{./screenshots/menu-analysis.pdf}}
\hfill
\parbox{0.75\textwidth}{
\colorbox{stepBackground}{\parbox{0.7\textwidth}{
@@ -772,7 +772,7 @@
}
\begin{center}
-\Fig{{\includegraphics[scale=\imagescale]{./screenshots/add-background-dlg.eps}}}
+\Fig{{\includegraphics[scale=\imagescale]{./screenshots/add-background-dlg.pdf}}}
{Add Background Layers Dialog \label{FIGaddBackgroundLayers}}
\end{center}
@@ -780,7 +780,7 @@
places, railroads and roads.}
\begin{center}
-\Fig{{\includegraphics[scale=0.55]{./screenshots/tutorial-calder-with-bg.eps}}}
+\Fig{{\includegraphics[scale=0.55]{./screenshots/tutorial-calder-with-bg.pdf}}}
{Calder Catchment with background data \label{FIGcalderWithBackground}}
\end{center}
@@ -797,7 +797,7 @@
or by {\em showing the layers attribute table}.}
\begin{center}
-\Fig{{\includegraphics[scale=0.55]{./screenshots/tutorial-monitoring-data.eps}}}
+\Fig{{\includegraphics[scale=0.55]{./screenshots/tutorial-monitoring-data.pdf}}}
{Calder Catchment with monitoring data \label{FIGcalderWithMonitoring}}
\end{center}
@@ -842,7 +842,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/pecinitial-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/pecinitial-dlg.pdf}}
{PEC$_{initial}$ calculation results \label{FIGPECinitial}}
\end{center}
@@ -938,7 +938,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/peccatchment-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/peccatchment-dlg.pdf}}
{PEC$_{catchment}$ calculation results \label{FIGPECcatchment}}
\end{center}
@@ -963,7 +963,7 @@
substance dialog.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-riskanalysis.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-riskanalysis.pdf}}
{Risk Analysis results \label{FIGPECcatchment}}
\end{center}
@@ -983,7 +983,7 @@
}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{screenshots/tutorial-massflux.eps}}{
+\Fig{\includegraphics[scale=0.5]{screenshots/tutorial-massflux.pdf}}{
Mass Flux}
\end{center}
@@ -1002,7 +1002,7 @@
the sampled C$_{sim, internal}$ mean values are displayed in a xy-plot.}
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-concentrationprofile.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-concentrationprofile.pdf}}
{Concentration Profile\label{FIGconcentrationProfile}}
\end{center}
@@ -1032,7 +1032,7 @@
\end{itemize}
\begin{center}
-\Fig{\includegraphics[scale=0.5]{./screenshots/tutorial-tableview.eps}}
+\Fig{\includegraphics[scale=0.5]{./screenshots/tutorial-tableview.pdf}}
{Concentration Profile Table with Export\label{FIGconcentrationProfileTable}}
\end{center}
@@ -1044,7 +1044,7 @@
allowing you to specify the two tables to be joined and the two
fields the join has to be based on.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-join-dlg.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-join-dlg.pdf}}
{Join Dialog\label{FIGjoin}}
\end{center}
@@ -1079,14 +1079,14 @@
For additional analysis concepts see the chapters below and the \Thuban\ Manual.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-fullcalder.eps}}
+\Fig{\includegraphics[scale=\imagescale]{./screenshots/tutorial-fullcalder.pdf}}
{Projected Calder Catchment with Background and Monitoring Data\label{FIGfull}}
\end{center}
}
% \section{Addit\begin{center}
%
-% \Fig{\includegraphics[scale=\imagescale]{./screenshots/missing.eps}}
+% \Fig{\includegraphics[scale=\imagescale]{./screenshots/missing.pdf}}
% {Display Menu \label{FIGmenuDisplay}}
%
% \TutorialStep{
@@ -1099,7 +1099,7 @@
% active session. Monitoring data will also be available amoung these.}
%
% \begin{center}
-% \Fig{\includegraphics[scale=\imagescale]{./screenshots/missing.eps}}
+% \Fig{\includegraphics[scale=\imagescale]{./screenshots/missing.pdf}}
% {Select Background Data Dialog \label{FIGbackgroundData}}
% \end{center}
%
@@ -1110,7 +1110,7 @@
% }
%
% \begin{center}
-% \Fig{\includegraphics[scale=0.69]{./screenshots/missing.eps}}
+% \Fig{\includegraphics[scale=0.69]{./screenshots/missing.pdf}}
% {Display of Monitoring Sites for Aire Catchment\label{FIGmonitoring}}
% \end{center}
%
@@ -1125,7 +1125,7 @@
% }
%
% \begin{center}
-% \Fig{\includegraphics[scale=\imagescale]{./screenshots/missing.eps}}
+% \Fig{\includegraphics[scale=\imagescale]{./screenshots/missing.pdf}}
% {Monitoring Data Identify Dialog\label{FIGidentifyMonitoring}}
% \end{center}
More information about the Greater-commits
mailing list