[Greater-commits] r3817 - branches/cefic-approved/GREAT-ER/Greater/Modules trunk/GREAT-ER/doc trunk/greater-pre-processing/doc trunk/packaging trunk/packaging/doc/screenshots
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Oct 14 15:08:58 CEST 2011
Author: aheinecke
Date: 2011-10-14 15:08:57 +0200 (Fri, 14 Oct 2011)
New Revision: 3817
Added:
trunk/GREAT-ER/doc/intevation-logo.png
Modified:
branches/cefic-approved/GREAT-ER/Greater/Modules/help.py
trunk/GREAT-ER/doc/Makefile
trunk/GREAT-ER/doc/greater-manual.tex
trunk/greater-pre-processing/doc/greater-preprocessing-manual.tex
trunk/greater-pre-processing/doc/howto.tex
trunk/packaging/doc/screenshots/config1.png
trunk/packaging/greater-installer.nsi
trunk/packaging/makeinstaller.py
Log:
Remove link to thuban user manual
Fix packaging
Change config screenshot to english locale
Expand and correct preprocessing
Modified: branches/cefic-approved/GREAT-ER/Greater/Modules/help.py
===================================================================
--- branches/cefic-approved/GREAT-ER/Greater/Modules/help.py 2011-10-14 09:22:46 UTC (rev 3816)
+++ branches/cefic-approved/GREAT-ER/Greater/Modules/help.py 2011-10-14 13:08:57 UTC (rev 3817)
@@ -68,17 +68,11 @@
def greater_user_manual(context):
user_manual(context, 'greater-manual.pdf')
-def thuban_user_manual(context):
- user_manual(context, 'thuban-manual.pdf')
registry.Add(Command("greater_user_manual", "&GREAT-ER User Manual",
greater_user_manual,
helptext = "Open GREAT-ER User Manual"))
-registry.Add(Command("thuban_user_manual", "&Thuban User Manual",
- thuban_user_manual, helptext = "Open Thuban User Manual"))
-
def init_menu(main_menu, toolbar):
menu = main_menu.InsertMenu("help", "&Help", after="table")
menu.SetItems(["greater_user_manual",
- "thuban_user_manual",
"help_about"])
Modified: trunk/GREAT-ER/doc/Makefile
===================================================================
--- trunk/GREAT-ER/doc/Makefile 2011-10-14 09:22:46 UTC (rev 3816)
+++ trunk/GREAT-ER/doc/Makefile 2011-10-14 13:08:57 UTC (rev 3817)
@@ -6,7 +6,7 @@
# the following line may look strange, but it works!
#TEXINPUTS = /home/intevation/doc/sty:$(TEXINPU)
-DOCUMENTS = greater-manual.ps gui_styleguide.ps greater-testplan.ps
+DOCUMENTS = greater-manual.pdf gui_styleguide.pdf greater-testplan.pdf
IMAGES =
%.eps: %.jpg
Modified: trunk/GREAT-ER/doc/greater-manual.tex
===================================================================
--- trunk/GREAT-ER/doc/greater-manual.tex 2011-10-14 09:22:46 UTC (rev 3816)
+++ trunk/GREAT-ER/doc/greater-manual.tex 2011-10-14 13:08:57 UTC (rev 3817)
@@ -1,5 +1,5 @@
%vim:set tw=68:
-\documentclass[a4paper,twoside,BCOR19mm]{scrbook}
+\documentclass[a4paper,11pt,oneside,openright,titlepage]{scrbook}
\usepackage{lastpage}
\usepackage[latin1]{inputenc}
\usepackage{color}
Added: trunk/GREAT-ER/doc/intevation-logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/GREAT-ER/doc/intevation-logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/greater-pre-processing/doc/greater-preprocessing-manual.tex
===================================================================
--- trunk/greater-pre-processing/doc/greater-preprocessing-manual.tex 2011-10-14 09:22:46 UTC (rev 3816)
+++ trunk/greater-pre-processing/doc/greater-preprocessing-manual.tex 2011-10-14 13:08:57 UTC (rev 3817)
@@ -22,6 +22,7 @@
\newcommand{\documentID}{}
%----------------------------------------------
+\newcommand{\imagescale}{0.6}
\newcommand{\FigExplanation}[3]%
{
@@ -149,12 +150,10 @@
\verb"http://great-er.intevation.org/"
-\begin{center}
-\begin{textbf} Note:\end{textbf} \begin{textit}
-The Catchment Format between Version 2 of
-the GREAT-ER Software and Version 3 stayed the same. So when preparing
-data for GREAT-ER III the correct Format is 2.0\end{textit}
-\end{center}
+Note:\\
+The Catchment format between Version 2 of
+the GREAT-ER Software and version 3 stayed the same. So when preparing
+data for GREAT-ER III the correct format is 2.0
%
% *************************************************************************
%
Modified: trunk/greater-pre-processing/doc/howto.tex
===================================================================
--- trunk/greater-pre-processing/doc/howto.tex 2011-10-14 09:22:46 UTC (rev 3816)
+++ trunk/greater-pre-processing/doc/howto.tex 2011-10-14 13:08:57 UTC (rev 3817)
@@ -25,17 +25,17 @@
\section{Running the Data Preprocessing}
\begin{center}
-\begin{textbf} Warning GREAT-ER Preprocessing will modify your
-files! Keep a backup of your raw data! \end{textbf} \end{center}
+{\textbf Warning GREAT-ER Preprocessing will modify files!
+Keep a backup of your raw data!} \end{center}
-On Windows a shortcut called \"Catchment Preprocessing\" should
+On Windows a shortcut called "Catchment Preprocessing" should
have been installed in your Start Menu.
If you deselected installing this shortcut or on another operating
-system you can start the Preprocessing Wizard by running
-\"greater-pre-processing.py\" from your installation directory.
+system you can start the Preprocessing wizard by running
+"greater-pre-processing.py" from your installation directory.
Once started you will be asked to select a directory containing
-the catchment you want to pre-process.
+the catchment you want to preprocess.
This folder must contain a file named catchment.desc.\\
(see section \ref{sec:catchment.desc} and \ref{sec:gisfilelist} for details).
@@ -65,13 +65,21 @@
\end{center}
A syntax check is then performed to see if all files are in
-the correct Format.
+the correct format.
Clicking next in this dialog will start the Preprocessing.
\begin{center}
\Fig{\includegraphics[scale=\imagescale]{images/gpp4.png}}{
- Syntax Check
+ Syntax Check}
\end{center}
+During the Preprocessing a window will open in the background
+containing more technical and detailed information about
+the Preprocessing. It can be useful in case of errors.
+\begin{center}
+\Fig{\includegraphics[scale=\imagescale]{images/gpp5.png}}{
+ Preprocessing Detailed Output}
+\end{center}
+
When the preprocessing is completed you can close the Wizard
and upload the catchment into the database.
@@ -94,11 +102,11 @@
\item Upload all GIS data (shapefiles) and additional binary files.
\end{itemize}
-To start the upload process either run \"Upload Catchment\" from the
+To start the upload process either run "Upload Catchment" from the
Start Menu or execute upload-cachment.py from your greater-pre-processing
directory.
-The Wizard will first ask for the directory containing the catchment.desc
+The wizard will first ask for the directory containing the catchment.desc
\begin{center}
\Fig{\includegraphics[scale=\imagescale]{images/upload1.png}}{
Catchment folder selection dialog}
@@ -109,20 +117,17 @@
with password greater for the database greater.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{images/upload2.png}}{
+\Fig{\includegraphics[scale=\imagescale]{images/upload3.png}}{
Database connection settings}
\end{center}
The upload confirmation checked some additional values to ensure
that your data is correctly prepared and ready to be uploaded.
-Selecting \"Next\" in this dialog will start the upload.
+Selecting "Next" in this dialog will start the upload.
\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{images/upload3.png}}{
+\Fig{\includegraphics[scale=\imagescale]{images/upload4.png}}{
Upload confirmation}
\end{center}
-After displaying the progress the status of the upload is reported.
-\begin{center}
-\Fig{\includegraphics[scale=\imagescale]{images/upload3.png}}{
- Upload confirmation}
-\end{center}
+After displaying the progress, the wizard is finished and the
+new catchment has been added to the database.
Modified: trunk/packaging/doc/screenshots/config1.png
===================================================================
(Binary files differ)
Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi 2011-10-14 09:22:46 UTC (rev 3816)
+++ trunk/packaging/greater-installer.nsi 2011-10-14 13:08:57 UTC (rev 3817)
@@ -61,7 +61,7 @@
!define MUI_WELCOMEPAGE_TITLE "Welcome to the installation of GREAT-ER III - PostgreSQL"
!define MUI_WELCOMEPAGE_TEXT "This Installer will install \r\n\
The Geo-referenced Regional Exposure Assesment Tool for European Rivers\r\n\
- Version ${version_number}-${version_date} using the Postges SQL Database backend."
+ Version ${version_number} using the Postges SQL Database backend."
!define MUI_HEADERIMAGE_BITMAP ""
!define MUI_COMPONENTSPAGE_TEXT_TOP "Please select installation type"
!define MUI_WELCOMEFINISHPAGE_BITMAP "ressources\welcome_left.bmp"
@@ -152,6 +152,8 @@
; Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
+ # Delete old Start menu entries.
+ RMDir /R "$SMPROGRAMS\${productname_short}"
SetOutPath "$TEMP"
DetailPrint "Installing Microsoft Visual C Runtime Libraries..."
File "vcredist_x86.exe"
@@ -233,10 +235,10 @@
# Create new Start menu entries
CreateDirectory "$SMPROGRAMS\${productname}"
CreateShortCut "$SMPROGRAMS\${productname}\Upload Catchment.lnk" \
- "$INSTDIR\python\pythonw.exe" '"$INSTDIR\greater-pre-processing\upload-catchment.py"' \
+ "$INSTDIR\python\python.exe" '"$INSTDIR\greater-pre-processing\upload-catchment.py"' \
"$INSTDIR\greater-pre-processing\greater.ico"
CreateShortCut "$SMPROGRAMS\${productname}\Catchment Preprocessing.lnk" \
- "$INSTDIR\python\pythonw.exe" '"$INSTDIR\greater-pre-processing\greater-pre-processing.py"' \
+ "$INSTDIR\python\python.exe" '"$INSTDIR\greater-pre-processing\greater-pre-processing.py"' \
"$INSTDIR\greater-pre-processing\greater.ico"
CreateDirectory "$SMPROGRAMS\${productname}\Documentation"
@@ -530,6 +532,7 @@
SetShellVarContext all
RMDir /R "$SMPROGRAMS\${productname}"
Delete "$DESKTOP\${productname_short}.lnk"
+ Delete "$DESKTOP\${productname_short} Sediment.lnk"
Delete "$QUICKLAUNCH\${productname_short}.lnk"
SetShellVarContext current
RMDir /R "$SMPROGRAMS\${productname}"
Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py 2011-10-14 09:22:46 UTC (rev 3816)
+++ trunk/packaging/makeinstaller.py 2011-10-14 13:08:57 UTC (rev 3817)
@@ -195,7 +195,7 @@
for name in extra_executables]:
gpp_files += exc
- outfiles = generate_files([CYGWIN_PATH], "gpp-dep-in.nsi", "gpp-dep-un.nsi",
+ outfiles = generate_files([CYGWIN_PATH, ADMINTOOL_PATH], "gpp-dep-in.nsi", "gpp-dep-un.nsi",
lambda f: os.path.basename(f).lower() in gpp_files,
keep_subdirs=False)
prefix_subdir("greater-pre-processing\\bin", outfiles)
More information about the Greater-commits
mailing list