Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1044 |
3338d 15h |
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
|
937 |
3680d 13h |
werner |
/branches/port_qt5_64bit/src/ |
hunting some bugs in summarizing GWL |
|
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/core/management.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.h
|
936 |
3681d 13h |
werner |
/branches/port_qt5_64bit/src/ |
searching for bugs in the bookkeeping of increments, volumes.
very cumbersome.... |
|
/branches/port_qt5_64bit/src/abe/fomescript.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/core/management.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.h /branches/port_qt5_64bit/src/core/standstatistics.cpp
|
915 |
3784d 13h |
werner |
/branches/port_qt5_64bit/src/ |
developing ABE unit level scheduling, start with dev. of ABE - Outputs. |
|
/branches/port_qt5_64bit/src/abe/output /branches/port_qt5_64bit/src/abe/output/unitout.cpp /branches/port_qt5_64bit/src/abe/output/unitout.h
/branches/port_qt5_64bit/src/abe/agent.h /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/fmunit.h /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/core/management.cpp /branches/port_qt5_64bit/src/iland/iland.pro
|
914 |
3786d 10h |
werner |
/branches/port_qt5_64bit/src/ |
finish of the stand split thing
many other tweaks in ABE land. |
|
/branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/actsalvage.cpp /branches/port_qt5_64bit/src/abe/actsalvage.h /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/fmstp.cpp /branches/port_qt5_64bit/src/abe/fmtreelist.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /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/iland/tests.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp /branches/port_qt5_64bit/src/tools/mapgrid.h
|
848 |
3974d 13h |
werner |
/branches/port_qt5_64bit/src/ |
advanced management functions for FUNDIV project
* create shapes (defined by mathematical functions) in stand grids
* filter not only based on boolean, but on continuous functions (0..1, values are seen as probabilities) |
|
/branches/port_qt5_64bit/src/core/management.cpp /branches/port_qt5_64bit/src/core/management.h /branches/port_qt5_64bit/src/tools/mapgrid.cpp /branches/port_qt5_64bit/src/tools/mapgrid.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.h
|
825 |
3980d 19h |
werner |
/branches/port_qt5_64bit/src/core/ |
modified API of management. QJSEngine has problems with overloaded slots (kill() and manage() functions in management). |
|
/branches/port_qt5_64bit/src/core/management.cpp /branches/port_qt5_64bit/src/core/management.h
|
793 |
4023d 13h |
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
|
779 |
4147d 14h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
767 |
4326d 08h |
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
|
753 |
4386d 14h |
werner |
/trunk/src/ |
minor changes after using CPPCheck source code scan utilty. |
|
/trunk/src/core/management.cpp /trunk/src/core/model.cpp /trunk/src/core/standloader.cpp /trunk/src/fonstudio/hemigrid.cpp
|
697 |
4687d 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
|
674 |
4730d 12h |
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 |
4730d 15h |
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
|
662 |
4773d 15h |
werner |
/trunk/src/ |
continued to work on the fire module. Include the fire severity (i.e. mortality due to fire). This had various other impacts, e.g., on the carbon cycle of saplings. |
|
/trunk/src/core/grid.h /trunk/src/core/management.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/snag.h /trunk/src/core/soil.cpp /trunk/src/core/soil.h /trunk/src/output/managementout.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
639 |
4891d 13h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
607 |
4957d 12h |
werner |
/src/core/ |
smaller fixes:
* error when exporting ESRI files
* a new JS function "slashSnags()" for managing standing dead trees
* handling of newly burnt tree when removing carbon due to a fire event |
|
/src/core/grid.h /src/core/management.cpp /src/core/management.h /src/core/snag.cpp /src/core/snag.h
|
604 |
4960d 19h |
werner |
/src/core/ |
fixed wrong biomass removal fractions (for soil and for management) |
|
/src/core/management.cpp /src/core/management.h /src/core/soil.cpp
|
590 |
4988d 15h |
werner |
/src/ |
added new global scripting functions (e.g. screenshot()). This required some work to do in the combination of MainWindow and the ModelController; removed the static connection (is bad!) and changed to signal / slot connections.... |
|
/src/core/management.cpp /src/core/model.cpp /src/core/modelcontroller.cpp /src/core/modelcontroller.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/tools/globalsettings.cpp /src/tools/globalsettings.h /src/tools/scriptglobal.cpp
|
585 |
4989d 19h |
werner |
/src/ |
bugfixes in the CSVFile class (with empty cells and whitespace-separators)
bugfixes in GridRunner: was running with an offset of 1 cell.
some other micro-changes. |
|
/src/core/grid.h /src/core/management.cpp /src/core/model.cpp /src/tools/csvfile.cpp /src/tools/mapgrid.cpp
|