Skip to content
Permalink
Browse files

Merge SIP v2 update

  • Loading branch information
NathanW2 committed Jun 8, 2013
2 parents 02c29c0 + a939ab1 commit 22133d83d8d0af983f6bfffdfdc279e3ffe89197
Showing with 1,205 additions and 1,390 deletions.
  1. +15 −15 python/console/console.py
  2. +37 −44 python/console/console_editor.py
  3. +6 −6 python/console/console_output.py
  4. +23 −23 python/console/console_sci.py
  5. +33 −33 python/console/console_settings.py
  6. +3 −3 python/console/console_settings.ui
  7. +5 −5 python/core/conversions.sip
  8. +1 −0 python/core/raster/qgsrasterlayer.sip
  9. +2 −2 python/plugins/GdalTools/GdalTools.py
  10. +181 −180 python/plugins/GdalTools/tools/GdalTools_utils.py
  11. +19 −17 python/plugins/GdalTools/tools/dialogBase.py
  12. +1 −1 python/plugins/GdalTools/tools/dialogSRS.py
  13. +18 −18 python/plugins/GdalTools/tools/doBuildVRT.py
  14. +30 −30 python/plugins/GdalTools/tools/doClipper.py
  15. +1 −1 python/plugins/GdalTools/tools/doContour.py
  16. +1 −1 python/plugins/GdalTools/tools/doGrid.py
  17. +13 −11 python/plugins/GdalTools/tools/doInfo.py
  18. +34 −30 python/plugins/GdalTools/tools/doOverview.py
  19. +2 −2 python/plugins/GdalTools/tools/doProjection.py
  20. +1 −1 python/plugins/GdalTools/tools/doTranslate.py
  21. +18 −17 python/plugins/GdalTools/tools/inOutSelector.py
  22. +14 −14 python/plugins/GdalTools/tools/widgetBatchBase.py
  23. +9 −176 python/plugins/GdalTools/tools/widgetOverview.ui
  24. +6 −4 python/plugins/GdalTools/tools/widgetPluginBase.py
  25. +9 −9 python/plugins/db_manager/completer.py
  26. +6 −6 python/plugins/db_manager/db_manager.py
  27. +24 −21 python/plugins/db_manager/db_model.py
  28. +1 −1 python/plugins/db_manager/db_plugins/connector.py
  29. +35 −35 python/plugins/db_manager/db_plugins/data_model.py
  30. +1 −1 python/plugins/db_manager/db_plugins/html_elems.py
  31. +3 −3 python/plugins/db_manager/db_plugins/plugin.py
  32. +2 −2 python/plugins/db_manager/db_plugins/postgis/data_model.py
  33. +13 −13 python/plugins/db_manager/db_plugins/postgis/plugin.py
  34. +3 −3 python/plugins/db_manager/db_plugins/spatialite/plugin.py
  35. +8 −8 python/plugins/db_manager/dlg_create_table.py
  36. +9 −7 python/plugins/db_manager/dlg_export_vector.py
  37. +6 −1 python/plugins/db_manager/dlg_field_properties.py
  38. +11 −9 python/plugins/db_manager/dlg_import_vector.py
  39. +14 −17 python/plugins/db_manager/dlg_sql_window.py
  40. +4 −4 python/plugins/db_manager/highlighter.py
  41. +4 −4 python/plugins/db_manager/layer_preview.py
  42. +7 −3 python/plugins/db_manager/ui/DlgSqlWindow.ui
  43. +3 −3 python/plugins/fTools/fTools.py
  44. +17 −10 python/plugins/fTools/tools/doDefineProj.py
  45. +10 −10 python/plugins/fTools/tools/doEliminate.py
  46. +40 −40 python/plugins/fTools/tools/doGeometry.py
  47. +25 −26 python/plugins/fTools/tools/doGeoprocessing.py
  48. +4 −4 python/plugins/fTools/tools/doIntersectLines.py
  49. +13 −13 python/plugins/fTools/tools/doMeanCoords.py
  50. +8 −9 python/plugins/fTools/tools/doMergeShapes.py
  51. +6 −6 python/plugins/fTools/tools/doPointDistance.py
  52. +4 −4 python/plugins/fTools/tools/doPointsInPolygon.py
  53. +4 −4 python/plugins/fTools/tools/doRandPoints.py
  54. +3 −3 python/plugins/fTools/tools/doRegPoints.py
  55. +10 −13 python/plugins/fTools/tools/doSimplify.py
  56. +2 −2 python/plugins/fTools/tools/doSpatialIndex.py
  57. +13 −15 python/plugins/fTools/tools/doSpatialJoin.py
  58. +1 −3 python/plugins/fTools/tools/doSubsetSelect.py
  59. +3 −4 python/plugins/fTools/tools/doSumLines.py
  60. +10 −11 python/plugins/fTools/tools/doValidate.py
  61. +11 −11 python/plugins/fTools/tools/doVectorGrid.py
  62. +8 −8 python/plugins/fTools/tools/doVectorSplit.py
  63. +6 −8 python/plugins/fTools/tools/doVisual.py
  64. +25 −25 python/plugins/fTools/tools/ftools_utils.py
  65. +12 −12 python/plugins/mapserver_export/mapserverexport.py
  66. +2 −3 python/plugins/mapserver_export/ms_export.py
  67. +5 −5 python/plugins/sextante/admintools/ImportIntoPostGIS.py
  68. +5 −5 python/plugins/sextante/admintools/PostGISExecuteSQL.py
  69. +1 −1 python/plugins/sextante/algs/AddTableField.py
  70. +1 −1 python/plugins/sextante/algs/AutoincrementalField.py
  71. +2 −2 python/plugins/sextante/algs/EquivalentNumField.py
  72. +2 −10 python/plugins/sextante/algs/FieldPyculator.py
  73. +2 −2 python/plugins/sextante/algs/FieldsCalculator.py
  74. +2 −2 python/plugins/sextante/algs/JoinAttributes.py
  75. +2 −2 python/plugins/sextante/algs/PointsLayerFromTable.py
  76. +1 −1 python/plugins/sextante/algs/Polygonize.py
  77. +3 −3 python/plugins/sextante/algs/StatisticsByCategories.py
  78. +1 −1 python/plugins/sextante/algs/ftools/BasicStatisticsNumbers.py
  79. +1 −1 python/plugins/sextante/algs/ftools/BasicStatisticsStrings.py
  80. +2 −2 python/plugins/sextante/algs/ftools/Buffer.py
  81. +3 −11 python/plugins/sextante/algs/ftools/ConvexHull.py
  82. +1 −1 python/plugins/sextante/algs/ftools/Dissolve.py
  83. +3 −4 python/plugins/sextante/algs/ftools/ExportGeometryInfo.py
  84. +2 −22 python/plugins/sextante/algs/ftools/ExtentFromLayer.py
  85. +0 −17 python/plugins/sextante/algs/ftools/FToolsUtils.py
  86. +3 −3 python/plugins/sextante/algs/ftools/MeanCoords.py
  87. +4 −4 python/plugins/sextante/algs/ftools/PointDistance.py
  88. +2 −2 python/plugins/sextante/algs/ftools/PointsInPolygon.py
  89. +3 −3 python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py
  90. +7 −5 python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py
  91. +1 −1 python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py
  92. +1 −1 python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py
  93. +4 −4 python/plugins/sextante/algs/ftools/SumLines.py
  94. +2 −2 python/plugins/sextante/algs/ftools/UniqueValues.py
  95. +16 −16 python/plugins/sextante/algs/mmqgisx/MMQGISXAlgorithms.py
  96. +2 −2 python/plugins/sextante/core/LayerExporter.py
  97. +3 −3 python/plugins/sextante/core/QGisLayers.py
  98. +2 −6 python/plugins/sextante/core/SextanteTableWriter.py
  99. +1 −1 python/plugins/sextante/core/SextanteVectorWriter.py
  100. +3 −3 python/plugins/sextante/gdal/GdalUtils.py
  101. +2 −2 python/plugins/sextante/gui/AlgorithmExecutor.py
  102. +1 −1 python/plugins/sextante/gui/BatchInputSelectionPanel.py
  103. +2 −2 python/plugins/sextante/gui/BatchOutputSelectionPanel.py
  104. +1 −1 python/plugins/sextante/gui/ConfigDialog.py
  105. +1 −1 python/plugins/sextante/gui/CouldNotLoadResultsDialog.py
  106. +5 −5 python/plugins/sextante/gui/FileSelectionPanel.py
  107. +1 −1 python/plugins/sextante/gui/FixedTableDialog.py
  108. +1 −1 python/plugins/sextante/gui/InputLayerSelectorPanel.py
  109. +1 −1 python/plugins/sextante/gui/MissingDependencyDialog.py
  110. +4 −4 python/plugins/sextante/gui/OutputSelectionPanel.py
  111. +3 −3 python/plugins/sextante/gui/RenderingStyleFilePanel.py
  112. +3 −4 python/plugins/sextante/gui/SextanteToolbox.py
  113. +2 −2 python/plugins/sextante/gui/TestTools.py
  114. +1 −1 python/plugins/sextante/gui/UnthreadedAlgorithmExecutor.py
  115. +1 −1 python/plugins/sextante/modeler/ModelerDialog.py
  116. +1 −1 python/plugins/sextante/modeler/ModelerParametersDialog.py
  117. +1 −1 python/plugins/sextante/outputs/OutputTable.py
  118. +1 −1 python/plugins/sextante/outputs/OutputVector.py
  119. +4 −4 python/plugins/sextante/script/scripts/Number_of_unique_values_in_classes.py
  120. +1 −1 python/plugins/sextante/script/scripts/Split_vector_layer_by_attribute.py
  121. +2 −2 python/plugins/sextante/script/scripts/Summarize.py
  122. +2 −2 python/plugins/sextante/taudem/TauDEMAlgorithm.py
  123. +2 −2 python/plugins/sextante/taudem/TauDEMUtils.py
  124. +2 −2 python/plugins/sextante/taudem/dinfdistdown.py
  125. +2 −2 python/plugins/sextante/taudem/dinfdistup.py
  126. +2 −2 python/plugins/sextante/taudem/dinftranslimaccum.py
  127. +2 −2 python/plugins/sextante/taudem/dinftranslimaccum2.py
  128. +2 −2 python/plugins/sextante/taudem/dropanalysis.py
  129. +2 −2 python/plugins/sextante/taudem/gridnet.py
  130. +2 −2 python/plugins/sextante/taudem/lengtharea.py
  131. +2 −2 python/plugins/sextante/taudem/peukerdouglas.py
  132. +2 −2 python/plugins/sextante/taudem/slopearea.py
  133. +3 −2 python/plugins/sextante/tools/vector.py
  134. +16 −18 python/pyplugin_installer/installer.py
  135. +112 −105 python/pyplugin_installer/installer_data.py
  136. +14 −14 python/pyplugin_installer/installer_gui.py
  137. +8 −8 python/utils.py
  138. +2 −2 src/app/qgisapp.cpp
  139. +8 −1 src/core/raster/qgsrasterlayer.cpp
  140. +1 −0 src/core/raster/qgsrasterlayer.h
  141. +14 −1 src/python/qgspythonutilsimpl.cpp
