Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
902 |
3811d 03h |
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 |
3813d 12h |
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
|
897 |
3817d 03h |
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 |
3818d 02h |
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 |
3838d 02h |
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
|
892 |
3839d 02h |
werner |
/branches/port_qt5_64bit/src/amie/ |
ABE, ABE, ABE |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/actscheduled.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/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/scheduler.cpp
|
891 |
3840d 02h |
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 |
3840d 08h |
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
|
889 |
3841d 02h |
werner |
/branches/port_qt5_64bit/src/ |
abe, abe, abe |
|
/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/fmtreelist.cpp /branches/port_qt5_64bit/src/amie/fmtreelist.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/environment.cpp /branches/port_qt5_64bit/src/core/environment.h /branches/port_qt5_64bit/src/core/layeredgrid.h /branches/port_qt5_64bit/src/core/model.cpp
|
888 |
3844d 23h |
werner |
/branches/port_qt5_64bit/src/amie/ |
... working on ABE ... |
|
/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/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomescript.h
|
887 |
3845d 07h |
werner |
/branches/port_qt5_64bit/src/amie/ |
debug/trace information when executing activities.
fixing some issues with events, ... |
|
/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/agenttype.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/fmtreelist.h /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomescript.h
|
886 |
3846d 01h |
werner |
/branches/port_qt5_64bit/src/amie/ |
.... |
|
/branches/port_qt5_64bit/src/amie/fomescript.h
|
885 |
3846d 01h |
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 |
3846d 22h |
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 |
3853d 04h |
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
|
880 |
3886d 03h |
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
|
878 |
3889d 02h |
werner |
/branches/port_qt5_64bit/src/ |
continuing AMIE development.
* first (potentially) multi threaded execution of activities (stands).
* some of the state changes of forest stands (i.e. after execution of an activity the active flag is false) |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/agenttype.cpp /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/threadrunner.h
|
877 |
3889d 02h |
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 |
3890d 01h |
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 |
3891d 00h |
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
|