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

Changeset - 2c972342206d

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Roeland Merks - 15 years ago 2010-06-21 15:44:45
roeland.merks@cwi.nl

Updated "about" window. Displaying it at startup.

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

5 files changed with 18 insertions and 12 deletions:

src/Makefile

src/VirtualLeaf.cpp

src/build_models/Makefile

src/canvas.cpp

src/canvas.h

0 comments (0 inline, 0 general)

src/Makefile

➞

Show inline comments

 # $Id$
 QMAKE = qmake
+QMAKE = $(HOME)/Trolltech/Qt-4.4.1/bin/qmake
 # Set $(MAKE) to the name of the make command on your machine, e.g. 'make' on Linux and 'mingw32-make' on windows.
 MAKE =  make # mingw32-make
 all: VirtualLeaf libplugin plugins
 VirtualLeaf: Makefile.VirtualLeaf
 	$(MAKE) -f Makefile.VirtualLeaf
 Makefile.VirtualLeaf: VirtualLeaf.pro
 	$(QMAKE) -makefile -o $@ $<

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -393,24 +393,27 @@ int main(int argc,char **argv) { @@
     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();
+      }
       // show "About" window at start up
       ((Main *)main_window)->about();
     } else {
       main_window=new MainBase(canvas, mesh);
+    }
     canvas.setSceneRect(QRectF());
     if (!batch) {
       QObject::connect( qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit()) );
+    }
     // Install model or read catalogue of models
     ModelCatalogue model_catalogue(&mesh, useGUI?(Main *)main_window:0,modelfile);
     if (useGUI)

src/build_models/Makefile

➞

Show inline comments

 # $Id$
 QMAKE = qmake
+QMAKE = $(HOME)/Trolltech/Qt-4.4.1/bin/qmake
 # Set $(MAKE) to the name of the make command on your machine, e.g. 'make' on Linux and 'mingw32-make' on windows.
 MAKE = make # mingw32-make
 all: plugin_auxingrowth plugin_meinhardt plugin_test
 plugin_auxingrowth: Makefile.plugin_auxingrowth
 	$(MAKE) -f Makefile.plugin_auxingrowth
 Makefile.plugin_auxingrowth: plugin_auxingrowth.pro
 	$(QMAKE) -makefile -o $@ $<

src/canvas.cpp

➞

Show inline comments

@@ @@ -545,25 +545,25 @@ Main::Main(QGraphicsScene& c, Mesh &m, Q @@
   // Menu of models
   modelmenu = new QMenu( menu );
   menu->insertItem("&Models", modelmenu);
   menu->insertSeparator();
   helpmenu = new Q3PopupMenu( menu );
   tooltips_id = helpmenu->insertItem("Show Cell&Info", this, SLOT(Refresh()));
   helpmenu->setItemChecked(tooltips_id, true);
   helpmenu->insertSeparator();
-  helpmenu->insertItem("&About", this, SLOT(help()) ); //, Key_F1);
+  helpmenu->insertItem("&About", this, SLOT(about()) ); //, Key_F1);
   helpmenu->insertSeparator();
   helpmenu->insertItem("&GPL", this, SLOT(gpl()) );
   menu->insertItem("&Help",helpmenu);
   statusBar();
   setCentralWidget(editor);
   printer = 0;
   init();
   // Start timer which repetitively invokes
   // a simulation time step
   timer = new QTimer( this );
   connect( timer, SIGNAL(timeout()), SLOT(TimeStepWrap()) );
@@ @@ -915,37 +915,40 @@ void Main::readStateXML() @@
     if (readStateXML((const char *)fileName,fd->readGeometryP(), fd->readParametersP()) )
       return readStateXML(); // user can try again
+  }
+}
 void Main::clear()
+{
   editor->clear();
+}
-void Main::help()
+void Main::about()
+{
   static QMessageBox* about = new QMessageBox
     ( "About",
       "<h3>Virtual Leaf</h3>"
+      "<h3>Virtual Leaf V1.0</h3>"
       "<p>"
       "Leaf growth computer model <br>"
       "(c) 2005-2007, Roeland Merks <br>"
       "VIB Department Plant Systems Biology <br>"
       "An Open Source framework for cell-based modeling of plant tissue growth and development <br>"
       "(c) 2005-2008, Roeland Merks <i>et al.</i><br>"
       "    <a href=\"http://www.psb.vib-ugent.be\">VIB Department Plant Systems Biology</a>, "
       "Ghent, Belgium <br>"
       "(c) 2008-2009, Roeland Merks <br>"
       "CWI/NCSB, Amsterdam, Netherlands <br>"
       "Pilot release for WUR/Biometris, 21-10-2009 <br>",
       "(c) 2008-2010, <a href=\"http://www.cwi.nl/~merks\">Roeland Merks <i>et al.</i></a> <br>"
       "    <a href=\"http://www.cwi.nl\">Centrum Wiskunde & Informatica</a> and <a href=\"http://www.ncsb.nl\">Netherlands Consortium for Systems Biology</a>, Amsterdam, Netherlands <br>"
 "<br>The Virtual Leaf is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br>"
       "<br>If you use this code for your projects, please cite our paper:"
 "<br>Merks, Guravage, Inze, and Beemster. An Open Source framework for cell-based modeling of plant tissue growth and development. <i>Plant Physiology,</i> submitted.<br> . <br>"
       "<br>Please share your model plugins and extensions at <a href=\"http://virtualleaf.googlecode.com\">http://virtualleaf.googlecode.com</a>.",
       QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
   about->setButtonText( 1, "Dismiss" );
   about->show();
+}
 #include <string>
 #include <fstream>
 #include <streambuf>
 void Main::gpl()
+{
   static QMessageBox* gpl = new QMessageBox ( "License", "",

src/canvas.h

➞

Show inline comments

@@ @@ -130,25 +130,25 @@ class Main : public Q3MainWindow, public @@
   void scale(double factor);
   virtual double getFluxArrowsize(void)
+  {
     return flux_arrow_size;
+  }
   void FitCanvasToWindow();
   void FitLeafToCanvas(void);
   public slots:
-  void help();
+  void about();
   void gpl();
   void TimeStepWrap();
   void togglePaused();
   void setFluxArrowSize(int size);
   void RestartSim(void);
   void toggleShowCellCenters(void);
   void toggleShowNodes(void);
   void toggleShowBorderCells(void);
   void toggleShowFluxes(void);
   void toggleNodeNumbers(void);
   void toggleCellNumbers(void);
   void toggleCellAxes(void);

0 comments (0 inline, 0 general)