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

Changeset - 1b01e13fa5f1

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Michael Guravage - 15 years ago 2010-10-14 12:18:26
michael.guravage@cwi.nl

Enquire first before overwriting an exported cell data file.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
changed src/ChangeLog
changed src/canvas.cpp

2 files changed with 32 insertions and 8 deletions:

src/ChangeLog

src/canvas.cpp

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* canvas.cpp (exportCellData): Added a check to inquire before
 	overwritting an existing file.
 -10-14    <merks@cwi.nl>
 	* cell.cpp (DivideWalls): accomodated for rename of Circumference -> WallCircumference
 	* hull.h: added an operator< to sort Points
 	* hull.cpp: added an operator< to sort Points
 	* cellbase.cpp (ExactCircumference): I added a new function ExactCircumference, yielding the circumference of the cell along its wall_elements
 	* cellbase.cpp (ExactCircumference): I added a new function
 	ExactCircumference, yielding the circumference of the cell along
 	its wall_elements
 	* VirtualLeaf.cpp: adjust info_string to accomodate for new name
 	of function CellBase::Circumference -> CellBase::WallCircumference
 	* VirtualLeaf.cpp: adjust info_string to accomodate for new name of function CellBase::Circumference -> CellBase::WallCircumference
 	* mesh.cpp: corrected Mesh::Compactness, the boundary coordinates need to be sorted in x,y order for the convex hull algorithm (thanks Margriet!). I updated CSVExportCellData so it exports the circumferences of hull and boundary_polygon.
 	* mesh.cpp: corrected Mesh::Compactness, the boundary coordinates
 	need to be sorted in x,y order for the convex hull algorithm
 	(thanks Margriet!). I updated CSVExportCellData so it exports the
 	circumferences of hull and boundary_polygon.
 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeafpar.tmpl (export_fn_prefix): changed to 'cell.'
 	* canvas.cpp (TimeStepWrap): Removed TimeStamp(). Cell data
 	filename now incorporates iteration number.
 	* canvas.h (MainBase): Removed TimeStamp().
 -10-08    <guravage@caterpie.sen.cwi.nl>
 	* pardialog.h:
 	* pardialog.cpp:
 	* parameter.h:
 	* parameter.cpp: Regenerated to include export_interval and export_fn_prefix.
 	* VirtualLeafpar.tmpl: Appended export_interval and export_fn_prefix.
 	* canvas.h (MainBase): Declared polymorphic exportCellData() functions.
 	* canvas.cpp:
 	(TimeStamp): New private TimeStamp() function.
 	(TimeStepWrap): Added invocation of exportCellData().
 	(exportCellData): Created two polymorphic functions: one with a
 	single QString argument, the other with no argument. The former is
 	called from TimeStepWrap() while the latter is called from the
 	"Export cell areas" item in the file menu.
 -10-07    <guravage@caterpie.sen.cwi.nl>
 	* canvas.cpp (exportCellData): Added a Q3FileDialog to inquire
 	where to write the exportCellData.
 -06-28    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeaf-install.nsi: Grab gpl3.txt from doc directory.
 	* canvas.cpp (gpl): gpl3.txt can be either in an ancestor doc
 	directory (Linux) or a decedent doc directory (Windows, via the
 	binary installer).
 	* VirtualLeaf-install.nsi: Add VirtualLeaf doc directory.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* gpl3.txt: Moved gpl3.txt from doc to src directory.
 	* VirtualLeaf.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 	* libplugin.pro: Ditto.
 	* parameter.cpp: Result of adding datadir changes to make_parameter_source.pl.

src/canvas.cpp

➞

Show inline comments

@@ @@ -646,130 +646,130 @@ void Main::savePars() @@
   fd->setMode( Q3FileDialog::AnyFile );
   fd->setFilter( "Parameter files (*.par)");
   QString fileName;
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     ofstream parfile((const char *)fileName);
     par.Write(parfile);
+  }
   startSimulation();
+}
 void Main::readPars()
+{
   stopSimulation();
   Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );
   fd->setMode( Q3FileDialog::ExistingFile );
   fd->setFilter( "Parameter files (*.par)");
   QString fileName;
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     par.Read((const char *)fileName);
+  }
   emit ParsChanged();
+}
 void Main::saveStateXML()
