2010-10-14    <guravage@caterpie.sen.cwi.nl>

	* canvas.cpp (exportCellData): Added a check to inquire before

	overwritting an existing file.

2010-10-14    <merks@cwi.nl>

	* cell.cpp (DivideWalls): accomodated for rename of Circumference -> WallCircumference

	* hull.h: added an operator< to sort Points

	* hull.cpp: added an operator< to sort Points

	* cellbase.cpp (ExactCircumference): I added a new function

	ExactCircumference, yielding the circumference of the cell along

	its wall_elements

	* VirtualLeaf.cpp: adjust info_string to accomodate for new name

	of function CellBase::Circumference -> CellBase::WallCircumference

	* mesh.cpp: corrected Mesh::Compactness, the boundary coordinates

	need to be sorted in x,y order for the convex hull algorithm

	(thanks Margriet!). I updated CSVExportCellData so it exports the

	circumferences of hull and boundary_polygon.

2010-10-14    <guravage@caterpie.sen.cwi.nl>

	* VirtualLeafpar.tmpl (export_fn_prefix): changed to 'cell.'

	* canvas.cpp (TimeStepWrap): Removed TimeStamp(). Cell data

	filename now incorporates iteration number.

	* canvas.h (MainBase): Removed TimeStamp().

2010-10-08    <guravage@caterpie.sen.cwi.nl>

	* pardialog.h:

	* pardialog.cpp:

	* parameter.h:

	* parameter.cpp: Regenerated to include export_interval and export_fn_prefix.

	* VirtualLeafpar.tmpl: Appended export_interval and export_fn_prefix.

	* canvas.h (MainBase): Declared polymorphic exportCellData() functions.

	* canvas.cpp:

	(TimeStamp): New private TimeStamp() function.

	(TimeStepWrap): Added invocation of exportCellData().

	(exportCellData): Created two polymorphic functions: one with a

	single QString argument, the other with no argument. The former is

	called from TimeStepWrap() while the latter is called from the

	"Export cell areas" item in the file menu.

2010-10-07    <guravage@caterpie.sen.cwi.nl>

	* canvas.cpp (exportCellData): Added a Q3FileDialog to inquire

	where to write the exportCellData.

2010-06-28    <guravage@caterpie.sen.cwi.nl>

	* VirtualLeaf-install.nsi: Grab gpl3.txt from doc directory.

	* canvas.cpp (gpl): gpl3.txt can be either in an ancestor doc

	directory (Linux) or a decedent doc directory (Windows, via the

	binary installer).

	* VirtualLeaf-install.nsi: Add VirtualLeaf doc directory.

2010-06-25    <guravage@caterpie.sen.cwi.nl>

	* gpl3.txt: Moved gpl3.txt from doc to src directory.

	* VirtualLeaf.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

	* libplugin.pro: Ditto.

	* parameter.cpp: Result of adding datadir changes to make_parameter_source.pl.

	* parameter.h: Ditto.

	* output.h: Declared new function (AppendHomeDirIfPathRelative).

	* output.cpp (AppendHomeDirIfPathRelative): Added new function.

	* canvas.cpp (gpl): Moving gpl3.txt from doc to src obviates the need to docDir.cd("../doc").

	* VirtualLeaf-install.nsi: Grab gpl3.txt from src directory.

	Add missing libiconv/bin, libxml2bin and libz/bin directories.

	Copy libiconv-2.dll, libxml2.dll and zlib1.dll from relative paths.

	* VirtualLeaf.pro: copy gpl3.txt as part of QMAKE_POST_LINK.

2010-06-24    <guravage@caterpie.sen.cwi.nl>

	* libplugin.pro: Use correct library path.

	* VirtualLeaf.pro: Ditto.

	* VirtualLeaf.cpp (DrawCell): Iterate over NChem to construct info_string.

