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

Changeset - ffb1f378901c

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 4 0

Roeland Merks - 15 years ago 2010-10-15 11:32:30
roeland.merks@cwi.nl

Merged one file - need to run now!

--
user: Roeland Merks <roeland.merks@cwi.nl>
branch merge
branch 'default'
changed src/ChangeLog
changed src/VirtualLeaf-install.nsi
changed src/VirtualLeaf.pro
changed src/canvas.cpp

4 files changed with 46 insertions and 14 deletions:

src/ChangeLog

src/VirtualLeaf-install.nsi

src/VirtualLeaf.pro

src/canvas.cpp

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeaf.pro: Turned debug off to make all profiles must be
 	consistant.
 	* VirtualLeaf-install.nsi: Tweaked paths to coincide with UNIX
 	distribution, i.e. VirtualLeaf.exe, its libraries, models, and the
 	uninstaller all go in the bin directory. And leaves directory
 	placed under data directory.
 	* canvas.cpp (exportCellData): Added a check to inquire before
 	overwritting an existing file.
 -10-14    <merks@cwi.nl>
 	* mesh.cpp: In response to referees' comments, added new parameter "yield_threshold" instead of fixed parameter '4' for yield threshold.
@@ @@ -11,11 +25,19 @@ 2010-10-14 <merks@cwi.nl> @@
 	* hull.cpp: added an operator< to sort Points
 	* cellbase.cpp (ExactCircumference): I added a new function ExactCircumference, yielding the circumference of the cell along its wall_elements
 	* cellbase.cpp (ExactCircumference): I added a new function
 	ExactCircumference, yielding the circumference of the cell along
 	its wall_elements
 	* VirtualLeaf.cpp: adjust info_string to accomodate for new name
 	of function CellBase::Circumference -> CellBase::WallCircumference
 	* VirtualLeaf.cpp: adjust info_string to accomodate for new name of function CellBase::Circumference -> CellBase::WallCircumference
 	* mesh.cpp: corrected Mesh::Compactness, the boundary coordinates need to be sorted in x,y order for the convex hull algorithm (thanks Margriet!). I updated CSVExportCellData so it exports the circumferences of hull and boundary_polygon.
 	* mesh.cpp: corrected Mesh::Compactness, the boundary coordinates
 	need to be sorted in x,y order for the convex hull algorithm
 	(thanks Margriet!). I updated CSVExportCellData so it exports the
 	circumferences of hull and boundary_polygon.
 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeafpar.tmpl (export_fn_prefix): changed to 'cell.'
@@ @@ -24,7 +46,7 @@ 2010-10-14 <guravage@caterpie.sen.cwi @@
 	filename now incorporates iteration number.
 	* canvas.h (MainBase): Removed TimeStamp().
 -10-08    <guravage@caterpie.sen.cwi.nl>

src/VirtualLeaf-install.nsi

➞

Show inline comments

@@ @@ -117,8 +117,8 @@ RequestExecutionLevel user @@
 section "Virtual Leaf executable"
   #sectionIn RO
   # define the output path for the Virtual Leaf executable
   setOutPath $INSTDIR
   writeUninstaller $INSTDIR\uninstaller.exe
   setOutPath $INSTDIR\bin
   writeUninstaller $INSTDIR\bin\uninstaller.exe
   file ..\bin\VirtualLeaf.exe
   # Required DLLs
@@ @@ -145,13 +145,13 @@ sectionEnd @@
 section "Virtual Leaf plugins"
   # define the output path for the Virtual Leaf models
   setOutPath $INSTDIR\models
+  setOutPath $INSTDIR\bin\models
   file ..\bin\models\*
 sectionEnd
 section "Virtual Leaf data"
   # define the output path for the Virtual Leaf models
   setOutPath $INSTDIR\leaves
+  setOutPath $INSTDIR\data\leaves
   file ..\data\leaves\*
 sectionEnd

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -19,8 +19,8 @@ @@
 #  Copyright 2010 Roeland Merks.
+#
 CONFIG -= release
 CONFIG += debug
 CONFIG += release
 CONFIG -= debug
 CONFIG += qt
 QMAKE_CXXFLAGS += -fexceptions

src/canvas.cpp

➞

Show inline comments

@@ @@ -691,7 +691,7 @@ void Main::saveStateXML() @@
 			       this,
 			       tr("Overwrite File? -- Leaf Growth"),
 			       tr("A file called %1 already exists."
 				  "Do you want to overwrite it?")
+				  " Do you want to overwrite it?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
@@ @@ -724,7 +724,7 @@ void Main::snapshot() @@
 			       this,
 			       tr("Overwrite File? -- Leaf Growth"),
 			       tr("A file called %1 already exists."
 				  "Do you want to overwrite it?")
+				  " Do you want to overwrite it?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
@@ @@ -1403,8 +1403,18 @@ void Main::exportCellData() { @@
   fd->setMode( Q3FileDialog::AnyFile );
   if ( fd->exec() == QDialog::Accepted ) {
     fileName = fd->selectedFile();
     if ( QFile::exists( fileName ) &&
 	!QMessageBox::question(
 			       this,
 			       tr("Overwrite File? -- Cell Data"),
 			       tr("A file called %1 already exists."
 				  " Do you want to overwrite it?")
 			       .arg( fileName ),
 			       tr("&Yes"), tr("&No"),
 			       QString::null, 1, 1 ) ) {
       this->exportCellData(fileName);
+    }
+  }
   this->exportCellData(fileName);
+}

0 comments (0 inline, 0 general)