Skip to content

Commit 6ddf1f6

Browse files
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents 5b6b293 + 0c39be6 commit 6ddf1f6

31 files changed

+9777
-5436
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ doc/CODING.tex
3939
doc/INSTALL.tex
4040
scripts/Debug
4141
scripts/RelWithDebInfo
42+
/CMakeLists.txt.user

CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ ENDIF (NOT BISON_EXECUTABLE)
117117
#############################################################
118118
# search for dependencies
119119

120-
IF(NOT WIN32)
120+
IF(NOT WIN32 AND NOT ANDROID)
121121
INCLUDE(CheckFunctionExists)
122122
CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)
123123
IF(NOT OPENPTY_IN_LIBC)
@@ -130,7 +130,7 @@ IF(NOT WIN32)
130130
MESSAGE (SEND_ERROR "openpty not found!")
131131
ENDIF(NEED_LIBUTIL)
132132
ENDIF(NOT OPENPTY_IN_LIBC)
133-
ENDIF(NOT WIN32)
133+
ENDIF(NOT WIN32 AND NOT ANDROID)
134134

135135
# required
136136
FIND_PACKAGE(Proj)
@@ -339,6 +339,10 @@ ELSE (WIN32)
339339

340340
ENDIF (WIN32)
341341

342+
IF (ANDROID)
343+
SET (DEFAULT_PLUGIN_SUBDIR lib)
344+
SET (DEFAULT_DATA_SUBDIR files/share)
345+
ENDIF (ANDROID)
342346

343347
#assume we have escaped compiler directives
344348
#eventually we want to change this to new

cmake/FindPostgres.cmake

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@
1414
# POSTGRES_INCLUDE_DIR
1515
# POSTGRES_LIBRARY
1616

17-
IF(WIN32)
17+
IF(ANDROID)
18+
SET(POSTGRES_INCLUDE_DIR ${POSTGRES_INCLUDE_DIR} CACHE STRING INTERNAL)
19+
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
20+
ENDIF(ANDROID)
21+
22+
IF(WIN32 AND NOT ANDROID)
1823
IF (NOT POSTGRES_INCLUDE_DIR)
1924
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
2025
/usr/local/include
@@ -65,7 +70,8 @@ ELSE(WIN32)
6570
ENDIF(POSTGRES_CONFIG)
6671

6772
ENDIF(UNIX)
68-
ENDIF(WIN32)
73+
ENDIF(WIN32 AND NOT ANDROID)
74+
6975

7076
IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
7177
SET(POSTGRES_FOUND TRUE)

i18n/qgis_pt_PT.ts

+8,985-5,138
Large diffs are not rendered by default.

python/plugins/fTools/fTools.py

+1
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ def dointLines(self):
379379

380380
def dosplitVect(self):
381381
d = doVectorSplit.Dialog(self.iface)
382+
d.show()
382383
d.exec_()
383384

384385
def docompGeo(self):

python/plugins/fTools/tools/doMergeShapes.py

-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ def accept( self ):
130130
if self.inEncoding == None:
131131
self.inEncoding = "System"
132132

133-
QApplication.setOverrideCursor( QCursor( Qt.WaitCursor ) )
134133
self.btnOk.setEnabled( False )
135134

136135
self.mergeThread = ShapeMergeThread( baseDir, self.inputFiles, self.inEncoding, self.outFileName, self.encoding )
@@ -192,7 +191,6 @@ def restoreGui( self ):
192191
self.progressFeatures.setRange( 0, 100 )
193192
self.progressFeatures.setValue( 0 )
194193
self.progressFiles.setValue( 0 )
195-
QApplication.restoreOverrideCursor()
196194
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
197195
self.btnClose.setText( self.tr( "Close" ) )
198196
self.btnOk.setEnabled( True )

python/plugins/fTools/tools/doSimplify.py

-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ def selectOutputFile( self ):
9090
def accept( self ):
9191
vLayer = ftools_utils.getVectorLayerByName( self.cmbInputLayer.currentText() )
9292

93-
QApplication.setOverrideCursor( Qt.WaitCursor )
9493
self.btnOk.setEnabled( False )
9594

9695
if self.chkWriteShapefile.isChecked():
@@ -156,7 +155,6 @@ def stopProcessing( self ):
156155

