Skip to content

Commit e65fff8

Browse files
volayavolaya
committed
Harcoded example folder for models and scripts
fixed bugs in mmqgis library.
1 parent 78d5ff5 commit e65fff8

File tree

6 files changed

+91
-85
lines changed

6 files changed

+91
-85
lines changed

‎python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py

+19-28
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def processAlgorithm(self, progress):
117117
else:
118118
line_terminator = "\r\n"
119119

120-
message = mmqgisx_attribute_export(qgis, outfilename, layername, None,
120+
message = mmqgisx_attribute_export(qgis, outfilename, layer, None,
121121
field_delimiter, line_terminator)
122122

123123
if message:
@@ -200,7 +200,7 @@ def processAlgorithm(self, progress):
200200
column = self.getParameterValue(self.COLUMN)
201201
savename = self.getOutputValue(self.SAVENAME)
202202

203-
message = mmqgisx_delete_columns(qgis, layername, [ column ], savename, False)
203+
message = mmqgisx_delete_columns(qgis, layer, [ column ], savename, False)
204204

205205
if message:
206206
raise GeoAlgorithmExecutionException(message)
@@ -231,7 +231,7 @@ def processAlgorithm(self, progress):
231231

232232
savename = self.getOutputValue(self.SAVENAME)
233233

234-
message = mmqgisx_delete_duplicate_geometries(qgis, layername, savename, False)
234+
message = mmqgisx_delete_duplicate_geometries(qgis, layer, savename, False)
235235

236236
if message:
237237
raise GeoAlgorithmExecutionException(message)
@@ -332,7 +332,7 @@ def processAlgorithm(self, progress):
332332
else:
333333
newtype = QGis.WKBPoint
334334

335-
message = mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, False)
335+
message = mmqgisx_geometry_convert(qgis, layer, newtype, splitnodes, savename, False)
336336

337337
if message:
338338
raise GeoAlgorithmExecutionException(message)
@@ -525,7 +525,7 @@ def processAlgorithm(self, progress):
525525
vspacing = self.getParameterValue(self.VSPACING)
526526
savename = self.getOutputValue(self.SAVENAME)
527527

528-
message = mmqgisx_gridify_layer(qgis, layername, hspacing, vspacing, savename, False)
528+
message = mmqgisx_gridify_layer(qgis, layer, hspacing, vspacing, savename, False)
529529

530530
if message:
531531
raise GeoAlgorithmExecutionException(message)
@@ -562,18 +562,15 @@ def processAlgorithm(self, progress):
562562
from sextante.core.Sextante import Sextante
563563
qgis = Sextante.getInterface()
564564

565-
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.SOURCENAME))
566-
sourcename = layer.name()
567-
568-
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.DESTNAME))
569-
destname = layer.name()
565+
layersource = QGisLayers.getObjectFromUri(self.getParameterValue(self.SOURCENAME))
566+
layerdest = QGisLayers.getObjectFromUri(self.getParameterValue(self.DESTNAME))
570567

571568
nameattribute = self.getParameterValue(self.NAMEATTRIBUTE)
572569
units = self.unitlist[self.getParameterValue(self.UNITS)]
573570
addlines = self.getParameterValue(self.SHAPETYPE)
574571
savename = self.getOutputValue(self.SAVENAME)
575572

576-
message = mmqgisx_hub_distance(qgis, sourcename, destname, nameattribute, units, addlines, savename, False)
573+
message = mmqgisx_hub_distance(qgis, layersource, layerdest, nameattribute, units, addlines, savename, False)
577574

578575
if message:
579576
raise GeoAlgorithmExecutionException(message)
@@ -604,18 +601,15 @@ def processAlgorithm(self, progress):
604601
from sextante.core.Sextante import Sextante
605602
qgis = Sextante.getInterface()
606603

607-
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.HUBNAME))
608-
hubname = layer.name()
609-
610-
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.SPOKENAME))
611-
spokename = layer.name()
612-
604+
hublayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.HUBNAME))
605+
spokelayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.SPOKENAME))
606+
613607
hubattribute = self.getParameterValue(self.HUBATTRIBUTE)
614608
spokeattribute = self.getParameterValue(self.SPOKEATTRIBUTE)
615609

