Showing with 7 additions and 6 deletions.
  1. +2 −4 src/app/qgsdxfexportdialog.cpp
  2. +5 −2 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
6 changes: 2 additions & 4 deletions src/app/qgsdxfexportdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ QgsDxfExportDialog::QgsDxfExportDialog( const QList<QgsMapLayer*>& layerKeys, QW
mSymbologyModeComboBox->setCurrentIndex( s.value( "qgis/lastDxfSymbologyMode", "2" ).toInt() );
//last symbol scale
mSymbologyScaleLineEdit->setText( s.value( "qgis/lastSymbologyExportScale", "50000" ).toString() );
mMapExtentCheckBox->setChecked( s.value( "qgis/lastDxfMapRectangle", "false" ).toBool() );

buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
}
Expand Down Expand Up @@ -148,12 +149,9 @@ bool QgsDxfExportDialog::exportMapExtent() const
void QgsDxfExportDialog::saveSettings()
{
QSettings s;

//last dxf dir
QFileInfo dxfFileInfo( mFileLineEdit->text() );
s.setValue( "qgis/lastDxfDir", dxfFileInfo.absolutePath() );

//last dxf symbology mode
s.setValue( "qgis/lastDxfSymbologyMode", mSymbologyModeComboBox->currentIndex() );
s.setValue( "qgis/lastSymbologyExportScale", mSymbologyScaleLineEdit->text() );
s.setValue( "qgis/lastDxfMapRectangle", mMapExtentCheckBox->isChecked() );
}
7 changes: 5 additions & 2 deletions src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,8 +764,11 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
}
double halfSize = size / 2.0;


QColor c = mBrush.color();
QColor c = mPen.color();
if ( mPen.style() == Qt::NoPen )
{
c = mBrush.color();
}
QgsExpression* colorExpression = expression( "color" );
if ( colorExpression )
{
Expand Down