Subversion Repositories public iLand

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
1222 3061d 06h werner / public SVN  
/tags/release_1.0
/branches/release_1.0
1221 3061d 06h werner /branches/ public SVN  
/branches/release_1.0
/branches/version1.0
1220 3061d 06h werner /branches/version1.0/ Version 1.0  
/branches/version1.0
1218 3061d 08h werner / clean up repository - make 1.0 trunk again!  
/trunk
/iland_regen
1217 3061d 08h werner / clean up repository - make 1.0 trunk again!  
/iland_regen
/branches/iland_regen
1104 3349d 12h werner /branches/iland_regen/ Branch dedicated to playing around with establishment/regeneration.
Goals are:
(i) speed up
(ii) introduction of new features for Yellowstone
 
/branches/iland_regen
1065 3461d 02h werner /branches/port_qt5_64bit/src/ interaction of bark beetle and wind disturbances.  
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
1050 3501d 13h werner /branches/port_qt5_64bit/src/ interaction wind/bark beetle --- in development  
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/tools/modules.cpp
1044 3524d 08h werner /branches/port_qt5_64bit/src/ implementing the interaction between bark beetle and wind disturbances;
introduced new flags to mark the reason why trees died when they do die, and a mechanism that allows disturbance modules to being notified when trees die. This involved the creation of a new "DisturbanceInterface".
 
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/core/plugin_interface.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.h
/branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/modules.h
961 3803d 01h werner /branches/port_qt5_64bit/src/ version 0.1 of the bark beetle dispersal routine. Lots of javascript-bindings (very efficient with all the ABE-experience).  
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetle.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/tools/modules.cpp
959 3804d 06h werner /branches/port_qt5_64bit/src/ start of bark beetle module  
/branches/port_qt5_64bit/src/plugins/barkbeetle
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetle.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.json
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/plugins/plugins.pro
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/modules.cpp
808 4181d 04h werner /branches/port_qt5_64bit/src/ implementing FOME.
* splitting "helper.cpp" into several files (debugtimer.h, statdata.h, viewport.h) (and changing lots of includes)
* implementing setup of activities (extracting from Javascript)
 
/branches/port_qt5_64bit/src/tools/debugtimer.cpp
/branches/port_qt5_64bit/src/tools/debugtimer.h
/branches/port_qt5_64bit/src/tools/statdata.cpp
/branches/port_qt5_64bit/src/tools/statdata.h
/branches/port_qt5_64bit/src/tools/viewport.cpp
/branches/port_qt5_64bit/src/tools/viewport.h
/branches/port_qt5_64bit/src/core/environment.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/speciesresponse.cpp
/branches/port_qt5_64bit/src/core/watercycle.cpp
/branches/port_qt5_64bit/src/fome/activity.cpp
/branches/port_qt5_64bit/src/fome/activity.h
/branches/port_qt5_64bit/src/fome/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/fome/forestmanagementengine.h
/branches/port_qt5_64bit/src/fome/knowledgebase.cpp
/branches/port_qt5_64bit/src/fome/knowledgebase.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/output/dynamicstandout.cpp
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/productionout.cpp
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/output/treeout.cpp
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/tools/helper.cpp
/branches/port_qt5_64bit/src/tools/helper.h
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
793 4209d 06h werner /branches/port_qt5_64bit/src/ Move from QScriptEngine to QJSEngine (=V8). Most of the stuff was quite smooth, but there are some open issues.
• Global functions (“print”, “include”, “alert”) are commented out (could be solved by moving functions to the “Globals” object and by creating alias JS-functions, i.e. function alert(x) {Globals.alert(x); } )
• Object creation: “new XXX”, XXX=ClimateConverter, CSVFile, … does not work now
possible solution: factory-pattern (i.e. var csv = Globals.newCSV())
 
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/core/plugin_interface.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/plugins/fire/fire.pro
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.h
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/climateconverter.cpp
/branches/port_qt5_64bit/src/tools/climateconverter.h
/branches/port_qt5_64bit/src/tools/csvfile.cpp
/branches/port_qt5_64bit/src/tools/csvfile.h
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.h
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/modules.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
781 4320d 07h werner /branches/port_qt5_64bit/src/ tried to compile also for MSVC 2010 32bit  
/branches/port_qt5_64bit/src/core/stampcontainer.cpp
/branches/port_qt5_64bit/src/core/watercycle.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/tools/dem.cpp
/branches/port_qt5_64bit/src/tools/expression.cpp
/branches/port_qt5_64bit/src/tools/helper.h
/branches/port_qt5_64bit/src/tools/modules.cpp
780 4320d 08h werner /branches/port_qt5_64bit/src/ Steps to build iLand with Qt 5 and with MSVC compiler and 64 bit.
http://iland.boku.ac.at/blogpost44