616610
savename = self.getOutputValue(self.SAVENAME)
617611

618-
message = mmqgisx_hub_lines(qgis, hubname, hubattribute, spokename, spokeattribute, savename, False)
612+
message = mmqgisx_hub_lines(qgis, hublayer, hubattribute, spokelayer, spokeattribute, savename, False)
619613

620614
if message:
621615
raise GeoAlgorithmExecutionException(message)
@@ -649,7 +643,7 @@ def processAlgorithm(self, progress):
649643

650644
savename = self.getOutputValue(self.SAVENAME)
651645

652-
message = mmqgisx_label_point(qgis, layername, labelattribute, savename, False)
646+
message = mmqgisx_label_point(qgis, layer, labelattribute, savename, False)
653647

654648
if message:
655649
raise GeoAlgorithmExecutionException(message)
@@ -676,11 +670,8 @@ def processAlgorithm(self, progress):
676670
from sextante.core.Sextante import Sextante
677671
qgis = Sextante.getInterface()
678672

679-
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER1))
680-
layer1 = layer.name()
681-
682-
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER2))
683-
layer2 = layer.name()
673+
layer1 = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER1))
674+
layer2 = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER2))
684675

685676
savename = self.getOutputValue(self.SAVENAME)
686677

@@ -726,7 +717,7 @@ def processAlgorithm(self, progress):
726717
comparisonvalue = self.getParameterValue(self.COMPARISONVALUE)
727718
savename = self.getOutputValue(self.SAVENAME)
728719

729-
message = mmqgisx_select(qgis, layername, attribute, comparisonvalue, comparison, savename, False)
720+
message = mmqgisx_select(qgis, layer, attribute, comparisonvalue, comparison, savename, False)
730721

731722
if message:
732723
raise GeoAlgorithmExecutionException(message)
@@ -763,7 +754,7 @@ def processAlgorithm(self, progress):
763754
direction = self.directions [ self.getParameterValue(self.DIRECTION) ]
764755
savename = self.getOutputValue(self.SAVENAME)
765756

766-
message = mmqgisx_sort(qgis, layername, attribute, savename, direction, False)
757+
message = mmqgisx_sort(qgis, layer, attribute, savename, direction, False)
767758

768759
if message:
769760
raise GeoAlgorithmExecutionException(message)
@@ -799,7 +790,7 @@ def processAlgorithm(self, progress):
799790
attribute = self.getParameterValue(self.ATTRIBUTE)
800791
savename = self.getOutputValue(self.SAVENAME)
801792

802-
message = mmqgisx_text_to_float(qgis, layername, [ attribute ], savename, False)
793+
message = mmqgisx_text_to_float(qgis, layer, [ attribute ], savename, False)
803794

804795
if message:
805796
raise GeoAlgorithmExecutionException(message)
@@ -829,7 +820,7 @@ def processAlgorithm(self, progress):
829820

830821
savename = self.getOutputValue(self.SAVENAME)
831822

832-
message = mmqgisx_voronoi_diagram(qgis, layername, savename, False)
823+
message = mmqgisx_voronoi_diagram(qgis, layer, savename, False)
833824

834825
if message:
835826
raise GeoAlgorithmExecutionException(message)

‎python/plugins/sextante/mmqgisx/mmqgisx_library.py

+51-52
Original file line numberDiff line numberDiff line change
@@ -387,15 +387,15 @@ def mmqgisx_animate_rows(qgis, layer_names, cumulative, outdir):
387387
# mmqgisx_attribute_export - Export attributes to CSV file
388388
# ----------------------------------------------------------
389389

390-
def mmqgisx_attribute_export(qgis, outfilename, layername, attribute_names, field_delimiter, line_terminator):
390+
def mmqgisx_attribute_export(qgis, outfilename, layer, attribute_names, field_delimiter, line_terminator):
391391
# Error checks
392392

