Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

resolve conflict

  • Loading branch information...
commit c5846488a14600b3a65e7cde6bf787a6c4270822 1 parent 32a10c9
@ismailsunni ismailsunni authored
Showing with 10,964 additions and 9,211 deletions.
  1. +4 −0 .gitignore
  2. +9 −0 .idea/dictionaries/timlinux.xml
  3. +1 −1  .idea/inasafe-dev.iml
  4. +8 −0 .idea/libraries/sass_stdlib.xml
  5. +1 −1  .idea/misc.xml
  6. +2 −2 .idea/runConfigurations/InaSAFE_Docs.xml
  7. +0 −26 .idea/runConfigurations/NoseTest_VectorTest.xml
  8. +0 −26 .idea/runConfigurations/NoseTests_SAFE_QGIS.xml
  9. +0 −20 .idea/runConfigurations/Sphinx_HTML.xml
  10. +2 −2 .idea/testrunner.xml
  11. +0 −738 .idea/workspace.xml
  12. +7 −2 AUTHORS.rst
  13. +15 −8 Makefile
  14. +0 −86 README
  15. +1 −0  README
  16. +0 −1  README.rst
  17. +86 −0 README.rst
  18. +22 −26 __init__.py
  19. BIN  docs/source/_static/calculation-progress.png
  20. BIN  docs/source/_static/docked-right.png
  21. BIN  docs/source/_static/error-display.png
  22. BIN  docs/source/_static/inasafe-dock-panel.png
  23. BIN  docs/source/_static/inasafe-options-dialog.png
  24. BIN  docs/source/_static/keyword-editor-advanced.jpeg
  25. BIN  docs/source/_static/keyword-editor-simple.jpeg
  26. BIN  docs/source/_static/keywords-for-active-layer.png
  27. BIN  docs/source/_static/plugin-manager.png
  28. BIN  docs/source/_static/scenario-results.png
  29. BIN  docs/source/_static/status-ready.png
  30. +3 −3 docs/source/_templates/index.html
  31. +2 −0  docs/source/api-docs/safe.rst
  32. +7 −0 docs/source/api-docs/safe/defaults.rst
  33. +4 −0 docs/source/api-docs/safe/engine/impact_functions_for_testing.rst
  34. +7 −0 docs/source/api-docs/safe/engine/impact_functions_for_testing/earthquake_impact_on_women.rst
  35. +7 −0 docs/source/api-docs/safe/engine/impact_functions_for_testing/error_raising_functions.rst
  36. +7 −0 docs/source/api-docs/safe/engine/impact_functions_for_testing/itb_fatality_model_configurable.rst
  37. +7 −0 docs/source/api-docs/safe/engine/impact_functions_for_testing/itb_fatality_model_org.rst
  38. +1 −1  docs/source/api-docs/safe/impact_functions/earthquake.rst
  39. +2 −2 ...ocs/safe/impact_functions/earthquake/{earthquake_impact_on_women.rst → earthquake_building_impact.rst}
  40. +0 −13 docs/source/api-docs/safe/impact_functions/experimental.rst
  41. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/BNPB_flood_building_impact.rst
  42. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/ashload_population_impact.rst
  43. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/flood_population_evacuation_worldbank_request.rst
  44. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/general_volcanic_population_impact.rst
  45. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/mappings.rst
  46. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/tsunami_building_impact.rst
  47. +0 −7 docs/source/api-docs/safe/impact_functions/experimental/tsunami_population_impact.rst
  48. +1 −0  docs/source/api-docs/safe/impact_functions/inundation.rst
  49. +7 −0 docs/source/api-docs/safe/impact_functions/inundation/flood_road_impact_experimental.rst
  50. +1 −0  docs/source/api-docs/safe/impact_functions/volcanic.rst
  51. +7 −0 docs/source/api-docs/safe/impact_functions/volcanic/volcano_building_impact.rst
  52. +10 −0 docs/source/api-docs/safe/postprocessors.rst
  53. +7 −0 docs/source/api-docs/safe/postprocessors/abstract_postprocessor.rst
  54. +7 −0 docs/source/api-docs/safe/postprocessors/age_postprocessor.rst
  55. +7 −0 docs/source/api-docs/safe/postprocessors/gender_postprocessor.rst
  56. +7 −0 docs/source/api-docs/safe/postprocessors/postprocessor_factory.rst
  57. +1 −0  docs/source/api-docs/safe/storage.rst
  58. +7 −0 docs/source/api-docs/safe/storage/geometry.rst
  59. +0 −7 docs/source/api-docs/safe/storage/interpolation.rst
  60. +4 −3 docs/source/api-docs/safe_qgis.rst
  61. +0 −7 docs/source/api-docs/safe_qgis/aggregation_attribute_dialog_base.rst
  62. +7 −0 docs/source/api-docs/safe_qgis/function_options_dialog.rst
  63. +7 −0 docs/source/api-docs/safe_qgis/function_options_dialog_base.rst
  64. +7 −0 docs/source/api-docs/safe_qgis/html_renderer.rst
  65. +7 −0 docs/source/api-docs/safe_qgis/map_legend.rst
  66. +0 −7 docs/source/api-docs/safe_qgis/odict.rst
  67. +5 −0 docs/source/api-docs/safe_qgis_tests.rst
  68. +7 −0 docs/source/api-docs/safe_qgis_tests/test_function_options_dialog.rst
  69. +7 −0 docs/source/api-docs/safe_qgis_tests/test_html_renderer.rst
  70. +2 −2 docs/source/api-docs/{safe_qgis/help_base.rst → safe_qgis_tests/test_init.rst}
  71. +7 −0 docs/source/api-docs/safe_qgis_tests/test_map_legend.rst
  72. +7 −0 docs/source/api-docs/safe_qgis_tests/test_safe_translations.rst
  73. +12 −10 docs/source/authors.rst
  74. +6 −6 docs/source/conf.py
  75. +1 −0  docs/source/developer-docs/coding_standards.rst
  76. +2 −2 docs/source/developer-docs/i18n.rst
  77. +2 −0  docs/source/developer-docs/index.rst
  78. +118 −0 docs/source/developer-docs/logging.rst
  79. +2 −1  docs/source/developer-docs/platform_linux.rst
  80. +11 −11 docs/source/developer-docs/platform_windows.rst
  81. +110 −0 docs/source/developer-docs/postprocessors.rst
  82. +2 −2 docs/source/developer-docs/preparing_a_release.rst
  83. +1 −1  docs/source/developer-docs/version_control.rst
  84. BIN  docs/source/favicon.ico
  85. 0  docs/source/{_static → static}/README
  86. BIN  docs/source/static/calculation-progress.png
  87. BIN  docs/source/static/docked-right.jpeg
  88. BIN  docs/source/static/error-display.png
  89. BIN  docs/source/static/impact_function_table_filtered.png
  90. BIN  docs/source/static/impact_function_table_unfiltered.png
  91. BIN  docs/source/static/inasafe-dock-panel.jpeg
  92. BIN  docs/source/static/inasafe-options-dialog.png
  93. 0  docs/source/{_static → static}/inasafe-options-icon.png
  94. BIN  docs/source/static/keyword-editor-advanced.jpeg
  95. 0  docs/source/{_static → static}/keyword-editor-icon.png
  96. BIN  docs/source/static/keyword-editor-simple.jpeg
  97. BIN  docs/source/static/keywords-for-active-layer.png
  98. BIN  docs/source/static/log-notifications.png
  99. BIN  docs/source/static/log-view.png
  100. 0  docs/source/{_static → static}/msysgit-step1.jpg
  101. 0  docs/source/{_static → static}/msysgit-step10.jpg
  102. 0  docs/source/{_static → static}/msysgit-step2.jpg
  103. 0  docs/source/{_static → static}/msysgit-step3.jpg
  104. 0  docs/source/{_static → static}/msysgit-step4.jpg
  105. 0  docs/source/{_static → static}/msysgit-step5.jpg
  106. 0  docs/source/{_static → static}/msysgit-step6.jpg
  107. 0  docs/source/{_static → static}/msysgit-step7.jpg
  108. 0  docs/source/{_static → static}/msysgit-step8.jpg
  109. 0  docs/source/{_static → static}/msysgit-step9.jpg
  110. 0  docs/source/{_static → static}/options-keyword-db-path.png
  111. 0  docs/source/{_static → static}/pep8-highlighting.jpeg
  112. BIN  docs/source/static/plugin-manager.png
  113. BIN  docs/source/static/postprocessor-config.png
  114. 0  docs/source/{_static → static}/release-workflow.odg
  115. 0  docs/source/{_static → static}/release-workflow.png
  116. BIN  docs/source/static/scenario-results.png
  117. 0  docs/source/{_static → static}/screenshot-small.jpg
  118. 0  docs/source/{_static → static}/screenshot.jpg
  119. 0  docs/source/{_static → static}/screenshot1-small.jpg
  120. 0  docs/source/{_static → static}/screenshot1.jpg
  121. 0  docs/source/{_static → static}/screenshot2-small.jpg
  122. 0  docs/source/{_static → static}/screenshot2.jpg
  123. BIN  docs/source/static/status-ready.png
  124. 0  docs/source/{_static → static}/toggle-traceback.png
  125. 0  docs/source/{tutorial-docs/static → static/tutorial}/001.png
  126. 0  docs/source/{tutorial-docs/static → static/tutorial}/002.png
  127. 0  docs/source/{tutorial-docs/static → static/tutorial}/003.png
  128. 0  docs/source/{tutorial-docs/static → static/tutorial}/004.png
  129. 0  docs/source/{tutorial-docs/static → static/tutorial}/005.png
  130. 0  docs/source/{tutorial-docs/static → static/tutorial}/006.png
  131. 0  docs/source/{tutorial-docs/static → static/tutorial}/007.png
  132. 0  docs/source/{tutorial-docs/static → static/tutorial}/008.png
  133. 0  docs/source/{tutorial-docs/static → static/tutorial}/009.png
  134. 0  docs/source/{tutorial-docs/static → static/tutorial}/010.png
  135. 0  docs/source/{tutorial-docs/static → static/tutorial}/011.png
  136. 0  docs/source/{tutorial-docs/static → static/tutorial}/012.png
  137. 0  docs/source/{tutorial-docs/static → static/tutorial}/013.png
  138. 0  docs/source/{tutorial-docs/static → static/tutorial}/014.png
  139. 0  docs/source/{tutorial-docs/static → static/tutorial}/015.png
  140. 0  docs/source/{tutorial-docs/static → static/tutorial}/016.png
  141. 0  docs/source/{tutorial-docs/static → static/tutorial}/017.png
  142. 0  docs/source/{tutorial-docs/static → static/tutorial}/018.png
  143. 0  docs/source/{tutorial-docs/static → static/tutorial}/019.png
  144. 0  docs/source/{tutorial-docs/static → static/tutorial}/020.png
  145. 0  docs/source/{tutorial-docs/static → static/tutorial}/021.png
  146. 0  docs/source/{tutorial-docs/static → static/tutorial}/022.png
  147. 0  docs/source/{tutorial-docs/static → static/tutorial}/023.png
  148. 0  docs/source/{tutorial-docs/static → static/tutorial}/024.png
  149. 0  docs/source/{tutorial-docs/static → static/tutorial}/025.png
  150. 0  docs/source/{tutorial-docs/static → static/tutorial}/026.png
  151. 0  docs/source/{tutorial-docs/static → static/tutorial}/027.png
  152. 0  docs/source/{tutorial-docs/static → static/tutorial}/028.png
  153. 0  docs/source/{tutorial-docs/static → static/tutorial}/029.png
  154. 0  docs/source/{tutorial-docs/static → static/tutorial}/030.png
  155. 0  docs/source/{tutorial-docs/static → static/tutorial}/031.png
  156. 0  docs/source/{tutorial-docs/static → static/tutorial}/032.png
  157. 0  docs/source/{tutorial-docs/static → static/tutorial}/033.png
  158. +33 −33 docs/source/tutorial-docs/tutorial.rst
  159. +39 −1 docs/source/user-docs/changelog.rst
  160. +7 −7 docs/source/user-docs/dock.rst
  161. +36 −10 docs/source/user-docs/faq.rst
  162. +68 −0 docs/source/user-docs/getting_involved.rst
  163. +64 −3 docs/source/user-docs/impact_functions.rst
  164. +2 −0  docs/source/user-docs/index.rst
  165. +1 −1  docs/source/user-docs/install.rst
  166. +10 −10 docs/source/user-docs/keywords.rst
  167. +4 −2 docs/source/user-docs/options.rst
  168. +45 −0 docs/source/user-docs/postprocessors.rst
  169. +3 −3 docs/source/user-docs/screenshots.rst
  170. +22 −22 extras/retired_impact_functions/flood_population_evacuation_worldbank_request.py
  171. +11 −11 extras/retired_impact_functions/tsunami_building_impact.py
  172. BIN  icon.png
  173. +6 −5 metadata.txt
  174. +258 −0 pylintrc_jenkins
  175. +4 −0 safe/__init__.py
  176. +9 −3 safe/api.py
  177. +111 −108 safe/common/dynamic_translations.py
  178. +6 −1 safe/common/exceptions.py
  179. +8 −5 safe/common/geodesy.py
  180. +4 −4 safe/common/interpolation1d.py
  181. +0 −1  safe/common/interpolation2d.py
  182. +144 −79 safe/common/polygon.py
  183. +1 −1  safe/common/tables.py
  184. +157 −0 safe/common/test_polygon.py
  185. +0 −1  safe/common/testing.py
  186. +21 −84 safe/common/utilities.py
  187. +1 −0  safe/common/version.py
  188. +48 −0 safe/defaults.py
  189. +49 −2 safe/engine/core.py
  190. +12 −12 safe/engine/impact_functions_for_testing/BNPB_earthquake_guidelines.py
  191. +13 −13 safe/{impact_functions/earthquake → engine/impact_functions_for_testing}/earthquake_impact_on_women.py
  192. +58 −0 safe/engine/impact_functions_for_testing/error_raising_functions.py
  193. +2 −2 safe/engine/impact_functions_for_testing/flood_road_impact.py
  194. +304 −0 safe/engine/impact_functions_for_testing/itb_fatality_model_configurable.py
  195. +236 −0 safe/engine/impact_functions_for_testing/itb_fatality_model_org.py
  196. +105 −83 safe/engine/interpolation.py
  197. +341 −243 safe/engine/test_engine.py
  198. BIN  safe/i18n/af/LC_MESSAGES/inasafe.mo
  199. +582 −2,132 safe/i18n/af/LC_MESSAGES/inasafe.po
  200. BIN  safe/i18n/id/LC_MESSAGES/inasafe.mo
  201. +553 −2,212 safe/i18n/id/LC_MESSAGES/inasafe.po
  202. +1 −0  safe/impact_functions/__init__.py
  203. +45 −8 safe/impact_functions/core.py
  204. +205 −0 safe/impact_functions/earthquake/earthquake_building_impact.py
  205. +21 −21 safe/impact_functions/earthquake/itb_building_impact_model.py
  206. +94 −57 safe/impact_functions/earthquake/itb_earthquake_fatality_model.py
  207. +23 −22 safe/impact_functions/earthquake/padang_building_impact_model.py
  208. +17 −16 safe/impact_functions/generic/categorised_hazard_building_impact.py
  209. +23 −23 safe/impact_functions/generic/categorised_hazard_population.py
  210. +76 −66 safe/impact_functions/inundation/flood_OSM_building_impact.py
  211. +62 −43 safe/impact_functions/inundation/flood_population_evacuation.py
  212. +42 −30 safe/impact_functions/inundation/flood_population_evacuation_polygon_hazard.py
  213. +107 −0 safe/impact_functions/inundation/flood_road_impact_experimental.py
  214. +6 −6 safe/impact_functions/mappings.py
  215. +8 −8 safe/impact_functions/styles.py
  216. +10 −10 safe/impact_functions/test_mappings.py
  217. +1 −1  safe/impact_functions/test_plugin_core.py
  218. +1 −2  safe/impact_functions/test_real_impact_functions.py
  219. +192 −0 safe/impact_functions/volcanic/volcano_building_impact.py
  220. +146 −62 safe/impact_functions/volcanic/volcano_population_evacuation_polygon_hazard.py
  221. +16 −0 safe/postprocessors/__init__.py
  222. +153 −0 safe/postprocessors/abstract_postprocessor.py
  223. +204 −0 safe/postprocessors/age_postprocessor.py
  224. +202 −0 safe/postprocessors/gender_postprocessor.py
  225. +78 −0 safe/postprocessors/postprocessor_factory.py
  226. +1 −1  safe/storage/clipping.py
  227. +30 −0 safe/storage/geometry.py
  228. +3 −3 safe/storage/layer.py
  229. +62 −6 safe/storage/projection.py
  230. +17 −11 safe/storage/raster.py
  231. +149 −2 safe/storage/test_clipping.py
  232. +473 −95 safe/storage/test_io.py
  233. +0 −1  safe/storage/test_utilities.py
  234. +0 −1  safe/storage/test_vector.py
  235. +166 −2 safe/storage/utilities.py
  236. +164 −81 safe/storage/vector.py
  237. +21 −27 safe_qgis/Makefile
  238. +2 −3 safe_qgis/__init__.py
  239. +0 −62 safe_qgis/aggregation_attribute_dialog_base.py
  240. +0 −80 safe_qgis/aggregation_attribute_dialog_base.ui
  241. +29 −28 safe_qgis/clipper.py
  242. +0 −90 safe_qgis/configurable_impact_functions_dialog.py
  243. +0 −41 safe_qgis/configurable_impact_functions_dialog_base.py
  244. +840 −431 safe_qgis/dock.py
  245. +73 −73 safe_qgis/dock_base.py
  246. +169 −161 safe_qgis/dock_base.ui
  247. +6 −1 safe_qgis/exceptions.py
  248. +150 −0 safe_qgis/function_options_dialog.py
  249. +77 −0 safe_qgis/function_options_dialog_base.py
  250. +129 −0 safe_qgis/function_options_dialog_base.ui
  251. +5 −25 safe_qgis/help.py
  252. +0 −44 safe_qgis/help_base.py
  253. +0 −70 safe_qgis/help_base.ui
  254. +244 −0 safe_qgis/html_renderer.py
  255. BIN  safe_qgis/i18n/inasafe_af.qm
  256. +427 −206 safe_qgis/i18n/inasafe_af.ts
  257. BIN  safe_qgis/i18n/inasafe_id.qm
  258. +701 −277 safe_qgis/i18n/inasafe_id.ts
  259. +0 −1  safe_qgis/impact_calculator.py
  260. +0 −1  safe_qgis/impact_calculator_thread.py
  261. +7 −5 safe_qgis/impact_functions_doc.py
  262. +1 −1  safe_qgis/impact_functions_doc_base.py
  263. +4 −2 safe_qgis/inasafe.pro
  264. +74 −16 safe_qgis/keyword_io.py
  265. +163 −89 safe_qgis/keywords_dialog.py
  266. +88 −40 safe_qgis/keywords_dialog_base.py
  267. +160 −88 safe_qgis/keywords_dialog_base.ui
  268. +221 −532 safe_qgis/map.py
  269. +334 −0 safe_qgis/map_legend.py
  270. +13 −6 safe_qgis/options_dialog.py
  271. +21 −8 safe_qgis/options_dialog_base.py
  272. +43 −19 safe_qgis/options_dialog_base.ui
  273. +22 −20 safe_qgis/plugin.py
  274. +65 −3 safe_qgis/qgis_interface.py
  275. +1 −1  safe_qgis/resources.py
  276. +1 −1  safe_qgis/resources_rc.py
  277. +24 −18 safe_qgis/safe_interface.py
  278. +32 −3 safe_qgis/test_clipper.py
  279. +40 −0 safe_qgis/test_data/test_files/test-aggregation-results.txt
  280. BIN  safe_qgis/test_data/test_images/addSymbolToLegend-variantJenkins.png
  281. BIN  safe_qgis/test_data/test_images/addSymbolToLegend-variantUB11.04-64.png
  282. BIN  safe_qgis/test_data/test_images/addSymbolToLegend-variantUB12.04-64.png
  283. BIN  safe_qgis/test_data/test_images/addSymbolToLegend-variantWindosVistaSP2-32.png
  284. BIN  safe_qgis/test_data/test_images/addSymbolToLegend.png
  285. BIN  safe_qgis/test_data/test_images/getClassToLegend-variantJenkins.png
  286. BIN  safe_qgis/test_data/test_images/getClassToLegend-variantUB11.04-64.png
  287. BIN  safe_qgis/test_data/test_images/getClassToLegend-variantUB12.04-64.png
  288. BIN  safe_qgis/test_data/test_images/getClassToLegend-variantWindosVistaSP2-32.png
  289. BIN  safe_qgis/test_data/test_images/getClassToLegend.png
  290. BIN  safe_qgis/test_data/test_images/getLegend-variantJenkins.png
  291. BIN  safe_qgis/test_data/test_images/getLegend-variantUB11.04-64.png
  292. BIN  safe_qgis/test_data/test_images/getLegend-variantUB12.04-64.png
  293. BIN  safe_qgis/test_data/test_images/getLegend-variantWindosVistaSP2-32.png
  294. BIN  safe_qgis/test_data/test_images/getLegend.png
  295. BIN  safe_qgis/test_data/test_images/getRasterLegend-variantJenkins.png
  296. BIN  safe_qgis/test_data/test_images/getRasterLegend-variantUB11.04-64.png
  297. BIN  safe_qgis/test_data/test_images/getRasterLegend-variantUB12.04-64.png
  298. BIN  safe_qgis/test_data/test_images/getRasterLegend-variantWindosVistaSP2-32.png
  299. BIN  safe_qgis/test_data/test_images/getRasterLegend.png
  300. BIN  safe_qgis/test_data/test_images/getVectorLegend-variantJenkins.png