2010-06-23    <guravage@caterpie.sen.cwi.nl>

	* simitembase.cpp: Removed NULL assignments to unused variables.

	* VirtualLeaf.cpp: Ditto.

	* apoplastitem.cpp: Ditto.

	* canvas.cpp: Ditto.

	* cell.cpp: Ditto.

	* cellbase.h: Ditto.

	* forwardeuler.cpp: Ditto.

	* mainbase.h: Ditto.

	* nodeitem.cpp: Ditto.

	* qcanvasarrow.h: Ditto.

	* simitembase.cpp: Ditto.

	* Makefile (clean): Add -f Makefile argument to each make invocation.

	* VirtualLeaf-install.nsi: New gpl license text.

	* VirtualLeaf.pro: Disabled console mode.

	* mesh.cpp (Clear): Added parentheses to qDebug statments.

	(TestIllegalWalls): Replaced qDebug().

	* canvas.cpp (mouseReleaseEvent): Replaced qDebug() with cerr since qDebug complains about *node_set.

	* wall.cpp (CorrectWall): Rplaced gDebug() with cerr in transform call and when printing *this.

2010-06-22    <guravage@caterpie.sen.cwi.nl>

	* Makefile (tutorials): Add tutorials target.

2010-06-21    <guravage@caterpie.sen.cwi.nl>

	* parameter.cpp: Added particular reassignment of datadir.

	* canvas.cpp (gpl): Added GPL3 License text. Display detail text only if the source text file exists.

2010-06-18    <guravage@caterpie.sen.cwi.nl>

	* canvas.cpp (gpl): Added gpl slot to display GPL license.

	* VirtualLeaf.pro: Changed default LIBXML2DIR, LIBICONVDIR and LIBZDIR to corresponding distribution lib directories.

	* libplugin.pro: Ditto.

	* Makefile (clean): add if stmt not to `touch` on windows.

2010-06-17    <guravage@caterpie.sen.cwi.nl>

	* VirtualLeaf.pro: Removed perl references.

	* libplugin.pro: Ditto.

2010-06-15    <guravage@caterpie.sen.cwi.nl>

	* VirtualLeaf.pro: Removed xmlwritecode.cpp from SOURCES list.

	* xmlwrite.cpp (XMLSave): Removed references to XMLWriteLeafSourceCode and XMLWriteReactionsCode.

	* xmlwrite.h (XMLIO): Ditto!

	* mesh.cpp (findNextBoundaryNode): Initialize Node *next_boundary_node = NULL;

	* xmlwrite.cpp (XMLReadSimtime): Removed unused variable cur

	(XMLReadWalls): viz_flux need not be declared twice; default value of 0.0.

	(XMLReadCells): Removed unused count variable.

	(XMLReadSimtime): Removed unused cur variable.

	(XMLRead): Removed unused v_str variable.

	* simitembase.cpp (userMove): Use assignment merely to obviate compilation warning.

	(SimItemBase) Ditto.

	* qcanvasarrow.h (QGraphicsLineItem): Use assignment merely to obviate compilation warning.

	* output.cpp (OpenWriteFile): Removed unused par variable.

	* nodeitem.cpp (paint): Use assignment merely to obviate compilation warning.

	* forwardeuler.cpp (odeint): Use assignment merely to obviate compilation warning.

	* cell.cpp (DivideOverGivenLine): Use assignment merely to obviate compilation warning.

	* canvas.cpp (FigureEditor): Use assignments merely to obviate compilation errors.

	(mousePressEvent): Removed unused item variable.

	* apoplastitem.cpp

	(ApoplastItem): Removed unused par variable.

	(OnClick): Use NULL assignment merely to obviate compilation warning.

	* mainbase.h (MainBase): Use assignment merely to obviate compilation warning.

# $Id$

# appends \ to the path if missing

# example: !insertmacro GetCleanDir "c:\blabla"

# Pop $0 => "c:\blabla\"

!macro GetCleanDir INPUTDIR

  ; ATTENTION: USE ON YOUR OWN RISK!

  ; Please report bugs here: http://stefan.bertels.org/

  !define Index_GetCleanDir 'GetCleanDir_Line${__LINE__}'

  Push $R0

  Push $R1

  StrCpy $R0 "${INPUTDIR}"

  StrCmp $R0 "" ${Index_GetCleanDir}-finish

  StrCpy $R1 "$R0" "" -1

  StrCmp "$R1" "\" ${Index_GetCleanDir}-finish

  StrCpy $R0 "$R0\"