157156
def restoreGui( self ):
158157
self.progressBar.setValue( 0 )
159-
QApplication.restoreOverrideCursor()
160158
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
161159
self.btnClose.setText( self.tr( "Close" ) )
162160
self.btnOk.setEnabled( True )

python/plugins/fTools/tools/doSpatialIndex.py

-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def clearList( self ):
108108
self.lstLayers.clear()
109109

110110
def accept( self ):
111-
QApplication.setOverrideCursor( Qt.WaitCursor )
112111
self.btnOk.setEnabled( False )
113112

114113
self.workThread = SpatialIdxThread( self.layers, self.chkExternalFiles.isChecked() )
@@ -147,7 +146,6 @@ def stopProcessing( self ):
147146

148147
def restoreGui( self ):
149148
self.progressBar.setValue( 0 )
150-
QApplication.restoreOverrideCursor()
151149
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
152150
self.btnClose.setText( self.tr( "Close" ) )
153151
self.btnOk.setEnabled( True )

python/plugins/fTools/tools/doVectorSplit.py

+138-46
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,26 @@
3131
from PyQt4.QtCore import *
3232
from PyQt4.QtGui import *
3333
from qgis.core import *
34-
#import os, sys, string, math
3534
import ftools_utils
3635
from ui_frmVectorSplit import Ui_Dialog
3736

3837
class Dialog(QDialog, Ui_Dialog):
3938
def __init__(self, iface):
4039
QDialog.__init__(self)
4140
self.iface = iface
42-
# Set up the user interface from Designer.
41+
4342
self.setupUi(self)
43+
self.setWindowTitle(self.tr("Split vector layer"))
44+
4445
QObject.connect(self.toolOut, SIGNAL("clicked()"), self.outFile)
4546
QObject.connect(self.inShape, SIGNAL("currentIndexChanged(QString)"), self.update)
46-
self.setWindowTitle(self.tr("Split vector layer"))
47-
self.buttonOk = self.buttonBox_2.button( QDialogButtonBox.Ok )
47+
48+
self.workThread = None
49+
50+
self.btnOk = self.buttonBox_2.button( QDialogButtonBox.Ok )
51+
self.btnClose = self.buttonBox_2.button( QDialogButtonBox.Close )
52+
4853
# populate layer list
49-
self.progressBar.setValue(0)
5054
mapCanvas = self.iface.mapCanvas()
5155
layers = ftools_utils.getLayerNames([QGis.Point, QGis.Line, QGis.Polygon])
5256
self.inShape.addItems(layers)
@@ -58,63 +62,151 @@ def update(self, inputLayer):
5862
for i in changedField:
5963
self.inField.addItem(unicode(changedField[i].name()))
6064

61-
def accept(self):
62-
self.buttonOk.setEnabled( False )
63-
if self.inShape.currentText() == "":
64-
QMessageBox.information(self, self.tr("Vector Split"), self.tr("No input shapefile specified"))
65-
elif self.outShape.text() == "":
66-
QMessageBox.information(self, self.tr("Vector Split"), self.tr("Please specify output shapefile"))
67-
else:
68-
inField = self.inField.currentText()
69-
inLayer = ftools_utils.getVectorLayerByName(unicode(self.inShape.currentText()))
70-
self.progressBar.setValue(5)
71-
outPath = QString(self.folderName)
72-
self.progressBar.setValue(10)
73-
if outPath.contains("\\"):
74-
outPath.replace("\\", "/")
75-
self.progressBar.setValue(15)
76-
if not outPath.endsWith("/"): outPath = outPath + "/"
77-
self.split(inLayer, unicode(outPath), unicode(inField), self.progressBar)
78-
self.progressBar.setValue(100)
79-
self.outShape.clear()
80-
QMessageBox.information(self, self.tr("Vector Split"), self.tr("Created output shapefiles in folder:\n%1").arg( outPath))
81-
self.progressBar.setValue(0)
82-
self.buttonOk.setEnabled( True )
83-
8465
def outFile(self):
8566
self.outShape.clear()
8667
( self.folderName, self.encoding ) = ftools_utils.dirDialog( self )
8768
if self.folderName is None or self.encoding is None:
8869
return
8970
self.outShape.setText( QString( self.folderName ) )
9071