393393
if (not outfilename) or (len(outfilename) <= 0):
394394
return "No output CSV file given"
395395

396-
layer = mmqgisx_find_layer(layername)
396+
#layer = mmqgisx_find_layer(layername)
397397
if layer == None:
398-
return "Layer " + layername + " not found"
398+
return "Layer not found"
399399

400400
# Find attribute indices
401401
attribute_indices = []
@@ -410,7 +410,7 @@ def mmqgisx_attribute_export(qgis, outfilename, layername, attribute_names, fiel
410410
for x in range(0, len(attribute_names)):
411411
index = layer.dataProvider().fieldNameIndex(attribute_names[x])
412412
if index < 0:
413-
return "Layer " + layername + " has no attribute " + attribute_names[x]
413+
return "Layer has no attribute " + attribute_names[x]
414414
attribute_indices.append(index)
415415

416416
# Create the CSV file
@@ -770,10 +770,10 @@ def mmqgisx_set_color_map(qgis, layername, bandname, lowvalue, midvalue, highval
770770
# mmqgisx_delete_columns - Change text fields to numbers
771771
# ---------------------------------------------------------
772772

773-
def mmqgisx_delete_columns(qgis, layername, columns, savename, addlayer):
774-
layer = mmqgisx_find_layer(layername)
773+
def mmqgisx_delete_columns(qgis, layer, columns, savename, addlayer):
774+
#layer = mmqgisx_find_layer(layername)
775775
if layer == None:
776-
return "No layer specified to modify: " + layername
776+
return "No layer specified to modify "
777777

778778
if len(savename) <= 0:
779779
return "No output filename given"
@@ -842,12 +842,12 @@ def mmqgisx_delete_columns(qgis, layername, columns, savename, addlayer):
842842
# while removing duplicate shapes
843843
# --------------------------------------------------------
844844

845-
def mmqgisx_delete_duplicate_geometries(qgis, layername, savename, addlayer):
845+
def mmqgisx_delete_duplicate_geometries(qgis, layer, savename, addlayer):
846846

847847
# Initialization and error checking
848-
layer = mmqgisx_find_layer(layername)
848+
#layer = mmqgisx_find_layer(layername)
849849
if layer == None:
850-
return "Invalid layer name: " + savename
850+
return "Invalid layer"
851851

852852
if len(savename) <= 0:
853853
return "No output filename given"
@@ -910,12 +910,12 @@ def mmqgisx_delete_duplicate_geometries(qgis, layername, savename, addlayer):
910910
# mmqgisx_float_to_text - String format numeric fields
911911
# ---------------------------------------------------------
912912

913-
def mmqgisx_float_to_text(qgis, layername, attributes, separator,
913+
def mmqgisx_float_to_text(qgis, layer, attributes, separator,
914914
decimals, prefix, suffix, savename, addlayer):
915915

916-
layer = mmqgisx_find_layer(layername)
916+
#layer = mmqgisx_find_layer(layername)
917917
if layer == None:
918-
return "Project has no active vector layer to convert: " + layername
918+
return "Project has no active vector layer to convert: "
919919

920920
if decimals < 0:
921921
return "Invalid number of decimals: " + unicode(decimals)
@@ -1117,11 +1117,11 @@ def mmqgisx_geocode_google(qgis, csvname, shapefilename, notfoundfile, keys, add
11171117
# simpler types
11181118
# --------------------------------------------------------
11191119

1120-
def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, addlayer):
1121-
layer = mmqgisx_find_layer(layername)
1120+
def mmqgisx_geometry_convert(qgis, layer, newtype, splitnodes, savename, addlayer):
1121+
#layer = mmqgisx_find_layer(layername)
11221122

11231123
if (layer == None) and (layer.type() != QgsMapLayer.VectorLayer):
1124-
return "Invalid Vector Layer " + layername
1124+
return "Invalid Vector Layer"
11251125

11261126
# Create output file
11271127
if len(savename) <= 0:
@@ -1765,8 +1765,8 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori
17651765
# mmqgisx_gridify - Snap shape verticies to grid
17661766
# --------------------------------------------------------
17671767

1768-
def mmqgisx_gridify_layer(qgis, layername, hspacing, vspacing, savename, addlayer):
1769-
layer = mmqgisx_find_layer(layername)
1768+
def mmqgisx_gridify_layer(qgis, layer, hspacing, vspacing, savename, addlayer):
1769+
#layer = mmqgisx_find_layer(layername)
17701770
if not layer:
17711771
return "Project has no active vector layer to gridify"
17721772

@@ -1911,18 +1911,18 @@ def __init__(self, point, newname):
19111911
self.name = newname
19121912

19131913

1914-
def mmqgisx_hub_distance(qgis, sourcename, destname, nameattributename, units, addlines, savename, addlayer):
1914+
def mmqgisx_hub_distance(qgis, sourcelayer, hubslayer, nameattributename, units, addlines, savename, addlayer):
19151915

19161916
# Error checks
1917-
sourcelayer = mmqgisx_find_layer(sourcename)
1917+
#sourcelayer = mmqgisx_find_layer(sourcename)
19181918
if (sourcelayer == None) or (sourcelayer.featureCount() <= 0):
1919-
return "Origin Layer " + sourcename + " not found"
1919+
return "Origin Layer not found"
19201920

1921-
hubslayer = mmqgisx_find_layer(destname)
1921+
#hubslayer = mmqgisx_find_layer(destname)
19221922
if (hubslayer == None) or (hubslayer.featureCount() <= 0):
1923-
return "Hub layer " + destname + " not found"
1923+
return "Hub layer not found"
19241924

1925-
if sourcename == destname:
1925+
if sourcelayer == hubslayer:
19261926
return "Same layer given for both hubs and spokes"
19271927

19281928
nameindex = hubslayer.dataProvider().fieldNameIndex(nameattributename)
@@ -2035,19 +2035,18 @@ def mmqgisx_hub_distance(qgis, sourcename, destname, nameattributename, units, a
20352035
# --------------------------------------------------------
20362036

20372037

2038-
def mmqgisx_hub_lines(qgis, hubname, hubattr, spokename, spokeattr, savename, addlayer):
2039-
2040-
# Find layers
2041-
if hubname == spokename:
2038+
def mmqgisx_hub_lines(qgis, hublayer, hubattr, spokelayer, spokeattr, savename, addlayer):
2039+
2040+
if hublayer == spokelayer:
20422041
return "Same layer given for both hubs and spokes"
20432042

2044-
hublayer = mmqgisx_find_layer(hubname)
2043+
#hublayer = mmqgisx_find_layer(hubname)
20452044
if (hublayer == None) or (hublayer.featureCount() <= 0):
2046-
return "Hub layer " + destname + " not found"
2045+
return "Hub layer not found"
20472046

2048-
spokelayer = mmqgisx_find_layer(spokename)
2047+
#spokelayer = mmqgisx_find_layer(spokename)
20492048
if spokelayer == None:
2050-
return "Spoke Point Layer " + sourcename + " not found"
2049+
return "Spoke Point Layer not found"
20512050

20522051
# Find Hub ID attribute indices
20532052
hubindex = hublayer.dataProvider().fieldNameIndex(hubattr)
@@ -2135,10 +2134,10 @@ def __init__(self, name, attributemap):
21352134
self.feature_count = 0
21362135
self.attributes = attributemap
21372136

2138-
def mmqgisx_label_point(qgis, layername, labelattributename, savename, addlayer):
2139-
layer = mmqgisx_find_layer(layername)
2137+
def mmqgisx_label_point(qgis, layer, labelattributename, savename, addlayer):
2138+
#layer = mmqgisx_find_layer(layername)
21402139
if layer == None:
2141-
return "Invalid layer name " . layername
2140+
return "Invalid layer name "
21422141

21432142
labelindex = layer.dataProvider().fieldNameIndex(labelattributename)
21442143
if labelindex < 0:
@@ -2214,24 +2213,24 @@ def mmqgisx_label_point(qgis, layername, labelattributename, savename, addlayer)
22142213
if addlayer:
22152214
qgis.addVectorLayer(savename, os.path.basename(savename), "ogr")
22162215

2217-
qgis.mainWindow().statusBar().showMessage(unicode(writecount) + " label shapefile created from " + layername)
2216+
qgis.mainWindow().statusBar().showMessage(unicode(writecount) + " label shapefile created from " + layer.name())
22182217

22192218
return None
22202219

22212220
# --------------------------------------------------------
22222221
# mmqgisx_merge - Merge layers to single shapefile
22232222
# --------------------------------------------------------
22242223

2225-
def mmqgisx_merge(qgis, layernames, savename, addlayer):
2224+
def mmqgisx_merge(qgis, layers, savename, addlayer):
22262225
fields = {}
2227-
layers = []
2226+
#layers = []
22282227
totalfeaturecount = 0
22292228

2230-
for x in range(0, len(layernames)):
2231-
layername = layernames[x]
2232-
layer = mmqgisx_find_layer(layername)
2229+
for x in range(0, len(layers)):
2230+
layer = layers[x]
2231+
#layer = mmqgisx_find_layer(layername)
22332232
if layer == None:
2234-
return "Layer " + layername + " not found"
2233+
return "Layer not found"
22352234

22362235
# Verify that all layers are the same type (point, polygon, etc)
22372236
if (len(layers) > 0):
@@ -2314,8 +2313,8 @@ def mmqgisx_merge(qgis, layernames, savename, addlayer):
23142313
# mmqgisx_select - Select features by attribute
23152314
# ----------------------------------------------------------
23162315

2317-
def mmqgisx_select(qgis, layername, selectattributename, comparisonvalue, comparisonname, savename, addlayer):
2318-
layer = mmqgisx_find_layer(layername)
2316+
def mmqgisx_select(qgis, layer, selectattributename, comparisonvalue, comparisonname, savename, addlayer):
2317+
#layer = mmqgisx_find_layer(layername)
23192318
if layer == None:
23202319
return "Project has no active vector layer to select from"
23212320

@@ -2397,8 +2396,8 @@ def mmqgisx_select(qgis, layername, selectattributename, comparisonvalue, compar
23972396
# mmqgisx_sort - Sort shapefile by attribute
23982397
# --------------------------------------------------------
23992398

2400-
def mmqgisx_sort(qgis, layername, sortattributename, savename, direction, addlayer):
2401-
layer = mmqgisx_find_layer(layername)
2399+
def mmqgisx_sort(qgis, layer, sortattributename, savename, direction, addlayer):
2400+
#layer = mmqgisx_find_layer(layername)
24022401
if layer == None:
24032402
return "Project has no active vector layer to sort"
24042403

@@ -2702,10 +2701,10 @@ def mmqgisx_searchable_streetname(name):
27022701
# mmqgisx_text_to_float - Change text fields to numbers
27032702
# ---------------------------------------------------------
27042703

2705-
def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer):
2706-
layer = mmqgisx_find_layer(layername)
2704+
def mmqgisx_text_to_float(qgis, layer, attributes, savename, addlayer):
2705+
#layer = mmqgisx_find_layer(layername)
27072706
if layer == None:
2708-
return "Project has no active vector layer to convert: " + layername
2707+
return "Project has no active vector layer to convert"
27092708

27102709
if len(savename) <= 0:
27112710
return "No output filename given"
@@ -2794,10 +2793,10 @@ def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer):
27942793
# mmqgisx_voronoi - Voronoi diagram creation
27952794
# --------------------------------------------------------
27962795

2797-
def mmqgisx_voronoi_diagram(qgis, sourcelayer, savename, addlayer):
2798-
layer = mmqgisx_find_layer(sourcelayer)
2796+
def mmqgisx_voronoi_diagram(qgis, layer, savename, addlayer):
2797+
#layer = mmqgisx_find_layer(sourcelayer)
27992798
if layer == None:
2800-
return "Layer " + sourcename + " not found"
2799+
return "Layer not found"
28012800

28022801
if len(savename) <= 0:
28032802
return "No output filename given"

0 commit comments

Comments
 (0)