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

Changeset - f4023d64bb53

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Roeland Merks - 11 years ago 2014-05-01 16:15:10
merks@cwi.nl

Fixed some minor syntactic errors that popped up after compiling on MacOSX10.8.5

5 files changed with 8 insertions and 8 deletions:

src/VirtualLeaf.cpp

src/canvas.cpp

src/modelcatalogue.cpp

src/parameter.cpp

src/xmlwrite.cpp

0 comments (0 inline, 0 general)

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -435,35 +435,35 @@ int main(int argc,char **argv) { @@
 	  main_window->Plot();
     */
     if (batch) {
       double t=0.;
       do {
 	t = main_window->TimeStep();
       } while (t < par.maxt);
     } else
       return app.exec();
   } catch (const char *message) {
     if (batch) {
       cerr << "Exception caught:" << endl;
       cerr << message << endl;
       abort();
     } else {
       QString qmess=QString("Exception caught: %1").arg(message);
       QMessageBox::critical(0, "Critical Error", qmess);
       abort();
+    }
   } catch (ios_base::failure) {
     stringstream error_message;
     error_message << "I/O failure: " << strerror(errno);
     if (batch) {
       cerr << error_message.str() <<endl;
+      cerr << error_message.str().c_str() <<endl;
       abort();
     } else {
       QString qmess(error_message.str().c_str());
       QMessageBox::critical(0, "I/O Error", qmess );
       abort();
+    }
+  }
+}
 /* finis */

src/canvas.cpp

➞

Show inline comments

@@ @@ -698,49 +698,49 @@ void Main::saveStateXML() @@
     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;
+      cerr << status_message.toStdString().c_str() << endl;
       statusBar()->showMessage(status_message);
+    }
+  }
+}
 void Main::snapshot()
+{
 #ifdef QDEBUG
   qDebug() << "Supported Image Formats: " << QImageWriter::supportedImageFormats() << endl;
 #endif
   stopSimulation();
   Q3FileDialog *fd = new Q3FileDialog( this, "Save snapshot", TRUE );
   fd->setDir(par.datadir);
   fd->setMode( Q3FileDialog::AnyFile );
   QString supported_file_formats = " *.pdf";
   foreach (QString format, QImageWriter::supportedImageFormats()){
     supported_file_formats += (" *." + format);
+  }
@@ @@ -761,49 +761,49 @@ void Main::snapshot() @@
+    }
     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;
+      cerr << status_message.toStdString().c_str() << 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;
+    }
@@ @@ -825,49 +825,49 @@ void Main::readPrevStateXML() @@
+  }
+}
 int Main::readStateXML(const char *filename, bool geometry, bool pars, bool simtime)
+{
   try {
     xmlNode *settings;
     mesh.XMLRead((const char *)filename, &settings, geometry, pars, simtime);
 #ifdef QDEBUG
     qDebug() << "Reading done."<< endl;
 #endif
     XMLReadSettings(settings);
     xmlFree(settings);
     Cell::SetMagnification(1);
     Cell::setOffset(0,0);
     FitLeafToCanvas();
     currentFile =  QString(filename);
     Plot();
     QString status_message = QString("Successfully read leaf from file %1. Time is %2 h.").arg(currentFile).arg(mesh.getTimeHours().c_str());
     cerr << status_message.toStdString() << endl;
+    cerr << status_message.toStdString().c_str() << endl;
     setCaption(caption_with_file.arg(filename));
     statusBar()->message(status_message);
     emit ParsChanged();
 #ifdef QDEBUG
     qDebug() << "Done. Returning 0." << endl;
 #endif
     return 0;
   } catch (const char *error_message) {
     QMessageBox mb( "Read leaf from XML file",
 		    QString(error_message),
 		    QMessageBox::Critical,
 		    QMessageBox::Ok | QMessageBox::Default,
 		    Qt::NoButton,
 		    Qt::NoButton);
     mb.exec();
     return 1;
+  }
+}
 void Main::readNextStateXML()
