EI/VirtualLeaf Changeset - c32457e84c7f · Centrum Wiskunde & Informatica (CWI)

Changeset - c32457e84c7f

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 14 0

Roeland Merks - 15 years ago 2010-10-14 11:56:01
roeland.merks@cwi.nl

Commit changes

user: Roeland Merks <roeland.merks@cwi.nl>
branch merge
branch 'default'
changed src/ChangeLog
changed src/TutorialCode/Tutorial3/ChangeLog
changed src/TutorialCode/Tutorial3/tutorial3.h
changed src/TutorialCode/Tutorial4/ChangeLog
changed src/TutorialCode/Tutorial4/tutorial4.h
changed src/TutorialCode/Tutorial5/ChangeLog
changed src/TutorialCode/Tutorial5/tutorial5.h
changed src/VirtualLeafpar.tmpl
changed src/canvas.cpp
changed src/canvas.h
changed src/parameter.cpp
changed src/parameter.h
changed src/pardialog.cpp
changed src/pardialog.h

13 files changed with 39 insertions and 27 deletions:

src/TutorialCode/Tutorial3/ChangeLog

src/TutorialCode/Tutorial3/tutorial3.h

src/TutorialCode/Tutorial4/ChangeLog

src/TutorialCode/Tutorial4/tutorial4.h

src/TutorialCode/Tutorial5/ChangeLog

src/TutorialCode/Tutorial5/tutorial5.h

src/VirtualLeafpar.tmpl

src/canvas.cpp

src/canvas.h

src/parameter.cpp

src/parameter.h

src/pardialog.cpp

src/pardialog.h

0 comments (0 inline, 0 general)

src/TutorialCode/Tutorial3/ChangeLog

➞

Show inline comments

 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* tutorial3.h (SimPluginInterface): Added default LeafML file.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial3.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial3/tutorial3.h

➞

Show inline comments

@@ @@ -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"); }
 };

src/TutorialCode/Tutorial4/ChangeLog

➞

Show inline comments

 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* tutorial4.h (SimPluginInterface): Added default LeafML file.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial4.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial4/tutorial4.h

➞

Show inline comments

@@ @@ -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"); }
 };

src/TutorialCode/Tutorial5/ChangeLog

➞

Show inline comments

 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* tutorial5.h (SimPluginInterface): Added default LeafML file.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial5.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial5/tutorial5.h

➞

Show inline comments

@@ @@ -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"); }
 };

src/VirtualLeafpar.tmpl

➞

Show inline comments

@@ @@ -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

src/canvas.cpp

➞

Show inline comments

@@ @@ -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)
+{

src/canvas.h

➞

Show inline comments

@@ @@ -227,8 +227,6 @@ class Main : public Q3MainWindow, public @@
   void RandomizeMesh();
   QString TimeStamp();
  signals:
   void SimulationDone(void);
   void ParsChanged(void);

src/parameter.cpp

➞

Show inline comments

@@ @@ -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 <cstdio>
 #include <cstring>
@@ @@ -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 */

src/parameter.h

➞

Show inline comments

@@ @@ -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_

src/pardialog.cpp

➞

Show inline comments

@@ @@ -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 */

src/pardialog.h

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)