# HG changeset patch # User Michael Guravage # Date 2010-06-24 15:22:58 # Node ID 15d6008916489df679e2ef6772a46fbca7dbbdd2 # Parent c131f8cd4b54cb2af8e98eba3637f454b1757fff In DrawCell class (VirtualLeaf.cpp) - iterate over NChem to construct info_string. Additional cleanup. -- user: Michael Guravage branch 'default' changed src/ChangeLog changed src/Neighbor.cpp changed src/Neighbor.h changed src/OptionFileDialog.cpp changed src/OptionFileDialog.h changed src/UniqueMessage.cpp changed src/UniqueMessage.h changed src/VirtualLeaf.cpp changed src/VirtualLeaf.pro changed src/build_models/plugin_auxingrowth.pro changed src/build_models/plugin_meinhardt.pro changed src/build_models/plugin_test.pro changed src/canvas.cpp changed src/canvas.h changed src/cell.cpp changed src/cell.h changed src/cellbase.cpp changed src/cellbase.h changed src/cellitem.cpp changed src/cellitem.h changed src/forwardeuler.cpp changed src/forwardeuler.h changed src/infobar.h changed src/libplugin.pro changed src/mainbase.cpp changed src/mainbase.h changed src/matrix.cpp changed src/matrix.h changed src/mesh.cpp changed src/mesh.h changed src/miscq.cpp changed src/miscq.h changed src/modelcatalogue.cpp changed src/modelcatalogue.h changed src/node.cpp changed src/node.h changed src/nodeitem.cpp changed src/nodeitem.h changed src/nodeset.cpp changed src/nodeset.h changed src/output.cpp changed src/output.h changed src/parameter.cpp changed src/parameter.h changed src/pardialog.cpp changed src/parse.cpp changed src/parse.h changed src/pi.h changed src/qcanvasarrow.h changed src/random.cpp changed src/random.h changed src/rungekutta.cpp changed src/rungekutta.h changed src/simitembase.cpp changed src/simitembase.h changed src/simplugin.h changed src/sqr.h changed src/tiny.h changed src/transporterdialog.cpp changed src/transporterdialog.h changed src/vector.cpp changed src/vector.h changed src/wall.cpp changed src/wall.h changed src/wallbase.cpp changed src/wallbase.h changed src/wallitem.cpp changed src/wallitem.h changed src/warning.cpp changed src/warning.h changed src/xmlwrite.cpp changed src/xmlwrite.h diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-06-24 + + * VirtualLeaf.cpp (DrawCell): Iterate over NChem to construct info_string. + 2010-06-23 * simitembase.cpp: Removed NULL assignments to unused variables. diff --git a/src/Neighbor.cpp b/src/Neighbor.cpp --- a/src/Neighbor.cpp +++ b/src/Neighbor.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -26,7 +26,7 @@ static const std::string _module_id("$Id$"); Neighbor::Neighbor(void): - cell(NULL), nb1(NULL), nb2(NULL){} + cell(0), nb1(0), nb2(0){} Neighbor::Neighbor(Cell *c, Node *n1, Node *n2): cell(c), nb1(n1), nb2(n2){} diff --git a/src/Neighbor.h b/src/Neighbor.h --- a/src/Neighbor.h +++ b/src/Neighbor.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/OptionFileDialog.cpp b/src/OptionFileDialog.cpp --- a/src/OptionFileDialog.cpp +++ b/src/OptionFileDialog.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/OptionFileDialog.h b/src/OptionFileDialog.h --- a/src/OptionFileDialog.h +++ b/src/OptionFileDialog.h @@ -3,12 +3,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/UniqueMessage.cpp b/src/UniqueMessage.cpp --- a/src/UniqueMessage.cpp +++ b/src/UniqueMessage.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/UniqueMessage.h b/src/UniqueMessage.h --- a/src/UniqueMessage.h +++ b/src/UniqueMessage.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/VirtualLeaf.cpp b/src/VirtualLeaf.cpp --- a/src/VirtualLeaf.cpp +++ b/src/VirtualLeaf.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -115,9 +115,14 @@ public: if (m.ShowBorderCellsP() || c.Boundary()==Cell::None) { if (!m.ShowBoundaryOnlyP() && !m.HideCellsP()) { if (m.ShowToolTipsP()) { - QString info_string=QString("Cell %1, chemicals: ( %2, %3, %4, %5, %6)\n %7 of PIN1 at walls.\n Area is %8\n PIN sum is %9\n Circumference is %10\n Boundary type is %11").arg(c.Index()).arg(c.Chemical(0)).arg(c.Chemical(1)).arg(c.Chemical(2)).arg(c.Chemical(3)).arg(c.Chemical(4)).arg(c.SumTransporters(1)).arg(c.Area()).arg(PINSum(c)).arg(c.Circumference()).arg(c.BoundaryStr()); - - info_string += "\n" + c.printednodelist(); + //QString info_string=QString("Cell %1, chemicals: ( %2, %3, %4, %5, %6)\n %7 of PIN1 at walls.\n Area is %8\n PIN sum is %9\n Circumference is %10\n Boundary type is %11").arg(c.Index()).arg(c.Chemical(0)).arg(c.Chemical(1)).arg(c.Chemical(2)).arg(c.Chemical(3)).arg(c.Chemical(4)).arg(c.SumTransporters(1)).arg(c.Area()).arg(PINSum(c)).arg(c.Circumference()).arg(c.BoundaryStr()); + QString info_string=QString("Cell %1, chemicals(%2): ").arg(c.Index()).arg(Cell::NChem()); + for (int i=0;isetItemChecked(fluxes_id, FALSE); cell_walls_id = view->insertItem("Show transporters", this, SLOT(toggleShowWalls())); view->setItemChecked(cell_walls_id, FALSE); - apoplasts_id = view->insertItem("Show apoplasts", this, SLOT(toggleShowApoplasts())); - view->setItemChecked(apoplasts_id, FALSE); + // apoplasts_id = view->insertItem("Show apoplasts", this, SLOT(toggleShowApoplasts())); + // view->setItemChecked(apoplasts_id, FALSE); view->insertSeparator(); only_boundary_id = view->insertItem("Show only leaf &boundary", this, SLOT(toggleLeafBoundary())); view->insertSeparator(); @@ -557,10 +557,11 @@ Main::Main(QGraphicsScene& c, Mesh &m, Q tooltips_id = helpmenu->insertItem("Show Cell&Info", this, SLOT(Refresh())); helpmenu->setItemChecked(tooltips_id, true); helpmenu->insertSeparator(); - helpmenu->insertItem("&About", this, SLOT(about()) ); //, Key_F1); - helpmenu->insertSeparator(); + //helpmenu->insertSeparator(); helpmenu->insertItem("&LICENSE", this, SLOT(gpl()) ); - menu->insertItem("&Help",helpmenu); + helpmenu->insertItem("About", this, SLOT(about()) ); //, Key_F1); + + menu->insertItem("&Help",helpmenu); statusBar(); setCentralWidget(editor); printer = 0; @@ -928,8 +929,8 @@ void Main::clear() void Main::about() { static QMessageBox* about = new QMessageBox - ( "Virtual Leaf V1.0", - "

