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

	* mesh.cpp: In response to referees' comments, added new parameter "yield_threshold" instead of fixed parameter '4' for yield threshold. 

	* wallitem.cpp: when clicking a wall, both the wall type was cycled and the transporterdialog popped up. Corrected this - for wall type cycling, hold the Control button while left clicking. TransporterDialog only pops up for left click. Also made sure the wall is redrawn after changing the transporter values.

	* 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

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.

# 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 \

}

void Main::init()

{

  clear();

  static int r=24;

  srand(++r);

  mainCount++;

}

Main::~Main()

{

  delete printer;

  if ( !--mainCount ) {

  }

  //EndGifAnim();

}

void Main::newView()

{

  // Open a new view... have it delete when closed.

  Main *m = new Main(canvas, mesh, 0, 0, Qt::WDestructiveClose);

  qApp->setMainWidget(m);

  m->show();

  qApp->setMainWidget(0);

}

void Main::EditParameters()

{

  ParameterDialog *pardial = new ParameterDialog(this, "stridediag");

  // Make sure the values in the parameter dialog are updated after a file is read 

  // each method changing the parameters (reading XML or PAR files) should

  // emit this signal

  QObject::connect(   this, SIGNAL( ParsChanged() ), pardial, SLOT( Reset() ) );

}

void Main::savePars()

{

  stopSimulation();

  Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );

  fd->setMode( Q3FileDialog::AnyFile );

  fd->setFilter( "Parameter files (*.par)");

  QString fileName;

  if ( fd->exec() == QDialog::Accepted ) {

    fileName = fd->selectedFile();

    ofstream parfile((const char *)fileName);

    par.Write(parfile);

  }

  startSimulation();

}

void Main::readPars()

{

  stopSimulation();

  Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );

  fd->setMode( Q3FileDialog::ExistingFile );

  fd->setFilter( "Parameter files (*.par)");

  QString fileName;

  if ( fd->exec() == QDialog::Accepted ) {

    fileName = fd->selectedFile();

    par.Read((const char *)fileName);

  }

  emit ParsChanged();

}

void Main::saveStateXML()

{

  stopSimulation();

  Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );

  fd->setMode( Q3FileDialog::AnyFile );

  fd->setFilter( "XML (*.xml)");

  QString fileName;

  if ( fd->exec() == QDialog::Accepted ) {

    fileName = fd->selectedFile();

    if ( QFile::exists( fileName ) &&

	 QMessageBox::question(

			       this,

			       tr("Overwrite File? -- Leaf Growth"),

			       tr("A file called %1 already exists."

			       .arg( fileName ),

			       tr("&Yes"), tr("&No"),

			       QString::null, 1, 1 ) ) {

      return saveStateXML();

    } else {

      mesh.XMLSave((const char *)fileName, XMLSettingsTree());

    }

  }

}

void Main::snapshot()

