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

Changeset - 3663c597352b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Roeland Merks - 15 years ago 2010-05-26 16:40:58
roeland.merks@cwi.nl

Oh, oh... my previous solution to clean and then reconstruct a new initial condition did not work in all cases. Now I am calling Init(leaffile) during startup initialization only if the user is passing a leafML file during startup (-l option).

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

2 files changed with 4 insertions and 3 deletions:

src/VirtualLeaf.cpp

src/modelcatalogue.cpp

0 comments (0 inline, 0 general)

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -487,50 +487,51 @@ int main(int argc,char **argv) { @@
     canvas.setSceneRect(QRectF());
     if (!batch) {
       QObject::connect( qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit()) );
+    }
 	  // Load plugins
 	  /*QVector<SimPluginInterface *> plugins = LoadPlugins();
 	  InstallPlugin(plugins[0], main_window);
 	  cerr << "List of models:" << endl;
 	  foreach (SimPluginInterface *p, plugins) {
 		  cerr << p->ModelID().toStdString() << endl;
+	  }
 	  */
     // Install model or read catalogue of models
     ModelCatalogue model_catalogue(&mesh, useGUI?(Main *)main_window:0,modelfile);
     if (useGUI)
       model_catalogue.PopulateModelMenu();
     model_catalogue.InstallFirstModel();
     mesh.Clean();
     main_window->Init(leaffile);
     if (leaffile)
       main_window->Init(leaffile);
     Cell::SetMagnification(1);
     Cell::setOffset(0,0);
     main_window->FitLeafToCanvas();
     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;

src/modelcatalogue.cpp

➞

Show inline comments

@@ @@ -92,49 +92,49 @@ void ModelCatalogue::LoadPlugin(const ch @@
     pluginDir.cdUp();
+  }
   //plugin_filters << "*.dylib";
 #endif
   plugin_filters << model;
   pluginDir.setNameFilters(plugin_filters);
   if (!pluginDir.cd("models")) {
     MyWarning::error("Directory 'models' not found!");
+  }
   //QVector<SimPluginInterface *> plugins;
   QStringList modelnames=pluginDir.entryList(QDir::Files);
   if (modelnames.empty()) {
     MyWarning::error("Model %s not found - hint: do not include path in filename.",model);
+  }
   foreach (QString fileName, modelnames){
     QPluginLoader loader(pluginDir.absoluteFilePath(fileName));
     if (SimPluginInterface *plugin =
 	qobject_cast<SimPluginInterface *>(loader.instance())) {
       models.append(plugin);
       MyWarning::warning("Successfully loaded model %s",fileName.toStdString().c_str());
+      //MyWarning::warning("Successfully loaded model %s",fileName.toStdString().c_str());
     } 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(), mainwin);
 		QVariant data;
 		data.setValue(model);
 		modelaction->setData(data);
 		mainwin->modelmenu->addAction(modelaction);
+	}
 	connect(mainwin->modelmenu, SIGNAL(triggered(QAction *)), this, SLOT(InstallModel(QAction *)) );
+}
 void ModelCatalogue::InstallModel(QAction *modelaction) {
 	QVariant data = modelaction->data();
 	SimPluginInterface *model = data.value<SimPluginInterface *>();

0 comments (0 inline, 0 general)