+{
   // if we have already read a file, read the next file

src/modelcatalogue.cpp

➞

Show inline comments

@@ @@ -118,49 +118,49 @@ void ModelCatalogue::LoadPlugin(const ch @@
     } else {
       MyWarning::warning("Could not load plugin %s",fileName.toStdString().c_str());
+    }
+  }
+}
 void ModelCatalogue::InstallFirstModel() {
   InstallModel(models[0]);
+}
 void ModelCatalogue::PopulateModelMenu() {
   foreach (SimPluginInterface *model, models) {
     QAction *modelaction = new QAction(model->ModelID(), (Main *)mainwin);
     QVariant data;
     data.setValue(model);
     modelaction->setData(data);
     ((Main *)mainwin)->modelmenu->addAction(modelaction);
+  }
   connect(((Main *)mainwin)->modelmenu, SIGNAL(triggered(QAction *)), this, SLOT(InstallModel(QAction *)) );
+}
 void ModelCatalogue::InstallModel(QAction *modelaction) {
   QVariant data = modelaction->data();
   SimPluginInterface *model = data.value<SimPluginInterface *>();
   cerr << "You chose model " << model->ModelID().toStdString() << "!\n";
+  cerr << "You chose model " << model->ModelID().toStdString().c_str() << "!\n";
   mesh->Clean();
   InstallModel(model);
+}
 void ModelCatalogue::InstallModel(SimPluginInterface *plugin) {
   // make sure both main and plugin use the same static datamembers (ncells, nchems...)
   mesh->Clean();
   plugin->SetCellsStaticDatamembers(CellBase::GetStaticDataMemberPointer());
   mesh->SetSimPlugin(plugin);
   Cell::SetNChem(plugin->NChem());
   plugin->SetParameters(&par);
   if (mainwin) {
     if (!qApp->type()==QApplication::Tty)  // only do this if we are running a GUI
       ((Main *)mainwin)->RefreshInfoBar();
     if (plugin->DefaultLeafML().isEmpty()) {
       mainwin->Init(0);
     } else {

src/parameter.cpp

➞

Show inline comments

@@ @@ -367,49 +367,49 @@ void Parameter::Write(ostream &os) const @@
   if (arrowcolor)
   os << " arrowcolor = " << arrowcolor << endl;
   os << " arrowsize = " << arrowsize << endl;
   if (textcolor)
   os << " textcolor = " << textcolor << endl;
   os << " cellnumsize = " << cellnumsize << endl;
   os << " nodenumsize = " << nodenumsize << endl;
   os << " node_mag = " << node_mag << endl;
   os << " outlinewidth = " << outlinewidth << endl;
   if (cell_outline_color)
   os << " cell_outline_color = " << cell_outline_color << endl;
   os << " resize_stride = " << resize_stride << endl;
   os << " export_interval = " << export_interval << endl;
   if (export_fn_prefix)
   os << " export_fn_prefix = " << export_fn_prefix << endl;
   os << " storage_stride = " << storage_stride << endl;
   os << " xml_storage_stride = " << xml_storage_stride << endl;
   if (datadir) {
                                      QDir dataDir = QDir::home().relativeFilePath(datadir);
                                      os << " datadir = " << dataDir.dirName().toStdString() << endl;
+                                     os << " datadir = " << dataDir.dirName().toStdString().c_str() << endl;
+                                 }
                                  else {
                                      os << "datadir = ." << endl;
+                                 }
   os << " T = " << T << endl;
   os << " lambda_length = " << lambda_length << endl;
   os << " yielding_threshold = " << yielding_threshold << endl;
   os << " lambda_celllength = " << lambda_celllength << endl;
   os << " target_length = " << target_length << endl;
   os << " cell_expansion_rate = " << cell_expansion_rate << endl;
   os << " cell_div_expansion_rate = " << cell_div_expansion_rate << endl;
   os << " auxin_dependent_growth = " << sbool(auxin_dependent_growth) << endl;
   os << " ode_accuracy = " << ode_accuracy << endl;
   os << " mc_stepsize = " << mc_stepsize << endl;
   os << " mc_cell_stepsize = " << mc_cell_stepsize << endl;
   os << " energy_threshold = " << energy_threshold << endl;
   os << " bend_lambda = " << bend_lambda << endl;
   os << " alignment_lambda = " << alignment_lambda << endl;
   os << " rel_cell_div_threshold = " << rel_cell_div_threshold << endl;
   os << " rel_perimeter_stiffness = " << rel_perimeter_stiffness << endl;
   os << " collapse_node_threshold = " << collapse_node_threshold << endl;
   os << " morphogen_div_threshold = " << morphogen_div_threshold << endl;
   os << " morphogen_expansion_threshold = " << morphogen_expansion_threshold << endl;
   os << " copy_wall = " << sbool(copy_wall) << endl;
@@ @@ -579,49 +579,49 @@ xmlNewProp(xmlpar, BAD_CAST "val", BAD_C @@
     text << export_fn_prefix;
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "storage_stride" );
   ostringstream text;
     text << storage_stride;
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "xml_storage_stride" );
   ostringstream text;
     text << xml_storage_stride;
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "datadir" );
   ostringstream text;
   if (datadir) {
                                      QDir dataDir = QDir::home().relativeFilePath(datadir);
                                      text << dataDir.dirName().toStdString();
+                                     text << dataDir.dirName().toStdString().c_str();
+                                   }
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "T" );
   ostringstream text;
     text << T;
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "lambda_length" );
   ostringstream text;
     text << lambda_length;
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "yielding_threshold" );
   ostringstream text;
     text << yielding_threshold;
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}

src/xmlwrite.cpp

➞

Show inline comments

@@ @@ -604,49 +604,49 @@ void Wall::XMLAdd(xmlNode *parent) const @@
     xmlNewProp(xmlwall, BAD_CAST "n1", BAD_CAST text.str().c_str());
+  }
+  {
     ostringstream text;
     text << n2->Index();
     xmlNewProp(xmlwall, BAD_CAST "n2", BAD_CAST text.str().c_str());
+  }
+  {
     ostringstream text;
     text << length;
     xmlNewProp(xmlwall, BAD_CAST "length", BAD_CAST text.str().c_str());
+  }
+  {
     ostringstream text;
     text << viz_flux;
     xmlNewProp(xmlwall, BAD_CAST "viz_flux", BAD_CAST text.str().c_str());
+  }
+  {
     ostringstream text;
     text << WallTypetoStr(wall_type);
+    text << WallTypetoStr(wall_type).c_str();
     xmlNewProp(xmlwall, BAD_CAST "wall_type", BAD_CAST text.str().c_str());
+  }
   xmlNodePtr tr1_xml = xmlNewChild(xmlwall, NULL, BAD_CAST "transporters1", NULL);
   if (transporters1) {
     for (int i=0;i<Cell::NChem();i++) {
       xmlNodePtr tr1_val_xml = xmlNewChild(tr1_xml, NULL, BAD_CAST "val", NULL);
+      {
 	ostringstream text;
 	text << transporters1[i];
 	xmlNewProp(tr1_val_xml, BAD_CAST "v", BAD_CAST text.str().c_str());
+      }
+    }
+  }
   if (transporters2) {
     xmlNodePtr tr2_xml = xmlNewChild(xmlwall, NULL, BAD_CAST "transporters2", NULL);
     for (int i=0;i<Cell::NChem();i++) {
       xmlNodePtr tr2_val_xml = xmlNewChild(tr2_xml, NULL, BAD_CAST "val", NULL);
+      {
 	ostringstream text;
 	text << transporters2[i];

0 comments (0 inline, 0 general)