${Index_GetCleanDir}-finish:

  Pop $R1

  Exch $R0

  !undef Index_GetCleanDir

!macroend

# similar to "RMDIR /r DIRECTORY", but does not remove DIRECTORY itself

# example: !insertmacro RemoveFilesAndSubDirs "$INSTDIR"

!macro RemoveFilesAndSubDirs DIRECTORY

  # ATTENTION: USE ON YOUR OWN RISK!

  # Please report bugs here: http://stefan.bertels.org/

  !define Index_RemoveFilesAndSubDirs 'RemoveFilesAndSubDirs_${__LINE__}'

  Push $R0

  Push $R1

  Push $R2

  !insertmacro GetCleanDir "${DIRECTORY}"

  Pop $R2

  FindFirst $R0 $R1 "$R2*.*"

${Index_RemoveFilesAndSubDirs}-loop:

  StrCmp $R1 "" ${Index_RemoveFilesAndSubDirs}-done

  StrCmp $R1 "." ${Index_RemoveFilesAndSubDirs}-next

  StrCmp $R1 ".." ${Index_RemoveFilesAndSubDirs}-next

  IfFileExists "$R2$R1\*.*" ${Index_RemoveFilesAndSubDirs}-directory

  ; file

  Delete "$R2$R1"

  goto ${Index_RemoveFilesAndSubDirs}-next

${Index_RemoveFilesAndSubDirs}-directory:

  ; directory

  RMDir /r "$R2$R1"

${Index_RemoveFilesAndSubDirs}-next:

  FindNext $R0 $R1

  Goto ${Index_RemoveFilesAndSubDirs}-loop

${Index_RemoveFilesAndSubDirs}-done:

  FindClose $R0

  Pop $R2

  Pop $R1

  Pop $R0

  !undef Index_RemoveFilesAndSubDirs

!macroend

!define PRODUCT_NAME "The Virtual Leaf"

!define PRODUCT_VERSION "1.0"

!define PRODUCT_PUBLISHER "Center for Mathematics and Computer Science (CWI)"

!define PRODUCT_WEB_SITE "www.cwi.nl"

!define EXECUTABLE "VirtualLeaf.exe"

!define PROGICON "leaficon.ico"

!define SETUP_BITMAP "leaficon.ico"

# MUI 1.67 compatible ------

!include "MUI.nsh"

!include "EnvVarUpdate.nsh"

# MUI Settings

!define MUI_ABORTWARNING

!define MUI_ICON "leaficon.ico"

!define MUI_UNICON "leaficon.ico"

# Welcome page

!insertmacro MUI_PAGE_WELCOME

# License page

!insertmacro MUI_PAGE_LICENSE "..\doc\gpl3.txt"

# Components page

!insertmacro MUI_PAGE_COMPONENTS

# Directory page

!insertmacro MUI_PAGE_DIRECTORY

# Instfiles page

!insertmacro MUI_PAGE_INSTFILES

# Finish page

!insertmacro MUI_PAGE_FINISH

# Uninstaller pages

!insertmacro MUI_UNPAGE_CONFIRM

!insertmacro MUI_UNPAGE_INSTFILES

!insertmacro MUI_UNPAGE_FINISH

# Language files

!insertmacro MUI_LANGUAGE "English"

# MUI end ------

# set the name of the installer

outfile "VirtualLeaf-install.exe"

Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"

ShowInstDetails show

ShowUnInstDetails show

# define the directory to install to

installDir C:\VirtualLeaf

# Request application privileges

RequestExecutionLevel user

section "Virtual Leaf executable"

  #sectionIn RO

  # define the output path for the Virtual Leaf executable

  file ..\bin\VirtualLeaf.exe

  # Required DLLs

  setOutPath $INSTDIR\bin

  file ..\lib\libiconv\bin\libiconv-2.dll

  file ..\lib\libxml2\lib\libxml2.dll

  file ..\lib\libz\bin\zlib1.dll

  # Is the pegging of these DLLs to a specific QT version a problem?

  file C:\Qt\2010.02.1\mingw\bin\mingwm10.dll

  file C:\Qt\2010.02.1\mingw\bin\libgcc_s_dw2-1.dll

  file C:\Qt\2010.02.1\qt\bin\Qt3Support4.dll

  file C:\Qt\2010.02.1\qt\bin\QtCore4.dll

  file C:\Qt\2010.02.1\qt\bin\QtGui4.dll

  file C:\Qt\2010.02.1\qt\bin\QtNetwork4.dll

  file C:\Qt\2010.02.1\qt\bin\QtSql4.dll

  file C:\Qt\2010.02.1\qt\bin\QtXml4.dll

  # Prepend the Virtual Leaf bin directory to the installers PATH

  ${EnvVarUpdate} $0 "PATH" "P" "HKCU" "$INSTDIR\bin"  

