sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

nsis: fix master installer bitmap

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-06-20 23:37:11 +02:00
parent 260d55e541
commit 522f2e4bd3
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ms-windows/Installer-Files/WelcomeFinishPage.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 201 KiB

After

Width:  |  Height:  |  Size: 151 KiB

12
python/plugins/processing/algs/qgis/SetRasterStyle.py
View File

@ -46,7 +46,7 @@ class SetRasterStyle(GeoAlgorithm):
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Set style for raster layer' self.name = 'Set style for raster layer'
self.group = 'Raster general tools' self.group = 'Raster general tools'
self.addParameter(ParameterRaster(self.INPUT, 'Raster layer')) self.addParameter(ParameterRaster(self.INPUT, 'Raster layer'))
self.addParameter(ParameterFile(self.STYLE, self.addParameter(ParameterFile(self.STYLE,
'Style file', False, False, 'qml')) 'Style file', False, False, 'qml'))
self.addOutput(OutputRaster(self.OUTPUT, 'Styled layer', True)) self.addOutput(OutputRaster(self.OUTPUT, 'Styled layer', True))
@ -61,11 +61,11 @@ class SetRasterStyle(GeoAlgorithm):
self.getOutputFromName(self.OUTPUT).open = False self.getOutputFromName(self.OUTPUT).open = False
else: else:
with open(style) as f: with open(style) as f:
xml = "".join(f.readlines()) xml = "".join(f.readlines())
d = QDomDocument(); d = QDomDocument()
d.setContent(xml); d.setContent(xml)
n = d.firstChild(); n = d.firstChild()
layer.readSymbology(n, '') layer.readSymbology(n, '')
self.setOutputValue(self.OUTPUT, filename) self.setOutputValue(self.OUTPUT, filename)
iface.mapCanvas().refresh() iface.mapCanvas().refresh()
iface.legendInterface().refreshLayerSymbology(layer) iface.legendInterface().refreshLayerSymbology(layer)

4
python/plugins/processing/algs/qgis/SetVectorStyle.py
View File

@ -52,7 +52,7 @@ class SetVectorStyle(GeoAlgorithm):
'Style file', False, False, 'qml')) 'Style file', False, False, 'qml'))
self.addOutput(OutputVector(self.OUTPUT, 'Styled layer', True)) self.addOutput(OutputVector(self.OUTPUT, 'Styled layer', True))
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
filename = self.getParameterValue(self.INPUT) filename = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(filename) layer = dataobjects.getObjectFromUri(filename)
@ -62,6 +62,6 @@ class SetVectorStyle(GeoAlgorithm):
dataobjects.load(filename, os.path.basename(filename), style=style) dataobjects.load(filename, os.path.basename(filename), style=style)
self.getOutputFromName(self.OUTPUT).open = False self.getOutputFromName(self.OUTPUT).open = False
else: else:
layer.loadNamedStyle(style) layer.loadNamedStyle(style)
iface.mapCanvas().refresh() iface.mapCanvas().refresh()
iface.legendInterface().refreshLayerSymbology(layer) iface.legendInterface().refreshLayerSymbology(layer)

2
python/plugins/processing/algs/qgis/mmqgisx/MMQGISXAlgorithms.py
View File

@ -1086,7 +1086,7 @@ class mmqgisx_select_algorithm(GeoAlgorithm):
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
filename = self.getParameterValue(self.LAYERNAME) filename = self.getParameterValue(self.LAYERNAME)
layer = dataobjects.getObjectFromUri(filename) layer = dataobjects.getObjectFromUri(filename)
attribute = self.getParameterValue(self.ATTRIBUTE) attribute = self.getParameterValue(self.ATTRIBUTE)
comparison = self.comparisons[self.getParameterValue(self.COMPARISON)] comparison = self.comparisons[self.getParameterValue(self.COMPARISON)]
comparisonvalue = self.getParameterValue(self.COMPARISONVALUE) comparisonvalue = self.getParameterValue(self.COMPARISONVALUE)

2
python/plugins/processing/parameters/ParameterMultipleInput.py
View File

@ -67,7 +67,7 @@ class ParameterMultipleInput(ParameterDataObject):
if self.optional: if self.optional:
return True return True
else: else:
return False return False
self.value = ";".join([self.getAsString(lay) for lay in obj]) self.value = ";".join([self.getAsString(lay) for lay in obj])
return True return True
else: else: