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

Changeset - 8509673ac23b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

Updated "saveStateXML" for consistency with snapshot() and exportData. It now suggests a default extension "xml" and produces a status message.

--
user: Roeland Merks <roeland.merks@cwi.nl>
branch 'default'
changed src/canvas.cpp

1 file changed with 16 insertions and 1 deletions:

src/canvas.cpp

0 comments (0 inline, 0 general)

src/canvas.cpp

➞

Show inline comments

@@ @@ -596,207 +596,222 @@ void Main::UserMessage(QString message, @@
+{
   statusBar()->showMessage(message, timeout);
+}
 void Main::init()
+{
   clear();
   static int r=24;
   srand(++r);
   mainCount++;
+}
 Main::~Main()
+{
   delete printer;
   if ( !--mainCount ) {
+  }
   //EndGifAnim();
+}
 void Main::newView()
+{
   // Open a new view... have it delete when closed.
   Main *m = new Main(canvas, mesh, 0, 0, Qt::WDestructiveClose);
   qApp->setMainWidget(m);
   m->show();
   qApp->setMainWidget(0);
+}
 void Main::EditParameters()
+{
   ParameterDialog *pardial = new ParameterDialog(this, "stridediag");
   // Make sure the values in the parameter dialog are updated after a file is read
   // each method changing the parameters (reading XML or PAR files) should
   // emit this signal
   QObject::connect(   this, SIGNAL( ParsChanged() ), pardial, SLOT( Reset() ) );
+}
 void Main::savePars()
+{
   stopSimulation();
   Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );
   fd->setMode( Q3FileDialog::AnyFile );
   fd->setFilter( "Parameter files (*.par)");
   fd->setDir(par.datadir);
   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)");
   fd->setDir(par.datadir);
   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( "LeafML files (*.xml)");
   fd->setDir(par.datadir);
   QString fileName;
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     // extract extension from filename
     QFileInfo fi(fileName);
     QString extension = fi.suffix();
     if (extension.isEmpty()) {
       extension = "xml";
       fileName += ".";
       fileName += extension;
+    }
     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?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
       return saveStateXML();
     } else {
       mesh.XMLSave((const char *)fileName, XMLSettingsTree());
       QString status_message;
       status_message = QString("Wrote LeafML to %1").arg(fileName);
       cerr << status_message.toStdString() << endl;
       statusBar()->showMessage(status_message);
+    }
+  }
+}
 void Main::snapshot()
+{
   stopSimulation();
   Q3FileDialog *fd = new Q3FileDialog( this, "Save snapshot", TRUE );
   fd->setDir(par.datadir);
   fd->setMode( Q3FileDialog::AnyFile );
   fd->setFilter( "Image files (*.pdf *.png *.jpg *.tif)");
   QString fileName;
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     // extract extension from filename
     QFileInfo fi(fileName);
     QString extension = fi.suffix();
     if (extension.isEmpty()) {
       extension = "jpg";
       fileName += ".";
       fileName += extension;
+    }
     if ( QFile::exists( fileName ) &&
 	 QMessageBox::question(
 			       this,
 			       tr("Overwrite file? -- Cell data export"),
 			       tr("A file called %1 already exists."
 				  " Do you want to overwrite it?").arg( fileName ),
 			       QMessageBox::Yes, QMessageBox::No
 			       ) == QMessageBox::No
 	 ) {
       return snapshot();
     } else {
       // Save bitmaps at 1024x768
       QString status_message;
       if (Save((const char *)fileName, extension, 1024, 768)==0) {
 	status_message = QString("Wrote snapshot to %1").arg(fileName);
       } else {
 	status_message = QString("Error writing snapshot to %1").arg(fileName);
+      }
       cerr << status_message.toStdString() << endl;
       statusBar()->showMessage(status_message);
+    }
+  }
+}
 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;
     readStateXML((const char *)next_file);
+  }
+}

0 comments (0 inline, 0 general)