Sorry, we could not display the entire diff because too many files (348) changed.
View
4 .gitignore
@@ -28,3 +28,7 @@ setup.cfg
run_qgis.sh
.achievements
.idea/runConfigurations/NoseTests_Realtime.xml
+.idea/workspace.xml
+pydev
+.idea/inasafe-dev.iml
+.idea/misc.xml
View
9 .idea/dictionaries/timlinux.xml
@@ -0,0 +1,9 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="timlinux">
+ <words>
+ <w>iface</w>
+ <w>pixmap</w>
+ <w>qgisapp</w>
+ </words>
+ </dictionary>
+</component>
View
2  .idea/inasafe-dev.iml
@@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
- <orderEntry type="jdk" jdkName="Python 2.7.3 (/usr/bin/python2.7)" jdkType="Python SDK" />
+ <orderEntry type="jdk" jdkName="Python with QGIS-Master libs" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PackageRequirementsSettings">
View
8 .idea/libraries/sass_stdlib.xml
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+ <library name="sass-stdlib">
+ <CLASSES />
+ <SOURCES>
+ <root url="file://$APPLICATION_HOME_DIR$/plugins/sass/lib/stubs/sass_functions.scss" />
+ </SOURCES>
+ </library>
+</component>
View
2  .idea/misc.xml
@@ -7,6 +7,6 @@
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
- <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.3 (/usr/bin/python2.7)" project-jdk-type="Python SDK" />
+ <component name="ProjectRootManager" version="2" project-jdk-name="Python with QGIS-Master libs" project-jdk-type="Python SDK" />
</project>
View
4 .idea/runConfigurations/InaSAFE_Docs.xml
@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="InaSAFE Docs" type="docs" factoryName="Sphinx task">
+ <configuration default="false" name="InaSAFE Docs" type="docs" factoryName="Sphinx task" editBeforeRun="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
@@ -9,7 +9,7 @@
<module name="inasafe-dev" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<option name="docutils_input_file" value="docs/source" />
- <option name="docutils_output_file" value="docs/_build" />
+ <option name="docutils_output_file" value="docs/build" />
<option name="docutils_params" value="" />
<option name="docutils_task" value="html" />
<option name="docutils_open_in_browser" value="false" />
View
26 .idea/runConfigurations/NoseTest_VectorTest.xml
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="NoseTest VectorTest" type="tests" factoryName="Nosetests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe/storage" />
- <option name="IS_MODULE_SDK" value="true" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_vector.py" />
- <option name="CLASS_NAME" value="VectorTest" />
- <option name="METHOD_NAME" value="testSublayerLoading" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_CLASS" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <RunnerSettings RunnerId="PyDebugRunner" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PyDebugRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
-</component>
View
26 .idea/runConfigurations/NoseTests_SAFE_QGIS.xml
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="NoseTests SAFE_QGIS" type="tests" factoryName="Nosetests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs>
- <env name="QGISPATH" value="/usr/local/qgis1.8" />
- </envs>
- <option name="SDK_HOME" value="/usr/bin/python2.7" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="FOLDER_NAME" value="$PROJECT_DIR$/safe_qgis" />
- <option name="TEST_TYPE" value="TEST_FOLDER" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
-</component>
View
20 .idea/runConfigurations/Sphinx_HTML.xml
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="Sphinx HTML" type="docs" factoryName="Sphinx task">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="/usr/bin/python2.7" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/docs" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="docutils_input_file" value="$PROJECT_DIR$/docs/source" />
- <option name="docutils_output_file" value="$PROJECT_DIR$/docs/build/html" />
- <option name="docutils_params" value="" />
- <option name="docutils_task" value="html" />
- <option name="docutils_open_in_browser" value="false" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
-</component>
View
4 .idea/testrunner.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="TestRunnerService">
- <option name="projectConfiguration" value="Nosetests" />
- <option name="PROJECT_CONFIGURATION" value="Nosetests" />
+ <option name="projectConfiguration" value="Unittests" />
+ <option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</project>
View
738 .idea/workspace.xml
@@ -1,738 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ChangeListManager">
- <list default="true" id="6815cb5a-e0e1-41b6-b799-f6f1722d6a68" name="Default" comment="Added link to complete list of pylint codes">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/inasafe-dev.iml" afterPath="$PROJECT_DIR$/.idea/inasafe-dev.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/testrunner.xml" afterPath="$PROJECT_DIR$/.idea/testrunner.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/dock.py" afterPath="$PROJECT_DIR$/safe_qgis/dock.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/help.py" afterPath="$PROJECT_DIR$/safe_qgis/help.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/utilities_test.py" afterPath="$PROJECT_DIR$/safe_qgis/utilities_test.py" />
- </list>
- <ignored path="inasafe-dev.iws" />
- <ignored path=".idea/workspace.xml" />
- <option name="TRACKING_ENABLED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
- <component name="CoverageDataManager">
- <SUITE FILE_PATH="coverage/inasafe-dev$Nosetests_in_test_vector.coverage" NAME="Nosetests in test_vector Coverage Results" MODIFIED="1345545273681" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/safe/storage" />
- <SUITE FILE_PATH="coverage/inasafe-dev$Nosetests_in_DockTest_test_Issue47.coverage" NAME="Nosetests in DockTest.test_Issue47 Coverage Results" MODIFIED="1348695744827" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
- </component>
- <component name="CreatePatchCommitExecutor">
- <option name="PATCH_PATH" value="" />
- </component>
- <component name="DaemonCodeAnalyzer">
- <disable_hints />
- </component>
- <component name="DatabaseView">
- <flatten value="false" />
- <groupTables value="false" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
- <component name="FavoritesManager">
- <favorites_list name="inasafe-dev" />
- </component>
- <component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="dock.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/safe_qgis/dock.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1820" column="12" selection-start="71324" selection-end="71346" vertical-scroll-proportion="-2.881356">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="help.py" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/safe_qgis/help.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="79" column="34" selection-start="2722" selection-end="2730" vertical-scroll-proportion="0.7823529">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="clipper.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/safe_qgis/clipper.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="379" column="8" selection-start="14439" selection-end="14479" vertical-scroll-proportion="-16.440678">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="utilities.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/safe_qgis/utilities.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="513" column="7" selection-start="20003" selection-end="20024" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="map.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/safe_qgis/map.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1139" column="30" selection-start="45248" selection-end="45253" vertical-scroll-proportion="-5.7966104">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FindManager">
- <FindUsagesManager>
- <setting name="OPEN_NEW_TAB" value="false" />
- </FindUsagesManager>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="IdeDocumentHistory">
- <option name="changedFiles">
- <list>
- <option value="$PROJECT_DIR$/safe/common/exceptions.py" />
- <option value="$PROJECT_DIR$/safe/storage/test_utilities.py" />
- <option value="$PROJECT_DIR$/docs/source/developer-docs/maintaining_documentation.rst" />
- <option value="$PROJECT_DIR$/extras/data_audit_wrapper.py" />
- <option value="$PROJECT_DIR$/safe/storage/utilities.py" />
- <option value="$PROJECT_DIR$/safe/api.py" />
- <option value="$PROJECT_DIR$/safe_qgis/safe_interface.py" />
- <option value="$PROJECT_DIR$/safe_qgis/test_keyword_io.py" />
- <option value="$PROJECT_DIR$/safe_qgis/keyword_io.py" />
- <option value="$PROJECT_DIR$/safe_qgis/keywords_dialog.py" />
- <option value="$PROJECT_DIR$/safe/storage/test_vector.py" />
- <option value="$PROJECT_DIR$/safe/storage/vector.py" />
- <option value="$PROJECT_DIR$/safe_qgis/test_dock.py" />
- <option value="$PROJECT_DIR$/safe_qgis/utilities_test.py" />
- <option value="$PROJECT_DIR$/safe_qgis/dock.py" />
- <option value="$PROJECT_DIR$/safe_qgis/help.py" />
- </list>
- </option>
- </component>
- <component name="ProjectFrameBounds">
- <option name="x" value="-1" />
- <option name="y" value="26" />
- <option name="width" value="1368" />
- <option name="height" value="743" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <ConfirmationsSetting value="2" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectReloadState">
- <option name="STATE" value="0" />
- </component>
- <component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages />
- <abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- </navigator>
- <panes>
- <pane id="ProjectPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="scripts" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="inasafe-dev" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="safe_qgis" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="Scope">
- <subPane subId="Project Files">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="options.splitter.main.proportions" value="0.3" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="options.lastSelected" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
- <property name="recentsLimit" value="5" />
- <property name="last_opened_file_path" value="/usr/local/qgis1.8/share/qgis/python" />
- <property name="restartRequiresConfirmation" value="true" />
- <property name="options.splitter.details.proportions" value="0.31698564" />
- <property name="options.searchVisible" value="true" />
- </component>
- <component name="PyConsoleOptionsProvider">
- <option name="myPythonConsoleState">
- <PyConsoleSettings />
- </option>
- <option name="myDjangoConsoleState">
- <PyConsoleSettings />
- </option>
- </component>
- <component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/safe/test/data/other" />
- <recent name="$PROJECT_DIR$/docs/source/api-docs/safe/common" />
- <recent name="$PROJECT_DIR$/docs/source/api-docs/safe_qgis_tests" />
- <recent name="$PROJECT_DIR$/docs/source/api-docs/safe" />
- <recent name="$PROJECT_DIR$/common" />
- </key>
- <key name="MoveFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/safe/storage" />
- <recent name="$PROJECT_DIR$/docs/source/api-docs" />
- <recent name="$PROJECT_DIR$/docs/source/api-docs/safe/storage" />
- <recent name="$PROJECT_DIR$/safe/common" />
- </key>
- </component>
- <component name="RunManager" selected="Python's test.Nosetests in DockTest.test_Issue47">
- <configuration default="false" name="Nosetests in test_dock" type="tests" factoryName="Nosetests" temporary="true">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs>
- <env name="QGIS_PREFIX_PATH" value="/usr/local/qgis1.8" />
- <env name="PYTHONPATH" value="$PYTHONPATH:/usr/local/qgis1.8/share/qgis/python" />
- <env name="LD_LIBRARY_PATH" value="/usr/local/qgis1.8/lib" />
- </envs>
- <option name="SDK_HOME" value="/usr/bin/python" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="IS_MODULE_SDK" value="true" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe_qgis/test_dock.py" />
- <option name="CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_SCRIPT" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
- <configuration default="false" name="Nosetests in DockTest.test_Issue47" type="tests" factoryName="Nosetests" temporary="true">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs>
- <env name="QGIS_PREFIX_PATH" value="/usr/local/qgis1.8" />
- <env name="PYTHONPATH" value="$PYTHONPATH:/usr/local/qgis1.8/share/qgis/python" />
- <env name="LD_LIBRARY_PATH" value="/usr/local/qgis1.8/lib" />
- </envs>
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="IS_MODULE_SDK" value="true" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe_qgis/test_dock.py" />
- <option name="CLASS_NAME" value="DockTest" />
- <option name="METHOD_NAME" value="test_Issue47" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_METHOD" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <RunnerSettings RunnerId="PythonCover" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PythonCover" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
- <configuration default="true" type="tests" factoryName="Nosetests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs>
- <env name="QGIS_PREFIX_PATH" value="/usr/local/qgis1.8" />
- <env name="PYTHONPATH" value="$PYTHONPATH:/usr/local/qgis1.8/share/qgis/python" />
- <env name="LD_LIBRARY_PATH" value="/usr/local/qgis1.8/lib" />
- </envs>
- <option name="SDK_HOME" value="/usr/bin/python" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_SCRIPT" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="PythonConfigurationType" factoryName="Python">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs>
- <env name="PYTHONUNBUFFERED" value="1" />
- </envs>
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="" />
- <option name="PARAMETERS" value="" />
- <option name="MULTIPROCESS" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="docs" factoryName="Docutils task">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="docutils_input_file" value="" />
- <option name="docutils_output_file" value="" />
- <option name="docutils_params" value="" />
- <option name="docutils_task" value="" />
- <option name="docutils_open_in_browser" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="docs" factoryName="Sphinx task">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="docutils_input_file" value="" />
- <option name="docutils_output_file" value="" />
- <option name="docutils_params" value="" />
- <option name="docutils_task" value="" />
- <option name="docutils_open_in_browser" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="tests" factoryName="Unittests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_SCRIPT" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PUREUNITTEST" value="true" />
- <method />
- </configuration>
- <configuration default="true" type="PyRemoteDebugConfigurationType" factoryName="Python Remote Debug">
- <module name="" />
- <option name="PORT" value="0" />
- <option name="HOST" value="null" />
- <PyPathMappingSettings>
- <option name="pathMappings">
- <list />
- </option>
- </PyPathMappingSettings>
- <option name="REDIRECT_OUTPUT" value="true" />
- <option name="SUSPEND_AFTER_CONNECT" value="true" />
- <method />
- </configuration>
- <configuration default="true" type="tests" factoryName="Doctests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_SCRIPT" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
- <JSDebuggerConfigurationSettings>
- <option name="engineId" value="embedded" />
- <option name="fileUrl" />
- </JSDebuggerConfigurationSettings>
- <method />
- </configuration>
- <configuration default="false" name="Remote Debug Server" type="PyRemoteDebugConfigurationType" factoryName="Python Remote Debug">
- <module name="" />
- <option name="PORT" value="53100" />
- <option name="HOST" value="localhost" />
- <PyPathMappingSettings>
- <option name="pathMappings">
- <list />
- </option>
- </PyPathMappingSettings>
- <option name="REDIRECT_OUTPUT" value="true" />
- <option name="SUSPEND_AFTER_CONNECT" value="true" />
- <RunnerSettings RunnerId="PyRemoteDebugRunner" />
- <ConfigurationWrapper RunnerId="PyRemoteDebugRunner" />
- <method />
- </configuration>
- <list size="9">
- <item index="0" class="java.lang.String" itemvalue="Python's test.NoseTests SAFE_QGIS" />
- <item index="1" class="java.lang.String" itemvalue="Python's test.NoseTests GUI I18N" />
- <item index="2" class="java.lang.String" itemvalue="Python's test.NoseTests Dock" />
- <item index="3" class="java.lang.String" itemvalue="Python's test.NoseTest VectorTest" />
- <item index="4" class="java.lang.String" itemvalue="Python Remote Debug.Remote Debug Server" />
- <item index="5" class="java.lang.String" itemvalue="Python docs.InaSAFE Docs" />
- <item index="6" class="java.lang.String" itemvalue="Python docs.Sphinx HTML" />
- <item index="7" class="java.lang.String" itemvalue="Python's test.Nosetests in test_dock" />
- <item index="8" class="java.lang.String" itemvalue="Python's test.Nosetests in DockTest.test_Issue47" />
- </list>
- </component>
- <component name="ShelveChangesManager" show_recycled="false" />
- <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false">
- <option name="USER" value="" />
- <option name="PASSWORD" value="" />
- <option name="mySSHConnectionTimeout" value="30000" />
- <option name="mySSHReadTimeout" value="30000" />
- <option name="LAST_MERGED_REVISION" />
- <option name="MERGE_DRY_RUN" value="false" />
- <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
- <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
- <option name="IGNORE_SPACES_IN_MERGE" value="false" />
- <option name="DETECT_NESTED_COPIES" value="true" />
- <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
- <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
- <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
- <option name="FORCE_UPDATE" value="false" />
- <option name="IGNORE_EXTERNALS" value="false" />
- <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="6815cb5a-e0e1-41b6-b799-f6f1722d6a68" name="Default" comment="" />
- <created>1342432170294</created>
- <updated>1342432170294</updated>
- </task>
- <task id="LOCAL-00001" summary="Added hashes for my xinerama based desktop.&#10;Refactored use of registry for DRY">
- <created>1342507802822</created>
- <updated>1342507802822</updated>
- </task>
- <task id="LOCAL-00002" summary="Python lint fixes.">
- <created>1342508962507</created>
- <updated>1342508962507</updated>
- </task>
- <task id="LOCAL-00003" summary="Python lint fixes.">
- <created>1342509546420</created>
- <updated>1342509546420</updated>
- </task>
- <task id="LOCAL-00004" summary="Added accessors to expose private members">
- <created>1342509598929</created>
- <updated>1342509598929</updated>
- </task>
- <task id="LOCAL-00005" summary="Python lint fixes. On advice from lint implemented much nicer exception handling for bbox calculator.">
- <created>1342511747011</created>
- <updated>1342511747011</updated>
- </task>
- <task id="LOCAL-00006" summary="Pep8 fixes">
- <created>1342512383828</created>
- <updated>1342512383828</updated>
- </task>
- <task id="LOCAL-00007" summary="Fix inconsistencies in md5 hash comparison by opening files in binary mode. I have commented out all old hashes and they should be re-added per platform as/if needed, though I am hoping we can have one canonical md5 hash for all systems now.">
- <created>1344914166275</created>
- <updated>1344914166275</updated>
- </task>
- <task id="LOCAL-00008" summary="Reinstated platform hashes for xvfb">
- <created>1344915082572</created>
- <updated>1344915082572</updated>
- </task>
- <task id="LOCAL-00009" summary="Added link to complete list of pylint codes">
- <created>1345602748009</created>
- <updated>1345602748009</updated>
- </task>
- <option name="localTasksCounter" value="10" />
- <servers />
- </component>
- <component name="TodoView" selected-index="0">
- <todo-panel id="selected-file">
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="false" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="false" />
- </todo-panel>
- <todo-panel id="default-changelist">
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="false" />
- </todo-panel>
- </component>
- <component name="ToolWindowManager">
- <frame x="-1" y="26" width="1368" height="743" extended-state="6" />
- <editor active="false" />
- <layout>
- <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32959402" sideWeight="0.6105611" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32893288" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19575115" sideWeight="0.24455611" order="1" side_tool="true" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19575115" sideWeight="0.74371856" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27364865" sideWeight="0.6655983" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16115262" sideWeight="0.21922246" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5929648" sideWeight="0.5273141" order="11" side_tool="true" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28713968" sideWeight="0.4673748" order="2" side_tool="false" content_ui="tabs" x="217" y="178" width="1477" height="799" />
- <window_info id="Pomodoro" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3255814" sideWeight="0.48504272" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3355856" sideWeight="0.49786323" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32869378" sideWeight="0.49358973" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32941177" sideWeight="0.7128603" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- </layout>
- </component>
- <component name="VcsContentAnnotationSettings">
- <option name="myLimit" value="2678400000" />
- </component>
- <component name="VcsManagerConfiguration">
- <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
- <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
- <option name="CHECK_NEW_TODO" value="true" />
- <option name="myTodoPanelSettings">
- <value>
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="false" />
- </value>
- </option>
- <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
- <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
- <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
- <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
- <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
- <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
- <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
- <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
- <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
- <option name="SHORT_DIFF_HORISONTALLY" value="true" />
- <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
- <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
- <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
- <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
- <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
- <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
- <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
- <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Added link to complete list of pylint codes" />
- <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
- <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
- <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
- <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
- <option name="ACTIVE_VCS_NAME" />
- <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
- <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
- <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
- <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="Added hashes for my xinerama based desktop" />
- <MESSAGE value="Added hashes for my xinerama based desktop.&#10;Refactored use of registry for DRY" />
- <MESSAGE value="Python lint fixes." />
- <MESSAGE value="Added accessors to expose private members" />
- <MESSAGE value="Python lint fixes. On advice from lint implemented much nicer exception handling for bbox calculator." />
- <MESSAGE value="Pep8 fixes" />
- <MESSAGE value="Fix inconsistencies in md5 hash comparison by opening files in binary mode. I have commented out all old hashes and they should be re-added per platform as/if needed, though I am hoping we can have one canonical md5 hash for all systems now." />
- <MESSAGE value="Reinstated platform hashes for xvfb" />
- <MESSAGE value="Added link to complete list of pylint codes" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/safe_qgis/safe_interface.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="253" column="0" selection-start="8624" selection-end="8624" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe/storage/utilities.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="355" column="7" selection-start="11695" selection-end="11695" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/__init__.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="10" column="0" selection-start="260" selection-end="260" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe/storage/test_vector.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="42" column="22" selection-start="1407" selection-end="1413" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe/api.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="26" column="40" selection-start="1046" selection-end="1046" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe/common/exceptions.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="62" column="0" selection-start="1413" selection-end="1413" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/utilities_test.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="85" column="42" selection-start="2467" selection-end="2467" vertical-scroll-proportion="0.61538464">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/test_dock.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="351" column="0" selection-start="13389" selection-end="13389" vertical-scroll-proportion="0.03846154">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe/storage/vector.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="343" column="0" selection-start="12394" selection-end="12394" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/test_keyword_io.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="169" column="0" selection-start="8155" selection-end="8155" vertical-scroll-proportion="0.5202109">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe/common/utilities.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-5.2003517">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/utilities.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="513" column="7" selection-start="20003" selection-end="20024" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/clipper.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="379" column="8" selection-start="14439" selection-end="14479" vertical-scroll-proportion="-16.440678">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/map.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1139" column="30" selection-start="45248" selection-end="45253" vertical-scroll-proportion="-5.7966104">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/dock.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1820" column="12" selection-start="71324" selection-end="71346" vertical-scroll-proportion="-2.881356">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/safe_qgis/help.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="79" column="34" selection-start="2722" selection-end="2730" vertical-scroll-proportion="0.7823529">
- <folding />
- </state>
- </provider>
- </entry>
- </component>
-</project>
-
View
9 AUTHORS.rst
@@ -11,10 +11,15 @@ Authors ordered by date of first contribution:
* Tim Sutton <tim@linfiniti.com>
* Ismail Sunni <ismailsunni@yahoo.co.id>
* Krisy Van Putten <Kristy.VanPutten@ausaid.gov.au>
+* Marco Bernasocchi <marco@opengis.ch>
+* Oscar Kurniawan <misugijunz@gmail.com>
+* Trevor Dhu <Trevor.Dhu@ausaid.gov.au>
+* Gigih Aji Ibrahim <bungcip@gmail.com>
+
Other contributors who have provided input, testing, translations etc.
-* Trevor Dhu <Trevor.Dhu@ausaid.gov.au>
* I Made Anombawa <anom1403@gmail.com>
-
+* Giovanni Manghi <giovanni.manghi@faunalia.pt>
+* Maning Sambale <emmanuel.sambale@gmail.com>
This work was kindly supported by AusAid and the World Bank.
View
23 Makefile
@@ -94,7 +94,7 @@ clean:
@-/bin/rm .coverage 2>/dev/null || true
# Run the test suite followed by style checking
-test: docs test_suite pep8 pylint dependency_test unwanted_strings run_data_audit testdata_errorcheck test-translations
+test: clean docs test_suite pep8 pylint dependency_test unwanted_strings run_data_audit testdata_errorcheck test-translations
# Run the test suite for gui only
guitest: gui_test_suite pep8 disabled_tests dependency_test unwanted_strings testdata_errorcheck
@@ -111,7 +111,7 @@ pep8:
@echo "-----------"
@echo "PEP8 issues"
@echo "-----------"
- @pep8 --repeat --ignore=E203,E121,E122,E123,E124,E125,E126,E127,E128 --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 . || true
+ @pep8 --repeat --ignore=E203,E121,E122,E123,E124,E125,E126,E127,E128 --exclude docs,pydev,third_party,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,function_options_dialog_base.py . || true
# Run entire test suite
test_suite: compile testdata
@@ -148,11 +148,11 @@ gui_test_suite: compile testdata
# commit rights. See issue https://github.com/AIFDR/inasafe/issues/232
testdata:
@echo
- @echo "-----------------------------------------------------------"
+ @echo "------------------------------------------------------------"
@echo "Updating inasafe_data - public test and demo data repository"
- @echo "You should update the hash to check out a specific data version"
- @echo "-----------------------------------------------------------"
- @scripts/update-test-data.sh e550ec0edae9e6cb6bc3653e76a357dd0af559af 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
+ @echo "Update the hash to check out a specific data version "
+ @echo "------------------------------------------------------------"
+ @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:
@@ -245,13 +245,20 @@ pyflakes:
@echo "---------------"
@-export PYTHONPATH=`pwd`:$(PYTHONPATH); pyflakes safe safe_qgis | wc -l
+indent:
+ @echo
+ @echo "---------------"
+ @echo "Check indentation is at 4 spaces (and apply fix)"
+ @echo "---------------"
+ @# sudo apt-get install python2.7-examples for reindent script
+ python /usr/share/doc/python2.7/examples/Tools/scripts/reindent.py *.py
##########################################################
#
# Make targets specific to Jenkins go below this point
#
##########################################################
-jenkins-test: testdata
+jenkins-test: testdata clean
@echo
@echo "----------------------------------"
@echo "Regresssion Test Suite for Jenkins"
@@ -284,7 +291,7 @@ jenkins-pylint:
@echo " with 'F0401' being the warning code."
@echo "----------------------------------"
rm -f pylint.log
- pylint --output-format=parseable --reports=y --rcfile=pylintrc -i y safe safe_qgis > pylint.log || :
+ pylint --output-format=parseable --reports=y --rcfile=pylintrc_jenkins -i y safe safe_qgis > pylint.log || :
jenkins-pep8:
@echo
View
86 README
@@ -1,86 +0,0 @@
-========================================================
-InaSAFE - Indonesian Scenario Assessment for Emergencies
-========================================================
-
-This is the project: InaSAFE a Quantum GIS plugin
-
-For more information about InaSAFE please visit
-`www.inasafe.org <http://www.inasafe.org>`_ and look at the documentation at
-`inasafe.readthedocs.org <http://inasafe.readthedocs.org>`_
-
-The latest source code is available at
-`https://github.com/AIFDR/inasafe <https://github.com/AIFDR/inasafe>`_
-which contains modules for risk calculations, gis functionality and functions
-for impact modelling.
-
-========================
-Quick Installation Guide
-========================
-
-To install the |project_name|, use the plugin manager in QGIS::
-
- Plugins -> Fetch Python Plugins
-
-Then search for '|project_name|', select it and click the install button.
-The plugin will now be added to your plugins menu.
-
-
-System Requirements
--------------------
-
- - A standard PC with at least 4GB of RAM running Windows, Linux or Mac OS X
- - The Open Source Geographic Information System QGIS (http://www.qgis.org).
- InaSAFE requires QGIS version 1.7 or newer.
-
-Limitations
-===========
-
-InaSAFE is a new project. The current code development started in
-earnest in January 2012 and there is still much to be done. However,
-we work on the philosophy that stakeholders should have access to the
-development and source code from the very beginning and invite
-comments, suggestions and contributions. See
-https://github.com/AIFDR/inasafe/issues/milestones and
-https://github.com/AIFDR/inasafe/issues?page=1&state=open for known
-bugs and outstanding tasks.
-
-
-License
-=======
-
-InaSAFE is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3 (GPLv3) as
-published by the Free Software Foundation.
-
-The full GNU General Public License is available in LICENSE.TXT or
-http://www.gnu.org/licenses/gpl.html
-
-
-Disclaimer of Warranty (GPLv3)
-==============================
-
-There is no warranty for the program, to the extent permitted by
-applicable law. Except when otherwise stated in writing the copyright
-holders and/or other parties provide the program "as is" without warranty
-of any kind, either expressed or implied, including, but not limited to,
-the implied warranties of merchantability and fitness for a particular
-purpose. The entire risk as to the quality and performance of the program
-is with you. Should the program prove defective, you assume the cost of
-all necessary servicing, repair or correction.
-
-
-Limitation of Liability (GPLv3)
-===============================
-
-In no event unless required by applicable law or agreed to in writing
-will any copyright holder, or any other party who modifies and/or conveys
-the program as permitted above, be liable to you for damages, including any
-general, special, incidental or consequential damages arising out of the
-use or inability to use the program (including but not limited to loss of
-data or data being rendered inaccurate or losses sustained by you or third
-parties or a failure of the program to operate with any other programs),
-even if such holder or other party has been advised of the possibility of
-such damages.
-
-
-
View
1  README
View
1  README.rst
View
86 README.rst
@@ -0,0 +1,86 @@
+========================================================
+InaSAFE - Indonesian Scenario Assessment for Emergencies
+========================================================
+
+This is the project: InaSAFE a Quantum GIS plugin
+
+For more information about InaSAFE please visit
+`www.inasafe.org <http://www.inasafe.org>`_ and look at the documentation at
+`inasafe.readthedocs.org <http://inasafe.readthedocs.org>`_
+
+The latest source code is available at
+`https://github.com/AIFDR/inasafe <https://github.com/AIFDR/inasafe>`_
+which contains modules for risk calculations, gis functionality and functions
+for impact modelling.
+
+========================
+Quick Installation Guide
+========================
+
+To install the InaSAFE plugin, use the plugin manager in `QGIS <http://qgis.org>`_::
+
+ Plugins -> Fetch Python Plugins
+
+Then search for 'InaSAFE', select it and click the install button.
+The plugin will now be added to your plugins menu.
+
+
+System Requirements
+-------------------
+
+ - A standard PC with at least 4GB of RAM running Windows, Linux or Mac OS X
+ - The QGIS Open Source Geographic Information System (http://www.qgis.org).
+ InaSAFE requires QGIS version 1.7 or newer.
+
+Limitations
+===========
+
+InaSAFE is a new project. The current code development started in
+earnest in January 2012 and there is still much to be done. However,
+we work on the philosophy that stakeholders should have access to the
+development and source code from the very beginning and invite
+comments, suggestions and contributions. See
+`our milestones list <https://github.com/AIFDR/inasafe/issues/milestones>`_ and
+`our open issues list <https://github.com/AIFDR/inasafe/issues?page=1&state=open>`_
+for known bugs and outstanding tasks.
+
+
+License
+=======
+
+InaSAFE is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3 (GPLv3) as
+published by the Free Software Foundation.
+
+The full GNU General Public License is available in LICENSE.txt or
+http://www.gnu.org/licenses/gpl.html
+
+
+Disclaimer of Warranty (GPLv3)
+==============================
+
+There is no warranty for the program, to the extent permitted by
+applicable law. Except when otherwise stated in writing the copyright
+holders and/or other parties provide the program "as is" without warranty
+of any kind, either expressed or implied, including, but not limited to,
+the implied warranties of merchantability and fitness for a particular
+purpose. The entire risk as to the quality and performance of the program
+is with you. Should the program prove defective, you assume the cost of
+all necessary servicing, repair or correction.
+
+
+Limitation of Liability (GPLv3)
+===============================
+
+In no event unless required by applicable law or agreed to in writing
+will any copyright holder, or any other party who modifies and/or conveys
+the program as permitted above, be liable to you for damages, including any
+general, special, incidental or consequential damages arising out of the
+use or inability to use the program (including but not limited to loss of
+data or data being rendered inaccurate or losses sustained by you or third
+parties or a failure of the program to operate with any other programs),
+even if such holder or other party has been advised of the possibility of
+such damages.
+
+
+
View
48 __init__.py
@@ -14,18 +14,33 @@
"""
__author__ = 'tim@linfiniti.com'
-__version__ = '0.6.0'
+__version__ = '1.0.0'
__date__ = '10/01/2011'
__copyright__ = ('Copyright 2012, Australia Indonesia Facility for '
'Disaster Reduction')
import os
+#
+# Note: Don't use function docstrings more than one line - they
+# break the plugins.qgis.org validator when uploading!
+#
+
def name():
"""A user friendly name for the plugin."""
return 'InaSAFE'
+def author():
+ """Author name."""
+ return 'BNPB, AusAID and the World Bank'
+
+
+def email():
+ """Email contact details."""
+ return 'ole.moller.nielsen@gmail.com'
+
+
def description():
"""A one line description for the plugin."""
return ('InaSAFE Disaster Scenario Assessment for Emergencies'
@@ -34,44 +49,25 @@ def description():
def version():
"""Version of the plugin."""
- return 'Version 0.5.0'
+ return 'Version 1.0.1'
def qgisMinimumVersion():
- """Minimum version of QGIS needed to run this plugin
-
- This is currently set to 1.7
- """
+ """Minimum version of QGIS needed to run this plugin."""
return '1.7'
def icon():
- """Icon path for the plugin - metadata.txt it will override this"""
- return os.path.join(os.path.dirname(__file__), 'safe_qgis', 'resources',
- 'img', 'icon.png')
+ """Icon path for the plugin - metadata.txt will override this."""
+ return 'icon.png'
def classFactory(iface):
"""Load Plugin class from file Plugin"""
- # setup the logging
- #import logging
- #logger = logging.getLogger('risiko')
-
- # TODO (TD): Change to read from a log file see
- # http://docs.python.org/howto/logging-cookbook.html#logging-cookbook
- # FIXME (TD): Logger is working at this level but not in the impact
- #functions!!
- #logger.setLevel(logging.DEBUG)
- #ch = logging.FileHandler('risiko.log')
- #fmt_str = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
- #formatter = logging.Formatter(fmt_str)
- #ch.setFormatter(formatter)
- #logger.addHandler(ch)
-
# Try loading the FunctionProvider
- #from impact_functions.core import FunctionProvider
- # FIXME (TD): reload doesn't seem to reload the plugins anything
+ # from impact_functions.core import FunctionProvider
+ # FIXME (TD): reload doesn't seem to reload the plugins
#logger.debug("reload core 3")
from safe_qgis.plugin import Plugin
View
BIN  docs/source/_static/calculation-progress.png
Deleted file not rendered
View
BIN  docs/source/_static/docked-right.png
Deleted file not rendered
View
BIN  docs/source/_static/error-display.png
Deleted file not rendered
View
BIN  docs/source/_static/inasafe-dock-panel.png
Deleted file not rendered
View
BIN  docs/source/_static/inasafe-options-dialog.png
Deleted file not rendered
View
BIN  docs/source/_static/keyword-editor-advanced.jpeg
Deleted file not rendered
View
BIN  docs/source/_static/keyword-editor-simple.jpeg
Deleted file not rendered
View
BIN  docs/source/_static/keywords-for-active-layer.png
Deleted file not rendered
View
BIN  docs/source/_static/plugin-manager.png
Deleted file not rendered
View
BIN  docs/source/_static/scenario-results.png
Deleted file not rendered
View
BIN  docs/source/_static/status-ready.png
Deleted file not rendered
View
6 docs/source/_templates/index.html
@@ -69,19 +69,19 @@
Development (AusAID) and the World Bank.</p>
<div class="figure align-center">
- <img alt="screenshot.jpg" src="_static/screenshot1-small.jpg" />
+ <img alt="screenshot.jpg" src="_images/screenshot1-small.jpg" />
</div>
<p>A completed assement using the QGIS InaSAFE plugin, in this scenario
analysing flood risk in Jakarta, Indonesia. </p>
<div class="figure align-center">
- <img alt="screenshot1.jpg" src="_static/screenshot-small.jpg" />
+ <img alt="screenshot1.jpg" src="_images/screenshot-small.jpg" />
</div>
<p>Padang (Indonesia) earthquake scenario with OSM building footprints likely
to undergo damage shown in red.</p>
<div class="figure align-center">
- <img alt="screenshot2.jpg" src="_static/screenshot2-small.jpg" />
+ <img alt="screenshot2.jpg" src="_images/screenshot2-small.jpg" />
</div>
<p>Maumere (Indonesia) tsunami inundation scenario. Areas shaded in red would
experience the greatest inundation in this scenario.
View
2  docs/source/api-docs/safe.rst
@@ -5,7 +5,9 @@ Package::safe
:maxdepth: 2
safe/api
+ safe/defaults
safe/storage
+ safe/postprocessors
safe/engine
safe/impact_functions
safe/i18n
View
7 docs/source/api-docs/safe/defaults.rst
@@ -0,0 +1,7 @@
+Module: safe.defaults
+======================
+
+.. automodule:: safe.defaults
+ :members:
+
+This module forms part of the `InaSAFE <http://inasafe.org>`_ tool.
View
4 docs/source/api-docs/safe/engine/impact_functions_for_testing.rst
@@ -4,11 +4,15 @@ Package::safe.engine.impact_functions_for_testing
.. toctree::
:maxdepth: 2
+ 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/general_ashload_impact
+ 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/NEXIS_building_impact_model
View
7 docs/source/api-docs/safe/engine/impact_functions_for_testing/earthquake_impact_on_women.rst
@@ -0,0 +1,7 @@
+Module: safe.engine.impact_functions_for_testing.earthquake_impact_on_women
+============================================================================
+
+.. automodule:: safe.engine.impact_functions_for_testing.earthquake_impact_on_women
+ :members:
+
+This module forms part of the `InaSAFE <http://inasafe.org>`_ tool.
View
7 docs/source/api-docs/safe/engine/impact_functions_for_testing/error_raising_functions.rst
@@ -0,0 +1,7 @@
+Module: safe.engine.impact_functions_for_testing.error_raising_functions
+=========================================================================
+
+.. automodule:: safe.engine.impact_functions_for_testing.error_raising_functions
+ :members:
+
+This module forms part of the `InaSAFE <http://inasafe.org>`_ tool.
View
7 ...rce/api-docs/safe/engine/impact_functions_for_testing/itb_fatality_model_configurable.rst
@@ -0,0 +1,7 @@
+Module: safe.engine.impact_functions_for_testing.itb_fatality_model_configurable
+=================================================================================
+
+.. automodule:: safe.engine.impact_functions_for_testing.itb_fatality_model_configurable
+ :members:
+
+This module forms part of the `InaSAFE <http://inasafe.org>`_ tool.
View
7 docs/source/api-docs/safe/engine/impact_functions_for_testing/itb_fatality_model_org.rst
@@ -0,0 +1,7 @@
+Module: safe.engine.impact_functions_for_testing.itb_fatality_model_org
+========================================================================
+
+.. automodule:: safe.engine.impact_functions_for_testing.itb_fatality_model_org
+ :members:
+
+This module forms part of the `InaSAFE <http://inasafe.org>`_ tool.
View
2  docs/source/api-docs/safe/impact_functions/earthquake.rst
@@ -4,7 +4,7 @@ Package::safe.impact_functions.earthquake
.. toctree::
:maxdepth: 2
- earthquake/earthquake_impact_on_women
earthquake/itb_building_impact_model
earthquake/itb_earthquake_fatality_model
+ earthquake/earthquake_building_impact
earthquake/padang_building_impact_model
View
4 ...earthquake/earthquake_impact_on_women.rst → ...earthquake/earthquake_building_impact.rst
@@ -1,7 +1,7 @@
-Module: safe.impact_functions.earthquake.earthquake_impact_on_women
+Module: safe.impact_functions.earthquake.earthquake_building_impact
====================================================================
-.. automodule:: safe.impact_functions.earthquake.earthquake_impact_on_women
+.. automodule:: safe.impact_functions.earthquake.earthquake_building_impact
:members:
This module forms part of the `InaSAFE <http://inasafe.org>`_ tool.
View
13 docs/source/api-docs/safe/impact_functions/experimental.rst
@@ -1,13 +0,0 @@
-Package::safe.impact_functions.experimental
-===========================================
-
-.. toctree::
- :maxdepth: 2
-
- experimental/mappings
- experimental/tsunami_population_impact
- experimental/general_volcanic_population_impact
- experimental/BNPB_flood_building_impact
- experimental/ashload_population_impact
- experimental/tsunami_building_impact
- experimental/flood_population_evacuation_worldbank_request
View
7 docs/source/api-docs/safe/impact_functions/experimental/BNPB_flood_building_impact.rst
@@ -1,7 +0,0 @@
-Module: safe.impact_functions.experimental.BNPB_flood_building_impact
-======================================================================
-