Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
103 |
5452d 09h |
Werner |
/src/ |
included grids |
|
/src/core/grid.cpp /src/core/model.cpp /src/core/model.h /src/core/species.cpp /src/core/species.h /src/core/stampcontainer.cpp /src/tests/modelCreate/modelCreate.pro /src/tests/modelCreate/test.xml /src/tests/testXmlHelper/xmlHelperTest.xml
|
102 |
5452d 10h |
Werner |
/src/ |
* added a global XML-node of the project file to GlobalSettings (each setup() routine has access to that)
* loading of stamps for each species. |
|
/src/core/exception.h
/src/core/global.h /src/core/model.cpp /src/core/model.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/core/stampcontainer.cpp /src/tests/modelCreate/modelCreate.pro /src/tests/modelCreate/testModelCreate.cpp /src/tools/globalsettings.cpp /src/tools/globalsettings.h /src/tools/xmlhelper.cpp /src/tools/xmlhelper.h
|
99 |
5452d 23h |
Werner |
/src/ |
added handling for file path to xml-project files and to GlobalSettings. |
|
/src/tests/modelCreate/Makefile /src/tests/modelCreate/Makefile.Debug /src/tests/modelCreate/Makefile.Release /src/tests/modelCreate/object_script.modelCreate.Debug /src/tests/modelCreate/object_script.modelCreate.Release
/src/core/model.cpp /src/core/species.cpp /src/core/speciesset.cpp /src/core/speciesset.h /src/core/stampcontainer.cpp /src/core/stampcontainer.h /src/fonstudio/fonstudio.pro /src/tests/modelCreate/test.xml /src/tests/testXmlHelper/testXmlHelper.cpp /src/tests/testXmlHelper/testXmlHelper.pro /src/tests/testXmlHelper/xmlHelperTest.xml /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
80 |
5455d 10h |
Werner |
/ |
change master structure |
|
/src
/fonstudio
|
65 |
5497d 00h |
Werner |
/fonstudio/ |
fixed the reading of stamps
more fixes during loading of stamps |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/inits/fon.xml /fonstudio/lightroom.cpp /fonstudio/mainwindow.cpp /fonstudio/mainwindow.h /fonstudio/mainwindow.ui
|
64 |
5497d 06h |
Werner |
/fonstudio/ |
remodeled StampContainer to store bins with different width (smaller bins for smaller diameter). Somewhat complicated to get it working again... |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/inits/fon.xml /fonstudio/mainwindow.cpp
|
63 |
5497d 06h |
Werner |
/fonstudio/ |
* added a comment to the binary stamp file
* removed some debug-messages |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/inits/fon.xml /fonstudio/mainwindow.cpp /fonstudio/tools/helper.cpp
|
61 |
5497d 07h |
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 |
5498d 06h |
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
|
54 |
5499d 00h |
Werner |
/fonstudio/ |
fixed warnings (release mode), added a routine Helper::fileDialog(). |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/inits/fon.xml /fonstudio/mainwindow.cpp /fonstudio/tools/helper.cpp /fonstudio/tools/helper.h
|
51 |
5499d 10h |
Werner |
/fonstudio/ |
changed application/stamp production to a multiplicative approach, disengaged the height field. |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/inits/fon.xml /fonstudio/mainwindow.cpp /fonstudio/mainwindow.ui /fonstudio/tree.cpp
|
47 |
5502d 06h |
Werner |
/fonstudio/ |
now to each "writer" stamp a reader stamp (i.e. the "crownradius") is directly attached. Therefore some changes in tree and treespecies. |
|
/fonstudio/core/stamp.cpp /fonstudio/core/stamp.h /fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/mainwindow.cpp /fonstudio/mainwindow.ui /fonstudio/tree.cpp /fonstudio/treespecies.cpp /fonstudio/treespecies.h
|
43 |
5502d 09h |
Werner |
/fonstudio/ |
changed lightroom again to aggregate averages of shadowing along the full height (including crown).
additionally saved the value at the center which will be used for the "dominance" height of the tree.
modified file structure of binary stamp files to include dominance values. |
|
/fonstudio/core/stamp.h /fonstudio/core/stampcontainer.cpp /fonstudio/lightroom.cpp /fonstudio/lightroom.h /fonstudio/mainwindow.cpp
|
42 |
5502d 10h |
Werner |
/fonstudio/ |
additionally storing crown radius in stamp file.
readout of stamps using radius-stamps. |
|
/fonstudio/core/stamp.cpp /fonstudio/core/stamp.h /fonstudio/core/stampcontainer.cpp /fonstudio/lightroom.h /fonstudio/mainwindow.cpp /fonstudio/tree.cpp
|
41 |
5503d 03h |
Werner |
/fonstudio/ |
checked and fixed orientation of the grids:
x-direction: -x = west, +x = east
y-direction: -y = south, +y = north
-> for display: y-axis must be reversed to fit screen coordinate system! |
|
/fonstudio/core/grid.h /fonstudio/core/stampcontainer.cpp /fonstudio/mainwindow.cpp
|
40 |
5503d 04h |
Werner |
/fonstudio/ |
reading out of stamp values.
lots of additional small changes. |
|
/fonstudio/core/grid.h /fonstudio/core/hemigrid.cpp /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/paintarea.cpp /fonstudio/paintarea.h /fonstudio/tools/helper.cpp /fonstudio/tools/helper.h /fonstudio/tree.cpp /fonstudio/tree.h /fonstudio/treespecies.cpp /fonstudio/treespecies.h
|
39 |
5504d 04h |
Werner |
/fonstudio/ |
implementing the application of gridded binary stamps. |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/global.h /fonstudio/inits/fon.xml /fonstudio/mainwindow.cpp /fonstudio/mainwindow.ui /fonstudio/tree.cpp /fonstudio/tree.h /fonstudio/treespecies.cpp /fonstudio/treespecies.h
|
38 |
5504d 05h |
Werner |
/fonstudio/ |
LightRoom: use sum instead of average
Use of Lightroom in mainwindow: cut parts of lightroom result based on values and save as binary stamp file.
create class TreeSpecies, start to impl. use of stamps in Tree. |
|
/fonstudio/treespecies.cpp /fonstudio/treespecies.h
/fonstudio/core/stamp.h /fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/fonstudio.pro /fonstudio/inits/fon.xml /fonstudio/lightroom.cpp /fonstudio/mainwindow.cpp /fonstudio/mainwindow.ui /fonstudio/tree.cpp /fonstudio/tree.h
|
37 |
5504d 10h |
Werner |
/fonstudio/ |
little optimizations of grid, fixed a bug in stampcontainer; "radial" analysis of stams (see mainwindow.cpp) |
|
/fonstudio/core/grid.h /fonstudio/core/stampcontainer.cpp /fonstudio/inits/fon.xml /fonstudio/lightroom.cpp /fonstudio/mainwindow.cpp
|
36 |
5506d 02h |
Werner |
/fonstudio/ |
some template dump functions for grids.
loading/saving of stamps. still a mess. |
|
/fonstudio/core/grid.cpp /fonstudio/core/grid.h /fonstudio/core/stampcontainer.cpp /fonstudio/mainwindow.cpp
|
35 |
5506d 02h |
Werner |
/fonstudio/ |
various fixes (still trying to load/save stamps). |
|
/fonstudio/core/stamp.cpp /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
|
34 |
5506d 04h |
Werner |
/fonstudio/ |
Handling of stamps (read, write, ...) |
|
/fonstudio/core/stamp.cpp /fonstudio/core/stamp.h /fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h /fonstudio/inits/fon.xml /fonstudio/mainwindow.cpp
|
33 |
5506d 05h |
Werner |
/fonstudio/ |
general handling of stamps. This includes:
* StampContainer class. encapsulates internal storage, fast access, read/write functions to binary streams
* factory-approach for creation of stamps with different size. This can be used to use specific looping routines depending on stamp size. |
|
/fonstudio/core/stampcontainer.cpp /fonstudio/core/stampcontainer.h
/fonstudio/core/grid.h /fonstudio/core/stamp.cpp /fonstudio/core/stamp.h /fonstudio/fonstudio.pro /fonstudio/global.h /fonstudio/mainwindow.cpp
|