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

Changeset - dcd49517f90b

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Roeland Merks - 15 years ago 2010-11-29 11:48:52
roeland.merks@cwi.nl

Two last corrections:
- Viewport was not written during automatic export of XML files, because Virtualization of XMLSettingsTree did not work due to inconsistent function definition (const vs. non-const)
- Some of the default parameter-file had "Start saving movie frames" switched on by default, dramatically slowing down the example runs. Now it is switched off in all example XML files.

user: Roeland Merks <roeland.merks@cwi.nl>
branch 'default'
changed data/leaves/auxin_growth.xml
changed data/leaves/tutorial5_init.xml
changed src/VirtualLeaf.cpp
changed src/mainbase.cpp
changed src/mainbase.h

5 files changed with 16 insertions and 16 deletions:

data/leaves/auxin_growth.xml

data/leaves/tutorial5_init.xml

src/VirtualLeaf.cpp

src/mainbase.cpp

src/mainbase.h

0 comments (0 inline, 0 general)

data/leaves/auxin_growth.xml

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8"?>
-<leaf name="/ufs/merks/VLeaf1.0/V1.0/data/leaves/auxin_growth.xml" date="Thu Nov 25 13:13:31 2010" simtime="11660">
+<leaf name="/ufs/merks/VLeaf1.0/V1.0/data/leaves/auxin_growth.xml" date="Mon Nov 29 11:43:46 2010" simtime="11660">
   <parameter>
     <par name="arrowcolor" val="white"/>
     <par name="arrowsize" val="10"/>
     <par name="textcolor" val="red"/>
     <par name="cellnumsize" val="1"/>
     <par name="nodenumsize" val="1"/>
@@ @@ -11,12 +11,13 @@ @@
     <par name="cell_outline_color" val="forestgreen"/>
     <par name="resize_stride" val="10"/>
     <par name="export_interval" val="0"/>
     <par name="export_fn_prefix" val="cell."/>
     <par name="storage_stride" val="100"/>
     <par name="xml_storage_stride" val="500"/>
     <par name="datadir" val="auxin_growth"/>
     <par name="T" val="1"/>
     <par name="lambda_length" val="100"/>
     <par name="yielding_threshold" val="4"/>
     <par name="lambda_celllength" val="0"/>
     <par name="target_length" val="60"/>
     <par name="cell_expansion_rate" val="10"/>
@@ @@ -101,13 +102,12 @@ @@
     <par name="van3prod" val="0.002"/>
     <par name="van3autokat" val="0.1"/>
     <par name="van3sat" val="10"/>
     <par name="k2van3" val="0.3"/>
     <par name="dt" val="0.1"/>
     <par name="rd_dt" val="10"/>
     <par name="datadir" val="auxin_growth"/>
     <par name="movie" val="true"/>
     <par name="nit" val="100000"/>
     <par name="maxt" val="1e+06"/>
     <par name="rseed" val="-1"/>
     <par name="constituous_expansion_limit" val="16"/>
     <par name="vessel_inh_level" val="1"/>
@@ @@ -381,13 +381,13 @@ @@
     <setting name="show_cell_numbers" val="false"/>
     <setting name="show_border_cells" val="false"/>
     <setting name="show_cell_axes" val="false"/>
     <setting name="show_cell_strain" val="false"/>
     <setting name="show_fluxes" val="true"/>
     <setting name="show_walls" val="true"/>
-    <setting name="save_movie_frames" val="true"/>
+    <setting name="save_movie_frames" val="false"/>
     <setting name="show_only_leaf_boundary" val="false"/>
     <setting name="cell_growth" val="true"/>
     <setting name="hide_cells" val="false"/>
     <viewport m11="8.83883" m12="0" m21="0" m22="8.83883" dx="0" dy="0"/>
   </settings>
 </leaf>

data/leaves/tutorial5_init.xml

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8"?>
-<leaf name="/ufs/merks/VLeaf1.0/V1.0/data/leaves/tutorial5_init.xml" date="Thu Nov 25 14:30:29 2010" simtime="11660">
+<leaf name="/ufs/merks/VLeaf1.0/V1.0/data/leaves/tutorial5_init.xml" date="Mon Nov 29 11:45:07 2010" simtime="11660">
   <parameter>
     <par name="arrowcolor" val="white"/>
     <par name="arrowsize" val="10"/>
     <par name="textcolor" val="red"/>
     <par name="cellnumsize" val="1"/>
     <par name="nodenumsize" val="1"/>
