sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

[api] Allow sink flags to be specified for QgsVectorFileWriterTask

Browse Source
This commit is contained in:
Nyall Dawson 2024-10-03 14:03:13 +10:00 committed by Julien Cabieces
parent fefba6c472
commit 594b466160
6 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/PyQt6/core/auto_generated/qgsvectorfilewritertask.sip.in
View File

@ -28,10 +28,13 @@ QGIS interface.
QgsVectorFileWriterTask( QgsVectorLayer *layer,
const QString &fileName,
const QgsVectorFileWriter::SaveVectorOptions &options );
const QgsVectorFileWriter::SaveVectorOptions &options,
QgsFeatureSink::SinkFlags sinkFlags = QgsFeatureSink::SinkFlags() );
%Docstring
Constructor for QgsVectorFileWriterTask. Takes a source ``layer``, destination ``fileName``
and save ``options``.
Since QGIS 3.40 the ``sinkFlags`` can be specified.
%End
virtual void cancel();

5
python/core/auto_generated/qgsvectorfilewritertask.sip.in
View File

@ -28,10 +28,13 @@ QGIS interface.
QgsVectorFileWriterTask( QgsVectorLayer *layer,
const QString &fileName,
const QgsVectorFileWriter::SaveVectorOptions &options );
const QgsVectorFileWriter::SaveVectorOptions &options,
QgsFeatureSink::SinkFlags sinkFlags = QgsFeatureSink::SinkFlags() );
%Docstring
Constructor for QgsVectorFileWriterTask. Takes a source ``layer``, destination ``fileName``
and save ``options``.
Since QGIS 3.40 the ``sinkFlags`` can be specified.
%End
virtual void cancel();

4
src/core/qgsvectorfilewriter.cpp
View File

@ -3477,7 +3477,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( Prepa
return writeAsVectorFormatV2( details, fileName, QgsCoordinateTransformContext(), options, newFilename, newLayer, errorMessage );
}
QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( PreparedWriterDetails &details, const QString &fileName, const QgsCoordinateTransformContext &transformContext, const QgsVectorFileWriter::SaveVectorOptions &options, QString *newFilename, QString *newLayer, QString *errorMessage )
QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( PreparedWriterDetails &details, const QString &fileName, const QgsCoordinateTransformContext &transformContext, const QgsVectorFileWriter::SaveVectorOptions &options, QString *newFilename, QString *newLayer, QString *errorMessage, SinkFlags sinkFlags )
{
Qgis::WkbType destWkbType = details.destWkbType;
@ -3545,7 +3545,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( Pre
newOptions.sourceDatabaseProviderConnection = details.sourceDatabaseProviderConnection.get();
}
std::unique_ptr< QgsVectorFileWriter > writer( create( fileName, details.outputFields, destWkbType, details.outputCrs, transformContext, newOptions, QgsFeatureSink::SinkFlags(), &tempNewFilename, &tempNewLayer ) );
std::unique_ptr< QgsVectorFileWriter > writer( create( fileName, details.outputFields, destWkbType, details.outputCrs, transformContext, newOptions, sinkFlags, &tempNewFilename, &tempNewLayer ) );
writer->setSymbologyScale( options.symbologyScale );
if ( newFilename )

4
src/core/qgsvectorfilewriter.h
View File

@ -1045,6 +1045,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink
* \param newFilename potentially modified file name (output parameter)
* \param newLayer potentially modified layer name (output parameter)
* \param errorMessage will be set to the error message text, if an error occurs while writing the layer
* \param sinkFlags optional sink flags (since QGIS 3.40)
* \returns Error message code, or QgsVectorFileWriter.NoError if the write operation was successful
* \since QGIS 3.10.3
*/
@ -1054,7 +1055,8 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink
const QgsVectorFileWriter::SaveVectorOptions &options,
QString *newFilename = nullptr,
QString *newLayer = nullptr,
QString *errorMessage SIP_OUT = nullptr );
QString *errorMessage SIP_OUT = nullptr,
QgsFeatureSink::SinkFlags sinkFlags = QgsFeatureSink::SinkFlags() );
/**
* Writes a previously prepared PreparedWriterDetails \a details object.

5
src/core/qgsvectorfilewritertask.cpp
View File

@ -18,9 +18,10 @@
#include "qgsvectorfilewritertask.h"
#include "qgsvectorlayer.h"
QgsVectorFileWriterTask::QgsVectorFileWriterTask( QgsVectorLayer *layer, const QString &fileName, const QgsVectorFileWriter::SaveVectorOptions &options )
QgsVectorFileWriterTask::QgsVectorFileWriterTask( QgsVectorLayer *layer, const QString &fileName, const QgsVectorFileWriter::SaveVectorOptions &options, QgsFeatureSink::SinkFlags sinkFlags )
: QgsTask( tr( "Saving %1" ).arg( fileName ), QgsTask::CanCancel )
, mDestFileName( fileName )
, mSinkFlags( sinkFlags )
, mOptions( options )
{
if ( mOptions.fieldValueConverter )
@ -59,7 +60,7 @@ bool QgsVectorFileWriterTask::run()
mError = QgsVectorFileWriter::writeAsVectorFormatV2(
mWriterDetails, mDestFileName, mTransformContext, mOptions, &mNewFilename, &mNewLayer, &mErrorMessage );
mWriterDetails, mDestFileName, mTransformContext, mOptions, &mNewFilename, &mNewLayer, &mErrorMessage, mSinkFlags );
return mError == QgsVectorFileWriter::NoError;
}

6
src/core/qgsvectorfilewritertask.h
View File

@ -40,10 +40,13 @@ class CORE_EXPORT QgsVectorFileWriterTask : public QgsTask
/**
* Constructor for QgsVectorFileWriterTask. Takes a source \a layer, destination \a fileName
* and save \a options.
*
* Since QGIS 3.40 the \a sinkFlags can be specified.
*/
QgsVectorFileWriterTask( QgsVectorLayer *layer,
const QString &fileName,
const QgsVectorFileWriter::SaveVectorOptions &options );
const QgsVectorFileWriter::SaveVectorOptions &options,
QgsFeatureSink::SinkFlags sinkFlags = QgsFeatureSink::SinkFlags() );
void cancel() override;
@ -79,6 +82,7 @@ class CORE_EXPORT QgsVectorFileWriterTask : public QgsTask
QString mDestFileName;
std::unique_ptr< QgsFeedback > mOwnedFeedback;
QgsFeatureSink::SinkFlags mSinkFlags;
QgsVectorFileWriter::WriterError mError = QgsVectorFileWriter::NoError;
QString mNewFilename;