Skip to content

Commit 69e54ee

Browse files
committed
dwg import: make curves optional (enabled by default, disabled completely with GDAL 1)
1 parent d5c6b97 commit 69e54ee

File tree

5 files changed

+131
-236
lines changed

5 files changed

+131
-236
lines changed

src/app/dwg/qgsdwgimportdialog.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ QgsDwgImportDialog::QgsDwgImportDialog( QWidget *parent, Qt::WindowFlags f )
8484
leDatabase->setText( s.value( "/DwgImport/lastDatabase", "" ).toString() );
8585
cbExpandInserts->setChecked( s.value( "/DwgImport/lastExpandInserts", true ).toBool() );
8686
cbMergeLayers->setChecked( s.value( "/DwgImport/lastMergeLayers", false ).toBool() );
87+
cbUseCurves->setChecked( s.value( "/DwgImport/lastUseCurves", true ).toBool() );
88+
89+
#if !defined(GDAL_COMPUTE_VERSION) || GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,0,0)
90+
cbUseCurves->setChecked( false );
91+
cbUseCurves->setHidden( true );
92+
#endif
8793

8894
leDrawing->setReadOnly( true );
8995
pbImportDrawing->setHidden( true );
@@ -109,6 +115,7 @@ QgsDwgImportDialog::~QgsDwgImportDialog()
109115
s.setValue( "/DwgImport/lastDatabase", leDatabase->text() );
110116
s.setValue( "/DwgImport/lastExpandInserts", cbExpandInserts->isChecked() );
111117
s.setValue( "/DwgImport/lastMergeLayers", cbMergeLayers->isChecked() );
118+
s.setValue( "/DwgImport/lastUseCurves", cbUseCurves->isChecked() );
112119
s.setValue( "/Windows/DwgImport/geometry", saveGeometry() );
113120
}
114121

@@ -267,7 +274,7 @@ void QgsDwgImportDialog::on_pbImportDrawing_clicked()
267274
QgsDwgImporter importer( leDatabase->text(), mCrsSelector->crs() );
268275

269276
QString error;
270-
if ( importer.import( leDrawing->text(), error, cbExpandInserts->isChecked() ) )
277+
if ( importer.import( leDrawing->text(), error, cbExpandInserts->isChecked(), cbUseCurves->isChecked() ) )
271278
{
272279
QgisApp::instance()->messageBar()->pushMessage( tr( "Drawing import completed." ), QgsMessageBar::INFO, 4 );
273280
}

0 commit comments

Comments
 (0)