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
1034 3360d 03h werner /branches/port_qt5_64bit/src/ warnings, version update.  
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
1033 3360d 03h werner /branches/port_qt5_64bit/src/ added GPL headers to files where it was still missing (mainly all ABE and BarkBeetle module files).  
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/actgeneral.h
/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/actscheduled.h
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.h
/branches/port_qt5_64bit/src/abe/agent.cpp
/branches/port_qt5_64bit/src/abe/agent.h
/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/fomescript.h
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/fomewrapper.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.h
/branches/port_qt5_64bit/src/abe/output/abestandremovalout.cpp
/branches/port_qt5_64bit/src/abe/output/abestandremovalout.h
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/abe/thinning.cpp
/branches/port_qt5_64bit/src/abe/thinning.h
/branches/port_qt5_64bit/src/core/climate.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/iland/main.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/output/landscapeout.cpp
/branches/port_qt5_64bit/src/output/landscapeout.h
/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/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.h
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
1032 3360d 03h werner /branches/port_qt5_64bit/src/ fixed compiler warnings (compiled again with GCC), and edited *.pro files for GCC.  
/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/agenttype.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/grid.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/tools/csvfile.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
1026 3367d 03h werner /branches/port_qt5_64bit/src/iland/ version 0.8.8  
/branches/port_qt5_64bit/src/iland/version.cpp
1018 3376d 20h werner /branches/port_qt5_64bit/src/ working on the crown-cover-grid  
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
1014 3412d 18h werner /branches/port_qt5_64bit/src/ bark beetle module fine tuning (outputs etc)
fixed an issue with always copying the labels (names) of layered grids.
warning: still a compile error ;)		  
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.h
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/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/barkbeetlescript.h
/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/spatialanalysis.h
1009 3419d 18h werner /branches/port_qt5_64bit/src/ bark beetle module
view with shading (i.e. based on DEM)		  
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/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/bbgenerations.cpp
/branches/port_qt5_64bit/src/tools/colors.cpp
/branches/port_qt5_64bit/src/tools/colors.h
/branches/port_qt5_64bit/src/tools/dem.cpp
/branches/port_qt5_64bit/src/tools/dem.h
1002 3428d 15h werner /branches/port_qt5_64bit/src/ new optimized establishment routine.
not finished yet, but looks promising in my first tests.		  
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/establishment.h
/branches/port_qt5_64bit/src/core/resourceunit.h
/branches/port_qt5_64bit/src/core/sapling.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/randomgenerator.h
1001 3428d 20h werner /branches/port_qt5_64bit/src/ removed some of the "DebugTimer" --- they tend to cause problems especially when multi-threading is enabled.  
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/speciesset.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
988 3435d 00h werner /branches/port_qt5_64bit/src/ trying to debug build on linux  
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
976 3457d 00h 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 3498d 15h 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 3503d 19h 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 3506d 22h 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 3527d 19h 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 3533d 19h 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 3567d 17h 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 3582d 20h 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 3587d 19h 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 3608d 21h 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

←Prev12Next→

Show All