@@ -248,7 +248,7 @@ def __init__(self, parent=None):
self.objectListButton = QAction(self)
self.objectListButton.setCheckable(True)
self.objectListButton.setEnabled(self.settings.value("pythonConsole/enableObjectInsp",
False).toBool())
False, type=bool))
self.objectListButton.setIcon(QgsApplication.getThemeIcon("console/iconClassBrowserConsole.png"))
self.objectListButton.setMenuRole(QAction.PreferencesRole)
self.objectListButton.setIconVisibleInMenu(True)
@@ -553,7 +553,7 @@ def _findPrev(self):
self.tabEditorWidget.currentWidget().newEditor.findText(False)

def _textFindChanged(self):
if not self.lineEditFind.text().isEmpty():
if self.lineEditFind.text():
self.findNextButton.setEnabled(True)
self.findPrevButton.setEnabled(True)
else:
@@ -615,11 +615,11 @@ def uncommentCode(self):
self.tabEditorWidget.currentWidget().newEditor.commentEditorCode(False)

def openScriptFile(self):
lastDirPath = self.settings.value("pythonConsole/lastDirPath").toString()
lastDirPath = self.settings.value("pythonConsole/lastDirPath")
openFileTr = QCoreApplication.translate("PythonConsole", "Open File")
fileList = QFileDialog.getOpenFileNames(
self, openFileTr, lastDirPath, "Script file (*.py)")
if not fileList.isEmpty():
if fileList:
for pyFile in fileList:
for i in range(self.tabEditorWidget.count()):
tabWidget = self.tabEditorWidget.widget(i)
@@ -631,7 +631,7 @@ def openScriptFile(self):
self.tabEditorWidget.newTabEditor(tabName, pyFile)