removed also a couple of warnings that were thrown by the MSVC compiler.
 
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.json
/branches/port_qt5_64bit/src/plugins/wind/windplugin.json
/branches/port_qt5_64bit/src/3rdparty/MersenneTwister.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/snag.h
/branches/port_qt5_64bit/src/core/species.h
/branches/port_qt5_64bit/src/core/threadrunner.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/watercycle.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/main.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/paintarea.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/plugins/fire/fire.pro
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.h
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/expression.cpp
/branches/port_qt5_64bit/src/tools/gisgrid.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/helper.cpp
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/ticktack.cpp
779 4333d 07h werner /branches/port_qt5_64bit/  
/branches/port_qt5_64bit
769 4463d 14h werner /trunk/src/ v 0.84
helper.cpp: added QMutex to handle possible crash when adding timers to the timers list
modules: added a catch() around the execution of modules (this should fix crashes due to unhandled exceptions)
 
/trunk/src/iland/version.cpp
/trunk/src/ilandc/ilandc.pro
/trunk/src/plugins/fire/fire.pro
/trunk/src/tools/helper.cpp
/trunk/src/tools/modules.cpp
/trunk/src/tools/spatialanalysis.h
767 4512d 01h werner /trunk/src/ larger restructuring of code (moving scripting related parts)
adding a shell for "spatialAnalysis".
In the future, a cleanup of all the "spatial" grids/maps/stuff is necessary...
 
/trunk/src/core/management.cpp
/trunk/src/core/management.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/timeevents.cpp
/trunk/src/iland/mainwindow.cpp
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/tools/globalsettings.cpp
/trunk/src/tools/globalsettings.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
/trunk/src/tools/scriptglobal.cpp
/trunk/src/tools/scriptglobal.h
/trunk/src/tools/spatialanalysis.cpp
/trunk/src/tools/spatialanalysis.h
701 4872d 00h werner /trunk/src/ Kickoff for the implementation of the wind module. It started with copying the stuff from the fire module.
This commit includes the basic framework (i.e. plugin, ...), some basic drawing and a first version of the "edge-detection" (which is copied from the seed dispersal routine). Promising...
 
/trunk/src/plugins/wind
/trunk/src/plugins/wind/wind.pro
/trunk/src/plugins/wind/windmodule.cpp
/trunk/src/plugins/wind/windmodule.h
/trunk/src/plugins/wind/windplugin.cpp
/trunk/src/plugins/wind/windplugin.h
/trunk/src/core/plugin_interface.h
/trunk/src/iland/iland.pro
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/plugins.pro
/trunk/src/tools/modules.cpp
674 4916d 05h werner /trunk/src/ added scripting capabilities (JavaScript) to the "Modules". Now a module can add own objects/properties to the global javascript object. The fire module adds a "FireScript" ("Fire" in JS) object that can be used e.g. to manually "ignite" fires.  
/trunk/src/plugins/fire/firescript.cpp
/trunk/src/plugins/fire/firescript.h
/trunk/src/core/management.cpp
/trunk/src/core/plugin_interface.h
/trunk/src/iland/mainwindow.cpp
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h

Show All