sectionEnd

section "Virtual Leaf plugins"

  # define the output path for the Virtual Leaf models

  file ..\bin\models\*

sectionEnd

section "Virtual Leaf data"

  # define the output path for the Virtual Leaf models

  file ..\data\leaves\*

sectionEnd

section "Virtual Leaf docs"

  # define the output path for the Virtual Leaf documentation

  setOutPath $INSTDIR\doc

  file ..\doc\*

sectionEnd

# create a section to define what the uninstaller does.

# the section will always be named "Uninstall"

section "Uninstall"

  # Always delete uninstaller first

  delete $INSTDIR\uninstaller.exe

  # Now delete installed file

  !insertmacro RemoveFilesAndSubDirs "$INSTDIR"

  # Last but not least - delete the path  

  ${un.EnvVarUpdate} $0 "PATH" "R" "HKCU" "$INSTDIR\bin"

sectionEnd

# finis

#

#  $Id$

#

#  This file is part of the Virtual Leaf.

#

#  The Virtual Leaf is free software: you can redistribute it and/or modify

#  it under the terms of the GNU General Public License as published by

#  the Free Software Foundation, either version 3 of the License, or

#  (at your option) any later version.

#

#  The Virtual Leaf is distributed in the hope that it will be useful,

#  but WITHOUT ANY WARRANTY; without even the implied warranty of

#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

#  GNU General Public License for more details.

#

#  You should have received a copy of the GNU General Public License

#  along with the Virtual Leaf.  If not, see <http://www.gnu.org/licenses/>.

#

#  Copyright 2010 Roeland Merks.

#

CONFIG += qt

QMAKE_CXXFLAGS += -fexceptions

QMAKE_CXXFLAGS += -Wall

QMAKE_CXXFLAGS += -Wno-write-strings

QMAKE_CXXFLAGS += -Wno-unused-parameter

QMAKE_CXXFLAGS_DEBUG += -g3

QMAKE_CXXFLAGS_DEBUG += -DQDEBUG

#REACTIONS = reactions_auxin_growth.h 

#REACTIONS = reactions_meinhardt.h

#REACTIONS = reactions_pce_growth.h

DEFINES += QTGRAPHICS

DEFINES += REACTIONS_HEADER=$${REACTIONS}

DEFINES += REACTIONS_HEADER_STRING=\"$${REACTIONS}\"

DEFINES += FLEMING

BINDIR = ../bin

LIBDIR = ../lib

DESTDIR = $$BINDIR

TARGET = VirtualLeaf

TEMPLATE = app

PARTMPL = $${TARGET}par.tmpl

MAINSRC = $${TARGET}.cpp

QT -= network sql xml

QT += qt3support

!win32 {

 GRAPHICS = qt #qwt

}

win32 {

 CONFIG -= console

 LIBXML2DIR = $${LIBDIR}\libxml2

 LIBICONVDIR = $${LIBDIR}\libiconv

 LIBZDIR = $${LIBDIR}\libz

 GRAPHICS = qt 

 RC_FILE = VirtualLeaf.rc

 QMAKE_CXXFLAGS += -DLIBXML_STATIC

 QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

 LIBS += -L$${LIBXML2DIR}\lib -lxml2 -L$${LIBICONVDIR}\lib -L$${LIBZDIR}\lib  -lz -lm -lwsock32 -liconv

}

macx:release {

 LIBS+= -dead_strip

}

unix {

 CC = /usr/bin/gcc 

 QWTDIR = /ufs/guravage/opt/qwt-5.2.1-svn

 QMAKE_LIBDIR += $$QWTDIR/lib 

 QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2

 QMAKE_LFLAGS += -fPIC

 LIBS += -lxml2 -lz -lm 

}

