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
27
5
src/VirtualLeaf-install.nsi
4
4
src/VirtualLeaf.pro
2
2
src/canvas.cpp
13
3
0 comments (0 inline, 0 general)
src/ChangeLog
➞
Show inline comments
 
2010-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.

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
2010-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. 

			




	
	
	
		
 

			




	
	
	
		
 
	* wallitem.cpp: when clicking a wall, both the wall type was cycled and the transporterdialog popped up. Corrected this - for wall type cycling, hold the Control button while left clicking. TransporterDialog only pops up for left click. Also made sure the wall is redrawn after changing the transporter values.

			




	
	
	
		
 
	

			




	
	
	
		
 

			




	
	
	
		
 
	* cell.cpp (DivideWalls): accomodated for rename of Circumference -> WallCircumference

			




	
	
	
		
 

			




	
	
	
		
 
	* hull.h: added an operator< to sort Points

			




	
	
	
		
 

			




	
	
	
		
 
	* 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.

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
2010-10-14    <guravage@caterpie.sen.cwi.nl>

			




	
	
	
		
 

			




	
	
	
		
 
	* VirtualLeafpar.tmpl (export_fn_prefix): changed to 'cell.'

			




	
	
	
		
 

			




	
	
	
		
 
	* canvas.cpp (TimeStepWrap): Removed TimeStamp(). Cell data

			




	
	
	
		
 
	filename now incorporates iteration number.

			




	
	
	
		
 

			




	
	
	
		
 
	* canvas.h (MainBase): Removed TimeStamp().

			




	
	
	
		
 
	

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
2010-10-08    <guravage@caterpie.sen.cwi.nl>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
	* pardialog.h:

			




	
	
	
		
 
	* pardialog.cpp:

			




	
	
	
		
 
	* parameter.h:

			




	
	
	
		
 
	* parameter.cpp: Regenerated to include export_interval and export_fn_prefix.

			




	
	
	
		
 

			




	
	
	
		
 
	* VirtualLeafpar.tmpl: Appended export_interval and export_fn_prefix.

			




	
	
	
		
 

			




	
	
	
		
 
	* canvas.h (MainBase): Declared polymorphic exportCellData() functions.

			




        

    


    
    

    

        

                

                    src/VirtualLeaf-install.nsi
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -108,26 +108,26 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}

			




	
	
	
		
 
ShowInstDetails show

			




	
	
	
		
 
ShowUnInstDetails show

			




	
	
	
		
 
 

			




	
	
	
		
 
# define the directory to install to

			




	
	
	
		
 
installDir C:\VirtualLeaf

			




	
	
	
		
 

			




	
	
	
		
 
# Request application privileges

			




	
	
	
		
 
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

			




	
	
	
		
 
  setOutPath $INSTDIR\bin

			




	
	
	
		
 

			




	
	
	
		
 
  file ..\lib\libiconv\bin\libiconv-2.dll

			




	
	
	
		
 
  file ..\lib\libxml2\lib\libxml2.dll

			




	
	
	
		
 
  file ..\lib\libz\bin\zlib1.dll

			




	
	
	
		
 

			




	
	
	
		
 
  # Is the pegging of these DLLs to a specific QT version a problem?

			




	
	
	
		
 
  file C:\Qt\2010.02.1\mingw\bin\mingwm10.dll

			




	
	
	
		
 
  file C:\Qt\2010.02.1\mingw\bin\libgcc_s_dw2-1.dll

			




	
	
		
 
@@ -136,31 +136,31 @@ section "Virtual Leaf executable"

			




	
	
	
		
 
  file C:\Qt\2010.02.1\qt\bin\QtCore4.dll

			




	
	
	
		
 
  file C:\Qt\2010.02.1\qt\bin\QtGui4.dll

			




	
	
	
		
 
  file C:\Qt\2010.02.1\qt\bin\QtNetwork4.dll

			




	
	
	
		
 
  file C:\Qt\2010.02.1\qt\bin\QtSql4.dll

			




	
	
	
		
 
  file C:\Qt\2010.02.1\qt\bin\QtXml4.dll

			




	
	
	
		
 

			




	
	
	
		
 
  # Prepend the Virtual Leaf bin directory to the installers PATH

			




	
	
	
		
 
  ${EnvVarUpdate} $0 "PATH" "P" "HKCU" "$INSTDIR\bin"  

			




	
	
	
		
 
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

			




	
	
	
		
 

			




	
	
	
		
 
section "Virtual Leaf docs"

			




	
	
	
		
 
  # define the output path for the Virtual Leaf documentation

			




	
	
	
		
 
  setOutPath $INSTDIR\doc

			




	
	
	
		
 
  file ..\doc\*

			




	
	
	
		
 