+{
   stopSimulation();
   Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );
   fd->setMode( Q3FileDialog::AnyFile );
   fd->setFilter( "XML (*.xml)");
   QString fileName;
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     if ( QFile::exists( fileName ) &&
 	 QMessageBox::question(
 			       this,
 			       tr("Overwrite File? -- Leaf Growth"),
 			       tr("A file called %1 already exists."
 				  "Do you want to overwrite it?")
+				  " Do you want to overwrite it?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
       return saveStateXML();
     } else {
       mesh.XMLSave((const char *)fileName, XMLSettingsTree());
+    }
+  }
+}
 void Main::snapshot()
+{
   stopSimulation();
   Q3FileDialog *fd = new Q3FileDialog( this, "Save snapshot", TRUE );
   fd->setMode( Q3FileDialog::AnyFile );
   QString fileName;
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     if ( QFile::exists( fileName ) &&
 	 QMessageBox::question(
 			       this,
 			       tr("Overwrite File? -- Leaf Growth"),
 			       tr("A file called %1 already exists."
 				  "Do you want to overwrite it?")
+				  " Do you want to overwrite it?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
       return snapshot();
     } else {
       // extract extension from filename
       QString extension = getExtension(fileName);
       // Save bitmaps at 1024x768
       Save((const char *)fileName, extension, 1024, 768);
+    }
+  }
+}
 void Main::readPrevStateXML()
+{
   // if we have already read a file, read the next file
   if (!currentFile.isEmpty() && working_dir) {
     QString next_file;
     QStringList xml_files = working_dir->entryList("*.xml");
     QString currentFile_nopath = currentFile.section( '/', -1 );
     QString currentFile_path = currentFile.section( '/', 0, -2 );
     QList<QString>::iterator f = xml_files.find( currentFile_nopath );
     if (f == xml_files.end()) {
       return;
+    }
     if (f==xml_files.begin()) {
       QMessageBox mb( "Read previous leaf",
 		      "No more files",
 		      QMessageBox::Information,
 		      QMessageBox::Ok | QMessageBox::Default,
 		      QMessageBox::NoButton,
 		      QMessageBox::NoButton);
       mb.exec();
       return;
+    }
     next_file = *(--f);
     next_file = currentFile_path+"/"+next_file;
@@ @@ -1358,54 +1358,64 @@ void Main::XMLReadSettings(xmlNode *sett @@
 xmlNode *Main::XMLSettingsTree(void)
+{
   showcentersp = view->isItemChecked(com_id);
   showmeshp = view->isItemChecked(mesh_id);
   showbordercellp =  view->isItemChecked(border_id);
   shownodenumbersp =  view->isItemChecked(node_number_id);
   showcellnumbersp =  view->isItemChecked(cell_number_id);
   showcellsaxesp = view->isItemChecked( cell_axes_id );
   showcellstrainp = view->isItemChecked( cell_strain_id );
   movieframesp = view->isItemChecked(movie_frames_id);;
   showboundaryonlyp =  view->isItemChecked(only_boundary_id);
   showfluxesp = view->isItemChecked(fluxes_id);
   dynamicscellsp = options->isItemChecked(dyn_cells_id);
   showwallsp = view->isItemChecked( cell_walls_id);
   //showapoplastsp = view->isItemChecked( apoplasts_id);
   hidecellsp = view->isItemChecked( hide_cells_id);
   xmlNode *settings = MainBase::XMLSettingsTree();
   QTransform viewport(editor->transform());
   xmlAddChild(settings, XMLViewportTree(viewport));
   return settings;
+}
 void Main::exportCellData(QString fileName) {
 #ifdef QDEBUG
   qDebug() << "exportCellData fileName: " << fileName << endl;
 #endif
   QFile file(fileName);
   if ( file.open( IO_WriteOnly ) ) {
     QTextStream stream( &file );
     mesh.CSVExportCellData(stream);
     mesh.CSVExportMeshData(stream);
     file.close();
+  }
+}
 void Main::exportCellData() {
   QString fileName;
   Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );
   stopSimulation();
   fd->setMode( Q3FileDialog::AnyFile );
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     if ( QFile::exists( fileName ) &&
 	!QMessageBox::question(
 			       this,
 			       tr("Overwrite File? -- Cell Data"),
 			       tr("A file called %1 already exists."
 				  " Do you want to overwrite it?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
       this->exportCellData(fileName);
+    }
+  }
   this->exportCellData(fileName);
+}
 /* finis */

0 comments (0 inline, 0 general)