Subversion Repositories public iLand

Rev

Go to most recent revision | Hide changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
96 5386d 22h Werner /src/  
/src
/src/core
/src/fonstudio
/src/fonstudio/res
/src/iland
/src/inits
/src/tests
/src/tests/modelCreate
/src/tests/testXmlHelper
/src/tools
95 5386d 22h Werner /src/  
/src/tests
/src/tests/modelCreate
/src/tests/modelCreate/modelCreate.pro
/src/tests/modelCreate/test.xml
/src/tests/modelCreate/testModelCreate.cpp
/src/tests/testXmlHelper
/src/tests/testXmlHelper/testXmlHelper.cpp
/src/tests/testXmlHelper/testXmlHelper.pro
/src/tests/testXmlHelper/xmlHelperTest.xml
/src/tests/tests.pro
/src
/src/core
/src/fonstudio
/src/fonstudio/res
/src/iland
/src/inits
/src/tools
80 5389d 04h Werner / change master structure  
/src
/fonstudio
65 5430d 18h 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 5431d 00h 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 5431d 00h 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
62 5431d 01h Werner /fonstudio/ * Tree:heightGrid(): changed calculation scheme for dominant height
* LightRoom: mod of aggregation: now weighing with the local dominant height (consistently with the usage in the FON-studio).		  
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/tree.cpp
61 5431d 01h 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
60 5431d 04h Werner /fonstudio/ application of stamps now considers local height of Z* (see also prev. commit)
in Tree::applyStamp()		  
/fonstudio/inits/fon.xml
/fonstudio/tree.cpp
59 5431d 04h Werner /fonstudio/ changed way of height-grid-calculation: (Tree::heightGrid()):
a tree affects the height grid of more cells (up to the 45° angle).		  
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/tree.cpp
58 5432d 00h 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 5432d 18h 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
52 5433d 00h Werner /fonstudio/ modified to additive again;
* in Lightroom again the average up to the treeheight is summed up
* while extracting stamps, an upper limit of 47x47px (i.e. with 2m grid size approx. 1ha) is used. Now the criterion is based upon absolute values - maybe switch to relative values again (to avoid huge stamps)??		  
/fonstudio/core/stamp.cpp
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/mainwindow.cpp
/fonstudio/tree.cpp
51 5433d 04h 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
50 5434d 02h Werner /fonstudio/ grid: fixed bug that mRect was overwritten by setup() after being set by constructor.
Viewport unfinished still.		  
/fonstudio/core/grid.h
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/tools/helper.cpp
44 5436d 03h Werner /fonstudio/ mainwindow: gui change + variable threshold in xml file when to cut the stamps
LightRoom: removed height in calculation of values per column (as we now calc. averages again)		  
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.ui
40 5436d 22h 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 5437d 22h 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 5437d 23h 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 5438d 04h 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

←Prev12Next→

Show All