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

Changeset - 5ec450ff7c49

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Michael Guravage - 15 years ago 2010-10-19 12:56:46
michael.guravage@cwi.nl

Render PNGs instead of JPGs. See ChangeLogs for details.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
changed src/ChangeLog
changed src/TutorialCode/Tutorial3/ChangeLog
changed src/TutorialCode/Tutorial3/tutorial3_init.xml
changed src/VirtualLeaf.cpp
changed src/mainbase.cpp

5 files changed with 25 insertions and 29 deletions:

src/ChangeLog

src/TutorialCode/Tutorial3/ChangeLog

src/TutorialCode/Tutorial3/tutorial3_init.xml

src/VirtualLeaf.cpp

src/mainbase.cpp

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -10-19    <guravage@caterpie.sen.cwi.nl>
 	* mainbase.cpp (Save): Use format specified in function prototype.
 	* VirtualLeaf.cpp (Plot): Render PNG instead of JPEG. Write image
 	and XML files dependent only on getTime().
 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* mainbase.cpp (Save): QDir::toNativeSeparators(fname). Invoke
 	save with format argument set to zero to force QImage to guess the
 	format by looking at fileName's suffix.
 	* VirtualLeaf-install.nsi: Put uninstaller in top directory.
 	* modelcatalogue.cpp (InstallModel): For all OS-es. Move from "bin" directory to root application folder.
 	* VirtualLeaf.pro: MAXOSX, look for gpl3.txt in the ../doc directory.

src/TutorialCode/Tutorial3/ChangeLog

➞

Show inline comments

 -10-19    <guravage@caterpie.sen.cwi.nl>
 	* tutorial3_init.xml (public): Render PNG instead of JPEG.
 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial3): Removed -makefile qmake option.
 -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_init.xml

➞

Show inline comments

@@ @@ -330,35 +330,35 @@ void MainBase::Plot(int resize_stride) { @@
 			stringstream fname;
 			fname &lt;&lt; par.datadir &lt;&lt; "/leaf.";
 			fname.fill('0');
 			fname.width(6);
 			/*
 			 fname &lt;&lt; frame &lt;&lt; ".pdf";
 			if (par.storage_stride &lt;= par.xml_storage_stride) {
 				frame++;
+			}
-			// Write high-res JPG snapshot every plot step
+			// Write high-res PDF snapshot every plot step
 			Save(fname.str().c_str(), "PDF");
 			*/
-			fname &lt;&lt; frame &lt;&lt; ".jpg";
+			fname &lt;&lt; frame &lt;&lt; ".png";
 			if (par.storage_stride &lt;= par.xml_storage_stride) {
 				frame++;
+			}
 			// Write high-res JPG snapshot every plot step
 			Save(fname.str().c_str(), "JPEG",1024,768);
 			// Write high-res PNG snapshot every plot step
 			Save(fname.str().c_str(), "PNG",1024,768);
+		}
 		if (!(count%par.xml_storage_stride)) {
 			stringstream fname;
 			fname &lt;&lt; par.datadir &lt;&lt; "/leaf.";
 			fname.fill('0');
 			fname.width(6);
 			fname &lt;&lt; frame &lt;&lt; ".xml";
 			if (par.xml_storage_stride &lt; par.storage_stride) {
 				frame++;

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -137,25 +137,26 @@ public: @@
+    }
+  }
 };
 Mesh mesh;
 bool batch=false;
 void MainBase::Plot(int resize_stride)