{

  stopSimulation();

  Q3FileDialog *fd = new Q3FileDialog( this, "Save snapshot", TRUE );

  fd->setMode( Q3FileDialog::AnyFile );

  QString fileName;

  if ( fd->exec() == QDialog::Accepted ) {

    fileName = fd->selectedFile();

    if ( QFile::exists( fileName ) &&

	 QMessageBox::question(

			       this,

			       tr("Overwrite File? -- Leaf Growth"),

			       tr("A file called %1 already exists."

			       .arg( fileName ),

			       tr("&Yes"), tr("&No"),

			       QString::null, 1, 1 ) ) {

      return snapshot();

    } else {

      // extract extension from filename

      QString extension = getExtension(fileName);

      // Save bitmaps at 1024x768

      Save((const char *)fileName, extension, 1024, 768);

    }

  }

}

void Main::readPrevStateXML()

{

  // if we have already read a file, read the next file

  if (!currentFile.isEmpty() && working_dir) {

    QString next_file;

    QStringList xml_files = working_dir->entryList("*.xml");

    QString currentFile_nopath = currentFile.section( '/', -1 );

    QString currentFile_path = currentFile.section( '/', 0, -2 );

    QList<QString>::iterator f = xml_files.find( currentFile_nopath );

    if (f == xml_files.end()) {

      return;

    }

    if (f==xml_files.begin()) {

      QMessageBox mb( "Read previous leaf",

		      "No more files",

		      QMessageBox::Information,

		      QMessageBox::Ok | QMessageBox::Default,

		      QMessageBox::NoButton,

		      QMessageBox::NoButton);

      mb.exec();

      return;

    }

    next_file = *(--f);

    next_file = currentFile_path+"/"+next_file;

    readStateXML((const char *)next_file);

  }

}

int Main::readStateXML(const char *filename, bool geometry, bool pars, bool simtime)

{

  try {

    xmlNode *settings;

    mesh.XMLRead((const char *)filename, &settings, geometry, pars, simtime);

#ifdef QDEBUG

    qDebug() << "Reading done."<< endl;

#endif

    XMLReadSettings(settings);

    xmlFree(settings);

    Cell::SetMagnification(1);

    Cell::setOffset(0,0);

    FitLeafToCanvas();

    currentFile =  QString(filename);

    Plot();

    QString status_message = QString("Successfully read leaf from file %1. Time is %2 h.").arg(currentFile).arg(mesh.getTimeHours().c_str());

    cerr << status_message.toStdString() << endl;

    setCaption(caption_with_file.arg(filename));

    statusBar()->message(status_message);

    emit ParsChanged();

#ifdef QDEBUG

    qDebug() << "Done. Returning 0." << endl;

#endif

    return 0;

  } catch (const char *error_message) {

    QMessageBox mb( "Read leaf from XML file",

		    QString(error_message),

		    QMessageBox::Critical,

		    QMessageBox::Ok | QMessageBox::Default,

		    Qt::NoButton,

		    Qt::NoButton);

    mb.exec();

    return 1;

  }

}

void Main::readNextStateXML()

{

  mesh.setTime(0);

  Plot();

  editor->FullRedraw();

}

void Main::RandomizeMesh(void) 

{

  vector<double> max_chem(Cell::NChem());

  vector<double> max_transporters(Cell::NChem());

  for (int i=0;i<Cell::NChem();i++) {

    max_transporters[i]=0.;

    max_chem[i]=par.initval[i];

  }

  // Amount of PIN1 at walls

  max_transporters[1] = 0.01;

  mesh.RandomizeChemicals(max_chem, max_transporters);

  Plot();

}

void Main::XMLReadSettings(xmlNode *settings) 

{

  MainBase::XMLReadSettings(settings);

  view->setItemChecked(com_id, showcentersp);

  view->setItemChecked(mesh_id, showmeshp);

  view->setItemChecked(border_id, showbordercellp);

  view->setItemChecked(node_number_id, shownodenumbersp);

  view->setItemChecked(cell_number_id, showcellnumbersp);

  view->setItemChecked(cell_axes_id, showcellsaxesp);

  view->setItemChecked(cell_strain_id, showcellstrainp);

  view->setItemChecked(movie_frames_id, movieframesp);

  view->setItemChecked(only_boundary_id, showboundaryonlyp);

  view->setItemChecked(fluxes_id, showfluxesp);

  view->setItemChecked(hide_cells_id, hidecellsp);

  options->setItemChecked(dyn_cells_id, dynamicscellsp);

  view->setItemChecked( cell_walls_id, showwallsp);

 // view->setItemChecked( apoplasts_id, showapoplastsp);

  editor->setTransform(viewport);

}

xmlNode *Main::XMLSettingsTree(void) 

{

  showcentersp = view->isItemChecked(com_id);

  showmeshp = view->isItemChecked(mesh_id);

  showbordercellp =  view->isItemChecked(border_id);

  shownodenumbersp =  view->isItemChecked(node_number_id);

  showcellnumbersp =  view->isItemChecked(cell_number_id);

  showcellsaxesp = view->isItemChecked( cell_axes_id );

  showcellstrainp = view->isItemChecked( cell_strain_id );

  movieframesp = view->isItemChecked(movie_frames_id);;

  showboundaryonlyp =  view->isItemChecked(only_boundary_id);

  showfluxesp = view->isItemChecked(fluxes_id);

  dynamicscellsp = options->isItemChecked(dyn_cells_id);

  showwallsp = view->isItemChecked( cell_walls_id);

  //showapoplastsp = view->isItemChecked( apoplasts_id);

  hidecellsp = view->isItemChecked( hide_cells_id);

  xmlNode *settings = MainBase::XMLSettingsTree();

  QTransform viewport(editor->transform());

  xmlAddChild(settings, XMLViewportTree(viewport));

  return settings;

}

void Main::exportCellData(QString fileName) {

#ifdef QDEBUG  

  qDebug() << "exportCellData fileName: " << fileName << endl;

#endif

  QFile file(fileName);

  if ( file.open( IO_WriteOnly ) ) {

    QTextStream stream( &file );

    mesh.CSVExportCellData(stream);

    mesh.CSVExportMeshData(stream);

    file.close();

  }

}

void Main::exportCellData() {

  QString fileName;

  Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );

  stopSimulation();

  fd->setMode( Q3FileDialog::AnyFile );

  if ( fd->exec() == QDialog::Accepted ) {

    fileName = fd->selectedFile();

  }

}

/* finis */