Virtual Leaf V1.0

" + ( "VirtualLeaf V1.0", + "

VirtualLeaf V1.0

" "

" "An Open Source framework for cell-based modeling of plant tissue growth and development
" "(c) 2005-2008, Roeland Merks et al.
" @@ -937,7 +938,7 @@ void Main::about() "Ghent, Belgium
" "(c) 2008-2010, Roeland Merks et al.
" " Centrum Wiskunde & Informatica and Netherlands Consortium for Systems Biology, Amsterdam, Netherlands
" -"
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.
" +"
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.
" "
If you use this code for your projects, please cite our paper:" "
Merks, Guravage, Inze, and Beemster. An Open Source framework for cell-based modeling of plant tissue growth and development. Plant Physiology, submitted.
.
" "
Please share your model plugins and extensions at http://virtualleaf.googlecode.com.", @@ -1324,7 +1325,7 @@ void Main::XMLReadSettings(xmlNode *sett view->setItemChecked(hide_cells_id, hidecellsp); options->setItemChecked(dyn_cells_id, dynamicscellsp); view->setItemChecked( cell_walls_id, showwallsp); - view->setItemChecked( apoplasts_id, showapoplastsp); + // view->setItemChecked( apoplasts_id, showapoplastsp); editor->setTransform(viewport); } @@ -1344,7 +1345,7 @@ xmlNode *Main::XMLSettingsTree(void) showfluxesp = view->isItemChecked(fluxes_id); dynamicscellsp = options->isItemChecked(dyn_cells_id); showwallsp = view->isItemChecked( cell_walls_id); - showapoplastsp = view->isItemChecked( apoplasts_id); + //showapoplastsp = view->isItemChecked( apoplasts_id); hidecellsp = view->isItemChecked( hide_cells_id); xmlNode *settings = MainBase::XMLSettingsTree(); diff --git a/src/canvas.h b/src/canvas.h --- a/src/canvas.h +++ b/src/canvas.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -120,7 +120,7 @@ class Main : public Q3MainWindow, public virtual bool MovieFramesP(void) {return view->isItemChecked(movie_frames_id);} virtual bool ShowBoundaryOnlyP(void) {return view->isItemChecked(only_boundary_id);} virtual bool ShowWallsP(void) {return view->isItemChecked(cell_walls_id);} - virtual bool ShowApoplastsP(void) { return view->isItemChecked(apoplasts_id);} + // virtual bool ShowApoplastsP(void) { return view->isItemChecked(apoplasts_id);} virtual bool ShowFluxesP(void) { return view->isItemChecked(fluxes_id); } virtual bool DynamicCellsP(void) { return options->isItemChecked(dyn_cells_id); } virtual bool RotationModeP(void) { return options->isItemChecked(rotation_mode_id); } @@ -256,7 +256,7 @@ class Main : public Q3MainWindow, public int cell_strain_id; // view->Show cell strain int only_boundary_id; // view ->Show only leaf boundary int cell_walls_id; // view -> Show transporters - int apoplasts_id; // view -> Show apoplasts + //int apoplasts_id; // view -> Show apoplasts int tooltips_id; // help -> Show Cell Info int hide_cells_id; // view->Hide Cells double flux_arrow_size; diff --git a/src/cell.cpp b/src/cell.cpp --- a/src/cell.cpp +++ b/src/cell.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/cell.h b/src/cell.h --- a/src/cell.h +++ b/src/cell.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/cellbase.cpp b/src/cellbase.cpp --- a/src/cellbase.cpp +++ b/src/cellbase.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -136,7 +136,7 @@ CellBase::CellBase(double x,double y,dou division_axis = 0; } -CellBase::CellBase(const CellBase &src) : Vector(src), QObject() +CellBase::CellBase(const CellBase &src) : QObject(), Vector(src) { chem=new double[NChem()]; diff --git a/src/cellbase.h b/src/cellbase.h --- a/src/cellbase.h +++ b/src/cellbase.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -55,7 +55,7 @@ struct ParentInfo { // We need a little trick here, to make sure the plugin and the main application will see the same static datamembers // otherwise each have their own instantation. -// My solution is as follow. I collect all original statics in a class. The main application instantiates it and +// My solution is as follows. I collect all original statics in a class. The main application instantiates it and // has a static pointer to it. After loading the plugin I set a static pointer to the same class class CellsStaticDatamembers { diff --git a/src/cellitem.cpp b/src/cellitem.cpp --- a/src/cellitem.cpp +++ b/src/cellitem.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/cellitem.h b/src/cellitem.h --- a/src/cellitem.h +++ b/src/cellitem.h @@ -5,12 +5,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/forwardeuler.cpp b/src/forwardeuler.cpp --- a/src/forwardeuler.cpp +++ b/src/forwardeuler.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/forwardeuler.h b/src/forwardeuler.h --- a/src/forwardeuler.h +++ b/src/forwardeuler.h @@ -5,12 +5,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/infobar.h b/src/infobar.h --- a/src/infobar.h +++ b/src/infobar.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -47,7 +47,7 @@ class InfoBar : public Q3DockWindow { } void SetText(QString text) { - virtleaf->setText(QString("

