| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 932 |
3695d 06h |
werner |
/branches/port_qt5_64bit/src/ |
worked on multithreading enabling for ABE;
created a class MapGridRULock that should serialize access --- found some minor bugs in the rest of the code, but finally I think that this locking-code is not strictly necessary since the treelists are *not* changed by management (i.e. a remove does not change the physical layout of the treelist and therefore does not invalidate any pointers to it). The unit-based approach for multithreading does reduce the chance of issues; there is a small chance of lost updates when updating the biomass pools of snags (i.e. if two trees (on two units) of the same resource unit die at the same time). |
|
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
|
| 930 |
3696d 05h |
werner |
/branches/port_qt5_64bit/src/ |
progressing in ABEland.
worked inter alia on the activity thinning.
the abe-harvest-output is still not added. |
|
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 929 |
3697d 02h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE.
fixing bugs, adding a stand-level output. |
|
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 923 |
3754d 02h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE:
ActThinning and some minor other stuff |
|
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.h
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 922 |
3760d 02h |
werner |
/branches/port_qt5_64bit/src/ |
new ABE stand level output. Consolidation of scheduler. |
|
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 921 |
3766d 02h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE scheduler. tricky stuff.... |
|
/branches/port_qt5_64bit/src/abe/agent.cpp
/branches/port_qt5_64bit/src/abe/agent.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/soil.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
| 916 |
3785d 06h |
werner |
/branches/port_qt5_64bit/src/ |
unit-output, testing of scheduler. |
|
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
| 915 |
3786d 05h |
werner |
/branches/port_qt5_64bit/src/ |
developing ABE unit level scheduling, start with dev. of ABE - Outputs. |
|
/branches/port_qt5_64bit/src/abe/output
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.h
/branches/port_qt5_64bit/src/abe/agent.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 914 |
3788d 02h |
werner |
/branches/port_qt5_64bit/src/ |
finish of the stand split thing
many other tweaks in ABE land. |
|
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
|
| 909 |
3800d 09h |
werner |
/branches/port_qt5_64bit/src/ |
more renaming: now it is hopefully done. |
|
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/abe/amiegrid.cpp
/branches/port_qt5_64bit/src/abe/amiegrid.h
/branches/port_qt5_64bit/src/abe/abe_global.h
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
|
| 908 |
3800d 10h |
werner |
/branches/port_qt5_64bit/src/ |
amie_global.h -> abe_global.h |
|
/branches/port_qt5_64bit/src/abe/abe_global.h
/branches/port_qt5_64bit/src/abe/amie_global.h
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/amiegrid.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/thinning.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 907 |
3800d 10h |
werner |
/branches/port_qt5_64bit/src/ |
amie -> abe transition |
|
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/activity.h
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actplanting.h
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/agenttype.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmstp.h
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 905 |
3800d 10h |
werner |
/branches/port_qt5_64bit/src/ |
working on scheduler and on implementing disturbances.
now again the AMIE/ABE transformation.... |
|
/branches/port_qt5_64bit/src/amie/actsalvage.cpp
/branches/port_qt5_64bit/src/amie/actsalvage.h
/branches/port_qt5_64bit/src/amie/actgeneral.h
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/actscheduled.h
/branches/port_qt5_64bit/src/amie/agent.cpp
/branches/port_qt5_64bit/src/amie/agent.h
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/amiegrid.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/fomewrapper.cpp
/branches/port_qt5_64bit/src/amie/fomewrapper.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/amie/scheduler.h
/branches/port_qt5_64bit/src/amie/thinning.cpp
/branches/port_qt5_64bit/src/amie/thinning.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/tests.cpp
|
| 904 |
3801d 01h |
werner |
/branches/port_qt5_64bit/src/ |
... working on amie... |
|
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/amie/scheduler.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/core/standloader.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
| 902 |
3808d 06h |
werner |
/branches/port_qt5_64bit/src/ |
work on AMIE.
introduced new activity: planting.
zillions of other small mods. |
|
/branches/port_qt5_64bit/src/amie/actplanting.cpp
/branches/port_qt5_64bit/src/amie/actplanting.h
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/actscheduled.cpp
/branches/port_qt5_64bit/src/amie/amie_global.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomewrapper.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
| 901 |
3810d 15h |
werner |
/branches/port_qt5_64bit/src/ |
repeating activities,
canceling of execution of javascript code in ABE (abort())
some other stuff.... |
|
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/tools/random.cpp
/branches/port_qt5_64bit/src/tools/random.h
|
| 899 |
3814d 06h |
werner |
/branches/port_qt5_64bit/src/ |
fix for crashes in getting ABE details after reload of the model. |
|
/branches/port_qt5_64bit/src/apidoc/ABE
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
| 897 |
3814d 06h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE - doing quite some documentation (YUIDOC), and improving, adding, fixing here or there.
progress is slow but steady ;) |
|
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
| 896 |
3815d 05h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE |
|
/branches/port_qt5_64bit/src/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/globals_doc.js
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/actscheduled.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/tools/gisgrid.cpp
|
| 893 |
3835d 05h |
werner |
/branches/port_qt5_64bit/src/ |
ABE ABE ABE ... |
|
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/amiegrid.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/core/species.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
|
| 891 |
3837d 04h |
werner |
/branches/port_qt5_64bit/src/ |
*lots* of changes for ABE. |
|
/branches/port_qt5_64bit/src/amie/actscheduled.cpp
/branches/port_qt5_64bit/src/amie/actscheduled.h
/branches/port_qt5_64bit/src/amie/knowledgebase.cpp
/branches/port_qt5_64bit/src/amie/knowledgebase.h
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 890 |
3837d 10h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE.
restructuring the directories for the documentation. |
|
/branches/port_qt5_64bit/src/apidoc/ABE
/branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/ABE/treelist_doc.js
/branches/port_qt5_64bit/src/apidoc/iLand
/branches/port_qt5_64bit/src/apidoc/iLand/globals_doc.js
/branches/port_qt5_64bit/src/apidoc/yuidoc.json
/branches/port_qt5_64bit/src/amie/treelist.cpp
/branches/port_qt5_64bit/src/amie/treelist.h
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/colors.cpp
|
| 885 |
3843d 03h |
werner |
/branches/port_qt5_64bit/src/ |
.... continuing.... ABE |
|
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/expressionwrapper.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
|
| 884 |
3844d 01h |
werner |
/branches/port_qt5_64bit/src/ |
working on the AMIE/ABE, whatever... |
|
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/amie_global.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
|
| 882 |
3850d 07h |
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. |
|
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/iland/qml/ruler.qml
/branches/port_qt5_64bit/src/tools/colors.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
| 881 |
3879d 03h |
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. |
|
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/paintarea.h
/branches/port_qt5_64bit/src/tools/dem.cpp
/branches/port_qt5_64bit/src/tools/expression.cpp
/branches/port_qt5_64bit/src/tools/gisgrid.cpp
/branches/port_qt5_64bit/src/tools/gisgrid.h
|
| 880 |
3883d 06h |
werner |
/branches/port_qt5_64bit/src/ |
implementing the QML based ruler/scale thing. Very nice when you get the hang of it.... |
|
/branches/port_qt5_64bit/src/iland/qml_res.qrc
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/iland/qml/ruler.qml
/branches/port_qt5_64bit/src/tools/colors.cpp
/branches/port_qt5_64bit/src/tools/colors.h
|
| 879 |
3884d 05h |
werner |
/branches/port_qt5_64bit/src/ |
starting with QML based ruler/image component. |
|
/branches/port_qt5_64bit/src/iland/qml
/branches/port_qt5_64bit/src/iland/qml/ruler.qml
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/tools/colors.cpp
/branches/port_qt5_64bit/src/tools/colors.h
|
| 877 |
3886d 04h |
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. |
|
/branches/port_qt5_64bit/src/tools/colors.cpp
/branches/port_qt5_64bit/src/tools/colors.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/amiegrid.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp
/branches/port_qt5_64bit/src/plugins/fire/firemodule.h
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windmodule.h
/branches/port_qt5_64bit/src/tools/helper.cpp
/branches/port_qt5_64bit/src/tools/helper.h
|
| 876 |
3887d 04h |
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). |
|
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
| 875 |
3888d 03h |
werner |
/branches/port_qt5_64bit/src/ |
AMIE development (many things...) |
|
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/amie/scheduler.h
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 873 |
3893d 01h |
werner |
/branches/port_qt5_64bit/src/ |
lots of development of AMIE. |
|
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/amiegrid.h
/branches/port_qt5_64bit/src/amie/treelist.cpp
/branches/port_qt5_64bit/src/amie/treelist.h
/branches/port_qt5_64bit/src/amie/agent.cpp
/branches/port_qt5_64bit/src/amie/agent.h
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
|
| 870 |
3899d 02h |
werner |
/branches/port_qt5_64bit/src/ |
amie development.... |
|
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/actgeneral.h
/branches/port_qt5_64bit/src/amie/amie_global.h
/branches/port_qt5_64bit/src/amie/thinning.cpp
/branches/port_qt5_64bit/src/amie/thinning.h
/branches/port_qt5_64bit/src/amie/fome_global.h
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/agent.cpp
/branches/port_qt5_64bit/src/amie/agent.h
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/fomewrapper.cpp
/branches/port_qt5_64bit/src/amie/fomewrapper.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/knowledgebase.cpp
/branches/port_qt5_64bit/src/amie/knowledgebase.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/tools/expression.cpp
|
| 864 |
3941d 05h |
werner |
/branches/port_qt5_64bit/src/ |
fixed typos (after merge) and version number |
|
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
|
| 863 |
3942d 06h |
werner |
/branches/port_qt5_64bit/ |
renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch. |
|
/branches/port_qt5_64bit/src/amie
/branches/port_qt5_64bit/src/fome
/branches/port_qt5_64bit
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/resourceunit.h
/branches/port_qt5_64bit/src/core/resourceunitspecies.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/standstatistics.cpp
/branches/port_qt5_64bit/src/core/standstatistics.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
|
| 860 |
3950d 05h |
werner |
/branches/port_qt5_64bit/src/ |
added stand treatment programme class. |
|
/branches/port_qt5_64bit/src/fome/fmstp.cpp
/branches/port_qt5_64bit/src/fome/fmstp.h
/branches/port_qt5_64bit/src/iland/iland.pro
|
| 855 |
3970d 06h |
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). |
|
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/standstatistics.cpp
/branches/port_qt5_64bit/src/core/standstatistics.h
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/output/dynamicstandout.cpp
/branches/port_qt5_64bit/src/output/dynamicstandout.h
|
| 852 |
3972d 01h |
werner |
/branches/port_qt5_64bit/src/iland/ |
updated version. |
|
/branches/port_qt5_64bit/src/iland/version.cpp
|
| 838 |
3977d 08h |
werner |
/branches/port_qt5_64bit/ |
new executable with required Qt 5.1 files. version 0.8.6. |
|
/branches/port_qt5_64bit/executable/QtCore4.dll
/branches/port_qt5_64bit/executable/QtGui4.dll
/branches/port_qt5_64bit/executable/QtScript4.dll
/branches/port_qt5_64bit/executable/QtSql4.dll
/branches/port_qt5_64bit/executable/QtXml4.dll
/branches/port_qt5_64bit/executable/fonstudio.exe
/branches/port_qt5_64bit/executable/libgcc_s_dw2-1.dll
/branches/port_qt5_64bit/executable/mingwm10.dll
/branches/port_qt5_64bit/executable/sqldrivers/qsqlite4.dll
/branches/port_qt5_64bit/executable/iland.exe
/branches/port_qt5_64bit/executable/ilandc.exe
/branches/port_qt5_64bit/src/iland/version.cpp
|
| 837 |
3977d 08h |
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" |
|
/branches/port_qt5_64bit/src/output/landscapeout.cpp
/branches/port_qt5_64bit/src/output/landscapeout.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/species.h
/branches/port_qt5_64bit/src/core/standstatistics.cpp
/branches/port_qt5_64bit/src/core/standstatistics.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.h
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/ilandc/main.cpp
/branches/port_qt5_64bit/src/output/carbonout.cpp
/branches/port_qt5_64bit/src/output/carbonout.h
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/standout.cpp
/branches/port_qt5_64bit/src/output/standout.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|