| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 1222 |
2731d 02h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
| 1221 |
2731d 02h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
| 1220 |
2731d 02h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
| 1218 |
2731d 05h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
| 1217 |
2731d 05h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
| 1104 |
3019d 09h |
werner |
/branches/iland_regen/ |
Branch dedicated to playing around with establishment/regeneration.
Goals are:
(i) speed up
(ii) introduction of new features for Yellowstone |
|
/branches/iland_regen
|
| 779 |
4003d 04h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
| 639 |
4747d 02h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 96 |
5367d 18h |
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 |
5367d 18h |
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 |
5370d 00h |
Werner |
/ |
change master structure |
|
/src
/fonstudio
|
| 65 |
5411d 15h |
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 |
5411d 20h |
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 |
5411d 21h |
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 |
5411d 21h |
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 |
5411d 22h |
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 |
5412d 00h |
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 |
5412d 00h |
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 |
5412d 20h |
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 |
5413d 14h |
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 |
5413d 21h |
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 |
5414d 00h |
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 |
5414d 22h |
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 |
5417d 00h |
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 |
5417d 18h |
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 |
5418d 19h |
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 |
5418d 20h |
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 |
5419d 01h |
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
|
| 35 |
5420d 17h |
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 |
5420d 18h |
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
|
| 32 |
5421d 02h |
Werner |
/fonstudio/ |
grid: average() function, more const access operators.
LightRoom: mod. mode of setup (now setup with metric length instead of pixelcount),
fixed "addition of angles" bug.
added generation of "subpixel" stamps. |
|
/fonstudio/core/grid.h
/fonstudio/core/stamp.cpp
/fonstudio/core/stamp.h
/fonstudio/global.h
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/lightroom.h
/fonstudio/mainwindow.cpp
/fonstudio/tree.cpp
|
| 31 |
5423d 16h |
Werner |
/fonstudio/ |
dropped crown-body from LightRoom calculation.
fixed 2 bugs during calculation. |
|
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/lightroom.h
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.ui
|
| 30 |
5424d 00h |
Werner |
/fonstudio/ |
change "stamp" to "imagestamp", added a new "stamp" which should be more like the real, efficient stamp used in iLand.
started impl. of lightroom - batch modus. |
|
/fonstudio/core/stamp.cpp
/fonstudio/core/stamp.h
/fonstudio/imagestamp.cpp
/fonstudio/imagestamp.h
/fonstudio/stamp.cpp
/fonstudio/stamp.h
/fonstudio/fonstudio.pro
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
/fonstudio/tree.cpp
/fonstudio/tree.h
|
| 29 |
5424d 18h |
Werner |
/fonstudio/ |
fixed amount of global radiation that is used for stamp-calculation. |
|
/fonstudio/core/hemigrid.cpp
/fonstudio/core/hemigrid.h
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/lightroom.h
|
| 28 |
5424d 19h |
Werner |
/fonstudio/ |
Mainwindow: applying of XML
LightRoom: behavior of coords x/y=0/0 fixed. |
|
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
|
| 27 |
5424d 21h |
Werner |
/fonstudio/ |
reworked lightroom, fixed a sin/cos bug.
added solar radiation for result.
dropped the 3d-grid, because of some strange behaviour (seems to be related with Qt shared classes and that stuff). |
|
/fonstudio/core/grid.h
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/lightroom.h
/fonstudio/mainwindow.cpp
|
| 19 |
5426d 20h |
Werner |
/fonstudio/ |
reworked GUI, added some nice icons and reorganized. Now the Fonstudio has severel main working areas, e.g. lightroom, FON,...
setup of LightRoom.
created a little Timer class in helper.cpp (DebugTimer). |
|
/fonstudio/res/audio-input-microphone.png
/fonstudio/res/camera.png
/fonstudio/res/source_xml.png
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
/fonstudio/res
/fonstudio/res/fonstudio.qrc
/fonstudio/tools/expression.cpp
/fonstudio/tools/helper.cpp
/fonstudio/tools/helper.h
|
| 18 |
5426d 21h |
Werner |
/fonstudio/ |
LightRoom::setup() |
|
/fonstudio/core/grid.h
/fonstudio/inits/fon.xml
/fonstudio/lightroom.cpp
/fonstudio/lightroom.h
|
| 15 |
5427d 01h |
Werner |
/fonstudio/ |
|
|
/fonstudio/core
/fonstudio/core/grid.cpp
/fonstudio/core/grid.h
/fonstudio/core/hemigrid.cpp
/fonstudio/core/hemigrid.h
/fonstudio/core/solarradiation.cpp
/fonstudio/core/solarradiation.h
/fonstudio/helper.cpp
/fonstudio/helper.h
/fonstudio/stable.h
/fonstudio/tools
/fonstudio
/fonstudio/fonstudio.pro
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/stamp.cpp
/fonstudio/tree.cpp
/fonstudio/tree.h
|
| 9 |
5428d 02h |
Werner |
/fonstudio/ |
|
|
/fonstudio/inits/fon.xml
/fonstudio/logicexpression.cpp
/fonstudio/logicexpression.h
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
/fonstudio/paintarea.cpp
/fonstudio/tree.cpp
|