Merge pull request #39 from clusterpy/consecutive_naming

Consecutive naming

Author: sergiobuj

Makefile

@@ -113,4 +113,3 @@ transclean:
 
 clean:
 	rm $(UI_FILES) $(RESOURCE_FILES)
-

README.md

@@ -20,13 +20,13 @@ a free and Open Source Geographic Information System.
 ##Cite the plugin
 If you are interested in citing this plugin, you can use:
 
-Duque, J.C.; Botero, Sergio (2014). Clusterpy QGIS plugin, Version 0.13-preview RiSE-group (Research in Spatial Economics). EAFIT University. http://www.rise-group.org.
+Duque, J.C.; Botero, Sergio (2014). Clusterpy QGIS plugin, Version 0.14-preview RiSE-group (Research in Spatial Economics). EAFIT University. http://www.rise-group.org.
 
 Or this BibTeX entry:
 ```
 @Manual{clusterpy-qgis-plugin,
 title = {Clusterpy QGIS plugin,
-{Version} 0.13-preview},
+{Version} 0.14-preview},
 author = {Duque, Juan C. and Botero, Sergio},
 organization = {RiSE-group (Research in Spatial Economics). EAFIT University.},
 address = {Colombia},

clusterpy_light.py

@@ -77,4 +77,3 @@ def maxp(self):
         self.maxpdlg.layer_combo.clear()
         self.maxpdlg.layer_combo.addItems([x.name() for x in self.mc.layers()])
         self.maxpdlg.exec_()
-

metadata.txt

@@ -4,7 +4,7 @@
 name=Clusterpy - Spatially constrained clustering
 qgisMinimumVersion=2.0
 description=Clusterpy plugin version for QGIS
-version=0.13-preview
+version=0.14-preview
 author=RISE Group Universidad EAFIT
 email=software@rise-group.org
 
@@ -14,11 +14,11 @@ email=software@rise-group.org
 # changelog=
 
 # tags are comma separated with spaces allowed
-tags=Clusterpy,Clustering,RISE Group
+tags=Clusterpy,Clustering,RISE Group,cluster
 
 homepage=http://www.rise-group.org
-tracker=https://www.github.com/clusterpy/clusterpy-qgis-plugin/issues
-repository=https://www.github.com/clusterpy/clusterpy-qgis-plugin
+tracker=https://www.github.com/clusterpy/clusterpy_qgis_plugin/issues
+repository=https://www.github.com/clusterpy/clusterpy_qgis_plugin
 icon=uifiles/icon.png
 experimental=False
 

plugin_utils.py

@@ -73,4 +73,3 @@ def saveDialog( parent, filtering="Shapefiles (*.shp *.SHP)"):
     files = fileDialog.selectedFiles()
     settings.setValue("/UI/lastShapefileDir", QFileInfo( unicode( files[0] ) ).absolutePath() )
     return ( unicode( files[0] ), unicode( fileDialog.encoding() ) )
-

uifiles/about.html

@@ -9,13 +9,13 @@ <h2>Research in Spatial Economics</h2>
 <h3>Cite the Plugin</h3>
 If you are interested in citing this plugin, you can use:
 <p>
-Duque, J.C.; Botero, Sergio (2014). Clusterpy QGIS plugin, Version 0.13-preview RiSE-group (Research in Spatial Economics). EAFIT University. http://www.rise-group.org.
+Duque, J.C.; Botero, Sergio (2014). Clusterpy QGIS plugin, Version 0.14-preview RiSE-group (Research in Spatial Economics). EAFIT University. http://www.rise-group.org.
 </p>
 Or this BibTeX entry:
 <pre><code>
 @Manual{clusterpy-qgis-plugin,
 title = {Clusterpy QGIS plugin,
-{Version} 0.13-preview},
+{Version} 0.14-preview},
 author = {Duque, Juan C. and Botero, Sergio},
 organization = {RiSE-group (Research in Spatial Economics). EAFIT University.},
 address = {Colombia},

workers.py

@@ -1,3 +1,6 @@
+# coding=utf-8
+# Clusterpy QGIS plugin - (C) 2014, RiSE Group
+
 from qgis.core import *
 from PyQt4 import QtCore, QtGui
 
@@ -26,7 +29,9 @@ def __init__(self, info={}):
 
     def run(self):
         provider = self.layer.dataProvider()
-        maxpfield = QgsField(name = "MAXP", type = 2)
+        curr = [ fl.name() for fl in provider.fields() ]
+        nfn = newColumnName(curr)
+        maxpfield = QgsField(name = nfn, type = 2)
         newfields = QgsFields()
         newfields.extend(provider.fields())
         newfields.append(maxpfield)
@@ -88,3 +93,20 @@ def run(self):
                 outputmsg = self.ERROR_MSG + str(map(str, islands))
         self.progress.emit(100.0)
         self.finished.emit(valid, outputmsg)
+
+# Get the name of the next MAXP execution column.
+def newColumnName(fields, basename = 'MAXP'):
+    last = -1
+    for fld in fields:
+        if fld.startswith(basename):
+            try:
+                cnt = int(fld[len(basename):])
+                last = cnt if cnt > last else last
+            except ValueError:
+                last = 0
+
+    num = ""
+    if last >= 0:
+        num = str(last + 1)
+
+    return basename + num