lastDirPath = QFileInfo(pyFile).path()
self.settings.setValue("pythonConsole/lastDirPath", QVariant(pyFile))
self.settings.setValue("pythonConsole/lastDirPath", pyFile)
self.updateTabListScript(pyFile, action='append')

def saveScriptFile(self):
@@ -641,8 +641,8 @@ def saveScriptFile(self):
except (IOError, OSError), error:
errTr = QCoreApplication.translate("PythonConsole", "Save Error")
msgText = QCoreApplication.translate('PythonConsole',
'The file <b>%1</b> could not be saved. Error: %2') \
.arg(unicode(tabWidget.path)).arg(error.strerror)
'The file <b>{}</b> could not be saved. Error: {}'.format(unicode(tabWidget.path),
error.strerror))
self.callWidgetMessageBarEditor(msgText, 2, False)

def saveAsScriptFile(self, index=None):
@@ -662,14 +662,14 @@ def saveAsScriptFile(self, index=None):
filename = QFileDialog.getSaveFileName(self,
saveAsFileTr,
pathFileName, "Script file (*.py)")
if not filename.isEmpty():
if filename:
try:
tabWidget.save(filename)
except (IOError, OSError), error:
errTr = QCoreApplication.translate("PythonConsole", "Save Error")
msgText = QCoreApplication.translate('PythonConsole',
'The file <b>%1</b> could not be saved. Error: %2') \
.arg(unicode(tabWidget.path)).arg(error.strerror)
'The file <b>{}</b> could not be saved. Error: {}'.format(unicode(tabWidget.path),
error.strerror))
self.callWidgetMessageBarEditor(msgText, 2, False)
if fileNone:
tabWidget.path = None
@@ -706,7 +706,7 @@ def updateTabListScript(self, script, action=None):
else:
self.tabListScript = []
self.settings.setValue("pythonConsole/tabScripts",
QVariant(self.tabListScript))
self.tabListScript)

def saveSettingsConsole(self):
self.settings.setValue("pythonConsole/splitterConsole", self.splitter.saveState())
@@ -717,10 +717,10 @@ def saveSettingsConsole(self):

def restoreSettingsConsole(self):
storedTabScripts = self.settings.value("pythonConsole/tabScripts")
self.tabListScript = storedTabScripts.toList()
self.splitter.restoreState(self.settings.value("pythonConsole/splitterConsole").toByteArray())
self.splitterEditor.restoreState(self.settings.value("pythonConsole/splitterEditor").toByteArray())
self.splitterObj.restoreState(self.settings.value("pythonConsole/splitterObj").toByteArray())
self.tabListScript = storedTabScripts
self.splitter.restoreState(self.settings.value("pythonConsole/splitterConsole", QByteArray()))
self.splitterEditor.restoreState(self.settings.value("pythonConsole/splitterEditor", QByteArray()))
self.splitterObj.restoreState(self.settings.value("pythonConsole/splitterObj", QByteArray()))

if __name__ == '__main__':
a = QApplication(sys.argv)

0 comments on commit 22133d8

Please sign in to comment.
You can’t perform that action at this time.