Permalink
Browse files

Revert "Merge branch 'master' of https://github.com/AIFDR/inasafe"

This reverts commit 6ba5d7d, reversing
changes made to 3ca4118.
  • Loading branch information...
1 parent 4dda5b4 commit 313d962858dccf642c12fc2dc625ebba7414e78b Kristy committed Dec 4, 2012
Showing with 1,225 additions and 5,512 deletions.
  1. +2 −10 Makefile
  2. +2 −1 __init__.py
  3. +4 −4 docs/source/api-docs/safe.rst
  4. +11 −11 docs/source/api-docs/safe/common.rst
  5. +6 −6 docs/source/api-docs/safe/engine/impact_functions_for_testing.rst
  6. +4 −5 docs/source/api-docs/safe/impact_functions.rst
  7. +2 −2 docs/source/api-docs/safe/impact_functions/earthquake.rst
  8. +1 −1 docs/source/api-docs/safe/impact_functions/inundation.rst
  9. +1 −1 docs/source/api-docs/safe/impact_functions/volcanic.rst
  10. +2 −2 docs/source/api-docs/safe/postprocessors.rst
  11. +9 −9 docs/source/api-docs/safe/storage.rst
  12. +18 −18 docs/source/api-docs/safe_qgis.rst
  13. +10 −10 docs/source/api-docs/safe_qgis_tests.rst
  14. +0 −1 docs/source/developer-docs/index.rst
  15. +0 −10 docs/source/developer-docs/logging.rst
  16. +0 −5 docs/source/developer-docs/platform_windows.rst
  17. +0 −24 docs/source/developer-docs/profiling.rst
  18. +8 −16 docs/source/user-docs/faq.rst
  19. +0 −18 docs/source/user-docs/impact_function_docs/CategorisedHazardBuildingImpactFunction.rst
  20. +0 −18 docs/source/user-docs/impact_function_docs/CategorisedHazardPopulationImpactFunction.rst
  21. +0 −14 docs/source/user-docs/impact_function_docs/EarthquakeBuildingImpactFunction.rst
  22. +0 −33 docs/source/user-docs/impact_function_docs/FloodBuildingImpactFunction.rst
  23. +0 −18 docs/source/user-docs/impact_function_docs/FloodEvacuationFunction.rst
  24. +0 −18 docs/source/user-docs/impact_function_docs/FloodEvacuationFunctionVectorHazard.rst
  25. +0 −14 docs/source/user-docs/impact_function_docs/FloodRoadImpactFunctionExperimental.rst
  26. +0 −18 docs/source/user-docs/impact_function_docs/ITBFatalityFunction.rst
  27. +0 −14 docs/source/user-docs/impact_function_docs/PadangEarthquakeBuildingDamageFunction.rst
  28. +0 −18 docs/source/user-docs/impact_function_docs/VolcanoBuildingImpact.rst
  29. +0 −18 docs/source/user-docs/impact_function_docs/VolcanoPolygonHazardPopulation.rst
  30. +0 −20 docs/source/user-docs/impact_functions_doc.rst
  31. +0 −1 docs/source/user-docs/index.rst
  32. +3 −23 docs/source/user-docs/options.rst
  33. +103 −0 docs/web_site/index.html
  34. +0 −115 extras/swap_gml_coords.py
  35. +2 −2 metadata.txt
  36. +1 −1 pylintrc
  37. +1 −1 pylintrc_jenkins
  38. +3 −5 safe/api.py
  39. +0 −3 safe/common/dynamic_translations.py
  40. +0 −1 safe/common/polygon.py
  41. +1 −1 safe/common/utilities.py
  42. +13 −19 safe/engine/impact_functions_for_testing/itb_fatality_model_configurable.py
  43. +0 −55 safe/engine/interpolation.py
  44. +1 −77 safe/engine/test_engine.py
  45. BIN safe/i18n/af/LC_MESSAGES/inasafe.mo
  46. +113 −179 safe/i18n/af/LC_MESSAGES/inasafe.po
  47. BIN safe/i18n/id/LC_MESSAGES/inasafe.mo
  48. +113 −196 safe/i18n/id/LC_MESSAGES/inasafe.po
  49. +0 −2 safe/impact_functions/__init__.py
  50. +34 −59 safe/impact_functions/core.py
  51. +3 −4 safe/impact_functions/earthquake/earthquake_building_impact.py
  52. +1 −2 safe/impact_functions/earthquake/itb_building_impact_model.py
  53. +20 −35 safe/impact_functions/earthquake/itb_earthquake_fatality_model.py
  54. +4 −5 safe/impact_functions/earthquake/padang_building_impact_model.py
  55. +0 −62 safe/impact_functions/earthquake/pager_earthquake_fatality_model.py
  56. +12 −54 safe/impact_functions/inundation/flood_OSM_building_impact.py
  57. +9 −11 safe/impact_functions/inundation/flood_population_evacuation.py
  58. +20 −37 safe/impact_functions/inundation/flood_population_evacuation_polygon_hazard.py
  59. +8 −10 safe/impact_functions/test_plugin_core.py
  60. +2 −4 safe/impact_functions/volcanic/volcano_building_impact.py
  61. +0 −15 safe/postprocessors/postprocessor_factory.py
  62. +4 −10 safe/storage/test_io.py
  63. +2 −6 safe/storage/vector.py
  64. +34 −120 safe_qgis/clipper.py
  65. +109 −135 safe_qgis/dock.py
  66. +15 −20 safe_qgis/exceptions.py
  67. +62 −170 safe_qgis/function_options_dialog.py
  68. +53 −44 safe_qgis/function_options_dialog_base.py
  69. +15 −41 safe_qgis/function_options_dialog_base.ui
  70. +3 −8 safe_qgis/help.py
  71. BIN safe_qgis/i18n/inasafe_id.qm
  72. +208 −228 safe_qgis/i18n/inasafe_id.ts
  73. +5 −5 safe_qgis/impact_calculator.py
  74. +4 −4 safe_qgis/impact_calculator_thread.py
  75. +9 −9 safe_qgis/keyword_io.py
  76. +4 −4 safe_qgis/keywords_dialog.py
  77. +2 −2 safe_qgis/map.py
  78. +6 −6 safe_qgis/map_legend.py
  79. +0 −12 safe_qgis/options_dialog.py
  80. +11 −32 safe_qgis/options_dialog_base.py
  81. +12 −43 safe_qgis/options_dialog_base.ui
  82. +2 −2 safe_qgis/plugin.py
  83. +22 −22 safe_qgis/safe_interface.py
  84. +6 −98 safe_qgis/test_clipper.py
  85. BIN safe_qgis/test_data/test_images/addSymbolToLegend-variantWindowsXPSP3-32.png
  86. BIN safe_qgis/test_data/test_images/getClassToLegend-variantWindowsXPSP3-32.png
  87. BIN safe_qgis/test_data/test_images/getLegend-variantWindowsXPSP3-32.png
  88. BIN safe_qgis/test_data/test_images/getRasterLegend-variantWindowsXPSP3-32.png
  89. BIN safe_qgis/test_data/test_images/getVectorLegend-variantWindowsXPSP3-32.png
  90. BIN safe_qgis/test_data/test_images/renderHtmlToImage-variantWindowsXPSP3-32.png
  91. +1 −67 safe_qgis/test_dock.py
  92. +13 −68 safe_qgis/test_function_options_dialog.py
  93. +0 −1 safe_qgis/test_html_renderer.py
  94. +7 −7 safe_qgis/test_impact_calculator.py
  95. +3 −3 safe_qgis/test_keyword_io.py
  96. +3 −3 safe_qgis/test_keywords_dialog.py
  97. +0 −5 safe_qgis/test_map_legend.py
  98. +1 −27 safe_qgis/test_qgis_environment.py
  99. +5 −5 safe_qgis/test_safe_interface.py
  100. +13 −20 safe_qgis/utilities.py
  101. +0 −121 scripts/gen_impfunc_doc.py
  102. +3 −12 scripts/gen_rst_script.py
  103. +3 −5 scripts/inasafe-install
  104. +38 −74 scripts/netcdf2tif.py
  105. +0 −2 scripts/update-website.sh
  106. +0 −12 third_party/raven/LICENSE
  107. +0 −18 third_party/raven/__init__.py
  108. +0 −563 third_party/raven/base.py
  109. +0 −86 third_party/raven/conf/__init__.py
  110. +0 −67 third_party/raven/conf/defaults.py
  111. 0 third_party/raven/contrib/__init__.py
  112. +0 −28 third_party/raven/contrib/async.py
  113. +0 −7 third_party/raven/contrib/paste.py
  114. 0 third_party/raven/contrib/transports/__init__.py
  115. +0 −58 third_party/raven/contrib/zerorpc/__init__.py
  116. +0 −148 third_party/raven/events.py
  117. +0 −7 third_party/raven/handlers/__init__.py
  118. +0 −78 third_party/raven/handlers/logbook.py
  119. +0 −129 third_party/raven/handlers/logging.py
  120. +0 −51 third_party/raven/middleware.py
  121. +0 −111 third_party/raven/processors.py
  122. +0 −7 third_party/raven/scripts/__init__.py
  123. +0 −88 third_party/raven/scripts/runner.py
  124. +0 −12 third_party/raven/transport/__init__.py
  125. +0 −243 third_party/raven/transport/base.py
  126. +0 −21 third_party/raven/transport/exceptions.py
  127. +0 −67 third_party/raven/transport/registry.py
  128. +0 −103 third_party/raven/transport/threaded.py
  129. +0 −125 third_party/raven/utils/__init__.py
  130. +0 −94 third_party/raven/utils/encoding.py
  131. +0 −34 third_party/raven/utils/json.py
  132. +0 −10 third_party/raven/utils/serializer/__init__.py
  133. +0 −139 third_party/raven/utils/serializer/base.py
  134. +0 −85 third_party/raven/utils/serializer/manager.py
  135. +0 −239 third_party/raven/utils/stacks.py
  136. +0 −12 third_party/raven/utils/urlparse.py
  137. +0 −93 third_party/raven/utils/wsgi.py
