diff --git a/src/TutorialCode/Tutorial3/ChangeLog b/src/TutorialCode/Tutorial3/ChangeLog --- a/src/TutorialCode/Tutorial3/ChangeLog +++ b/src/TutorialCode/Tutorial3/ChangeLog @@ -1,3 +1,7 @@ +2010-10-14 + + * tutorial3.h (SimPluginInterface): Added default LeafML file. + 2010-06-25 * tutorial3.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial3/tutorial3.h b/src/TutorialCode/Tutorial3/tutorial3.h --- a/src/TutorialCode/Tutorial3/tutorial3.h +++ b/src/TutorialCode/Tutorial3/tutorial3.h @@ -53,6 +53,9 @@ public: virtual void SetCellColor(CellBase *c, QColor *color); // return number of chemicals virtual int NChem(void); + + // default LeafML file + virtual QString DefaultLeafML(void) { return QString("tutorial3_init.xml"); } }; diff --git a/src/TutorialCode/Tutorial4/ChangeLog b/src/TutorialCode/Tutorial4/ChangeLog --- a/src/TutorialCode/Tutorial4/ChangeLog +++ b/src/TutorialCode/Tutorial4/ChangeLog @@ -1,3 +1,7 @@ +2010-10-14 + + * tutorial4.h (SimPluginInterface): Added default LeafML file. + 2010-06-25 * tutorial4.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial4/tutorial4.h b/src/TutorialCode/Tutorial4/tutorial4.h --- a/src/TutorialCode/Tutorial4/tutorial4.h +++ b/src/TutorialCode/Tutorial4/tutorial4.h @@ -55,6 +55,9 @@ public: virtual int NChem(void); virtual double PINflux(CellBase *this_cell, CellBase *adjacent_cell, Wall *w); + + // default LeafML file + virtual QString DefaultLeafML(void) { return QString("tutorial4_init.xml"); } }; diff --git a/src/TutorialCode/Tutorial5/ChangeLog b/src/TutorialCode/Tutorial5/ChangeLog --- a/src/TutorialCode/Tutorial5/ChangeLog +++ b/src/TutorialCode/Tutorial5/ChangeLog @@ -1,3 +1,7 @@ +2010-10-14 + + * tutorial5.h (SimPluginInterface): Added default LeafML file. + 2010-06-25 * tutorial5.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial5/tutorial5.h b/src/TutorialCode/Tutorial5/tutorial5.h --- a/src/TutorialCode/Tutorial5/tutorial5.h +++ b/src/TutorialCode/Tutorial5/tutorial5.h @@ -55,6 +55,9 @@ public: virtual int NChem(void); virtual double PINflux(CellBase *this_cell, CellBase *adjacent_cell, Wall *w); + + // default LeafML file + virtual QString DefaultLeafML(void) { return QString("tutorial5_init.xml"); } }; diff --git a/src/VirtualLeafpar.tmpl b/src/VirtualLeafpar.tmpl --- a/src/VirtualLeafpar.tmpl +++ b/src/VirtualLeafpar.tmpl @@ -125,4 +125,4 @@ b4 = false / bool dir1 = . / directory dir2 = . / directory export_interval = 0 / int -export_fn_prefix = CellData_ / string +export_fn_prefix = cell. / string diff --git a/src/canvas.cpp b/src/canvas.cpp --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -90,6 +90,7 @@ using namespace std; // We use a global variable to save memory - all the brushes and pens in // the mesh are shared. +#define FNAMESIZE 100 #define QUOTE_ME(s) QUOTE_ME_2NDLEV(s) #define QUOTE_ME_2NDLEV(s) #s @@ -480,7 +481,7 @@ Main::Main(QGraphicsScene& c, Mesh &m, Q file->insertItem("Read previous leaf", this, SLOT(readPrevStateXML()), Qt::Key_PageUp); file->insertItem("Read last leaf", this, SLOT(readLastStateXML()), Qt::Key_End); file->insertItem("Read first leaf", this, SLOT(readFirstStateXML()), Qt::Key_Home); - file->insertItem("Export cell areas", this, SLOT(exportCellData())); + file->insertItem("Export cell data", this, SLOT(exportCellData())); file->insertSeparator(); file->insertItem("&Print...", this, SLOT(print()), Qt::CTRL+Qt::Key_P); @@ -1165,11 +1166,17 @@ void Main::print() void Main::TimeStepWrap(void) { static int t=0; + stringstream fname; + TimeStep(); t++; if ((par.export_interval > 0) && ((t % par.export_interval) == 0)){ - this->exportCellData(QString(par.datadir) + QString('/') + QString(par.export_fn_prefix) + this->TimeStamp()); + fname << par.datadir << "/" << par.export_fn_prefix; + fname.fill('0'); + fname.width(6); + fname << t << ".csv"; + this->exportCellData(QString(fname.str().c_str())); } // check number of timesteps @@ -1179,18 +1186,6 @@ void Main::TimeStepWrap(void) } -QString Main::TimeStamp(){ - time_t rawtime; - struct tm * timeinfo; - char buffer [15]; - - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - strftime (buffer,15,"%Y%m%d%H%M%S",timeinfo); - return QString(buffer); -} - - void Main::RestartSim(void) { diff --git a/src/canvas.h b/src/canvas.h --- a/src/canvas.h +++ b/src/canvas.h @@ -227,8 +227,6 @@ class Main : public Q3MainWindow, public void RandomizeMesh(); - QString TimeStamp(); - signals: void SimulationDone(void); void ParsChanged(void); diff --git a/src/parameter.cpp b/src/parameter.cpp --- a/src/parameter.cpp +++ b/src/parameter.cpp @@ -19,9 +19,9 @@ * */ +// WARNING: This file is automatically generated by make_parameter_source.pl. // Do not edit. All edits will be discarded. - #include "parameter.h" #include #include @@ -186,8 +186,8 @@ Parameter::Parameter() { b4 = false; dir1 = strdup("."); dir2 = strdup("."); - export_interval = 100; - export_fn_prefix = strdup("CELLDATA"); + export_interval = 0; + export_fn_prefix = strdup("cell."); } Parameter::~Parameter() { @@ -347,8 +347,8 @@ void Parameter::Read(const char *filenam dir2 = sgetpar(fp, "dir2", ".", true); if (strcmp(dir2, ".")) MakeDir(dir2); - export_interval = igetpar(fp, "export_interval", 100, true); - export_fn_prefix = sgetpar(fp, "export_fn_prefix", "CELLDATA", true); + export_interval = igetpar(fp, "export_interval", 0, true); + export_fn_prefix = sgetpar(fp, "export_fn_prefix", "cell.", true); } const char *sbool(const bool &p) { @@ -1893,4 +1893,3 @@ ostream &operator<<(ostream &os, Paramet return os; } -/* finis */ diff --git a/src/parameter.h b/src/parameter.h --- a/src/parameter.h +++ b/src/parameter.h @@ -22,7 +22,7 @@ */ // WARNING: This file is automatically generated by make_parameter_source.pl. Do not edit. -// All edits will be discarded. +// Do not edit. All edits will be discarded. #ifndef _PARAMETER_H_ #define _PARAMETER_H_ diff --git a/src/pardialog.cpp b/src/pardialog.cpp --- a/src/pardialog.cpp +++ b/src/pardialog.cpp @@ -19,6 +19,7 @@ * */ +// WARNING: This file is automatically generated by make_parameter_source.pl. Do not edit. // Do not edit. All edits will be discarded. #include "pardialog.h" @@ -818,4 +819,3 @@ void ParameterDialog::Reset(void) { export_fn_prefix_edit->setText( QString("%1").arg(par.export_fn_prefix) ); } -/* finis */ diff --git a/src/pardialog.h b/src/pardialog.h --- a/src/pardialog.h +++ b/src/pardialog.h @@ -22,7 +22,7 @@ */ // WARNING: This file is automatically generated by make_parameter_source.pl. Do not edit. -// All edits will be discarded. +// Do not edit. All edits will be discarded. #ifndef PARAMETER_DIALOG_H #define PARAMETER_DIALOG_H @@ -148,4 +148,3 @@ class ParameterDialog : public QDialog { QLineEdit *export_fn_prefix_edit; }; #endif -