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.

1 file changed with 1 insertions and 0 deletions:

src/VirtualLeaf.cpp

0 comments (0 inline, 0 general)

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -463,94 +463,95 @@ int main(int argc,char **argv) { @@
     QPalette tooltippalette = QToolTip::palette();
     QColor transparentcolor = QColor(tooltippalette.brush(QPalette::Window).color());
     tooltippalette.setBrush (QPalette::Window, QBrush (transparentcolor) );
     QToolTip::setPalette( tooltippalette );
     QGraphicsScene canvas(0,0,8000,6000);
     if (useGUI) {
          main_window=new Main(canvas, mesh);
       if ( QApplication::desktop()->width() > ((Main *)main_window)->width() + 10
 	   && QApplication::desktop()->height() > ((Main *)main_window)->height() +30 ) {
 	((Main *)main_window)->show();
 	((Main *)main_window)->resize( ((Main *)main_window)->sizeHint());
     } else {
         ((Main *)main_window)->showMaximized();
+    }
   } else {
         main_window=new MainBase(canvas, mesh);
+ }
     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) {
       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;
       abort();
     } else {
       QString qmess(error_message.str().c_str());
       QMessageBox::critical(0, "I/O Error", qmess );
       abort();
+    }
+  }
+}

0 comments (0 inline, 0 general)