View
@@ -152,7 +152,7 @@ testdata:
@echo "Updating inasafe_data - public test and demo data repository"
@echo "Update the hash to check out a specific data version "
@echo "------------------------------------------------------------"
- @scripts/update-test-data.sh 87153042627bb1a7ae1547521708bb9bc12a3fd3 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
+ @scripts/update-test-data.sh 0a33f7d27c28a8fb7ad7951ed7163341ef1ea7ad 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
#check and show if there was an error retrieving the test data
testdata_errorcheck:
@@ -216,14 +216,6 @@ run_data_audit:
@echo "-----------------------------------"
@-export PYTHONPATH=`pwd`:$(PYTHONPATH); python scripts/data_IP_audit.py
-gen_impact_function_doc:
- @echo
- @echo "-----------------------------------"
- @echo "Generate impact functions' documentation"
- @echo "-----------------------------------"
- @-export PYTHONPATH=`pwd`:$(PYTHONPATH); python scripts/gen_impfunc_doc.py
- @echo $(PYTHONPATH)
-
pylint-count:
@echo
@echo "---------------------------"
@@ -306,4 +298,4 @@ jenkins-pep8:
@echo "-----------------------------"
@echo "PEP8 issue check for Jenkins"
@echo "-----------------------------"
- @pep8 --repeat --ignore=E203 --exclude docs,odict.py,keywords_dialog_base.py,dock_base.py,options_dialog_base.py,resources.py,resources_rc.py,help_base.py,xml_tools.py,system_tools.py,data_audit.py,data_audit_wrapper.py,impact_functions_doc_base.py,function_options_dialog_base.py . > pep8.log || :
+ @pep8 --repeat --ignore=E203 --exclude docs,odict.py,keywords_dialog_base.py,dock_base.py,options_dialog_base.py,resources.py,resources_rc.py,help_base.py,xml_tools.py,system_tools.py,data_audit.py,data_audit_wrapper.py,impact_functions_doc_base.py,configurable_impact_functions_dialog_base.py . > pep8.log || :
View
@@ -14,6 +14,7 @@
"""
__author__ = 'tim@linfiniti.com'
+__version__ = '1.0.0'
__date__ = '10/01/2011'
__copyright__ = ('Copyright 2012, Australia Indonesia Facility for '
'Disaster Reduction')
@@ -48,7 +49,7 @@ def description():
def version():
"""Version of the plugin."""
- return 'Version 1.1.0'
+ return 'Version 1.0.1'
def qgisMinimumVersion():
@@ -6,10 +6,10 @@ Package::safe
safe/api
safe/defaults
- safe/i18n
- safe/test
- safe/engine
+ safe/storage
safe/postprocessors
+ safe/engine
safe/impact_functions
+ safe/i18n
+ safe/test
safe/common
- safe/storage
@@ -4,19 +4,19 @@ Package::safe.common
.. toctree::
:maxdepth: 2
- common/test_geodesy
- common/version
- common/utilities
- common/numerics
+ common/geodesy
common/tables
- common/test_interpolate
+ common/exceptions
+ common/numerics
common/testing
- common/test_numerics
- common/test_polygon
- common/dynamic_translations
+ common/polygon
common/test_tables
- common/exceptions
common/interpolation2d
+ common/utilities
+ common/test_polygon
+ common/version
+ common/test_interpolate
+ common/dynamic_translations
+ common/test_numerics
common/interpolation1d
- common/polygon
- common/geodesy
+ common/test_geodesy
@@ -4,15 +4,15 @@ Package::safe.engine.impact_functions_for_testing
.. toctree::
:maxdepth: 2
- impact_functions_for_testing/flood_road_impact
- impact_functions_for_testing/itb_fatality_model_org
impact_functions_for_testing/error_raising_functions
+ impact_functions_for_testing/BNPB_earthquake_guidelines
+ impact_functions_for_testing/earthquake_impact_on_women
impact_functions_for_testing/unspecific_building_impact_model
+ impact_functions_for_testing/itb_fatality_model_org
+ impact_functions_for_testing/flood_road_impact
impact_functions_for_testing/allen_fatality_model
- impact_functions_for_testing/NEXIS_building_impact_model
- impact_functions_for_testing/BNPB_earthquake_guidelines
impact_functions_for_testing/general_ashload_impact
- impact_functions_for_testing/empirical_fatality_model
impact_functions_for_testing/itb_fatality_model_configurable
+ impact_functions_for_testing/empirical_fatality_model
impact_functions_for_testing/HKV_flood_study
- impact_functions_for_testing/earthquake_impact_on_women
+ impact_functions_for_testing/NEXIS_building_impact_model
@@ -4,17 +4,16 @@ Package::safe.impact_functions
.. toctree::
:maxdepth: 2
- impact_functions/test_real_impact_functions
impact_functions/test_plugin_core
+ impact_functions/test_real_impact_functions
impact_functions/test_mappings
- impact_functions/utilities
impact_functions/mappings
+ impact_functions/styles
+ impact_functions/utilities
impact_functions/test_plugins
impact_functions/core
- impact_functions/styles
impact_functions/tephra
impact_functions/generic
+ impact_functions/inundation
impact_functions/volcanic
impact_functions/earthquake
- impact_functions/experimental
- impact_functions/inundation
@@ -4,7 +4,7 @@ Package::safe.impact_functions.earthquake
.. toctree::
:maxdepth: 2
- earthquake/padang_building_impact_model
+ earthquake/itb_building_impact_model
earthquake/itb_earthquake_fatality_model
earthquake/earthquake_building_impact
- earthquake/itb_building_impact_model
+ earthquake/padang_building_impact_model
@@ -5,6 +5,6 @@ Package::safe.impact_functions.inundation
:maxdepth: 2
inundation/flood_road_impact_experimental
+ inundation/flood_population_evacuation
inundation/flood_OSM_building_impact
inundation/flood_population_evacuation_polygon_hazard
- inundation/flood_population_evacuation
@@ -4,5 +4,5 @@ Package::safe.impact_functions.volcanic
.. toctree::
:maxdepth: 2
- volcanic/volcano_building_impact
volcanic/volcano_population_evacuation_polygon_hazard
+ volcanic/volcano_building_impact
@@ -4,7 +4,7 @@ Package::safe.postprocessors
.. toctree::
:maxdepth: 2
- postprocessors/age_postprocessor
postprocessors/gender_postprocessor
- postprocessors/postprocessor_factory
postprocessors/abstract_postprocessor
+ postprocessors/age_postprocessor
+ postprocessors/postprocessor_factory
@@ -4,16 +4,16 @@ Package::safe.storage
.. toctree::
:maxdepth: 2
- storage/test_vector
- storage/utilities
- storage/test_clipping
+ storage/projection
storage/test_io
- storage/test_utilities
+ storage/test_clipping
+ storage/utilities_test
+ storage/clipping
+ storage/layer
storage/geometry
- storage/projection
+ storage/test_vector
+ storage/test_utilities
+ storage/raster
+ storage/utilities
storage/vector
storage/core
- storage/clipping
- storage/utilities_test
- storage/raster
- storage/layer
@@ -4,29 +4,29 @@ Package::safe_qgis
.. toctree::
:maxdepth: 2
- safe_qgis/plugin
- safe_qgis/dock_base
+ safe_qgis/options_dialog_base
+ safe_qgis/clipper
safe_qgis/impact_calculator
- safe_qgis/utilities
- safe_qgis/keyword_io
- safe_qgis/safe_interface
- safe_qgis/function_options_dialog
- safe_qgis/html_renderer
- safe_qgis/resources_rc
- safe_qgis/function_options_dialog_base
safe_qgis/keywords_dialog_base
- safe_qgis/map_legend
- safe_qgis/qgis_interface
- safe_qgis/impact_calculator_thread
- safe_qgis/map
- safe_qgis/clipper
+ safe_qgis/resources_rc
+ safe_qgis/dock
safe_qgis/help
- safe_qgis/options_dialog
safe_qgis/impact_functions_doc
+ safe_qgis/map_legend
+ safe_qgis/impact_calculator_thread
safe_qgis/exceptions
- safe_qgis/utilities_test
+ safe_qgis/dock_base
safe_qgis/keywords_dialog
safe_qgis/resources
+ safe_qgis/keyword_io
+ safe_qgis/html_renderer
+ safe_qgis/utilities_test
+ safe_qgis/plugin
+ safe_qgis/safe_interface
+ safe_qgis/function_options_dialog
safe_qgis/impact_functions_doc_base
- safe_qgis/dock
- safe_qgis/options_dialog_base
+ safe_qgis/function_options_dialog_base
+ safe_qgis/options_dialog
+ safe_qgis/utilities
+ safe_qgis/qgis_interface
+ safe_qgis/map
@@ -4,20 +4,20 @@ Package::safe_qgis_tests
.. toctree::
:maxdepth: 2
- safe_qgis_tests/test_map_legend
safe_qgis_tests/test_function_options_dialog
+ safe_qgis_tests/test_init
safe_qgis_tests/test_clipper
+ safe_qgis_tests/test_qgis_environment
safe_qgis_tests/test_keyword_io
- safe_qgis_tests/test_dock
- safe_qgis_tests/test_utilities
- safe_qgis_tests/test_init
- safe_qgis_tests/test_impact_functions_doc
- safe_qgis_tests/test_help
- safe_qgis_tests/test_safe_translations
- safe_qgis_tests/test_safe_interface
safe_qgis_tests/test_plugin
safe_qgis_tests/test_html_renderer
+ safe_qgis_tests/test_keywords_dialog
safe_qgis_tests/test_map
safe_qgis_tests/test_impact_calculator
- safe_qgis_tests/test_keywords_dialog
- safe_qgis_tests/test_qgis_environment
+ safe_qgis_tests/test_safe_translations
+ safe_qgis_tests/test_dock
+ safe_qgis_tests/test_impact_functions_doc
+ safe_qgis_tests/test_utilities
+ safe_qgis_tests/test_safe_interface
+ safe_qgis_tests/test_help
+ safe_qgis_tests/test_map_legend
@@ -18,7 +18,6 @@ Developer Documentation Contents:
platform_windows
coding_standards
logging
- profiling
i18n
version_control
maintaining_documentation
@@ -57,16 +57,6 @@ and the message provided to the LOGGER.exception call to all be logged e.g.::
The above example was contrived in the QGIS python console. When the exception
originates inside a module, the traceback will include the complete call tree.
-Logging in loops
-------------------
-.. warning::
-
- Please be considerate when logging into loops as this can slow execution a
- lot (we had a spatial analysis loop with two logged messages and it took
- 15sec for 1000 itterations, removing logging brought it to 5sec)
- See also :ref:`profiling`
-
-
Remote logging
--------------
@@ -300,11 +300,6 @@ If the installation goes successfully, you should see output like this::
Processing dependencies for pip
Finished processing dependencies for pip
-.. note:: If your Windows is 64bit, you need to do a little trick to install pip.
- First you have to install python 32bit and add its path to PATH variable in
- environment variable (on Windows 7: `System Properties --> Advanced --> Environment Variables`).
- After that, run command prompt (as administrator if needed) and run `easy_install pip`
-
Installing nose
...............
@@ -1,24 +0,0 @@
-.. _profiling:
-
-Profiling
----------
-
-Profiling a script in python is as easy as calling:
-python -m cProfile myscript.py
-see also: http://docs.python.org/2/library/profile.html#module-cProfile
-
-the problem is that sometimes the code you want to profile deep in ianSAFE. You
-can still get nice cProfiles by replacing the original call with a call to
-cProfile.runctx()
-
-so::
-
- self.preparePolygonLayerForAggr(theClippedHazardFilename, myHazardLayer)
-would become::
-
- cProfile.runctx('self.preparePolygonLayerForAggr(theClippedHazardFilename, myHazardLayer)', globals(), locals())
-see also http://stackoverflow.com/questions/1031657/profiling-self-and-arguments-in-python
-
-You can put a raise statement right after the runctx call so the execution is
-stopped and you can see your cProfile results in the console
-
@@ -10,6 +10,14 @@ issue tracker is open to everyone, though you will first need to register a
(free) account on GitHub to use it. You can find the GitHub self-registration
page `here <https://github.com/signup/free>`_.
+Why can't I find the plugin in the QGIS repositories?
+-----------------------------------------------------
+
+We do plan to publish the plugin at
+`plugins.qgis.org <http://plugins.qgis.org/>`_ so that it can be effortlessly
+installed from within QGIS, we are just no ready to do that yet. In the mean
+time please use the manual installation procedure to install InaSAFE in QGIS.
+
Do I need to pay to use |project_name|?
---------------------------------------
@@ -117,19 +125,3 @@ For vector to raster conversion, use gdal_rasterize utility, for example::
gdal_rasterize -a <attribute_name> -l <source>.shp <destination>.tif
-Why does the plugin not show up in my QGIS Plugin Manager?
-----------------------------------------------------------
-
-One common issue is that if you upgraded from QGIS 1.7.x to 1.8 you may not
-get the new plugin repo added to your repo list. To fix this you can do:
-
-* open QGIS
-* Go Plugins -> Fetch Python Plugins
-* click 'Repositories' tab
-* click add
-* :guilabel:`Name`: Official QGIS Repository
-* :guilabel:`Url`: http://plugins.qgis.org/plugins/plugins.xml
-* Save it and the plugin repo list should update. If it doesn't,
- close and open QGIS to force an update.
-* In the python plugin manager main tab now you should find InaSAFE available
-
@@ -1,18 +0,0 @@
-Categorised Hazard Building Impact Function
-===========================================
-
-Overview
---------
-
-**Unique Identifier**: Categorised Hazard Building Impact Function
-
-**Rating**: The Rating
-
-**Title**: Be affected
-
-**Author**: The Author
-
-Details
--------
-
-No documentation found
Oops, something went wrong.

1 comment on commit 313d962

Contributor

timlinux commented on 313d962 Dec 4, 2012

Just a note that this commit rolled back a lot of good changes in the code base too as it undid your merge with master. I am reverting the revert and will commit after testing. What specific changes were you trying to undo?

Regards

Tim

Please sign in to comment.