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

Changeset - 0c49e452410f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

After default initialization two polygons were constructed. Corrected.

2 files changed with 12 insertions and 11 deletions:

src/VirtualLeaf.cpp

src/modelcatalogue.cpp

0 comments (0 inline, 0 general)

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -486,49 +486,50 @@ 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);
     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) {

src/modelcatalogue.cpp

➞

Show inline comments

@@ @@ -124,38 +124,38 @@ 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 *>();
 	cerr << "You chose model " << model->ModelID().toStdString() << "!\n";
 	mesh->Clean();
 	InstallModel(model);
+}
 void ModelCatalogue::InstallModel(SimPluginInterface *plugin) {
 	// make sure both main and plugin use the same static datamembers (ncells, nchems...)
 	plugin->SetCellsStaticDatamembers(CellBase::GetStaticDataMemberPointer());
   // make sure both main and plugin use the same static datamembers (ncells, nchems...)
   plugin->SetCellsStaticDatamembers(CellBase::GetStaticDataMemberPointer());
 	mesh->SetSimPlugin(plugin);
 	Cell::SetNChem(plugin->NChem());
 	plugin->SetParameters(&par);
   mesh->SetSimPlugin(plugin);
   Cell::SetNChem(plugin->NChem());
   plugin->SetParameters(&par);
 	if (mainwin) {
 		mainwin->RefreshInfoBar();
 		mainwin->Init(0);
+	}
 	//	mesh->StandardInit();
   if (mainwin) {
     mainwin->RefreshInfoBar();
     mainwin->Init(0);
+  }
   //	mesh->StandardInit();
+}

0 comments (0 inline, 0 general)