sectionEnd

			




	
	
	
		
 

			




	
	
	
		
 
# create a section to define what the uninstaller does.

			




	
	
	
		
 
# the section will always be named "Uninstall"

			




	
	
	
		
 
section "Uninstall"

			




        

    


    
    

    

        

                

                    src/VirtualLeaf.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,26 +10,26 @@

			




	
	
	
		
 
#

			




	
	
	
		
 
#  The Virtual Leaf is distributed in the hope that it will be useful,

			




	
	
	
		
 
#  but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
#  GNU General Public License for more details.

			




	
	
	
		
 
#

			




	
	
	
		
 
#  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
#  along with the Virtual Leaf.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
#

			




	
	
	
		
 
#  Copyright 2010 Roeland Merks.

			




	
	
	
		
 
#

			




	
	
	
		
 

			




	
	
	
		
 
CONFIG -= release

			




	
	
	
		
 
CONFIG += debug

			




	
	
	
		
 
CONFIG += release

			




	
	
	
		
 
CONFIG -= debug

			




	
	
	
		
 
CONFIG += qt

			




	
	
	
		
 

			




	
	
	
		
 
QMAKE_CXXFLAGS += -fexceptions

			




	
	
	
		
 
QMAKE_CXXFLAGS += -Wall

			




	
	
	
		
 
QMAKE_CXXFLAGS += -Wno-write-strings

			




	
	
	
		
 
QMAKE_CXXFLAGS += -Wno-unused-parameter

			




	
	
	
		
 
QMAKE_CXXFLAGS_DEBUG += -g3

			




	
	
	
		
 
QMAKE_CXXFLAGS_DEBUG += -DQDEBUG

			




	
	
	
		
 

			




	
	
	
		
 
#REACTIONS = reactions_auxin_growth.h 

			




	
	
	
		
 
#REACTIONS = reactions_meinhardt.h

			




	
	
	
		
 
#REACTIONS = reactions_pce_growth.h

			




        

    


    
    

    

        

                

                    src/canvas.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -682,25 +682,25 @@ void Main::saveStateXML()

			




	
	
	
		
 
  Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );

			




	
	
	
		
 
  fd->setMode( Q3FileDialog::AnyFile );

			




	
	
	
		
 
  fd->setFilter( "XML (*.xml)");

			




	
	
	
		
 
  QString fileName;

			




	
	
	
		
 

			




	
	
	
		
 
  if ( fd->exec() == QDialog::Accepted ) {

			




	
	
	
		
 
    fileName = fd->selectedFile();

			




	
	
	
		
 
    if ( QFile::exists( fileName ) &&

			




	
	
	
		
 
	 QMessageBox::question(

			




	
	
	
		
 
			       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 ) ) {

			




	
	
	
		
 
      return saveStateXML();

			




	
	
	
		
 

			




	
	
	
		
 
    } else {

			




	
	
	
		
 

			




	
	
	
		
 
      mesh.XMLSave((const char *)fileName, XMLSettingsTree());

			




	
	
	
		
 

			




	
	
	
		
 
    }

			




	
	
	
		
 
  }

			




	
	
	
		
 
}

			




	
	
		
 
@@ -715,25 +715,25 @@ void Main::snapshot()

			




	
	
	
		
 
  Q3FileDialog *fd = new Q3FileDialog( this, "Save snapshot", TRUE );

			




	
	
	
		
 
  fd->setMode( Q3FileDialog::AnyFile );

			




	
	
	
		
 

			




	
	
	
		
 
  QString fileName;

			




	
	
	
		
 

			




	
	
	
		
 
  if ( fd->exec() == QDialog::Accepted ) {

			




	
	
	
		
 
    fileName = fd->selectedFile();

			




	
	
	
		
 
    if ( QFile::exists( fileName ) &&

			




	
	
	
		
 
	 QMessageBox::question(

			




	
	
	
		
 
			       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 ) ) {

			




	
	
	
		
 
      return snapshot();

			




	
	
	
		
 

			




	
	
	
		
 
    } else {

			




	
	
	
		
 

			




	
	
	
		
 
      // extract extension from filename

			




	
	
	
		
 
      QString extension = getExtension(fileName);

			




	
	
	
		
 

			




	
	
	
		
 
      // Save bitmaps at 1024x768

			




	
	
	
		
 
      Save((const char *)fileName, extension, 1024, 768);

			




	
	
		
 
@@ -1394,18 +1394,28 @@ void Main::exportCellData(QString fileNa

			




	
	
	
		
 
  }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void Main::exportCellData() {

			




	
	
	
		
 
  QString fileName;

			




	
	
	
		
 
  Q3FileDialog *fd = new Q3FileDialog( this, "file dialog", TRUE );

			




	
	
	
		
 

			




	
	
	
		
 
  stopSimulation();

			




	
	
	
		
 
  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);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
/* finis */

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: kalli-620
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support