91-
def split(self, vlayer, outPath, inField, progressBar):
92-
provider = vlayer.dataProvider()
93-
#unique = []
94-
index = provider.fieldNameIndex(inField)
95-
#provider.uniqueValues(index, unique)
96-
unique = ftools_utils.getUniqueValues(vlayer.dataProvider(), int(index))
97-
baseName = unicode( outPath + vlayer.name() + "_" + inField + "_" )
72+
def accept(self):
73+
inShape = self.inShape.currentText()
74+
outDir = self.outShape.text()
75+
if inShape == "":
76+
QMessageBox.information(self, self.tr("Vector Split"),
77+
self.tr("No input shapefile specified"))
78+
return
79+
elif outDir == "":
80+
QMessageBox.information(self, self.tr("Vector Split"),
81+
self.tr("Please specify output shapefile"))
82+
return
83+
84+
self.btnOk.setEnabled( False )
85+
86+
vLayer = ftools_utils.getVectorLayerByName(unicode(self.inShape.currentText()))
87+
self.workThread = SplitThread(vLayer, self.inField.currentText(), self.encoding, outDir)
88+
89+
QObject.connect(self.workThread, SIGNAL("rangeCalculated(PyQt_PyObject)"), self.setProgressRange)
90+
QObject.connect(self.workThread, SIGNAL("valueProcessed()"), self.valueProcessed)
91+
QObject.connect(self.workThread, SIGNAL("processFinished(PyQt_PyObject)"), self.processFinished)
92+
QObject.connect(self.workThread, SIGNAL("processInterrupted()"), self.processInterrupted)
93+
94+
self.btnClose.setText(self.tr("Cancel"))
95+
QObject.disconnect(self.buttonBox_2, SIGNAL("rejected()"), self.reject)
96+
QObject.connect(self.btnClose, SIGNAL("clicked()"), self.stopProcessing)
97+
98+
self.workThread.start()
99+
100+
def setProgressRange(self, maximum):
101+
self.progressBar.setRange(0, maximum)
102+
103+
def valueProcessed(self):
104+
self.progressBar.setValue(self.progressBar.value() + 1)
105+
106+
def restoreGui(self):
107+
self.progressBar.setValue(0)
108+
self.outShape.clear()
109+
QObject.connect(self.buttonBox_2, SIGNAL("rejected()"), self.reject)
110+
self.btnClose.setText(self.tr("Close"))
111+
self.btnOk.setEnabled(True)
112+
113+
def stopProcessing(self):
114+
if self.workThread != None:
115+
self.workThread.stop()
116+
self.workThread = None
117+
118+
def processInterrupted( self ):
119+
self.restoreGui()
120+
121+
def processFinished(self, errors):
122+
self.stopProcessing()
123+
outPath = self.outShape.text()
124+
self.restoreGui()
125+
126+
if not errors.isEmpty():
127+
msg = QString( "Processing of the following layers/files ended with error:<br><br>" ).append( errors.join( "<br>" ) )
128+
QErrorMessage( self ).showMessage( msg )
129+
130+
QMessageBox.information(self, self.tr("Vector Split"),
131+
self.tr("Created output shapefiles in folder:\n%1").arg(outPath))
132+
133+
class SplitThread(QThread):
134+
def __init__(self, layer, splitField, encoding, outDir):
135+
QThread.__init__(self, QThread.currentThread())
136+
self.layer = layer
137+
self.field = splitField
138+
self.encoding = encoding
139+
self.outDir = outDir
140+
141+
self.mutex = QMutex()
142+
self.stopMe = 0
143+
144+
self.errors = QStringList()
145+
146+
def run(self):
147+
self.mutex.lock()
148+
self.stopMe = 0
149+
self.mutex.unlock()
150+
151+
interrupted = False
152+
153+
outPath = QString(self.outDir)
154+
155+
if outPath.contains("\\"):
156+
outPath.replace("\\", "/")
157+
158+
if not outPath.endsWith("/"):
159+
outPath = outPath + "/"
160+
161+
provider = self.layer.dataProvider()
162+
index = provider.fieldNameIndex(self.field)
163+
unique = ftools_utils.getUniqueValues(provider, int(index))
164+
baseName = unicode( outPath + self.layer.name() + "_" + self.field + "_" )
98165
allAttrs = provider.attributeIndexes()
99166
provider.select(allAttrs)
100-
fieldList = ftools_utils.getFieldList(vlayer)
167+
fieldList = ftools_utils.getFieldList(self.layer)
101168
sRs = provider.crs()
169+
geom = self.layer.wkbType()
102170
inFeat = QgsFeature()
103-
progressBar.setValue(20)
104-
start = 20.00
105-
add = 80.00 / len(unique)
171+
172+
self.emit(SIGNAL("rangeCalculated(PyQt_PyObject)"), len(unique))
173+
106174
for i in unique:
107-
check = QFile(baseName + "_" + unicode(i) + ".shp")
175+
print "I", i
176+
print "INDEX", index
177+
check = QFile(baseName + "_" + unicode(i.toString().trimmed()) + ".shp")
178+
fName = check.fileName()
108179
if check.exists():
109-
if not QgsVectorFileWriter.deleteShapeFile(baseName + "_" + unicode(i.toString().trimmed()) + ".shp"):
110-
return
111-
writer = QgsVectorFileWriter(baseName + "_" + unicode(i.toString().trimmed()) + ".shp", self.encoding, fieldList, vlayer.dataProvider().geometryType(), sRs)
180+
if not QgsVectorFileWriter.deleteShapeFile(fName):
181+
self.errors.append( fName )
182+
continue
183+
184+
writer = QgsVectorFileWriter(fName, self.encoding, fieldList, geom, sRs)
112185
provider.rewind()
113186
while provider.nextFeature(inFeat):
114187
atMap = inFeat.attributeMap()
115-
#changed from QVariant(i) to below:
188+
#print "AtMAP", atMAP
116189
if atMap[index] == i:
117190
writer.addFeature(inFeat)
118191
del writer
119-
start = start + add
120-
progressBar.setValue(start)
192+
193+
self.emit(SIGNAL("valueProcessed()"))
194+
195+
self.mutex.lock()
196+
s = self.stopMe
197+
self.mutex.unlock()
198+
if s == 1:
199+
interrupted = True
200+
break
201+
202+
if not interrupted:
203+
self.emit(SIGNAL("processFinished( PyQt_PyObject )"), self.errors)
204+
else:
205+
self.emit(SIGNAL("processInterrupted()"))
206+
207+
def stop(self):
208+
self.mutex.lock()
209+
self.stopMe = 1
210+
self.mutex.unlock()
211+
212+
QThread.wait(self)