+{
   clear();
   static int count=0;
   int count=(int)mesh.getTime();
   if (resize_stride) {
     if ( !((count)%resize_stride) ) {
       FitLeafToCanvas();
+    }
+  }
   mesh.LoopCells(DrawCell(),canvas,*this);
   if (ShowNodeNumbersP())
     mesh.LoopNodes( bind2nd (mem_fun_ref ( &Node::DrawIndex), &canvas ) ) ;
   if (ShowCellNumbersP())
     mesh.LoopCells( bind2nd (mem_fun_ref ( &Cell::DrawIndex), &canvas ) ) ;
@@ @@ -170,63 +171,47 @@ void MainBase::Plot(int resize_stride) @@
     mesh.LoopWalls( bind2nd( mem_fun_ref( &Wall::Draw ), &canvas ) );
 /*  if (ShowApoplastsP())
     mesh.LoopWalls( bind2nd( mem_fun_ref( &Wall::DrawApoplast ), &canvas ) );
 */
   if (ShowMeshP())
     mesh.DrawNodes(&canvas);
   if (ShowBoundaryOnlyP())
     mesh.DrawBoundary(&canvas);
   if ( ( batch || MovieFramesP() )) {
      static int frame = 0;
     // frame numbers are sequential for the most frequently written file type.
     // for the less frequently written file type they match the other type
     if (!(count%par.storage_stride) )  {
     if (!(count%par.storage_stride) ) {
       stringstream fname;
       fname << par.datadir << "/leaf.";
       fname.fill('0');
       fname.width(6);
       fname << frame << ".jpg";
       if (par.storage_stride <= par.xml_storage_stride) {
 	frame = (int)mesh.getTime();
+      }
       // Write high-res JPG snapshot every plot step
       Save(fname.str().c_str(), "JPEG",1024,768);
       fname << count << ".png";
       // Write high-res PNG snapshot every plot step
       Save(fname.str().c_str(), "PNG", 1024, 768);
+    }
     if (!(count%par.xml_storage_stride)) {
       stringstream fname;
       fname << par.datadir << "/leaf.";
       fname.fill('0');
       fname.width(6);
       fname << frame << ".xml";
       if (par.xml_storage_stride < par.storage_stride) {
 	frame = (int)mesh.getTime();
+      }
       fname << count << ".xml";
       // Write XML file every ten plot steps
       mesh.XMLSave(fname.str().c_str(), XMLSettingsTree());
+    }
+  }
  count++;
+}
 INIT {
   //mesh.SetSimPlugin(plugin);
   if (leaffile) {
     xmlNode *settings;
     mesh.XMLRead(leaffile, &settings);
     main_window->XMLReadSettings(settings);
     xmlFree(settings);
     main_window->UserMessage(QString("Ready. Time is %1").arg(mesh.getTimeHours().c_str()));
   } else {

src/mainbase.cpp

➞

Show inline comments

@@ @@ -335,34 +335,34 @@ void MainBase::Save(const char *fname, c @@
   // give the leaf some space
   Vector border = ((ur-ll)/5.);
   if (!QString(format).contains("pdf", Qt::CaseInsensitive)) {
     QImage *image = new QImage(QSize(sizex, sizey), QImage::Format_RGB32);
     image->fill(QColor(Qt::white).rgb());
     QPainter *painter=new QPainter(image);
     canvas.render(painter);
 #ifdef QDEBUG
     qDebug() << "Native Image Filename: " << QDir::toNativeSeparators(QString(fname)) << endl;
 #endif
-    if (!image->save(QDir::toNativeSeparators(QString(fname)), 0, -1)) {
+    if (!image->save(QDir::toNativeSeparators(QString(fname)), format)) {
       MyWarning::warning("Image not saved successfully. Is the disk full or the extension not recognized?");
-    };
+    }
     delete painter;
     delete image;
   } else {
     QPrinter pdf(QPrinter::HighResolution);
     pdf.setOutputFileName(fname);
     pdf.setOutputFormat(QPrinter::PdfFormat);
     QPainter painter(&pdf);
     canvas.render(&painter, QRectF(), QRectF(-5000,-5000, 10000, 10000));
     cerr << "Rendering to printer\n";
+  }
+}
 void MainBase::CutSAM()
+{
   mesh.CutAwaySAM();
+}
 /* finis */

0 comments (0 inline, 0 general)