From 693a1fe8606cbca2d01fdf5660702f488c11343d Mon Sep 17 00:00:00 2001 From: Giuseppe Sucameli Date: Mon, 20 May 2013 00:52:42 +0200 Subject: [PATCH] gdaltools: move clipper dialog on top when the user ends to define a new extent (fix #7783) --- python/plugins/GdalTools/tools/doClipper.py | 7 ++++++- python/plugins/GdalTools/tools/extentSelector.py | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python/plugins/GdalTools/tools/doClipper.py b/python/plugins/GdalTools/tools/doClipper.py index aeb0e4edf1cb..7f33b354fbf8 100644 --- a/python/plugins/GdalTools/tools/doClipper.py +++ b/python/plugins/GdalTools/tools/doClipper.py @@ -61,7 +61,7 @@ def __init__(self, iface): self.connect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputFileEdit) self.connect(self.outSelector, SIGNAL("selectClicked()"), self.fillOutputFileEdit) self.connect(self.maskSelector, SIGNAL("selectClicked()"), self.fillMaskFileEdit) - self.connect(self.extentSelector, SIGNAL("newExtentDefined()"), self.checkRun) + self.connect(self.extentSelector, SIGNAL("newExtentDefined()"), self.extentChanged) self.connect(self.extentSelector, SIGNAL("selectionStarted()"), self.checkRun) self.connect(self.extentModeRadio, SIGNAL("toggled(bool)"), self.switchClippingMode) @@ -91,6 +91,11 @@ def checkRun(self): enabler = not self.maskSelector.filename().isEmpty() self.base.enableRun( enabler ) + def extentChanged(self): + self.activateWindow() + self.raise_() + self.checkRun() + def onLayersChanged(self): self.inSelector.setLayers( Utils.LayerRegistry.instance().getRasterLayers() ) self.maskSelector.setLayers( filter( lambda x: x.geometryType() == QGis.Polygon, Utils.LayerRegistry.instance().getVectorLayers() ) ) diff --git a/python/plugins/GdalTools/tools/extentSelector.py b/python/plugins/GdalTools/tools/extentSelector.py index 316d28bc7cdc..1f90e6bac81c 100644 --- a/python/plugins/GdalTools/tools/extentSelector.py +++ b/python/plugins/GdalTools/tools/extentSelector.py @@ -150,8 +150,9 @@ def canvasPressEvent(self, e): def canvasReleaseEvent(self, e): self.isEmittingPoint = False - if self.rectangle() != None: - self.emit( SIGNAL("rectangleCreated()") ) + #if self.rectangle() != None: + # self.emit( SIGNAL("rectangleCreated()") ) + self.emit( SIGNAL("rectangleCreated()") ) def canvasMoveEvent(self, e): if not self.isEmittingPoint: