Skip to content

Commit 8ae64b4

Browse files
committed
fTools: remove unnecessary checks on output field names (fix #8241)
1 parent 5592878 commit 8ae64b4

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

python/plugins/fTools/tools/doGeoprocessing.py

-15
Original file line numberDiff line numberDiff line change
@@ -891,11 +891,6 @@ def intersect( self ):
891891
else:
892892
crs_match = crsA == crsB
893893
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
894-
longNames = ftools_utils.checkFieldNameLength( fields )
895-
if longNames:
896-
message = self.tr('Following field names are longer than 10 characters:\n%s') % ( '\n'.join(longNames) )
897-
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
898-
899894
writer = QgsVectorFileWriter( self.myName, self.myEncoding, fields,
900895
vproviderA.geometryType(), vproviderA.crs() )
901896
if writer.hasError():
@@ -1076,11 +1071,6 @@ def union( self ):
10761071
crs_match = crsA == crsB
10771072

10781073
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
1079-
longNames = ftools_utils.checkFieldNameLength( fields )
1080-
if longNames:
1081-
message = self.tr( 'Following field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) )
1082-
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
1083-
10841074
writer = QgsVectorFileWriter( self.myName, self.myEncoding, fields,
10851075
vproviderA.geometryType(), vproviderA.crs() )
10861076
if writer.hasError():
@@ -1262,11 +1252,6 @@ def symetrical_difference( self ):
12621252
crs_match = crsA == crsB
12631253

12641254
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
1265-
longNames = ftools_utils.checkFieldNameLength( fields )
1266-
if longNames:
1267-
message = self.tr( 'Following field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) )
1268-
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
1269-
12701255
writer = QgsVectorFileWriter( self.myName, self.myEncoding, fields,
12711256
vproviderA.geometryType(), vproviderA.crs() )
12721257
if writer.hasError():

python/plugins/fTools/tools/doSpatialJoin.py

-8
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,6 @@ def compute(self, inName, joinName, outName, summary, sumList, keep, progressBar
146146
seq = range(0, len(fieldList1))
147147
fieldList1 = dict(zip(seq, fieldList1))
148148

149-
# check for correct field names
150-
print fieldList1
151-
longNames = ftools_utils.checkFieldNameLength( fieldList1.values() )
152-
if len( longNames ) > 0:
153-
QMessageBox.warning( self, self.tr( 'Incorrect field names' ),
154-
self.tr( 'No output will be created.\nFollowing field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) ) )
155-
return False
156-
157149
sRs = provider1.crs()
158150
progressBar.setValue(13)
159151
check = QFile(self.shapefileName)

0 commit comments

Comments
 (0)