Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-3_42] [DXF] Fix writing the codec name and set the correct DXF version (Fix #60802) #60817

Merged
merged 4 commits into from
Mar 2, 2025
Merged

[Backport release-3_42] [DXF] Fix writing the codec name and set the correct DXF version (Fix #60802) #60817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62f7646
[DXF] Fix writing encoding name
agiudiceandrea Mar 1, 2025
688c2f8
[DXF] Avoid a loop in dxfEncoding
agiudiceandrea Mar 1, 2025
1cd5bd3
[DXF] Add test for codepage writing
agiudiceandrea Mar 1, 2025
59eb047
[DXF] Set $ACADVER to AC1018 (AutoCAD 2004)
agiudiceandrea Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/core/dxf/qgsdxfexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void QgsDxfExport::writeHeader( const QString &codepage )

// ACADVER
writeGroup( 9, QStringLiteral( "$ACADVER" ) );
writeGroup( 1, QStringLiteral( "AC1015" ) );
writeGroup( 1, QStringLiteral( "AC1018" ) );

// EXTMIN
writeGroup( 9, QStringLiteral( "$EXTMIN" ) );
Expand Down Expand Up @@ -2354,20 +2354,17 @@ QString QgsDxfExport::layerName( const QString &id, const QgsFeature &f ) const

QString QgsDxfExport::dxfEncoding( const QString &name )
{
const QList< QByteArray > codecs = QTextCodec::availableCodecs();
for ( const QByteArray &codec : codecs )
const QByteArray codec = name.toLocal8Bit();
if ( QTextCodec::codecForName( codec ) )
{
if ( name != codec )
continue;

int i;
for ( i = 0; i < static_cast< int >( sizeof( DXF_ENCODINGS ) / sizeof( *DXF_ENCODINGS ) ) && name != DXF_ENCODINGS[i][1]; ++i )
for ( i = 0; i < static_cast< int >( sizeof( DXF_ENCODINGS ) / sizeof( *DXF_ENCODINGS ) ) && strcasecmp( codec.data(), DXF_ENCODINGS[i][1] ) != 0; ++i )
;

if ( i == static_cast< int >( sizeof( DXF_ENCODINGS ) / sizeof( *DXF_ENCODINGS ) ) )
continue;

return DXF_ENCODINGS[i][0];
if ( i != static_cast< int >( sizeof( DXF_ENCODINGS ) / sizeof( *DXF_ENCODINGS ) ) )
{
return DXF_ENCODINGS[i][0];
}
}

return QString();
Expand Down
30 changes: 30 additions & 0 deletions tests/src/core/testqgsdxfexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class TestQgsDxfExport : public QObject
void testExtentWithSelection();
void testOutputLayerNamePrecedence();
void testMinimumLineWidthExport();
void testWritingCodepage();

private:
QgsVectorLayer *mPointLayer = nullptr;
Expand Down Expand Up @@ -1958,6 +1959,35 @@ void TestQgsDxfExport::testMinimumLineWidthExport()
QVERIFY( !fileContainsText( file, QStringLiteral( " 43\n7.0" ) ) );
}

void TestQgsDxfExport::testWritingCodepage()
{
QgsDxfExport d;
d.addLayers( QList<QgsDxfExport::DxfLayer>() << QgsDxfExport::DxfLayer( mPointLayer ) );

QgsMapSettings mapSettings;
const QSize size( 640, 480 );
mapSettings.setOutputSize( size );
mapSettings.setExtent( mPointLayer->extent() );
mapSettings.setLayers( QList<QgsMapLayer *>() << mPointLayer );
mapSettings.setOutputDpi( 96 );
mapSettings.setDestinationCrs( mPointLayer->crs() );

d.setMapSettings( mapSettings );
d.setSymbologyScale( 1000 );

const QString file1 = getTempFileName( "CP1252UpperCase_dxf" );
QFile dxfFile1( file1 );
QCOMPARE( d.writeToFile( &dxfFile1, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
dxfFile1.close();
QVERIFY( fileContainsText( file1, QStringLiteral( "ANSI_1252" ) ) );

const QString file2 = getTempFileName( "cp1252lowercase_dxf" );
QFile dxfFile2( file2 );
QCOMPARE( d.writeToFile( &dxfFile2, QStringLiteral( "cp1252" ) ), QgsDxfExport::ExportResult::Success );
dxfFile2.close();
QVERIFY( fileContainsText( file2, QStringLiteral( "ANSI_1252" ) ) );
}

bool TestQgsDxfExport::fileContainsText( const QString &path, const QString &text, QString *debugInfo ) const
{
QStringList debugLines;
Expand Down
Loading