dxf export: use half width texts and support transparent colors

jef-n · jef-n · commit 4d72d721e828 · 2014-10-13T11:41:48.000+02:00
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -366,7 +366,7 @@ void QgsDxfExport::writeGroup( int code, const QgsPoint &p, double z, bool skipz
     writeGroup( code + 30, z );
 }
 
-void QgsDxfExport::writeGroup( QColor color, int exactMatchCode, int rgbCode )
+void QgsDxfExport::writeGroup( QColor color, int exactMatchCode, int rgbCode, int transparencyCode )
 {
   int minDistAt = -1;
   int minDist = INT_MAX;
@@ -390,6 +390,8 @@ void QgsDxfExport::writeGroup( QColor color, int exactMatchCode, int rgbCode )
   writeGroup( exactMatchCode, minDistAt );
   int c = ( color.red() & 0xff ) * 0x10000 + ( color.green() & 0xff ) * 0x100 + ( color.blue() & 0xff );
   writeGroup( rgbCode, c );
+  if( transparencyCode != -1 && color.alpha() < 255 )
+    writeGroup( transparencyCode, 0x2000000 | color.alpha() );
 }
 
 void QgsDxfExport::writeGroupCode( int code )
@@ -606,6 +608,7 @@ void QgsDxfExport::writeTables()
   writeGroup( 2, "VPORT" );
   writeHandle();
   writeGroup( 100, "AcDbSymbolTable" );
+
   writeGroup( 70, 0 );
   writeGroup( 0, "ENDTAB" );
 
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
@@ -74,7 +74,7 @@ class CORE_EXPORT QgsDxfExport
     void writeDouble( double d );
     void writeString( const QString& s );
     void writeGroup( int code, const QgsPoint &p, double z = 0.0, bool skipz = false );
-    void writeGroup( QColor color, int exactMatch = 62, int rgb = 420 );
+    void writeGroup( QColor color, int exactMatch = 62, int rgbCode = 420, int tranparencyCode = 440 );
 
     int writeHandle( int code = 5, int handle = 0 );
 
diff --git a/src/core/dxf/qgsdxfpallabeling.cpp b/src/core/dxf/qgsdxfpallabeling.cpp
@@ -89,16 +89,16 @@ void QgsDxfPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext&
     {
       line.append( QgsPoint( label->getX( i ), label->getY( i ) ) );
     }
-    mDxfExport->writePolyline( line, mLayerName, "CONTINUOUS", 1, 0.01, true );
+    mDxfExport->writePolyline( line, g->dxfLayer(), "CONTINUOUS", 1, 0.01, true );
 #endif
     text = text.replace( tmpLyr.wrapChar.isEmpty() ? "\n" : tmpLyr.wrapChar, "\\P" );
 
-    text.prepend( QString( "\\f%1|i%2|b%3;\\H%4;" )
+    text.prepend( QString( "\\f%1|i%2|b%3;\\H%4;\\W0.5;" )
                   .arg( tmpLyr.textFont.family() )
                   .arg( tmpLyr.textFont.italic() ? 1 : 0 )
                   .arg( tmpLyr.textFont.bold() ? 1 : 0 )
-                  .arg( label->getHeight() / ( 1 + text.count( "\\P" ) ) ) );
+                  .arg( label->getHeight() / ( 1 + text.count( "\\P" ) ) * 0.75 ) );
 
-    mDxfExport->writeMText( g->dxfLayer(), text, QgsPoint( label->getX(), label->getY() ), label->getWidth(), angle, tmpLyr.textColor );
+    mDxfExport->writeMText( g->dxfLayer(), text, QgsPoint( label->getX(), label->getY() ), label->getWidth() * 1.1, angle, tmpLyr.textColor );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -89,16 +89,16 @@ void QgsDxfPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext&`
`89`	`89`	`{`
`90`	`90`	`line.append( QgsPoint( label->getX( i ), label->getY( i ) ) );`
`91`	`91`	`}`
`92`		`- mDxfExport->writePolyline( line, mLayerName, "CONTINUOUS", 1, 0.01, true );`
	`92`	`+ mDxfExport->writePolyline( line, g->dxfLayer(), "CONTINUOUS", 1, 0.01, true );`
`93`	`93`	`#endif`
`94`	`94`	`text = text.replace( tmpLyr.wrapChar.isEmpty() ? "\n" : tmpLyr.wrapChar, "\\P" );`
`95`	`95`
`96`		`- text.prepend( QString( "\\f%1\|i%2\|b%3;\\H%4;" )`
	`96`	`+ text.prepend( QString( "\\f%1\|i%2\|b%3;\\H%4;\\W0.5;" )`
`97`	`97`	`.arg( tmpLyr.textFont.family() )`
`98`	`98`	`.arg( tmpLyr.textFont.italic() ? 1 : 0 )`
`99`	`99`	`.arg( tmpLyr.textFont.bold() ? 1 : 0 )`
`100`		`- .arg( label->getHeight() / ( 1 + text.count( "\\P" ) ) ) );`
	`100`	`+ .arg( label->getHeight() / ( 1 + text.count( "\\P" ) ) * 0.75 ) );`
`101`	`101`
`102`		`- mDxfExport->writeMText( g->dxfLayer(), text, QgsPoint( label->getX(), label->getY() ), label->getWidth(), angle, tmpLyr.textColor );`
	`102`	`+ mDxfExport->writeMText( g->dxfLayer(), text, QgsPoint( label->getX(), label->getY() ), label->getWidth() * 1.1, angle, tmpLyr.textColor );`
`103`	`103`	`}`
`104`	`104`	`}`