Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1222 |
3037d 22h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
1221 |
3037d 22h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
1220 |
3037d 22h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
1218 |
3038d 00h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
1217 |
3038d 00h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
1104 |
3326d 04h |
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
|
793 |
4185d 22h |
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
|
780 |
4297d 01h |
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 |
4310d 00h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
674 |
4892d 21h |
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
|
671 |
4893d 01h |
werner |
/trunk/src/ |
Necessary changes for GPL licence (i.e. headers in all source files) |
|
/trunk/src/core/climate.cpp /trunk/src/core/climate.h /trunk/src/core/environment.cpp /trunk/src/core/environment.h /trunk/src/core/establishment.cpp /trunk/src/core/establishment.h /trunk/src/core/exception.h /trunk/src/core/global.h /trunk/src/core/grid.h /trunk/src/core/layeredgrid.h /trunk/src/core/management.cpp /trunk/src/core/management.h /trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/core/modelsettings.cpp /trunk/src/core/modelsettings.h /trunk/src/core/phenology.cpp /trunk/src/core/phenology.h /trunk/src/core/plugin_interface.h /trunk/src/core/production3pg.cpp /trunk/src/core/production3pg.h /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/seeddispersal.cpp /trunk/src/core/seeddispersal.h /trunk/src/core/snag.cpp /trunk/src/core/snag.h /trunk/src/core/soil.cpp /trunk/src/core/soil.h /trunk/src/core/species.cpp /trunk/src/core/species.h /trunk/src/core/speciesresponse.cpp /trunk/src/core/speciesresponse.h /trunk/src/core/speciesset.cpp /trunk/src/core/speciesset.h /trunk/src/core/stamp.cpp /trunk/src/core/stamp.h /trunk/src/core/stampcontainer.cpp /trunk/src/core/stampcontainer.h /trunk/src/core/standloader.cpp /trunk/src/core/standloader.h /trunk/src/core/standstatistics.cpp /trunk/src/core/standstatistics.h /trunk/src/core/threadrunner.cpp /trunk/src/core/threadrunner.h /trunk/src/core/timeevents.cpp /trunk/src/core/timeevents.h /trunk/src/core/tree.cpp /trunk/src/core/tree.h /trunk/src/core/watercycle.cpp /trunk/src/core/watercycle.h /trunk/src/iland/aboutdialog.cpp /trunk/src/iland/aboutdialog.h /trunk/src/iland/aboutdialog.ui /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h /trunk/src/iland/paintarea.cpp /trunk/src/iland/paintarea.h /trunk/src/iland/stable.h /trunk/src/iland/tests.cpp /trunk/src/iland/tests.h /trunk/src/iland/version.h /trunk/src/output/carbonflowout.cpp /trunk/src/output/carbonflowout.h /trunk/src/output/carbonout.cpp /trunk/src/output/carbonout.h /trunk/src/output/dynamicstandout.cpp /trunk/src/output/dynamicstandout.h /trunk/src/output/managementout.cpp /trunk/src/output/managementout.h /trunk/src/output/output.cpp /trunk/src/output/output.h /trunk/src/output/outputmanager.cpp /trunk/src/output/outputmanager.h /trunk/src/output/productionout.cpp /trunk/src/output/productionout.h /trunk/src/output/saplingout.cpp /trunk/src/output/saplingout.h /trunk/src/output/standdeadout.cpp /trunk/src/output/standdeadout.h /trunk/src/output/standout.cpp /trunk/src/output/standout.h /trunk/src/output/treeout.cpp /trunk/src/output/treeout.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h /trunk/src/plugins/fire/fireout.cpp /trunk/src/plugins/fire/fireout.h /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/plugins/fire/fireplugin.h /trunk/src/tools/climateconverter.cpp /trunk/src/tools/climateconverter.h /trunk/src/tools/csvfile.cpp /trunk/src/tools/csvfile.h /trunk/src/tools/dem.cpp /trunk/src/tools/dem.h /trunk/src/tools/expression.cpp /trunk/src/tools/expression.h /trunk/src/tools/expressionwrapper.cpp /trunk/src/tools/expressionwrapper.h /trunk/src/tools/floatingaverage.cpp /trunk/src/tools/floatingaverage.h /trunk/src/tools/gisgrid.cpp /trunk/src/tools/gisgrid.h /trunk/src/tools/globalsettings.cpp /trunk/src/tools/globalsettings.h /trunk/src/tools/helper.cpp /trunk/src/tools/helper.h /trunk/src/tools/mapgrid.cpp /trunk/src/tools/mapgrid.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h /trunk/src/tools/random.cpp /trunk/src/tools/random.h /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/scriptglobal.h /trunk/src/tools/settingmetadata.cpp /trunk/src/tools/settingmetadata.h /trunk/src/tools/sqlhelper.cpp /trunk/src/tools/sqlhelper.h /trunk/src/tools/ticktack.cpp /trunk/src/tools/ticktack.h /trunk/src/tools/xmlhelper.cpp /trunk/src/tools/xmlhelper.h
|
665 |
4933d 23h |
werner |
/trunk/src/ |
modified the output infrastructure to deal with outputs defined by Modules. Added a fire output. |
|
/trunk/src/plugins/fire/fireout.cpp /trunk/src/plugins/fire/fireout.h
/trunk/src/output/output.h /trunk/src/output/outputmanager.cpp /trunk/src/output/outputmanager.h /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
|
652 |
5026d 19h |
werner |
/trunk/src/ |
added a test routine to check the fire spread algorithm. Looks basically ok, but maybe we need to spread to the 8neighborhood. |
|
/trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/iland/mainwindow.cpp /trunk/src/iland/tests.cpp /trunk/src/iland/tests.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/fireplugin.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h
|
649 |
5032d 18h |
werner |
/trunk/src/ |
the fire module is growing functional, which actually means: the Interfaces/plugin/thingy is getting more stable ;)
Now the fire module can: calculate drought indices and even start a fire event.
Nice: the mechanism to push grids from the model to the GUI for means of visualization works like a charm. |
|
/trunk/src/core/model.cpp /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/core/plugin_interface.h /trunk/src/iland/tests.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h /trunk/src/plugins/fire/fireplugin.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h
|
646 |
5034d 01h |
werner |
/trunk/src/ |
reorganized the fire module code and other stuff.
* added new interfaces and linked some of them already (setup(), ...)
* separated the plugin from the implementation (fireplugin.h vs. FireModule)
* worked on finding a way to create "layeredgrids" (how to avoid the templates...)- i have a solution now but still not sure if it really works |
|
/trunk/src/core/layeredgrid.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
/trunk/src/core/grid.h /trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/core/plugin_interface.h /trunk/src/core/watercycle.cpp /trunk/src/iland/iland.pro /trunk/src/plugins/fire/fire.pro /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/plugins/fire/fireplugin.h /trunk/src/tools/gisgrid.cpp /trunk/src/tools/gisgrid.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h
|
645 |
5038d 22h |
werner |
/trunk/src/ |
Fire disturbance: started fire drought index calculation. Still not sure how to design the plug in system... |
|
/trunk/src/core/plugin_interface.h /trunk/src/core/watercycle.h /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/plugins/fire/fireplugin.h
|
641 |
5040d 18h |
werner |
/trunk/src/ |
started development of the plugin / module system.
this includes playing around with qmake and the QPluginLoader.
Now the plan is to build a static library for each module and use the Qt mechanism to load them. The fire module is a kind of a test pilot - lets see how the needed interfaces etc. develop. |
|
/trunk/src/core/plugin_interface.h /trunk/src/plugins /trunk/src/plugins/fire /trunk/src/plugins/fire/fire.pro /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/plugins/fire/fireplugin.h /trunk/src/plugins/plugins.pro /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h
/trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/iland/tests.h
|