Subversion Repositories public iLand

Rev

Go to most recent revision | Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
976 3451d 16h werner /branches/port_qt5_64bit/src/ compiling ilandc with Qt5.4 (and barkbeetle plugin).  
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
965 3493d 07h werner /branches/port_qt5_64bit/src/ move to qt5.4  
/branches/port_qt5_64bit/src/core/watercycle.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
964 3498d 12h werner /branches/port_qt5_64bit/src/ compile with Qt5.4/MSVC2013.
added class for BBgenerations (emtpy)
fixed minor issues in mainwindow (e.g. disabled run buttons after pause->cancel).		  
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetle.pro
963 3501d 14h werner /branches/port_qt5_64bit/src/ change for compiling with Qt 5.4. / MSVC 2013
looked again at GCC and had to change a couple of things. There seems to be still a problem with the plugin-system.		  
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/activity.h
/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/fomescript.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/output/landscapeout.cpp
962 3522d 12h werner /branches/port_qt5_64bit/src/ adding click-support to the layers/disturbance modules.  
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
959 3528d 12h werner /branches/port_qt5_64bit/src/ start of bark beetle module  
/branches/port_qt5_64bit/src/plugins/barkbeetle
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetle.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.json
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/plugins/plugins.pro
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/modules.cpp
948 3562d 09h werner /branches/port_qt5_64bit/src/ little fixes of things found during tests of ABE.  
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/tools/expression.cpp
942 3577d 13h werner /branches/port_qt5_64bit/src/ working on ABE: definition of Agents; scheduling of changes of agent-behavior. oh man.  
/branches/port_qt5_64bit/src/abe/activity.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/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmstp.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/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/version.cpp
940 3582d 11h werner /branches/port_qt5_64bit/src/ abe implementation of agents.  
/branches/port_qt5_64bit/src/abe/agent.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/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
932 3603d 13h 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 3604d 12h 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 3605d 09h 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 3662d 09h 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 3668d 08h 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 3674d 08h 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 3693d 12h 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 3694d 12h 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 3696d 09h 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 3708d 16h 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 3708d 17h 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

←Prev12Next→

Show All