| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 881 |
3882d 13h |
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 |
3886d 16h |
werner |
/branches/port_qt5_64bit/src/ |
implementing the QML based ruler/scale thing. Very nice when you get the hang of it.... |
|
| 879 |
3887d 15h |
werner |
/branches/port_qt5_64bit/src/ |
starting with QML based ruler/image component. |
|
| 877 |
3889d 14h |
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 |
3890d 14h |
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 |
3891d 12h |
werner |
/branches/port_qt5_64bit/src/ |
AMIE development (many things...) |
|
| 873 |
3896d 11h |
werner |
/branches/port_qt5_64bit/src/ |
lots of development of AMIE. |
|
| 870 |
3902d 12h |
werner |
/branches/port_qt5_64bit/src/ |
amie development.... |
|
| 864 |
3944d 15h |
werner |
/branches/port_qt5_64bit/src/ |
fixed typos (after merge) and version number |
|
| 863 |
3945d 16h |
werner |
/branches/port_qt5_64bit/ |
renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch. |
|
| 860 |
3953d 15h |
werner |
/branches/port_qt5_64bit/src/ |
added stand treatment programme class. |
|
| 855 |
3973d 16h |
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 |
3975d 11h |
werner |
/branches/port_qt5_64bit/src/iland/ |
updated version. |
|
| 838 |
3980d 18h |
werner |
/branches/port_qt5_64bit/ |
new executable with required Qt 5.1 files. version 0.8.6. |
|
| 837 |
3980d 18h |
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 |
3985d 21h |
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 |
3986d 21h |
werner |
/branches/port_qt5_64bit/src/iland/ |
fixed crash when visualizing regeneration grid |
|
| 818 |
3992d 15h |
werner |
/branches/port_qt5_64bit/src/ |
new tree variable (crownarea)
transparent color in gui, filtering of trees in gui |
|
| 816 |
3993d 11h |
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 |
3993d 14h |
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 |
3998d 13h |
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 |
3999d 16h |
werner |
/branches/port_qt5_64bit/src/ |
implementing activity/javascript link |
|
| 808 |
4000d 12h |
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 |
4000d 16h |
werner |
/branches/port_qt5_64bit/src/ |
started implementation of the Forest Management Engine. |
|
| 803 |
4019d 21h |
werner |
/branches/port_qt5_64bit/src/ |
testing the neighborsOf function of MapGrid
added a Factory function for creating of "Map" objects |
|
| 802 |
4019d 22h |
werner |
/branches/port_qt5_64bit/ |
merge from trunk up to revision 801 |
|
| 798 |
4021d 16h |
werner |
/branches/port_qt5_64bit/ |
some comments, maximum number of years of simulations changed to 10000 |
|
| 794 |
4027d 17h |
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 |
4028d 15h |
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 |
4139d 15h |
werner |
/branches/port_qt5_64bit/src/ |
tried to compile also for MSVC 2010 32bit |
|
| 780 |
4139d 17h |
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 |
4152d 16h |
werner |
/branches/port_qt5_64bit/ |
|
|
| 777 |
4222d 17h |
werner |
/trunk/src/ |
removed a couple of warnings (partly using Q_UNUSED but also dropping of parameters) |
|
| 776 |
4223d 14h |
werner |
/trunk/src/ |
updated logic for starting/stopping the model (there actually was an error with infinite calling depth) |
|
| 773 |
4245d 21h |
werner |
/trunk/ |
fresh compile (Qt 4.8.3), removed debug symbols from executables, included recompiled fonstudio. |
|
| 770 |
4282d 21h |
werner |
/trunk/src/ |
fixed a bug with deadwood decay: (see analysis/extseeds/analyse_total_carbon20130113.docx). For a RU without vegetation (trees/saplings) the water cycle was not calculated -> therefore no values for evapotranspiration were available -> the climate factors for the deadwood decay were only driven by temperature (not by humidity) -> only a very slow decay until a RU got populated. Ouch.
now the water cycle is calculated for every resource unit with non-empty snags (either flux or state non-zero) |
|
| 769 |
4282d 23h |
werner |
/trunk/src/ |
v 0.84
helper.cpp: added QMutex to handle possible crash when adding timers to the timers list
modules: added a catch() around the execution of modules (this should fix crashes due to unhandled exceptions) |
|
| 767 |
4331d 10h |
werner |
/trunk/src/ |
larger restructuring of code (moving scripting related parts)
adding a shell for "spatialAnalysis".
In the future, a cleanup of all the "spatial" grids/maps/stuff is necessary... |
|
| 766 |
4331d 16h |
werner |
/trunk/src/ |
adding the rumple index calculation to iland. missing: script binding, ...
time to move the qtscript engine from management to the main model.... |
|
| 765 |
4341d 14h |
werner |
/trunk/src/ |
fixed crash with external seed input; removed some compiler warnings. |
|