| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 212 |
5394d 13h |
werner |
/src/ |
added LightResponse as a TreeVariable, fixed bug during Light distribution. |
|
/src/core/climate.cpp
/src/core/resourceunit.h
/src/core/speciesresponse.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expressionwrapper.cpp
|
| 187 |
5401d 05h |
iland |
/src/ |
wow. Ressource is correctly spelled as Resource. I jerk. |
|
/src/core/global.h
/src/core/model.cpp
/src/core/production3pg.h
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.cpp
/src/core/ressourceunitspecies.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/management.cpp
/src/iland/tests.cpp
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/xmlhelper.h
|
| 180 |
5402d 09h |
werner |
/src/ |
created StandStatistics (similar to the solution in Picus). Each tree adds itself to the statistics object of RU x species. During yearEnd() of RessourceUnit the data is aggregated for the whole stand. |
|
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
|
| 170 |
5407d 10h |
werner |
/src/ |
added a "age" to trees (Tree, also Treewrapper, also StandLoader). Used by aging. |
|
/src/core/modelcontroller.cpp
/src/core/production3pg.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/tools/expressionwrapper.cpp
|
| 169 |
5407d 14h |
werner |
/src/ |
Aging in Tree growth (Species::aging()), species parameters, ... |
|
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expression.cpp
/src/tools/globalsettings.cpp
|
| 159 |
5409d 18h |
werner |
/src/ |
Mortality of trees (new species parameter, mortality function, ...) |
|
/src/core/model.cpp
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expressionwrapper.cpp
|
| 158 |
5411d 16h |
werner |
/src/core/ |
code cleanup/refactoring on Tree. |
|
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/tree.cpp
/src/core/tree.h
|
| 157 |
5412d 11h |
werner |
/src/ |
cleaning of memory after trees died; this had some impacts on AllTreeIterator and some other places.
added a "Tests" class to combine some simple tests. |
|
/src/iland/tests.cpp
/src/iland/tests.h
/src/core/global.h
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/tools/expression.cpp
/src/tools/expressionwrapper.cpp
|
| 156 |
5412d 15h |
werner |
/src/core/ |
removed QPointF position in Tree (now only the index on the grid is stored). This saves 8 Bytes (2x double, now 2x int), and should be slightly faster. |
|
/src/core/model.cpp
/src/core/tree.cpp
/src/core/tree.h
|
| 155 |
5412d 16h |
werner |
/src/ |
wraparound of trees around an one hectare patch. Edges are glued together. This is done by doubling code for applyStamp, readStamp and heightGrid in Tree.
improved "clicking" on trees in MainWindow. |
|
/src/core/model.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
|
| 151 |
5413d 16h |
iland |
/src/ |
- now calculating the area per RU which is stocked.
to achieve that, changes were made to:
- heightGrid() in Tree
- RessourceUnit: new member variables
- Model: function to iterate over RUs and calculate actual values.
- added functions for binary (QByteArray) loading/saving to file in
Helper
GUI: saveState/restoreState in MainWindow - used for dockwindows. |
|
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.ui
/src/tools/globalsettings.cpp
/src/tools/helper.cpp
/src/tools/helper.h
|
| 149 |
5414d 09h |
werner |
/src/ |
- drawing GUI in MainWindow
- "Opacity" of tree crowns as a function of leafarea (and crown area;
crown radius is stored in LIP-stamp). |
|
/src/core/model.cpp
/src/core/stamp.cpp
/src/core/stamp.h
/src/core/stampcontainer.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/tools/expressionwrapper.cpp
|
| 148 |
5414d 10h |
iland |
/src/ |
- distribution of radiation
- painting trees with results of formulae |
|
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
|
| 145 |
5414d 15h |
Werner |
/src/ |
Run and compiled iLand on Linux (Kubuntu) with a virtual machine. The gcc on Linux issues lots of warnings which I fixed on the Linux side. Also fixed TTickTack (the clock issue).
Now iLand also runs on Linux - nice! |
|
/src/core/grid.h
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/production3pg.h
/src/core/ressourceunit.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.h
/src/core/stamp.h
/src/core/stampcontainer.h
/src/core/threadrunner.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland.pro
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/stable.h
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/globalsettings.h
/src/tools/helper.cpp
/src/tools/helper.h
/src/tools/ticktack.cpp
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
|
| 144 |
5415d 09h |
Werner |
/src/ |
prettier Tree-dump-list, more debugging in partition - there is a problem with big trees.... |
|
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/tools/globalsettings.cpp
|
| 143 |
5415d 10h |
Werner |
/src/ |
- StampContainer: find stamps out of HD bounds.
- AllTreeIterator fixed bug in next()
- improvements in Expression (function inlining, ...)
- use tree with expression, together with Stats-class.
... and much more ;) |
|
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.h
/src/core/stampcontainer.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/globalsettings.cpp
/src/tools/helper.cpp
/src/tools/helper.h
|
| 141 |
5415d 17h |
Werner |
/src/ |
documentation ExpressionWrapper, code cleanup |
|
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expression.cpp
/src/tools/expressionwrapper.cpp
|
| 139 |
5416d 04h |
Werner |
/src/ |
added debugTimer for simulation of N years. |
|
/src/core/tree.h
/src/iland/mainwindow.cpp
|
| 137 |
5416d 06h |
Werner |
/src/ |
rework of the growing process, also debugging outputs etc. |
|
/src/core/model.cpp
/src/core/model.h
/src/core/production3pg.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
|
| 136 |
5416d 10h |
Werner |
/src/ |
rework of the partition model. changed species parameter and partition routine, also some work on debug outputs.
added the "year" of the simulation now th globalsettings. |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
|
| 135 |
5416d 16h |
Werner |
/src/ |
added keyboard support for scrolling in PaintArea, some issues with startup/init the model, modfied growth-routine. |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/paintarea.cpp
/src/iland/paintarea.h
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
|
| 129 |
5417d 12h |
Werner |
/src/ |
MainWindow GUI (uses Qt Actions) to start/stop/create the "model", GUI to retrieve debug data. |
|
/src/fonstudio/res/icon4.png
/src/iland/iland.pro
/src/iland/res/go-next.png
/src/iland/res/icon4.png
/src/iland/res/process-stop.png
/src/iland/res/user-trash.png
/src/iland/res/www.png
/src/core/modelcontroller.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/mainwindow.cpp
/src/fonstudio/res
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/iland/res
/src/iland/res/iland.qrc
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
|
| 125 |
5419d 13h |
Werner |
/src/ |
growth of individual trees |
|
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/mainwindow.cpp
|
| 119 |
5422d 15h |
Werner |
/src/ |
added HD-range species parameter. |
|
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/mainwindow.cpp
|
| 117 |
5423d 09h |
Werner |
/src/ |
new debug macros (which are compiled to NOOP in release mode) |
|
/src/core/global.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/tools/globalsettings.cpp
|
| 116 |
5423d 10h |
Werner |
/src/core/ |
added turnover rates to species |
|
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
|
| 115 |
5423d 11h |
Werner |
/src/core/ |
moved 3PG class to RessourceUnitSpecies. |
|
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/ressourceunit.cpp
/src/core/ressourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
|
| 113 |
5423d 13h |
Werner |
/src/ |
started Production3PG-class which couples the (stand-level) production.
implemented zooming and panning in Viewport (this is always a hell of a job) |
|
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
/src/fonstudio/paintarea.cpp
/src/fonstudio/paintarea.h
/src/tools/helper.cpp
/src/tools/helper.h
|
| 111 |
5424d 13h |
Werner |
/src/ |
added "RessourceUnitSpecies" (included setup and access functions). Each species has now a numeric index which is used to construct vectors of RessourceUnitSpecies per RessourceUnit. |
|
/src/core/ressourceunitspecies.cpp
/src/core/ressourceunitspecies.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/species.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
|
| 110 |
5424d 15h |
Werner |
/src/ |
added calculation of LAI |
|
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/helper.cpp
|
| 107 |
5425d 05h |
Werner |
/src/ |
created "AllTreeIterator" as a convenient means to traverse all trees in the model, adapted the painting of trees in MainWindow to the many RessourceUnits. |
|
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/mainwindow.cpp
|
| 106 |
5425d 06h |
Werner |
/src/ |
added StandLoader class which encapsulates the initialization of stands. Currently only Picus-style initfiles can be loaded.
added more content to Model and cleaned the Tree class. Now a multiple stand setup with N ressource units and N duplicate stands can be loaded and the light-patterns calculated. cool! |
|
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/model.cpp
/src/core/model.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
|
| 105 |
5425d 08h |
Werner |
/src/ |
several changes:
create multiple RessourceUnits as a grid
modified include-order for model.h and mainwindow.cpp
added clear() to Grid.
fixed bug in Grid::indexOf()
... |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/exception.h
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/lightroom.cpp
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
|
| 90 |
5426d 18h |
Werner |
/src/ |
changed TreeSpecies -> Species.
added class SpeciesSet. |
|
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/core/treespecies.cpp
/src/core/treespecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/tools/expression.cpp
/src/tools/expression.h
|
| 83 |
5428d 16h |
Werner |
/src/ |
new structure |
|
/src/core/tree.cpp
/src/core/tree.h
/src/core/treespecies.cpp
/src/core/treespecies.h
/src/fonstudio/global.h
/src/fonstudio/res
/src/fonstudio/stable.h
/src/global.h
/src/res
/src/stable.h
/src/tree.cpp
/src/tree.h
/src/treespecies.cpp
/src/treespecies.h
/src/core/stamp.cpp
/src/core/stamp.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/lightroom.cpp
/src/fonstudio/lightroom.h
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
|
| 80 |
5428d 16h |
Werner |
/ |
change master structure |
|
/src
/fonstudio
|
| 61 |
5470d 14h |
Werner |
/fonstudio/ |
* modified bin-sizes in StampContainer
* cleaned Tree-class (dropped some old code and refs from other places) |
|
/fonstudio/core/stampcontainer.cpp
/fonstudio/core/stampcontainer.h
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/tree.cpp
/fonstudio/tree.h
|
| 58 |
5471d 12h |
Werner |
/fonstudio/ |
working version of light alogorithnm:
* steps during read:
own_xy = 1 - writer_xy * la_factor / h_dom
value_xy = grid_xy / own_xy
lightvalue = sum( value_xy * reader_xy) [ sum(reader) = 1 ]
additional correction for overstorey:
if h > h_dom:
lightvalue = 1 - (1 - lightvalue) * h/h_dom
other issues:
* added buffer around sim. area
* cleaned xml-file and code to interpret
* fixed Viewport (handling of negative coordinates - see buffer)
* fixed StampContainer, added finalizeSetup() - (filling up of the lookup map) |
|
/fonstudio/core/grid.h
/fonstudio/core/stamp.h
/fonstudio/core/stampcontainer.cpp
/fonstudio/core/stampcontainer.h
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
/fonstudio/tools/helper.cpp
/fonstudio/tree.cpp
/fonstudio/tree.h
|
| 53 |
5472d 13h |
Werner |
/fonstudio/ |
additive mode, relate impact sum to Z*-crown height. |
|
/fonstudio/mainwindow.cpp
/fonstudio/tree.cpp
/fonstudio/tree.h
|
| 48 |
5475d 12h |
Werner |
/fonstudio/ |
grid: bugfix
mainwindow: added different visualizations
tree: adopted to new scheme: dominance height split in "above Z*" and "below Z*" |
|
/fonstudio/core/grid.h
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/tree.cpp
/fonstudio/tree.h
|