Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
808 |
3996d 11h |
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
|
802 |
4015d 21h |
werner |
/branches/port_qt5_64bit/ |
merge from trunk up to revision 801 |
|
/branches/port_qt5_64bit/R_analysis
/branches/port_qt5_64bit /branches/port_qt5_64bit/executable/iland.exe /branches/port_qt5_64bit/src/core/climate.cpp /branches/port_qt5_64bit/src/core/climate.h /branches/port_qt5_64bit/src/core/global.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/production3pg.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/speciesresponse.cpp /branches/port_qt5_64bit/src/core/speciesresponse.h /branches/port_qt5_64bit/src/core/speciesset.cpp /branches/port_qt5_64bit/src/core/speciesset.h /branches/port_qt5_64bit/src/core/stampcontainer.cpp /branches/port_qt5_64bit/src/core/watercycle.cpp /branches/port_qt5_64bit/src/core/watercycle.h /branches/port_qt5_64bit/src/fonstudio/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/version.cpp /branches/port_qt5_64bit/src/output/dynamicstandout.cpp /branches/port_qt5_64bit/src/output/dynamicstandout.h /branches/port_qt5_64bit/src/output/productionout.cpp /branches/port_qt5_64bit/src/output/snapshot.cpp /branches/port_qt5_64bit/src/output/standdeadout.cpp /branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp /branches/port_qt5_64bit/src/plugins/fire/firescript.cpp /branches/port_qt5_64bit/src/plugins/fire/firescript.h /branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp /branches/port_qt5_64bit/src/tools/expression.cpp /branches/port_qt5_64bit/src/tools/expression.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
780 |
4135d 16h |
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 |
4148d 15h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
776 |
4219d 13h |
werner |
/trunk/src/ |
updated logic for starting/stopping the model (there actually was an error with infinite calling depth) |
|
/trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h
|
760 |
4360d 21h |
werner |
/trunk/src/ |
improved the ilandc version, removed a bug with trying to show a message box in the non-GUI version; ilandc runs now quite stable (e.g. 11 replicates of HJA fire simulations without problems) |
|
/trunk/src/core/modelcontroller.cpp /trunk/src/ilandc/consoleshell.cpp /trunk/src/ilandc/ilandc.pro /trunk/src/ilandc/main.cpp /trunk/src/plugins/fire/firemodule.cpp
|
759 |
4372d 14h |
werner |
/trunk/src/ |
restarting the "ilandc" command line version of iLand. |
|
/trunk/src/core/modelcontroller.cpp /trunk/src/iland/iland.pro /trunk/src/ilandc/ilandc.pro /trunk/src/ilandc/main.cpp /trunk/src/plugins/fire/fire.pro /trunk/src/tools/randomgenerator.cpp
|
697 |
4688d 12h |
werner |
/trunk/ |
Doxygen documentation revisited.
After re-establishing doxygen documentation (last update: 2009) a lot of smaller/medium documentation fixes.
Documentation is something that could definitely be always improved ;) |
|
/trunk/doc /trunk/doc/iland_doxyfile.doxy
/trunk/src/core/environment.cpp /trunk/src/core/grid.h /trunk/src/core/layeredgrid.h /trunk/src/core/management.cpp /trunk/src/core/model.cpp /trunk/src/core/modelcontroller.cpp /trunk/src/core/phenology.cpp /trunk/src/core/production3pg.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunitspecies.cpp /trunk/src/core/sapling.cpp /trunk/src/core/seeddispersal.cpp /trunk/src/core/snag.cpp /trunk/src/core/soil.cpp /trunk/src/core/species.cpp /trunk/src/core/speciesresponse.cpp /trunk/src/core/speciesset.cpp /trunk/src/core/stamp.h /trunk/src/core/stampcontainer.h /trunk/src/core/standloader.cpp /trunk/src/core/standstatistics.cpp /trunk/src/core/tree.cpp /trunk/src/core/watercycle.cpp /trunk/src/core/watercycle.h /trunk/src/iland/maindoc.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h /trunk/src/plugins/fire/firescript.cpp /trunk/src/tools/csvfile.cpp /trunk/src/tools/dem.h /trunk/src/tools/expressionwrapper.cpp /trunk/src/tools/gisgrid.cpp /trunk/src/tools/mapgrid.cpp /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/sqlhelper.cpp
|
678 |
4725d 16h |
werner |
/trunk/src/ |
Created initial version of the console based iLand.
The console application will get the nice name: "ilandc". |
|
/trunk/src/ilandc /trunk/src/ilandc/consoleshell.cpp /trunk/src/ilandc/consoleshell.h /trunk/src/ilandc/ilandc.pro /trunk/src/ilandc/main.cpp /trunk/src/ilandc/stable.h
/trunk/src /trunk/src/core/modelcontroller.cpp /trunk/src/iland/iland.pro /trunk/src/output/snapshot.cpp /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/tools/expression.h /trunk/src/tools/floatingaverage.h
|
671 |
4731d 16h |
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
|
652 |
4865d 10h |
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 |
4871d 09h |
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
|
647 |
4872d 13h |
werner |
/trunk/src/ |
setup a way how layered grids can be organized; it is a little bit complicated - but in the end it seems to work! (at least partially ;)) |
|
/trunk/src/core/layeredgrid.h /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
646 |
4872d 17h |
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
|
643 |
4878d 22h |
werner |
/trunk/src/ |
improved the visualization of grids - now the main windows stores a list of grids along with type of drawing (black/white, color, ...).
The GUI has a combo box to select the grid to draw. Nice: this can easily be extended to be used with grids to come (fire, grids provided from scripts...)
Whats missing: some life cycle kind of thing: now it is quite dangerous to produce crashes.... needs some investigation of scoped pointer classes... |
|
/trunk/src/core/grid.h /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h /trunk/src/iland/mainwindow.ui /trunk/src/iland/tests.cpp /trunk/src/tools/helper.cpp /trunk/src/tools/helper.h
|
642 |
4879d 09h |
werner |
/trunk/src/ |
added DEMs.
The DEM is an enriched FloatGrid featuring some special functions to load DEMs from file and to calculate aspect/slope and such.
currently only in testing, not really used in the model. |
|
/trunk/src/tools/dem.cpp /trunk/src/tools/dem.h
/trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/iland/iland.pro /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h /trunk/src/iland/tests.cpp
|
639 |
4892d 13h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
634 |
4938d 14h |
werner |
/src/ |
iland movie maker |
|
/src/core/modelcontroller.cpp /src/core/modelcontroller.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/tools/scriptglobal.cpp /src/tools/scriptglobal.h
|
632 |
4939d 14h |
werner |
/src/ |
bugfixes and improved writing of error messages |
|
/src/core/model.cpp /src/core/modelcontroller.cpp /src/core/modelcontroller.h /src/core/stampcontainer.cpp /src/iland/iland.pro /src/iland/version.cpp
|
596 |
4975d 20h |
werner |
/src/ |
painting of MapGrid from javascript; the call is tunneled through the ModelController. |
|
/src/core/modelcontroller.cpp /src/core/modelcontroller.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/tools/scriptglobal.cpp /src/tools/scriptglobal.h
|