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"/>
@@ @@ -14,6 +14,7 @@ @@
     <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"/>
@@ @@ -104,7 +105,6 @@ @@
     <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"/>
@@ @@ -384,7 +384,7 @@ @@
     <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"/>

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"/>
@@ @@ -384,7 +384,7 @@ @@
     <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"/>

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -170,9 +170,9 @@ void MainBase::Plot(int resize_stride) @@
   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);
@@ @@ -277,11 +277,11 @@ TIMESTEP { @@
 /* 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) {
@@ @@ -401,7 +401,7 @@ int main(int argc,char **argv) { @@
 	((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
@@ @@ -428,11 +428,11 @@ int main(int argc,char **argv) { @@
     /*    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.;

src/mainbase.cpp

➞

Show inline comments

@@ @@ -52,7 +52,7 @@ xmlNode *MainBase::XMLViewportTree(QTran @@
   return xmlviewport;
+}
-xmlNode *MainBase::XMLSettingsTree(void) const {
 xmlNode *MainBase::XMLSettingsTree(void) {
   xmlNode *xmlsettings = xmlNewNode(NULL, BAD_CAST "settings");
+  {

src/mainbase.h

➞

Show inline comments

@@ @@ -111,7 +111,7 @@ class MainBase { @@
  protected:
   QGraphicsScene &canvas;
-  virtual xmlNode *XMLSettingsTree(void) const;
   virtual xmlNode *XMLSettingsTree(void);
   virtual xmlNode *XMLViewportTree(QTransform &transform) const;

0 comments (0 inline, 0 general)