Dxf color palette

mhugent · mhugent · commit f98ecf753fca · 2013-10-31T08:23:50.000+01:00
diff --git a/src/core/qgsdxfexport.cpp b/src/core/qgsdxfexport.cpp
@@ -25,6 +25,7 @@
 
 QgsDxfExport::QgsDxfExport(): mSymbologyScaleDenominator( 1.0 ), mSymbologyExport( NoSymbology )
 {
+    initColorPalette();
 }
 
 QgsDxfExport::~QgsDxfExport()
@@ -366,7 +367,7 @@ int QgsDxfExport::colorFromSymbolLayer( const QgsSymbolLayerV2* symbolLayer )
   }
 
 
-  return 5; //todo...
+  return 1; //todo...
 }
 
 double QgsDxfExport::widthFromSymbolLayer( const QgsSymbolLayerV2* symbolLayer )
@@ -404,3 +405,17 @@ int QgsDxfExport::pixel_distance( QRgb p1, QRgb p2 )
 
   return abs( r1 - r2 ) + abs( g1 - g2 ) + abs( b1 - b2 ) + abs( a1 - a2 );
 }
+
+void QgsDxfExport::initColorPalette()
+{
+    mDxfColorPalette.resize( 256 );
+    mDxfColorPalette[1] = qRgb( 255, 0, 0 );
+    mDxfColorPalette[2] = qRgb( 255, 255, 0 );
+    mDxfColorPalette[3] = qRgb( 0, 255, 0 );
+    mDxfColorPalette[4] = qRgb( 0, 255, 255 );
+    mDxfColorPalette[5] = qRgb( 0, 0, 255 );
+    mDxfColorPalette[6] = qRgb( 255, 0, 255 );
+    mDxfColorPalette[7] = qRgb( 255, 255, 255 );
+    mDxfColorPalette[8] = qRgb( 255, 255, 255 );
+    mDxfColorPalette[9] = qRgb( 255, 255, 255 );
+}
diff --git a/src/core/qgsdxfexport.h b/src/core/qgsdxfexport.h
@@ -58,6 +58,8 @@ class QgsDxfExport
     double mSymbologyScaleDenominator;
     SymbologyExport mSymbologyExport;
 
+    QVector<QRgb> mDxfColorPalette;
+
     void writeHeader( QTextStream& stream );
     void writeTables( QTextStream& stream );
     void writeEntities( QTextStream& stream );
@@ -81,6 +83,7 @@ class QgsDxfExport
     double widthFromSymbolLayer( const QgsSymbolLayerV2* symbolLayer );
 
     //functions for dxf palette
+    void initColorPalette();
     static int closestMatch( QRgb pixel, const QVector<QRgb>& palette );
     static int pixel_distance( QRgb p1, QRgb p2 );
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`
`26`	`26`	`QgsDxfExport::QgsDxfExport(): mSymbologyScaleDenominator( 1.0 ), mSymbologyExport( NoSymbology )`
`27`	`27`	`{`
	`28`	`+ initColorPalette();`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`QgsDxfExport::~QgsDxfExport()`
`@@ -366,7 +367,7 @@ int QgsDxfExport::colorFromSymbolLayer( const QgsSymbolLayerV2* symbolLayer )`
`366`	`367`	`}`
`367`	`368`
`368`	`369`
`369`		`- return 5; //todo...`
	`370`	`+ return 1; //todo...`
`370`	`371`	`}`
`371`	`372`
`372`	`373`	`double QgsDxfExport::widthFromSymbolLayer( const QgsSymbolLayerV2* symbolLayer )`
`@@ -404,3 +405,17 @@ int QgsDxfExport::pixel_distance( QRgb p1, QRgb p2 )`
`404`	`405`
`405`	`406`	`return abs( r1 - r2 ) + abs( g1 - g2 ) + abs( b1 - b2 ) + abs( a1 - a2 );`
`406`	`407`	`}`
	`408`	`+`
	`409`	`+void QgsDxfExport::initColorPalette()`
	`410`	`+{`
	`411`	`+ mDxfColorPalette.resize( 256 );`
	`412`	`+ mDxfColorPalette[1] = qRgb( 255, 0, 0 );`
	`413`	`+ mDxfColorPalette[2] = qRgb( 255, 255, 0 );`
	`414`	`+ mDxfColorPalette[3] = qRgb( 0, 255, 0 );`
	`415`	`+ mDxfColorPalette[4] = qRgb( 0, 255, 255 );`
	`416`	`+ mDxfColorPalette[5] = qRgb( 0, 0, 255 );`
	`417`	`+ mDxfColorPalette[6] = qRgb( 255, 0, 255 );`
	`418`	`+ mDxfColorPalette[7] = qRgb( 255, 255, 255 );`
	`419`	`+ mDxfColorPalette[8] = qRgb( 255, 255, 255 );`
	`420`	`+ mDxfColorPalette[9] = qRgb( 255, 255, 255 );`
	`421`	`+}`