[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/karbon
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2007-08-31 20:12:27
Message-ID: 1188591147.787768.24042.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707034 by jaham:

Import fill rule property from wmf files and export to svg files.



 M  +1 -3      svg/svgexport.cc  
 M  +4 -3      wmf/wmfimportparser.cc  


--- trunk/koffice/filters/karbon/svg/svgexport.cc #707033:707034
@@ -200,12 +200,10 @@
 
     *m_body << " d=\"" << path->toString( path->absoluteTransformation(0) ) << "\" ";
 
-    /*
-    if( composite.fillRule() == evenOdd )
+    if( path->fillRule() == Qt::OddEvenFill )
         *m_body << " fill-rule=\"evenodd\"";
     else
         *m_body << " fill-rule=\"nonzero\"";
-    */
 
     *m_body << " />" << endl;
 }
--- trunk/koffice/filters/karbon/wmf/wmfimportparser.cc #707033:707034
@@ -294,18 +294,19 @@
 }
 
 
-void WMFImportParser::drawPolygon( const QPolygon &pa, bool ) {
+void WMFImportParser::drawPolygon( const QPolygon &pa, bool winding ) {
     KoPathShape *polygon = new KoPathShape();
     appendPen( *polygon );
     appendBrush( *polygon );
     appendPoints( *polygon, pa );
 
     polygon->close();
+    polygon->setFillRule( winding ? Qt::WindingFill : Qt::OddEvenFill );
     mDoc->add( polygon );
 }
 
 
-void WMFImportParser::drawPolyPolygon( QList<QPolygon>& listPa, bool ) {
+void WMFImportParser::drawPolyPolygon( QList<QPolygon>& listPa, bool winding ) {
     KoPathShape *path = new KoPathShape();
 
     if ( listPa.count() > 0 ) {
@@ -313,7 +314,7 @@
         appendBrush( *path );
         appendPoints( *path, listPa.first() );
         path->close();
-
+        path->setFillRule( winding ? Qt::WindingFill : Qt::OddEvenFill );
         foreach( QPolygon pa, listPa )
         {
             KoPathShape *newPath = new KoPathShape();
[prev in list] [next in list] [prev in thread] [next in thread]