# Input

HEADERS += \

# apoplastitem.h \

 canvas.h \

 cellbase.h \

 cell.h \

 cellitem.h \

 forwardeuler.h \

       hull.h \ 

 infobar.h \

 mainbase.h \

 mainbase.h \

 matrix.h \

 mesh.h \

 miscq.h \

 modelcatalogue.h \

 Neighbor.h \

 node.h \

 nodeitem.h \

 nodeset.h \

 OptionFileDialog.h \

 output.h \

 parameter.h \

 pardialog.h \

 parse.h \

 pi.h \

 qcanvasarrow.h \

 random.h \

 rungekutta.h \

 simitembase.h \

 simplugin.h \

 sqr.h \

 tiny.h \

 transporterdialog.h \

 UniqueMessage.h \

 vector.h \

 wallbase.h \

 wall.h \

 wallitem.h \

 warning.h \

 xmlwrite.h \

 $${PARTMPL}

SOURCES += \

# apoplastitem.cpp \

 canvas.cpp \

 cellbase.cpp \

 cell.cpp \

 cellitem.cpp \

 forwardeuler.cpp \

 hull.cpp \

 mainbase.cpp \

 matrix.cpp \

 mesh.cpp \

 miscq.cpp \

 modelcatalogue.cpp \

 Neighbor.cpp \

 node.cpp \

 nodeitem.cpp \

 nodeset.cpp \

 OptionFileDialog.cpp \

 output.cpp \

 parameter.cpp \

 pardialog.cpp \

 parse.cpp \

 random.cpp \

 rungekutta.cpp \

 simitembase.cpp \

 transporterdialog.cpp \

 UniqueMessage.cpp \

 vector.cpp \

 wallbase.cpp \

 wall.cpp \

 wallitem.cpp \

 warning.cpp \

 xmlwrite.cpp \

 $$MAINSRC

contains( TARGET, leaf_fleming ) {

 DEFINES += FLEMING	

}

contains(GRAPHICS, qwt) {

 #macx:LIBS += -L$$QWTDIR/lib -lqwt

 #win32:LIBS += -L$$QWTDIR/lib -lqwt5

 #LIBS += -L$$QWTDIR/lib -lqwt

 INCLUDEPATH += $$QWTDIR/include

 DEFINES += HAVE_QWT

 HEADERS += data_plot.h

 SOURCES += data_plot.cpp

}

contains( GRAPHICS, qt ) {

 message( "Building Qt executable" )

 QMAKE_CXXFLAGS += -DQTGRAPHICS # -fpermissive

}

contains( GRAPHICS, xfig ) {

 message("Building Xfig executable (background runnable).")

 QMAKE_CXXFLAGS += -DXFIGGRAPHICS

}

contains( GRAPHICS, x11 ) {

 !unix {

  error("X11 graphics only available on Unix systems.")

 }

 message("Building X11 executable")

 SOURCES += x11graph.cpp

 HEADERS += x11graph.h

 QMAKE_CXXFLAGS += -DX11GRAPHICS

 CONFIG -= qt

 CONFIG += x11

 unix:LIBS += -lpng

}

#contains( GRAPHICS, qwt ) {

# 	QMAKE_POST_LINK = "install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \

#}

# MACOSX packaging

macx {

ICON = leaficon.icns

QMAKE_POST_LINK = "\

	#install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \

	cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \

	cp gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/.                                    ; \

	mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

	cp -R /Library/Frameworks/QtCore.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

	cp -R /Library/Frameworks/QtGui.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

	cp -R /Library/Frameworks/Qt3Support.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

	#cp /usr/local/qwt/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

	#install_name_tool -id @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/libqwt.dylib; \

	install_name_tool -change /usr/local/qwt/lib/libqwt.dylib @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET};\

	install_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/Current/QtCore $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/QtCore.framework/Versions/4.0/QtCore; \

	install_name_tool -id @executable_path/../Frameworks/QtGui.framework/Versions/Current/QtGui $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/QtGui.framework/Versions/4.0/QtGui; \