@@ @@ -381,13 +381,13 @@ @@
     <setting name="show_cell_numbers" val="false"/>
     <setting name="show_border_cells" val="false"/>
     <setting name="show_cell_axes" val="false"/>
     <setting name="show_cell_strain" val="false"/>
     <setting name="show_fluxes" val="true"/>
     <setting name="show_walls" val="true"/>
-    <setting name="save_movie_frames" val="true"/>
+    <setting name="save_movie_frames" val="false"/>
     <setting name="show_only_leaf_boundary" val="false"/>
     <setting name="cell_growth" val="true"/>
     <setting name="hide_cells" val="false"/>
     <viewport m11="2.20971" m12="0" m21="0" m22="2.20971" dx="0" dy="0"/>
   </settings>
 </leaf>

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -167,15 +167,15 @@ void MainBase::Plot(int resize_stride) @@
   if (ShowCellStrainP())
     mesh.LoopCells( bind2nd (mem_fun_ref ( &Cell::DrawStrain), &canvas ) );
   if (ShowWallsP())
     mesh.LoopWalls( bind2nd( mem_fun_ref( &Wall::Draw ), &canvas ) );
 /*  if (ShowApoplastsP())
     mesh.LoopWalls( bind2nd( mem_fun_ref( &Wall::DrawApoplast ), &canvas ) );
 */
   /*  if (ShowApoplastsP())
       mesh.LoopWalls( bind2nd( mem_fun_ref( &Wall::DrawApoplast ), &canvas ) );
   */
   if (ShowMeshP())
     mesh.DrawNodes(&canvas);
   if (ShowBoundaryOnlyP())
     mesh.DrawBoundary(&canvas);
@@ @@ -274,17 +274,17 @@ TIMESTEP { @@
   i++;
   return mesh.getTime();
+}
 /* Called if a cell is clicked */
+  /* Called if a cell is clicked */
 void Cell::OnClick(QMouseEvent *e){}
 /* Custom message handler - Default appends a newline character to the end of each line. */
+  /* Custom message handler - Default appends a newline character to the end of each line. */
 void vlMessageOutput(QtMsgType type, const char *msg)
+{
   switch (type) {
   case QtDebugMsg:
     //fprintf(stderr, "Debug: %s\n", msg);
     cerr << msg << flush;
@@ @@ -398,13 +398,13 @@ int main(int argc,char **argv) { @@
       if ( QApplication::desktop()->width() > ((Main *)main_window)->width() + 10
 	   && QApplication::desktop()->height() > ((Main *)main_window)->height() +30 ) {
 	((Main *)main_window)->show();
 	((Main *)main_window)->resize( ((Main *)main_window)->sizeHint());
       } else {
-        ((Main *)main_window)->showMaximized();
+	((Main *)main_window)->showMaximized();
+      }
       // show "About" window at start up
       ((Main *)main_window)->about();
     } else {
       main_window=new MainBase(canvas, mesh);
@@ @@ -425,17 +425,17 @@ int main(int argc,char **argv) { @@
       model_catalogue.PopulateModelMenu();
     model_catalogue.InstallFirstModel();
     /*    Cell::SetMagnification(1);
-    Cell::setOffset(0,0);
+	  Cell::setOffset(0,0);
-    main_window->FitLeafToCanvas();
+	  main_window->FitLeafToCanvas();
-    main_window->Plot();
+	  main_window->Plot();
     */
     if (batch) {
       double t=0.;
       do {
 	t = main_window->TimeStep();
       } while (t < par.maxt);

src/mainbase.cpp

➞

Show inline comments

@@ @@ -49,13 +49,13 @@ xmlNode *MainBase::XMLViewportTree(QTran @@
     xmlNewProp(xmlviewport, BAD_CAST "dy", BAD_CAST standardlocale.toString(transform.dy()).toStdString().c_str() );
+ }
   return xmlviewport;
+}
-xmlNode *MainBase::XMLSettingsTree(void) const {
 xmlNode *MainBase::XMLSettingsTree(void) {
   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;

src/mainbase.h

➞

Show inline comments

@@ @@ -108,13 +108,13 @@ class MainBase { @@
   Mesh &mesh;
   QTransform viewport;
  protected:
   QGraphicsScene &canvas;
-  virtual xmlNode *XMLSettingsTree(void) const;
   virtual xmlNode *XMLSettingsTree(void);
   virtual xmlNode *XMLViewportTree(QTransform &transform) const;
  protected:
   bool showcentersp;

0 comments (0 inline, 0 general)