src/analysis/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ ENDIF (WIN32)
9393
ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS})
9494

9595
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
96-
VERSION ${COMPLETE_VERSION}
97-
SOVERSION ${COMPLETE_VERSION}
9896
# no moc headers, messes up PROPERTIES syntax
9997
PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
10098
CLEAN_DIRECT_OUTPUT 1
@@ -104,6 +102,14 @@ SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
104102
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
105103
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis)
106104

105+
#generate unversioned libs for android
106+
IF (NOT ANDROID)
107+
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
108+
VERSION ${COMPLETE_VERSION}
109+
SOVERSION ${COMPLETE_VERSION}
110+
)
111+
ENDIF (NOT ANDROID)
112+
107113
ADD_DEPENDENCIES(qgis_analysis qgis_core)
108114

109115
TARGET_LINK_LIBRARIES(qgis_analysis

src/analysis/network/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ INCLUDE_DIRECTORIES(
4545
ADD_LIBRARY(qgis_networkanalysis SHARED ${QGIS_NETWORK_ANALYSIS_SRCS} ${QGIS_NETWORK_ANALYSIS_MOC_SRCS} ${QGIS_NETWORK_ANALYSIS_HDRS})
4646

4747
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
48-
VERSION ${COMPLETE_VERSION}
49-
SOVERSION ${COMPLETE_VERSION}
5048
PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
5149
CLEAN_DIRECT_OUTPUT 1
5250
FRAMEWORK 1
@@ -55,6 +53,14 @@ SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
5553
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
5654
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis)
5755

56+
#generate unversioned libs for android
57+
IF (NOT ANDROID)
58+
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
59+
VERSION ${COMPLETE_VERSION}
60+
SOVERSION ${COMPLETE_VERSION}
61+
)
62+
ENDIF (NOT ANDROID)
63+
5864
ADD_DEPENDENCIES(qgis_networkanalysis qgis_core)
5965

6066
TARGET_LINK_LIBRARIES(qgis_networkanalysis

0 commit comments

Comments
 (0)