The Virtual Leaf

\n
Model: %1
").arg(text)); + virtleaf->setText(QString("

VirtualLeaf

\n
Model: %1
").arg(text)); } private: diff --git a/src/libplugin.pro b/src/libplugin.pro --- a/src/libplugin.pro +++ b/src/libplugin.pro @@ -24,6 +24,7 @@ CONFIG -= debug CONFIG += staticlib QMAKE_CXXFLAGS += -fexceptions +win32:QMAKE_CXXFLAGS -= O2 QMAKE_CXXFLAGS_DEBUG += -g3 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG QMAKE_CXXFLAGS_DEBUG -= -finstrument-functions @@ -68,10 +69,10 @@ unix { } win32 { - LIBXML2DIR = ..\lib\libxml2 - LIBICONVDIR = ..\lib\libiconv - LIBZDIR = ..\lib\libz - QMAKE_CXXFLAGS += -DLIBXML_STATIC + LIBXML2DIR = C: + LIBICONVDIR = C: + LIBZDIR = C: +# QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include } diff --git a/src/mainbase.cpp b/src/mainbase.cpp --- a/src/mainbase.cpp +++ b/src/mainbase.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -116,13 +116,13 @@ xmlNode *MainBase::XMLSettingsTree(void) text << bool_name(showwallsp); 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_apoplasts"); ostringstream text; text << bool_name(showapoplastsp); 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 "save_movie_frames"); @@ -292,9 +292,9 @@ void MainBase::XMLReadSettings(xmlNode * if (!xmlStrcmp(name, (const xmlChar *)"show_walls")) { showwallsp = strtobool( (const char *)val ); } - if (!xmlStrcmp(name, (const xmlChar *)"show_apoplasts")) { + /* 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 ); } diff --git a/src/mainbase.h b/src/mainbase.h --- a/src/mainbase.h +++ b/src/mainbase.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -77,7 +77,7 @@ class MainBase { virtual bool ShowBoundaryOnlyP(void) {return showboundaryonlyp;} virtual bool ShowToolTipsP(void) {return showtooltipsp;} virtual bool ShowWallsP(void) {return showwallsp;} - virtual bool ShowApoplastsP(void) { return showapoplastsp;} + // virtual bool ShowApoplastsP(void) { return showapoplastsp;} virtual bool ShowFluxesP(void) { return showfluxesp; } virtual bool DynamicCellsP(void) { return dynamicscellsp; } virtual void FitCanvasToWindow() {}; @@ -124,7 +124,7 @@ class MainBase { bool movieframesp; bool showboundaryonlyp; bool showwallsp; - bool showapoplastsp; +// bool showapoplastsp; bool showfluxesp; bool dynamicscellsp; bool showtooltipsp; diff --git a/src/matrix.cpp b/src/matrix.cpp --- a/src/matrix.cpp +++ b/src/matrix.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/matrix.h b/src/matrix.h --- a/src/matrix.h +++ b/src/matrix.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/mesh.cpp b/src/mesh.cpp --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -480,19 +480,7 @@ void Mesh::Clear(void) { shuffled_cells.clear(); shuffled_nodes.clear(); - //Cell::ncells=0; - /* Cell::ClearNCells(); - Node::nnodes=0; - - cells.clear(); - nodes.clear(); - shuffled_cells.clear(); - shuffled_nodes.clear(); - node_insertion_queue.empty(); - - cerr << "Meshed cleared: cells: " << cells.size() << ", nodes: " << nodes.size() << endl; - */ - + #ifdef QDEBUG qDebug() << "cells.size() = " << cells.size() << endl; qDebug() << "walls.size() = " << walls.size() << endl; @@ -564,11 +552,11 @@ double Mesh::DisplaceNodes(void) { for (list::const_iterator cit=node.owners.begin(); cit!=node.owners.end(); cit++) { - //Cell &c=m->getCell(cit->cell); - //Cell &c=cit->cell->BoundaryPolP()?*boundary_polygon:*(cit->cell); + Cell &c=*((Cell *)(cit->cell)); - //Cell &c=cells[cit->cell]; + if (c.MoveSelfIntersectsP(&node, new_p )) { + // reject if move results in self intersection // // I know: using goto's is bad practice... except when jumping out @@ -580,8 +568,7 @@ double Mesh::DisplaceNodes(void) { // summing stiffnesses of cells. Move has to overcome this minimum required energy. sum_stiff += c.stiffness; // area - (area after displacement): see notes for derivation - //Vector i_min_1 = m->getNode(cit->nb1); - + Vector i_min_1 = *(cit->nb1); //Vector i_plus_1 = m->getNode(cit->nb2); Vector i_plus_1 = *(cit->nb2); @@ -777,37 +764,11 @@ double Mesh::DisplaceNodes(void) { node_insertion_queue.push( Edge(&node, cit->nb2 ) ); } count++; - /*length_dh += 2*Node::target_length * (old_l1 + old_l2 - new_l1 - new_l2) - + DSQR(new_l1) - DSQR(old_l1) + DSQR(new_l2) - DSQR(old_l2);*/ + } - /* length_dh += 2*Node::target_length * ( w1*(old_l1 - new_l1) + - w2*(old_l2 - new_l2) ) + - w1*(DSQR(new_l1) - - DSQR(old_l1)) - + w2*(DSQR(new_l2) - - DSQR(old_l2)); */ - /* if (c.cellvec.ManhattanNorm()!=0) { - - // wall element length constraint - double old_aniso1, old_aniso2; - double new_aniso1, new_aniso2; - - // anisotropic expansion? - old_aniso1 = 1 + par.lambda_aniso*(1 - fabs(InnerProduct((old_p-i_min_1), c.cellvec))/old_l1); - old_aniso2 = 1 + par.lambda_aniso*(1 - fabs(InnerProduct((old_p-i_plus_1), c.cellvec))/old_l2); - new_aniso1 = 1 + par.lambda_aniso*(1 - fabs(InnerProduct((new_p-i_min_1), c.cellvec))/new_l1); - new_aniso2 = 1 + par.lambda_aniso*(1 - fabs(InnerProduct((new_p-i_plus_1), c.cellvec))/new_l2); - - - length_dh += w1 * ( new_aniso1 * DSQR(new_l1 - Node::target_length) - - old_aniso1 * DSQR(old_l1 - Node::target_length) ) - + w2 * ( new_aniso2 * DSQR(new_l2 - Node::target_length) - - old_aniso2 * DSQR(old_l2 - Node::target_length) ); - - } else { - */ + length_dh += 2*Node::target_length * ( w1*(old_l1 - new_l1) + w2*(old_l2 - new_l2) ) + w1*(DSQR(new_l1) @@ -816,8 +777,7 @@ double Mesh::DisplaceNodes(void) { - DSQR(old_l2)); - //} - + } @@ -826,8 +786,7 @@ double Mesh::DisplaceNodes(void) { // first implementation. Can probably be done more efficiently // calculate circumcenter radius (gives local curvature) // the ideal bending state is flat... (K=0) - // if (cit->cell==-1 && node.cells.size()>2 /* boundary_pol, cell and a second cell */) { - { + { // strong bending energy to resist "cleaving" by division planes double r1, r2, xc, yc; CircumCircle(i_min_1.x, i_min_1.y, old_p.x, old_p.y, i_plus_1.x, i_plus_1.y, @@ -839,39 +798,19 @@ double Mesh::DisplaceNodes(void) { MyWarning::warning("r1 = %f, r2 = %f",r1,r2); } bending_dh += DSQR(1/r2 - 1/r1); - //bending_dh += ( DSQR(1/r2) - DSQR(1/r1) ); - - //cerr << "bending_dh = " << par.bend_lambda*bending_dh << endl; } - /*cerr << "Bending = " << ( DSQR(1/r2) - DSQR(1/r1)) << endl; - cerr << node.index << ": " << bending_dh << " (" << r1 << ", " << r2 << ") " << cit->nb1 << ", " << cit->nb2 << ")" << endl; - }*/ - /*else - bending_dh += ( DSQR(1/r2) - DSQR(1/r1) );*/ - /*if (cit->cell==-1) { - cerr << node.index << ": " << bending_dh << " (" << r1 << ", " << r2 << ") " << cit->nb1 << ", " << cit->nb2 << ")" << endl; - }*/ - - //bending_dh += r1 - r2; - } - //const double bend_lambda = 100000; - //const double bend_lambda = 0; + + - /* double dh = //(area_dev_sum_after - area_dev_sum_before) + - area_dh + par.lambda_celllength * cell_length_dh + - par.lambda_length * length_dh + par.bend_lambda * bending_dh + par.alignment_lambda * alignment_dh;*/ - - dh = //(area_dev_sum_after - area_dev_sum_before) + - area_dh + cell_length_dh + + dh = area_dh + cell_length_dh + par.lambda_length * length_dh + par.bend_lambda * bending_dh + par.alignment_lambda * alignment_dh; - //cerr << "cell_length_dh = " << par.lambda_celllength * cell_length_dh << endl; - //(length_constraint_after - length_constraint_before); + //(length_constraint_after - length_constraint_before); if (node.fixed) { @@ -1013,8 +952,7 @@ void Mesh::InsertNode(Edge &e) { // debug_stream << "Cell " << c->cell << " owns Edge " << e << endl; - //if (c->cell>=0) { - //if (!c->cell->BoundaryPolP()) { + // find the position of the edge's first node in cell c... list::iterator ins_pos = find (c->cell->nodes.begin(), @@ -1082,14 +1020,14 @@ void Mesh::InsertNode(Edge &e) { while (c!=owners.end()) { c=adjacent_find(c,owners.end(), neighbor_cell_eq); // repair neighborhood lists of cell and Wall lists - //if (c->cell>=0) { + if (!c->cell->BoundaryPolP()) { c->cell->ConstructNeighborList(); - // debug_stream << "Repairing NeighborList of " << c->cell << endl; + } c++; } - // debug_stream.flush(); + } @@ -1478,7 +1416,7 @@ void Mesh::RepairBoundaryPolygon(void) { Node* Mesh::findNextBoundaryNode(Node* boundary_node) { bool found_next_boundary_node = false; - Node *next_boundary_node = NULL; + Node *next_boundary_node = 0; set boundary_node_owners; // This is a list of the current boundary node's owners' Ids vector neighborIds; // A list of the current boundary node's owners' 2nd neighbor Ids vector *> nodeOwners; // A vector of set pointers where each set contains the owner Ids of the nodes in the neighborIds list. @@ -1923,9 +1861,6 @@ void Mesh::SettoInitVals(void) { clean_chem[i]=par.initval[i]; } - // Amount of PIN1 - //clean_chem[1] = 0.; - CleanChemicals(clean_chem); CleanTransporters(clean_transporters); } diff --git a/src/mesh.h b/src/mesh.h --- a/src/mesh.h +++ b/src/mesh.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/miscq.cpp b/src/miscq.cpp --- a/src/miscq.cpp +++ b/src/miscq.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/miscq.h b/src/miscq.h --- a/src/miscq.h +++ b/src/miscq.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/modelcatalogue.cpp b/src/modelcatalogue.cpp --- a/src/modelcatalogue.cpp +++ b/src/modelcatalogue.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/modelcatalogue.h b/src/modelcatalogue.h --- a/src/modelcatalogue.h +++ b/src/modelcatalogue.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/node.cpp b/src/node.cpp --- a/src/node.cpp +++ b/src/node.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/node.h b/src/node.h --- a/src/node.h +++ b/src/node.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/nodeitem.cpp b/src/nodeitem.cpp --- a/src/nodeitem.cpp +++ b/src/nodeitem.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/nodeitem.h b/src/nodeitem.h --- a/src/nodeitem.h +++ b/src/nodeitem.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/nodeset.cpp b/src/nodeset.cpp --- a/src/nodeset.cpp +++ b/src/nodeset.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/nodeset.h b/src/nodeset.h --- a/src/nodeset.h +++ b/src/nodeset.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/output.cpp b/src/output.cpp --- a/src/output.cpp +++ b/src/output.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/output.h b/src/output.h --- a/src/output.h +++ b/src/output.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/parameter.cpp b/src/parameter.cpp --- a/src/parameter.cpp +++ b/src/parameter.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/parameter.h b/src/parameter.h --- a/src/parameter.h +++ b/src/parameter.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/pardialog.cpp b/src/pardialog.cpp --- a/src/pardialog.cpp +++ b/src/pardialog.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -139,8 +139,8 @@ ParameterDialog::ParameterDialog(QWidget QGridLayout *grid = new QGridLayout( this, 1, 1 ); // add the first four widgets with (row, column) addressing - setWindowTitle( QString( " Parameter values for The Virtual Leaf") ); - grid->addWidget( new QLabel( "

Parameter values for The Virtual Leaf

",this), 0, 0, 1, -1, Qt::AlignCenter); + setWindowTitle( QString( " Parameter values for VirtualLeaf") ); + grid->addWidget( new QLabel( "

Parameter values for VirtualLeaf

",this), 0, 0, 1, -1, Qt::AlignCenter); grid->addWidget( new QLabel( "", this), 0+1, 0, 1, -1); grid->addWidget( new QLabel( " Visualization", this), 3, 0, 1, 2 ); grid->addWidget( new QLabel( "arrowcolor", this ),4, 0 ); diff --git a/src/parse.cpp b/src/parse.cpp --- a/src/parse.cpp +++ b/src/parse.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/parse.h b/src/parse.h --- a/src/parse.h +++ b/src/parse.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/pi.h b/src/pi.h --- a/src/pi.h +++ b/src/pi.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/qcanvasarrow.h b/src/qcanvasarrow.h --- a/src/qcanvasarrow.h +++ b/src/qcanvasarrow.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/random.cpp b/src/random.cpp --- a/src/random.cpp +++ b/src/random.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/random.h b/src/random.h --- a/src/random.h +++ b/src/random.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/rungekutta.cpp b/src/rungekutta.cpp --- a/src/rungekutta.cpp +++ b/src/rungekutta.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/rungekutta.h b/src/rungekutta.h --- a/src/rungekutta.h +++ b/src/rungekutta.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/simitembase.cpp b/src/simitembase.cpp --- a/src/simitembase.cpp +++ b/src/simitembase.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/simitembase.h b/src/simitembase.h --- a/src/simitembase.h +++ b/src/simitembase.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/simplugin.h b/src/simplugin.h --- a/src/simplugin.h +++ b/src/simplugin.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/sqr.h b/src/sqr.h --- a/src/sqr.h +++ b/src/sqr.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/tiny.h b/src/tiny.h --- a/src/tiny.h +++ b/src/tiny.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/transporterdialog.cpp b/src/transporterdialog.cpp --- a/src/transporterdialog.cpp +++ b/src/transporterdialog.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -28,7 +28,7 @@ static const std::string _module_id("$Id$"); TransporterDialog::TransporterDialog(Wall *w, CellBase *c, int wn, QWidget *parent) - : wall(w), cell(c), wall_num(wn), QDialog(parent) + : QDialog(parent), wall(w), cell(c), wall_num(wn) { int frameStyle = QFrame::Plain | QFrame::NoFrame; QPushButton *ok = new QPushButton(tr("Ok")); diff --git a/src/transporterdialog.h b/src/transporterdialog.h --- a/src/transporterdialog.h +++ b/src/transporterdialog.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/vector.cpp b/src/vector.cpp --- a/src/vector.cpp +++ b/src/vector.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/vector.h b/src/vector.h --- a/src/vector.h +++ b/src/vector.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -49,12 +49,6 @@ class Vector { z=m[2]; } - // should be taken over by default arguments of Vector constructor - /* inline Vector(void) { */ - /* x=0.; */ - /* y=0.; */ - /* z=0.; */ - /* } */ inline Vector(const Vector &source) { diff --git a/src/wall.cpp b/src/wall.cpp --- a/src/wall.cpp +++ b/src/wall.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -24,7 +24,7 @@ #include "cell.h" #include "wallitem.h" #include "node.h" -#include "apoplastitem.h" +//#include "apoplastitem.h" #include #include @@ -162,10 +162,10 @@ void Wall::Draw(QGraphicsScene *c) { wi2->show(); } -void Wall::DrawApoplast(QGraphicsScene *c) { +/* void Wall::DrawApoplast(QGraphicsScene *c) { ApoplastItem *apo = new ApoplastItem(this, c); apo->show(); -} +}*/ void Wall::ShowStructure(QGraphicsScene *c) { diff --git a/src/wall.h b/src/wall.h --- a/src/wall.h +++ b/src/wall.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -46,7 +46,7 @@ class Wall : public WallBase { void Draw(QGraphicsScene *c); //! Visualize contents of the apoplast - void DrawApoplast(QGraphicsScene *c); + //void DrawApoplast(QGraphicsScene *c); /*! \brief Visualize the structure of the wall (Cell ID's etc.). Used for debugging purposes. */ diff --git a/src/wallbase.cpp b/src/wallbase.cpp --- a/src/wallbase.cpp +++ b/src/wallbase.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -34,7 +34,7 @@ #include #include #include "wallitem.h" -#include "apoplastitem.h" +//#include "apoplastitem.h" #endif static const std::string _module_id("$Id$"); @@ -77,7 +77,7 @@ WallBase::WallBase(Node *sn1, Node *sn2, transporters1[i] = transporters2[i] = new_transporters1[i] = new_transporters2[i] = 0.; } - apoplast = new double[CellBase::NChem()]; // not yet in use. +// apoplast = new double[CellBase::NChem()]; // not yet in use. SetLength(); @@ -105,9 +105,9 @@ void WallBase::CopyWallContents(const Wa new_transporters2[i]=src.new_transporters2[i]; } - if (apoplast) { + /* if (apoplast) { apoplast[i]=src.apoplast[i]; - } + }*/ } dead = src.dead; wall_type = src.wall_type; @@ -144,12 +144,12 @@ void WallBase::SwapWallContents(WallBase new_transporters2[i]=tmp; } - if (apoplast) { + /* if (apoplast) { double tmp; tmp=src->apoplast[i]; src->apoplast[i]=apoplast[i]; apoplast[i]=tmp; - } + }*/ } bool tmp_bool; tmp_bool = src->dead; diff --git a/src/wallbase.h b/src/wallbase.h --- a/src/wallbase.h +++ b/src/wallbase.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -66,7 +66,7 @@ class WallBase { bool IllegalP(void) { return c1 == c2; } //! The chemicals in the apoplast at this position - double *apoplast; + //double *apoplast; //! Pointers to the wall's corner nodes Node *n1, *n2; @@ -100,7 +100,7 @@ class WallBase { transporters2 = src.transporters2; new_transporters1 = src.new_transporters1; new_transporters2 = src.new_transporters2; - apoplast = src.apoplast; + //apoplast = src.apoplast; n1 = src.n1; n2 = src.n2; length = src.length; @@ -167,8 +167,8 @@ class WallBase { throw "WallBase::setTransporter called with wrong cell"; } } - inline double getApoplast(int ch) const { return apoplast[ch]; } - inline void setApoplast(int ch, double val) { apoplast[ch] = val; } + //inline double getApoplast(int ch) const { return apoplast[ch]; } + //inline void setApoplast(int ch, double val) { apoplast[ch] = val; } inline CellBase *getOtherCell(CellBase *c) { return c1 == c ? c2 : c1; } Vector getInfluxVector(CellBase *c); Vector getWallVector(CellBase *c); diff --git a/src/wallitem.cpp b/src/wallitem.cpp --- a/src/wallitem.cpp +++ b/src/wallitem.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/wallitem.h b/src/wallitem.h --- a/src/wallitem.h +++ b/src/wallitem.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/warning.cpp b/src/warning.cpp --- a/src/warning.cpp +++ b/src/warning.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/warning.h b/src/warning.h --- a/src/warning.h +++ b/src/warning.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. diff --git a/src/xmlwrite.cpp b/src/xmlwrite.cpp --- a/src/xmlwrite.cpp +++ b/src/xmlwrite.cpp @@ -2,12 +2,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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. @@ -655,7 +655,7 @@ void Wall::XMLAdd(xmlNode *parent) const } } - if (apoplast) { +/* if (apoplast) { xmlNodePtr apo_xml = xmlNewChild(xmlwall, NULL, BAD_CAST "apoplast", NULL); for (int i=0;iname, (const xmlChar *)"apoplast"))) { + /* if ((!xmlStrcmp(w_node->name, (const xmlChar *)"apoplast"))) { xmlNode *v_node = w_node->xmlChildrenNode; int nv=0; @@ -1309,7 +1309,7 @@ void Mesh::XMLReadWalls(xmlNode *root, v } v_node = v_node->next; } - } + }*/ w_node=w_node->next; } } diff --git a/src/xmlwrite.h b/src/xmlwrite.h --- a/src/xmlwrite.h +++ b/src/xmlwrite.h @@ -4,12 +4,12 @@ * * This file is part of the Virtual Leaf. * - * The Virtual Leaf is free software: you can redistribute it and/or modify + * 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. * - * The Virtual Leaf is distributed in the hope that it will be useful, + * 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.