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

List:       kde-commits
Subject:    koffice/kexi/plugins/reportspgz/backend
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2008-04-20 8:39:16
Message-ID: 1208680756.601194.624.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 799065 by piggz:

Build against kexdb/parser in the tree instead of the installed one and add some more saving.

 M  +10 -1     common/krchartdata.cpp  
 M  +2 -1      common/krchartdata.h  
 M  +4 -3      wrtembed/reportentities.cpp  
 M  +8 -0      wrtembed/reportentitychart.cpp  


--- trunk/koffice/kexi/plugins/reportspgz/backend/common/krchartdata.cpp #799064:799065
@@ -25,7 +25,7 @@
 
 #include <kexidb/connection.h>
 #include <kexidb/cursor.h>
-#include <kexidb/parser.h>
+#include <kexidb/parser/parser.h>
 #include <koproperty/property.h>
 
 #include <kdebug.h>
@@ -330,6 +330,15 @@
 	}
 }
 
+ORLineStyleData KRChartData::lineStyle()
+{
+	ORLineStyleData ls;
+	ls.weight = _lnWeight->value().toInt();
+	ls.lnColor = _lnColor->value().value<QColor>();
+	ls.style = (Qt::PenStyle)_lnStyle->value().toInt();
+	return ls;
+}
+
 // RTTI
 int KRChartData::type() const { return RTTI; }
 int KRChartData::RTTI = KRObjectData::EntityChart;
--- trunk/koffice/kexi/plugins/reportspgz/backend/common/krchartdata.h #799064:799065
@@ -42,9 +42,9 @@
 		~KRChartData();
 		virtual KRChartData * toChart();
 		virtual int type() const;
+	
 	protected:
 		
-		QRect _rect;
 		KRPos _pos;
 		KRSize _size;	
 		KoProperty::Property * _dataSource;
@@ -57,6 +57,7 @@
 		KoProperty::Property * _xTitle;
 		KoProperty::Property * _yTitle;
 		
+		KoProperty::Property *_bgColor;
 		KoProperty::Property* _lnColor;
 		KoProperty::Property* _lnWeight;
 		KoProperty::Property* _lnStyle;
--- trunk/koffice/kexi/plugins/reportspgz/backend/wrtembed/reportentities.cpp #799064:799065
@@ -49,6 +49,7 @@
 #include "reportentityline.h"
 #include "reportentitybarcode.h"
 #include "reportentityimage.h"
+#include "reportentitychart.h"
 
 //
 // ReportEntity
@@ -81,9 +82,9 @@
 		case KRObjectData::EntityImage:
 			re = ( ReportEntityImage* ) item;
 			break;
-			//case EntityGraph:
-			//    re = (ReportEntityGraph*)item;
-			//    break;
+		case KRObjectData::EntityChart:
+			re = (ReportEntityChart*)item;
+			break;
 		default:
 			kDebug() << "ReportEntity::buildXML(): unrecognized rtti type" << item->type() << endl;
 	};
--- trunk/koffice/kexi/plugins/reportspgz/backend/wrtembed/reportentitychart.cpp #799064:799065
@@ -162,9 +162,17 @@
 	entity.appendChild ( d3 );
 	
 	//color scheme
+	QDomElement cs = doc.createElement ( "colorscheme" );
+	cs.appendChild ( doc.createTextNode ( _colorScheme->value().toString() ));
+	entity.appendChild ( cs );
 	
 	//aa
+	QDomElement aa = doc.createElement ( "antialiased" );
+	aa.appendChild ( doc.createTextNode ( _aa->value().toBool() ? "true" : "false" ));
+	entity.appendChild ( aa );
 	
+	//Line Style
+	buildXMLLineStyle(doc, entity, lineStyle());
 	
 	parent.appendChild ( entity );
 }
[prev in list] [next in list] [prev in thread] [next in thread]