| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 1102 |
3074d 09h |
werner |
/branches/port_qt5_64bit/src/ |
fixed couple of clang warnings.
some debugging/profiling work w.r.t. establishment/regen. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.h
/branches/port_qt5_64bit/src/core/soil.cpp
/branches/port_qt5_64bit/src/core/stamp.cpp
/branches/port_qt5_64bit/src/core/stampcontainer.cpp
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/core/standstatistics.cpp
/branches/port_qt5_64bit/src/core/timeevents.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/treeout.cpp
/branches/port_qt5_64bit/src/output/treeout.h
/branches/port_qt5_64bit/src/tools/xmlhelper.cpp
/branches/port_qt5_64bit/src/tools/xmlhelper.h
|
| 1054 |
3207d 14h |
werner |
/branches/port_qt5_64bit/ |
next iteration of the barkbeetle Modules
added background image to the iland viewer
some update of the wind-module as well (new wind output, for example) |
|
/branches/port_qt5_64bit/src/iland/res/iland_splash.png
/branches/port_qt5_64bit/src/plugins/wind/windout.cpp
/branches/port_qt5_64bit/src/plugins/wind/windout.h
/branches/port_qt5_64bit/R_analysis/stacked.timeseries.R
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/iland/qml/ruler.qml
/branches/port_qt5_64bit/src/iland/res/iland.qrc
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/outputmanager.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/barkbeetleout.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windmodule.h
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/colors.cpp
|
| 837 |
3885d 17h |
werner |
/branches/port_qt5_64bit/src/ |
* added total carbon to stand output
* created a new output "landscape" for stand aggregates on landscape level (per species)
* improved error handling ModelController
* improved ilandc: now model settings can be changed via command line (and javascript function can be called)
* finalized "background external seeds" |
|
/branches/port_qt5_64bit/src/output/landscapeout.cpp
/branches/port_qt5_64bit/src/output/landscapeout.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/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/species.h
/branches/port_qt5_64bit/src/core/standstatistics.cpp
/branches/port_qt5_64bit/src/core/standstatistics.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.h
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/ilandc/main.cpp
/branches/port_qt5_64bit/src/output/carbonout.cpp
/branches/port_qt5_64bit/src/output/carbonout.h
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/standout.cpp
/branches/port_qt5_64bit/src/output/standout.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
| 808 |
3905d 12h |
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
|
| 779 |
4057d 15h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
| 671 |
4640d 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
|
| 665 |
4681d 15h |
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
|
| 639 |
4801d 14h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 605 |
4870d 19h |
werner |
/src/ |
added the "rid" (i.e. a unique id per resource unit) in various debug outputs.
added the "shell" of a new carbonflow output. |
|
/src/output/carbonflowout.cpp
/src/output/carbonflowout.h
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/snag.cpp
/src/core/speciesresponse.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
/src/tools/globalsettings.cpp
|
| 587 |
4899d 10h |
werner |
/src/ |
added carbon output.
lots of changes necessary to get this done (especially budgeting of biomass pools) |
|
/src/output/carbonout.cpp
/src/output/carbonout.h
/src/core/model.cpp
/src/core/snag.cpp
/src/core/snag.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 539 |
4948d 16h |
werner |
/src/ |
continue implementing grid functionality (yeah! a simple grid input already works)
removing the bug that caused db locks when reloaded model without actually simulating. |
|
/src/core/model.cpp
/src/core/model.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/tools/gisgrid.cpp
/src/tools/gisgrid.h
|
| 520 |
4961d 20h |
werner |
/src/ |
fixed crash in Expression that occurred with dynamic stand outputs without any trees.
Extended the dynamic stand output so that a treefilter can be applied. |
|
/src/output/dynamicstandout.cpp
/src/output/dynamicstandout.h
/src/output/output.h
/src/output/outputmanager.cpp
/src/tools/expression.cpp
/src/tools/expression.h
|
| 504 |
4991d 13h |
werner |
/src/ |
New output for "saplings" |
|
/src/output/saplingout.cpp
/src/output/saplingout.h
/src/core/model.cpp
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/standstatistics.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 395 |
5174d 10h |
werner |
/src/ |
fixed the "output on startup" which was broken due to changes in the execution sequence. |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/output/output.h
/src/output/outputmanager.cpp
|
| 278 |
5371d 02h |
werner |
/src/ |
Management output. Added a statisticsMgmt() for ResourceUnitSpecies. Complicated to get the order right. |
|
/src/output/managementout.cpp
/src/output/managementout.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 262 |
5375d 11h |
werner |
/src/ |
added output for dead trees (StandDeadOut) |
|
/src/output/standdeadout.cpp
/src/output/standdeadout.h
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 254 |
5377d 08h |
werner |
/src/ |
menu entry in apps main menu to copy the wiki-style description of output tables to the clipboard. |
|
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
|
| 232 |
5382d 12h |
werner |
/src/output/ |
Outputs: strange insert performance behavior and locks when re-running the model. finally, old inserter-statements are finish()-ed to clear all locks. |
|
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/output/outputmanager.h
|
| 231 |
5382d 23h |
werner |
/src/ |
3pg model, strange behavior of database. Modified the transaction logic (really important for SQLite), but still shows odd behavior. |
|
/src/core/resourceunit.cpp
/src/iland/iland.pro
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/output/productionout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/globalsettings.cpp
|
| 228 |
5384d 07h |
werner |
/src/ |
created output for production details. |
|
/src/output/productionout.cpp
/src/output/productionout.h
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunitspecies.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 225 |
5384d 10h |
werner |
/src/ |
Run/Pause/Stop, etc. in ModelController. |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/output/outputmanager.cpp
|
| 223 |
5388d 06h |
werner |
/src/ |
Model Pause, Model restart,etc. (wamod little hack) |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/tests.cpp
/src/output/outputmanager.cpp
/src/tools/helper.h
|
| 222 |
5388d 11h |
werner |
/src/ |
* outputs: delayed commits of transactions. transactions are commited (and thus written to disk) at the end of run
* improved the "remotecontrol", added signals and slots to indicate progress... |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
|
| 207 |
5391d 12h |
werner |
/src/ |
nasty bug, if expressions contain(ed) newline characters. now fixed (newline considered as whitespace and removed).
changed output so it is always checked, if outputs are valid w.r.t. the mIndex position. |
|
/src/core/model.h
/src/core/tree.cpp
/src/iland/tests.cpp
/src/output/dynamicstandout.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/tools/expression.cpp
|
| 200 |
5395d 07h |
werner |
/src/ |
added "ModelSettings", i.e. a high performant storage for model settings, further spelling resource vs ressource, including the "batch" job feature from fonstudio into iland. added a slot for MainWindow to force a repaint. and much more. |
|
/src/core/management.cpp
/src/core/management.h
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/iland/management.cpp
/src/iland/management.h
/src/core/model.cpp
/src/core/model.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
/src/core/tree.cpp
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/tests.cpp
/src/iland/tests.h
/src/output/outputmanager.cpp
/src/tools/expressionwrapper.h
|
| 184 |
5397d 07h |
werner |
/src/ |
DynamicStandOut: output on stand level based on aggregates (sum, mean, ...) on a set of trees.very neat. stripped column names for tables (no special characters), filter for ressource-units,... |
|
/src/core/model.cpp
/src/output/dynamicstandout.cpp
/src/output/dynamicstandout.h
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/output/standout.h
/src/tools/expressionwrapper.h
|
| 182 |
5397d 11h |
werner |
/src/ |
stand statistics - work now, outputs can be enabled/disabled in config file |
|
/src/core/model.cpp
/src/core/ressourceunitspecies.h
/src/core/standstatistics.h
/src/output/outputmanager.cpp
/src/output/standout.cpp
|
| 181 |
5397d 13h |
werner |
/src/ |
outputs |
|
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
|
| 179 |
5398d 05h |
werner |
/src/ |
added standoutput (accompanied by some changes at other places) |
|
/src/output/standout.cpp
/src/output/standout.h
/src/core/ressourceunit.h
/src/core/species.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/iland/iland.pro
/src/output/output.h
/src/output/outputmanager.cpp
|
| 178 |
5398d 05h |
werner |
/src/ |
fonstudio compiles again... |
|
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
/src/output/outputmanager.cpp
|
| 177 |
5398d 07h |
werner |
/src/output/ |
documentation of outputs |
|
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/treeout.cpp
|
| 176 |
5398d 07h |
werner |
/src/ |
getting database oriented outputs to work |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/output/treeout.cpp
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
|
| 173 |
5401d 02h |
werner |
/src/output/ |
created basic output structure (Output, OutputManager) as well as a test output |
|
/src/output
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/output/treeout.cpp
/src/output/treeout.h
|