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

	* VirtualLeaf.pro: MAXOSX, look for gpl3.txt in the ../doc directory.

	* Makefile (Makefile.libplugin): Removed -makefile qmake option.

	* VirtualLeaf.cpp (TIMESTEP): Removed getIterations().

	* mesh.h (Mesh): Removed {increment,get}Iterations().

	* canvas.cpp (TimeStepWrap): Replaced getIterations() with getTime().

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

	* mesh.h (Mesh): Added iterations. incrementIterations() and

	getIterations().

	* VirtualLeaf.cpp (Plot): Replaced local frame counter with

	mesh.incrementIterations().

	* canvas.cpp (TimeStepWrap): Replaced local counter with

	mesh.incrementIterations().

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

	* VirtualLeaf.pro: Turned debug off to make all profiles must be

	consistant.

	* VirtualLeaf-install.nsi: Tweaked paths to coincide with UNIX

	distribution, i.e. VirtualLeaf.exe, its libraries, models, and the

	uninstaller all go in the bin directory. And leaves directory

	placed under data directory.

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

	overwritting an existing file.

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

!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

  setOutPath $INSTDIR\bin

  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

  setOutPath $INSTDIR\bin\models

  file ..\bin\models\*

sectionEnd

section "Virtual Leaf data"

  # define the output path for the Virtual Leaf models

  setOutPath $INSTDIR\data\leaves

  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

/*

 *

 *  This file is part of the Virtual Leaf.

 *

 *  VirtualLeaf 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.

 *

 *  VirtualLeaf 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.

 *

 */

#include <libxml/xpath.h>

#include <libxml/xmlreader.h>

#include "mainbase.h"

#include "xmlwrite.h"

#include <sstream>

#include <string>

#include <QLocale>

static const std::string _module_id("$Id$");

xmlNode *MainBase::XMLViewportTree(QTransform &transform) const {

  QLocale standardlocale(QLocale::C);

  xmlNode *xmlviewport = xmlNewNode(NULL, BAD_CAST "viewport");

  {

    xmlNewProp(xmlviewport, BAD_CAST "m11", BAD_CAST standardlocale.toString(transform.m11()).toStdString().c_str() );

    xmlNewProp(xmlviewport, BAD_CAST "m12", BAD_CAST standardlocale.toString(transform.m12()).toStdString().c_str() );    

    xmlNewProp(xmlviewport, BAD_CAST "m21", BAD_CAST standardlocale.toString(transform.m21()).toStdString().c_str() );    

    xmlNewProp(xmlviewport, BAD_CAST "m22", BAD_CAST standardlocale.toString(transform.m22()).toStdString().c_str() );    

    xmlNewProp(xmlviewport, BAD_CAST "dx", BAD_CAST standardlocale.toString(transform.dx()).toStdString().c_str() );    

    xmlNewProp(xmlviewport, BAD_CAST "dy", BAD_CAST standardlocale.toString(transform.dy()).toStdString().c_str() );    

 }

  return xmlviewport;

}

xmlNode *MainBase::XMLSettingsTree(void) const {

  xmlNode *xmlsettings = xmlNewNode(NULL, BAD_CAST "settings");

  {

    xmlNode *xmloption = xmlNewChild(xmlsettings, NULL, BAD_CAST "setting", NULL);

    xmlNewProp(xmloption, BAD_CAST "name", BAD_CAST "show_cell_centers");

    ostringstream text;

    text << bool_name(showcentersp);

    xmlNewProp(xmloption, BAD_CAST "val", BAD_CAST text.str().c_str());

  }

  {

    xmlNode *xmloption = xmlNewChild(xmlsettings, NULL, BAD_CAST "setting", NULL);

    xmlNewProp(xmloption, BAD_CAST "name", BAD_CAST "show_nodes");

    ostringstream text;

    text << bool_name(showmeshp);

    xmlNewProp(xmloption, BAD_CAST "val", BAD_CAST text.str().c_str());

  }

  {

    xmlNode *xmloption = xmlNewChild(xmlsettings, NULL, BAD_CAST "setting", NULL);

    xmlNewProp(xmloption, BAD_CAST "name", BAD_CAST "show_node_numbers");

    ostringstream text;

    text << bool_name(shownodenumbersp);

    xmlNewProp(xmloption, BAD_CAST "val", BAD_CAST text.str().c_str());

  }

  {

    xmlNode *xmloption = xmlNewChild(xmlsettings, NULL, BAD_CAST "setting", NULL);

    xmlNewProp(xmloption, BAD_CAST "name", BAD_CAST "show_cell_numbers");

      }

     /* if (!xmlStrcmp(name, (const xmlChar *)"show_apoplasts")) {

	showapoplastsp = strtobool( (const char *)val );

      }*/

      if (!xmlStrcmp(name, (const xmlChar *)"save_movie_frames")) {

	movieframesp = strtobool( (const char *)val );

      }

      if (!xmlStrcmp(name, (const xmlChar *)"show_only_leaf_boundary")) {

	showboundaryonlyp = strtobool( (const char *)val );

      }

      if (!xmlStrcmp(name, (const xmlChar *)"cell_growth")) {

	dynamicscellsp = strtobool( (const char *)val );

      }

      if (!xmlStrcmp(name,(const xmlChar *)"hide_cells")) {

	hidecellsp = strtobool( (const char *)val ); 

      }

      xmlFree(name);

      xmlFree(val);

    }

    cur=cur->next;

  }

}

void MainBase::Save(const char *fname, const char *format, int sizex, int sizey)

{

  Vector ll,ur;

  mesh.BoundingBox(ll, ur);

  if (QString(fname).isEmpty()) {

    MyWarning::warning("No output filename given. Saving nothing.\n");

    return;

  }

  ll*=Cell::Magnification(); ur*=Cell::Magnification();

  // give the leaf some space

  Vector border = ((ur-ll)/5.);

  if (!QString(format).contains("pdf", Qt::CaseInsensitive)) {

    QImage *image = new QImage(QSize(sizex, sizey), QImage::Format_RGB32);

    image->fill(QColor(Qt::white).rgb());

    QPainter *painter=new QPainter(image);

    canvas.render(painter);

      MyWarning::warning("Image not saved successfully. Is the disk full or the extension not recognized?");

    };

    delete painter;

    delete image;

  } else {

    QPrinter pdf(QPrinter::HighResolution);

    pdf.setOutputFileName(fname);

    pdf.setOutputFormat(QPrinter::PdfFormat);

    QPainter painter(&pdf);

    canvas.render(&painter, QRectF(), QRectF(-5000,-5000, 10000, 10000));

    cerr << "Rendering to printer\n";

  }

}

void MainBase::CutSAM()

{

  mesh.CutAwaySAM();

}

/* finis */