| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 896 |
3728d 19h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE |
|
| 893 |
3748d 19h |
werner |
/branches/port_qt5_64bit/src/ |
ABE ABE ABE ... |
|
| 891 |
3750d 19h |
werner |
/branches/port_qt5_64bit/src/ |
*lots* of changes for ABE. |
|
| 890 |
3751d 01h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE.
restructuring the directories for the documentation. |
|
| 885 |
3756d 18h |
werner |
/branches/port_qt5_64bit/src/ |
.... continuing.... ABE |
|
| 884 |
3757d 16h |
werner |
/branches/port_qt5_64bit/src/ |
working on the AMIE/ABE, whatever... |
|
| 882 |
3763d 21h |
werner |
/branches/port_qt5_64bit/src/ |
introduced delayed setup for the resource units (in order for the Mapgrids to behave right).
smaller fixes in the qml-based rulers. |
|
| 881 |
3792d 17h |
werner |
/branches/port_qt5_64bit/src/ |
fixed problem with new resource unit storage that allows gaps.
some smaller additions (e.g. the literals "true" and "false" in the expression engine).
DEM: a new bilinear interpolation algorithm to improve DEM. Still not perfect. |
|
| 880 |
3796d 20h |
werner |
/branches/port_qt5_64bit/src/ |
implementing the QML based ruler/scale thing. Very nice when you get the hang of it.... |
|
| 879 |
3797d 19h |
werner |
/branches/port_qt5_64bit/src/ |
starting with QML based ruler/image component. |
|
| 877 |
3799d 19h |
werner |
/branches/port_qt5_64bit/src/ |
COLORS
added non-numerical layers to iland.
New "Colors" class (including typical R-color-palettes (RColorBrewer, terrain-colors).
the "LayeredGrid" has now a more versatile "LayerElement" that stores default view type, name and caption.
updated the grid definition of fire and wind module. |
|
| 876 |
3800d 19h |
werner |
/branches/port_qt5_64bit/src/ |
trying to identify why we observe crashes when calling javascript-functions.
Results: not sure, but:
happens, when in JS-file "include('anotherfile.js');" is used;
happens not, if "Globals.include('anotherfile.js');" is used.
bug is related to loosing the "scope" of the (Qt-internal) FunctionObject ("scope->owner" is rubbish, access violations when trying to climb up the scope tree).
I was not able to reproduce the behavior in a mini-project (jstest.pro). |
|
| 875 |
3801d 17h |
werner |
/branches/port_qt5_64bit/src/ |
AMIE development (many things...) |
|
| 873 |
3806d 16h |
werner |
/branches/port_qt5_64bit/src/ |
lots of development of AMIE. |
|
| 870 |
3812d 16h |
werner |
/branches/port_qt5_64bit/src/ |
amie development.... |
|
| 864 |
3854d 19h |
werner |
/branches/port_qt5_64bit/src/ |
fixed typos (after merge) and version number |
|
| 863 |
3855d 20h |
werner |
/branches/port_qt5_64bit/ |
renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch. |
|
| 860 |
3863d 20h |
werner |
/branches/port_qt5_64bit/src/ |
added stand treatment programme class. |
|
| 855 |
3883d 20h |
werner |
/branches/port_qt5_64bit/src/ |
fixed bug in landscape output
added (not already included) mode for dynamicstand output to aggregate to ru level (without species level)
now newly recruited trees are also included in the stand statistics (ru-level). |
|
| 852 |
3885d 15h |
werner |
/branches/port_qt5_64bit/src/iland/ |
updated version. |
|
| 838 |
3890d 22h |
werner |
/branches/port_qt5_64bit/ |
new executable with required Qt 5.1 files. version 0.8.6. |
|
| 837 |
3890d 23h |
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" |
|
| 824 |
3896d 01h |
werner |
/branches/port_qt5_64bit/src/ |
fixed *big* regeneration bug. The map with the height of saplings on a resource unit was used in the establishment subroutine although it was *invalid*. Now the establishment and the regeneration are (again?) in one function and use the same valid map.
this removed the strange stripes in the regeneration pattern (there should have been crashes, but weren't). Consequently, the performance debug output was modified.
added better formatting to debugtimer.cpp for large times (in hours, minutes, seconds). |
|
| 822 |
3897d 02h |
werner |
/branches/port_qt5_64bit/src/iland/ |
fixed crash when visualizing regeneration grid |
|
| 818 |
3902d 20h |
werner |
/branches/port_qt5_64bit/src/ |
new tree variable (crownarea)
transparent color in gui, filtering of trees in gui |
|
| 816 |
3903d 15h |
werner |
/branches/port_qt5_64bit/ |
merge from iLand trunk (e.g. the new in() function for expressions)
now first (+-) working version of the bridging of Javascript and C++ world. |
|
| 813 |
3903d 18h |
werner |
/branches/port_qt5_64bit/src/ |
continuing with the forest management engine.
* added a script-binding for site/stand/simulation objects
* more variables in the stand/unit objects |
|
| 811 |
3908d 17h |
werner |
/branches/port_qt5_64bit/src/ |
working on the Forest Management Engine.
* new classes that represent Agent, AgentType, FMUnit, FMStand, ...
* +- working evaluation of expressions (activities) in the context of stand/site/... variables. |
|
| 810 |
3909d 20h |
werner |
/branches/port_qt5_64bit/src/ |
implementing activity/javascript link |
|
| 808 |
3910d 17h |
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) |
|
| 807 |
3910d 20h |
werner |
/branches/port_qt5_64bit/src/ |
started implementation of the Forest Management Engine. |
|
| 803 |
3930d 02h |
werner |
/branches/port_qt5_64bit/src/ |
testing the neighborsOf function of MapGrid
added a Factory function for creating of "Map" objects |
|
| 802 |
3930d 03h |
werner |
/branches/port_qt5_64bit/ |
merge from trunk up to revision 801 |
|
| 798 |
3931d 21h |
werner |
/branches/port_qt5_64bit/ |
some comments, maximum number of years of simulations changed to 10000 |
|
| 794 |
3937d 22h |
werner |
/branches/port_qt5_64bit/src/ |
Some further tests with the QJSEngine - some of the shortcomings are "fixed".
* single functions (like "print"): they are now parts of the Globals-Object, and a wrapper-function is created.
* object creation: "new"-keyword: a "Factory" was added to create new objects (e.g. CSVFile, ClimateConverter)
* exceptions: are not supported; this is still a problem. Now only a message is written to the log. |
|
| 793 |
3938d 19h |
werner |
/branches/port_qt5_64bit/src/ |
Move from QScriptEngine to QJSEngine (=V8). Most of the stuff was quite smooth, but there are some open issues.
• Global functions (“print”, “include”, “alert”) are commented out (could be solved by moving functions to the “Globals” object and by creating alias JS-functions, i.e. function alert(x) {Globals.alert(x); } )
• Object creation: “new XXX”, XXX=ClimateConverter, CSVFile, … does not work now
possible solution: factory-pattern (i.e. var csv = Globals.newCSV()) |
|
| 781 |
4049d 20h |
werner |
/branches/port_qt5_64bit/src/ |
tried to compile also for MSVC 2010 32bit |
|
| 780 |
4049d 22h |
werner |
/branches/port_qt5_64bit/src/ |
Steps to build iLand with Qt 5 and with MSVC compiler and 64 bit.
http://iland.boku.ac.at/blogpost44
removed also a couple of warnings that were thrown by the MSVC compiler. |
|
| 779 |
4062d 21h |
werner |
/branches/port_qt5_64bit/ |
|
|
| 777 |
4132d 22h |
werner |
/trunk/src/ |
removed a couple of warnings (partly using Q_UNUSED but also dropping of parameters) |
|