[QGIS Commit] r15135 - in trunk/qgis/python/plugins/GdalTools: .
icons tools
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Feb 7 19:09:24 EST 2011
Author: brushtyler
Date: 2011-02-07 16:09:24 -0800 (Mon, 07 Feb 2011)
New Revision: 15135
Added:
trunk/qgis/python/plugins/GdalTools/icons/tileindex.png
trunk/qgis/python/plugins/GdalTools/tools/doTileIndex.py
trunk/qgis/python/plugins/GdalTools/tools/widgetTileIndex.ui
Modified:
trunk/qgis/python/plugins/GdalTools/GdalTools.py
trunk/qgis/python/plugins/GdalTools/resources.qrc
Log:
Applied the patch attached to #3331 to implement gdaltindex. Thanks alexbruy!
Modified: trunk/qgis/python/plugins/GdalTools/GdalTools.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/GdalTools.py 2011-02-07 22:52:30 UTC (rev 15134)
+++ trunk/qgis/python/plugins/GdalTools/GdalTools.py 2011-02-08 00:09:24 UTC (rev 15135)
@@ -196,6 +196,11 @@
QObject.connect( self.rgb, SIGNAL( "triggered()" ), self.doRGB )
self.menu.addAction(self.rgb)
+ self.tileindex = QAction( QIcon( ":icons/tileindex.png" ), QCoreApplication.translate( "GdalTools", "Tile index" ), self.iface.mainWindow() )
+ self.rgb.setStatusTip( QCoreApplication.translate( "GdalTools", "Build a shapefile as a raster tileindex" ) )
+ QObject.connect( self.tileindex, SIGNAL( "triggered()" ), self.doTileIndex )
+ self.menu.addAction(self.tileindex)
+
self.settings = QAction( QCoreApplication.translate( "GdalTools", "GdalTools settings" ), self.iface.mainWindow() )
self.settings.setStatusTip( QCoreApplication.translate( "GdalTools", "Various settings for Gdal Tools" ) )
QObject.connect( self.settings, SIGNAL( "triggered()" ), self.doSettings )
@@ -300,6 +305,11 @@
d = PctRgb( self.iface )
d.show_()
+ def doTileIndex( self ):
+ from tools.doTileIndex import GdalToolsDialog as TileIndex
+ d = TileIndex( self.iface )
+ d.show_()
+
def doSettings( self ):
from tools.doSettings import GdalToolsSettingsDialog as Settings
d = Settings( self.iface )
Added: trunk/qgis/python/plugins/GdalTools/icons/tileindex.png
===================================================================
(Binary files differ)
Property changes on: trunk/qgis/python/plugins/GdalTools/icons/tileindex.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/qgis/python/plugins/GdalTools/resources.qrc
===================================================================
--- trunk/qgis/python/plugins/GdalTools/resources.qrc 2011-02-07 22:52:30 UTC (rev 15134)
+++ trunk/qgis/python/plugins/GdalTools/resources.qrc 2011-02-08 00:09:24 UTC (rev 15135)
@@ -17,6 +17,7 @@
<file>icons/raster-clip.png</file>
<file>icons/raster-paletted.png</file>
<file>icons/raster-rgb.png</file>
+ <file>icons/tileindex.png</file>
<file>icons/about.png</file>
</qresource>
</RCC>
Added: trunk/qgis/python/plugins/GdalTools/tools/doTileIndex.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doTileIndex.py (rev 0)
+++ trunk/qgis/python/plugins/GdalTools/tools/doTileIndex.py 2011-02-08 00:09:24 UTC (rev 15135)
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from qgis.core import *
+from qgis.gui import *
+
+from ui_widgetTileIndex import Ui_GdalToolsWidget as Ui_Widget
+from widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
+import GdalTools_utils as Utils
+
+import os.path
+
+class GdalToolsDialog( QWidget, Ui_Widget, BasePluginWidget ):
+
+ def __init__( self, iface ):
+ QWidget.__init__( self )
+ self.iface = iface
+
+ self.setupUi( self )
+ BasePluginWidget.__init__( self, self.iface, "gdaltindex" )
+
+ self.setParamsStatus(
+ [
+ ( self.inputDirEdit, SIGNAL( "textChanged( const QString & )" ) ),
+ #( self.recurseCheck, SIGNAL( "stateChanged( int )" ),
+ ( self.outputFileEdit, SIGNAL( "textChanged( const QString & )" ) ),
+ ( self.indexFieldEdit, SIGNAL( "textChanged( const QString & )" ), self.indexFieldCheck),
+ ( self.absolutePathCheck, SIGNAL( "stateChanged( int )" ) ),
+ ( self.skipDifferentProjCheck, SIGNAL( "stateChanged( int )" ) )
+ ]
+ )
+
+ self.connect( self.selectInputDirButton, SIGNAL( "clicked()" ), self.fillInputDirEdit )
+ self.connect( self.selectOutputFileButton, SIGNAL( "clicked()" ), self.fillOutputFileEdit )
+
+ def fillInputDirEdit( self ):
+ inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with raster files" ))
+ if inputDir.isEmpty():
+ return
+
+ self.inputDirEdit.setText( inputDir )
+
+ def fillOutputFileEdit( self ):
+ lastUsedFilter = Utils.FileFilter.lastUsedVectorFilter()
+ outputFile, encoding = Utils.FileDialog.getSaveFileName( self, self.tr( "Select where to save the TileIndex output" ), Utils.FileFilter.allVectorsFilter(), lastUsedFilter, True )
+ if outputFile.isEmpty():
+ return
+ Utils.FileFilter.setLastUsedVectorFilter(lastUsedFilter)
+
+ self.outputFormat = Utils.fillVectorOutputFormat( lastUsedFilter, outputFile )
+ self.outputFileEdit.setText( outputFile )
+ self.lastEncoding = encoding
+
+ def getArguments( self ):
+ arguments = QStringList()
+ if self.indexFieldCheck.isChecked() and not self.indexFieldEdit.text().isEmpty():
+ arguments << "-tileindex"
+ arguments << self.indexFieldEdit.text()
+ if self.absolutePathCheck.isChecked():
+ arguments << "-write_absolute_path"
+ if self.skipDifferentProjCheck.isChecked():
+ arguments << "-skip_different_projection"
+ arguments << self.outputFileEdit.text()
+ arguments << Utils.getRasterFiles( self.inputDirEdit.text(), self.recurseCheck.isChecked() )
+ return arguments
+
+ def getOutputFileName( self ):
+ return self.outputFileEdit.text()
+
+ def addLayerIntoCanvas( self, fileInfo ):
+ vl = self.iface.addVectorLayer( fileInfo.filePath(), fileInfo.baseName(), "ogr" )
+ if vl.isValid():
+ if hasattr( self, 'lastEncoding' ):
+ vl.setProviderEncoding( self.lastEncoding )
Added: trunk/qgis/python/plugins/GdalTools/tools/widgetTileIndex.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetTileIndex.ui (rev 0)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetTileIndex.ui 2011-02-08 00:09:24 UTC (rev 15135)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GdalToolsWidget</class>
+ <widget class="QWidget" name="GdalToolsWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>188</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Raster tile index</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Input directory</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="inputDirEdit"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="selectInputDirButton">
+ <property name="text">
+ <string>Select...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="recurseCheck">
+ <property name="text">
+ <string>Recurse subdirectories</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Output shapefile</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLineEdit" name="outputFileEdit"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="selectOutputFileButton">
+ <property name="text">
+ <string>Select...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="indexFieldCheck">
+ <property name="text">
+ <string>Tile index field</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="indexFieldEdit">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>location</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="absolutePathCheck">
+ <property name="text">
+ <string>Write absolute path</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="skipDifferentProjCheck">
+ <property name="text">
+ <string>Skip files with different projection ref</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
More information about the QGIS-commit
mailing list