python/plugins/GdalTools/tools/doBuildVRT.py

@@ -21,6 +21,7 @@ def __init__(self, iface):
       self.inSelector.setType( self.inSelector.FILE )
       self.outSelector.setType( self.outSelector.FILE )
       self.recurseCheck.hide()
+      self.visibleRasterLayers = QStringList()
 
       self.setParamsStatus(
         [
@@ -31,13 +32,38 @@ def __init__(self, iface):
           (self.inputDirCheck, SIGNAL("stateChanged(int)")),
           (self.separateCheck, SIGNAL("stateChanged(int)"), None, "1.7.0"),
           (self.allowProjDiffCheck, SIGNAL("stateChanged(int)"), None, "1.7.0"),
-          (self.recurseCheck, SIGNAL("stateChanged(int)"), self.inputDirCheck)
+          (self.recurseCheck, SIGNAL("stateChanged(int)"), self.inputDirCheck),
+          (self.inputSelLayersCheck, SIGNAL("stateChanged(int)"))
         ]
       )
 
       self.connect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputFilesEdit)
       self.connect(self.outSelector, SIGNAL("selectClicked()"), self.fillOutputFileEdit)
       self.connect( self.inputDirCheck, SIGNAL( "stateChanged( int )" ), self.switchToolMode )
+      self.connect( self.inputSelLayersCheck, SIGNAL( "stateChanged( int )" ), self.switchLayerMode )
+      self.connect( self.iface.mapCanvas(), SIGNAL( "stateChanged( int )" ), self.switchLayerMode )
+
+
+  def initialize(self):
+      # connect to mapCanvas.layerChanged() signal
+      self.connect(self.iface.mapCanvas(), SIGNAL("layersChanged()"), self.onVisibleLayersChanged)
+      BasePluginWidget.initialize(self)
+
+  def onClosing(self):
+      # disconnect from mapCanvas.layerChanged() signal
+      self.disconnect(self.iface.mapCanvas(), SIGNAL("layersChanged()"), self.onVisibleLayersChanged)
+      BasePluginWidget.onClosing(self)
+
+
+  def onVisibleLayersChanged(self):
+      # refresh list of visible raster layers
+      self.visibleRasterLayers = QStringList()
+      for layer in self.iface.mapCanvas().layers():
+        if Utils.LayerRegistry.isRaster( layer ):
+          self.visibleRasterLayers << layer.source()
+
+      # refresh the text in the command viewer
+      self.someValueChanged()
 
   def switchToolMode(self):
       self.recurseCheck.setVisible( self.inputDirCheck.isChecked() )
@@ -55,6 +81,12 @@ def switchToolMode(self):
         QObject.connect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputFilesEdit)
         QObject.disconnect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputDir)
 
+  def switchLayerMode(self):
+      enableInputFiles = not self.inputSelLayersCheck.isChecked()
+      self.inputDirCheck.setEnabled( enableInputFiles )
+      self.inSelector.setEnabled( enableInputFiles )
+      self.recurseCheck.setEnabled( enableInputFiles )
+
   def fillInputFilesEdit(self):
       lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
       files = Utils.FileDialog.getOpenFileNames(self, self.tr( "Select the files for VRT" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
@@ -88,7 +120,9 @@ def getArguments(self):
       if self.allowProjDiffCheck.isChecked():
         arguments << "-allow_projection_difference"
       arguments << self.getOutputFileName()
-      if self.inputDirCheck.isChecked():
+      if self.inputSelLayersCheck.isChecked():
+        arguments << self.visibleRasterLayers
+      elif self.inputDirCheck.isChecked():
         arguments << Utils.getRasterFiles( self.getInputFileName(), self.recurseCheck.isChecked() )
       else:
         arguments << self.getInputFileName()

python/plugins/GdalTools/tools/widgetBuildVRT.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>348</width>
-    <height>238</height>
+    <height>266</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,13 +26,20 @@
       <enum>QLayout::SetNoConstraint</enum>
      </property>
      <item row="0" column="0" colspan="2">
+      <widget class="QCheckBox" name="inputSelLayersCheck">
+       <property name="text">
+        <string>Use visible raster layers for input</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" colspan="2">
       <widget class="QCheckBox" name="inputDirCheck">
        <property name="text">
         <string>Choose input directory instead of files</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>&amp;Input files</string>
@@ -42,14 +49,14 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QCheckBox" name="recurseCheck">
        <property name="text">
         <string>Recurse subdirectories</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>&amp;Output file</string>
@@ -59,14 +66,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QCheckBox" name="resolutionCheck">
        <property name="text">
         <string>&amp;Resolution</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="QComboBox" name="resolutionComboBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -94,14 +101,14 @@
        </item>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QCheckBox" name="srcNoDataCheck">
        <property name="text">
         <string>&amp;Source No Data</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="6" column="1">
       <widget class="QSpinBox" name="srcNoDataSpin">
        <property name="minimum">
         <number>-100000</number>
@@ -111,20 +118,20 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <widget class="QCheckBox" name="separateCheck">
        <property name="text">
         <string>Se&amp;parate</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="2" column="1">
       <widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="GdalToolsInOutSelector" name="outSelector" native="true"/>
      </item>
-     <item row="7" column="0" colspan="2">
+     <item row="8" column="0" colspan="2">
       <widget class="QCheckBox" name="allowProjDiffCheck">
        <property name="text">
         <string>Allow projection difference</string>

python/plugins/GdalTools/tools/widgetPluginBase.py

@@ -30,20 +30,19 @@ def someValueChanged(self):
   def onLayersChanged(self):
       pass
 
-  def exec_(self):
+  def initialize(self):
       if not self.initialized:
         self.connect(Utils.LayerRegistry.instance(), SIGNAL("layersChanged"), self.onLayersChanged)
         self.onLayersChanged()
         self.someValueChanged()
       self.initialized = True
+
+  def exec_(self):
+      self.initialize()
       return self.base.exec_()
 
   def show_(self):
-      if not self.initialized:
-        self.connect(Utils.LayerRegistry.instance(), SIGNAL("layersChanged"), self.onLayersChanged)
-        self.onLayersChanged()
-        self.someValueChanged()
-      self.initialized = True
+      self.initialize()
       return self.base.show()
 
   def setCommandViewerEnabled(self, enable):