| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 646 |
4782d 15h |
werner |
/trunk/src/ |
reorganized the fire module code and other stuff.
* added new interfaces and linked some of them already (setup(), ...)
* separated the plugin from the implementation (fireplugin.h vs. FireModule)
* worked on finding a way to create "layeredgrids" (how to avoid the templates...)- i have a solution now but still not sure if it really works |
|
/trunk/src/core/layeredgrid.h
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/core/grid.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/core/plugin_interface.h
/trunk/src/core/watercycle.cpp
/trunk/src/iland/iland.pro
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/gisgrid.cpp
/trunk/src/tools/gisgrid.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
|
| 643 |
4788d 20h |
werner |
/trunk/src/ |
improved the visualization of grids - now the main windows stores a list of grids along with type of drawing (black/white, color, ...).
The GUI has a combo box to select the grid to draw. Nice: this can easily be extended to be used with grids to come (fire, grids provided from scripts...)
Whats missing: some life cycle kind of thing: now it is quite dangerous to produce crashes.... needs some investigation of scoped pointer classes... |
|
/trunk/src/core/grid.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/mainwindow.ui
/trunk/src/iland/tests.cpp
/trunk/src/tools/helper.cpp
/trunk/src/tools/helper.h
|
| 642 |
4789d 08h |
werner |
/trunk/src/ |
added DEMs.
The DEM is an enriched FloatGrid featuring some special functions to load DEMs from file and to calculate aspect/slope and such.
currently only in testing, not really used in the model. |
|
/trunk/src/tools/dem.cpp
/trunk/src/tools/dem.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/iland/iland.pro
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/tests.cpp
|
| 639 |
4802d 12h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 634 |
4848d 12h |
werner |
/src/ |
iland movie maker |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 632 |
4849d 13h |
werner |
/src/ |
bugfixes and improved writing of error messages |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/stampcontainer.cpp
/src/iland/iland.pro
/src/iland/version.cpp
|
| 596 |
4885d 18h |
werner |
/src/ |
painting of MapGrid from javascript; the call is tunneled through the ModelController. |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 590 |
4899d 14h |
werner |
/src/ |
added new global scripting functions (e.g. screenshot()). This required some work to do in the combination of MainWindow and the ModelController; removed the static connection (is bad!) and changed to signal / slot connections.... |
|
/src/core/management.cpp
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
/src/tools/scriptglobal.cpp
|
| 575 |
4902d 16h |
werner |
/src/ |
* renamed toString() from IException to message() (several occurences).
* added a "name" property to the MapGridWrapper |
|
/src/core/environment.cpp
/src/core/exception.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/speciesset.cpp
/src/core/standstatistics.cpp
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/mapgrid.cpp
/src/tools/mapgrid.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 515 |
4983d 14h |
werner |
/src/core/ |
small update of the "automatic pause" to avoid crashes |
|
/src/core/modelcontroller.cpp
|
| 514 |
4983d 15h |
werner |
/src/ |
added a species-selection drop down box for GUI visualization. |
|
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/speciesset.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
|
| 497 |
5009d 15h |
werner |
/src/ |
tried some possibilities to eliminate "strange" crashes when simulating very for a long time. Ended up with adding additional "pause" between every 50 year or so (see modelcontroller.cpp); this helps at least a little.
also updated the expression-linearization |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/tree.cpp
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/expression.cpp
|
| 431 |
5148d 08h |
werner |
/src/ |
included the logLevel-Functions at several locations in the source code.
added a option to only display debug messages in the DebugTimer destructor when elapsed time is longer than one millisecond. |
|
/src/core/global.h
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelsettings.cpp
/src/core/resourceunit.cpp
/src/core/standloader.cpp
/src/core/watercycle.cpp
/src/iland/tests.cpp
/src/tools/globalsettings.cpp
/src/tools/helper.cpp
/src/tools/helper.h
|
| 421 |
5151d 08h |
werner |
/src/ |
additional timer in ModelController
fixed the way the rectangles are drawn in Qt4.6 (removed the white lines in the Height-grid-view) |
|
/src/core/modelcontroller.cpp
/src/tools/helper.h
|
| 395 |
5175d 08h |
werner |
/src/ |
fixed the "output on startup" which was broken due to changes in the execution sequence. |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/output/output.h
/src/output/outputmanager.cpp
|
| 370 |
5195d 16h |
werner |
/src/ |
* expansion of the logwindow on the mainwindow
* bug with multi threading: serialization using QMutexLocker when attempting to write/print the debug outputs.
* enabled painting of the visuals in modelcontroller.cpp (re-enabled??)
* changed the threshold for multi threading to 6 resource-units
* optimized StatData-class to avoid unnecessary calculations of percentiles
* several comments |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.h
/src/core/threadrunner.cpp
/src/iland/mainwindow.cpp
/src/iland/mainwindow.ui
/src/tools/globalsettings.h
/src/tools/helper.cpp
/src/tools/helper.h
|
| 362 |
5222d 15h |
werner |
/src/ |
small logging adaptations.
StampContainer: increased class count for HD classes to 16 (had previously an error with a hd value of 185) |
|
/src/core/modelcontroller.cpp
/src/core/stampcontainer.cpp
/src/iland/mainwindow.cpp
|
| 294 |
5367d 00h |
werner |
/src/ |
lots of scripting stuff: new global functions (include, alert)
new methods of the "Globals" javascript object (set, setting, addTrees, ...) |
|
/src/core/management.cpp
/src/core/management.h
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/resourceunit.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 286 |
5369d 07h |
werner |
/src/ |
management of output-database files. A table "runs" in the input species contains rudimentary run-metadata (id, timestamp), keywords in the database path are substituted, 'output' is a new path category. |
|
/src/tools/sqlhelper.cpp
/src/tools/sqlhelper.h
/src/core/model.cpp
/src/core/model.h
/src/core/modelcontroller.cpp
/src/iland/iland.pro
/src/tools/globalsettings.cpp
|
| 285 |
5370d 22h |
werner |
/src/core/ |
loading of the landscape. added "areaMask.imageFile" to "world" in xml file. This loads a image mask that establishes area that are inside and outside the project area respectively. |
|
/src/core/global.h
/src/core/grid.cpp
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
|