[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jason Harris]

SVN commit 489873 by harris:

Use QRectF instead of DRect in KStarsPlotWidget, and the library should 
be named libkstarswidget.a (not .la).  Thanks Pablo and Jasem.

CCMAIL: kstars-devel at kde.org


 M  +1 -1      Makefile.am  
 M  +4 -4      widgets/kstarsplotwidget.cpp  
 M  +3 -3      widgets/kstarsplotwidget.h  


--- trunk/KDE/kdeedu/kstars/kstars/Makefile.am #489872:489873
@@ -31,7 +31,7 @@
 kde_kcfg_DATA = kstars.kcfg
 kde_conf_DATA = kstarsrc
 
-kstars_LDADD = indi/liblilxml.a indi/libindicom.a skycomponents/libkstarscomponents.a widgets/libkstarswidgets.la tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
+kstars_LDADD = indi/liblilxml.a indi/libindicom.a skycomponents/libkstarscomponents.a widgets/libkstarswidgets.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
 
 SUBDIRS = skycomponents widgets indi tools . data icons 
 
--- trunk/KDE/kdeedu/kstars/kstars/widgets/kstarsplotwidget.cpp #489872:489873
@@ -47,7 +47,7 @@
 	if ( y2<y1) { Y1=y2; Y2=y1; }
 	else { Y1=y1; Y2=y2; }
 
-	DataRect = DRect( X1, Y1, X2 - X1, Y2 - Y1 );
+	DataRect = QRectF( X1, Y1, X2 - X1, Y2 - Y1 );
 	checkLimits();
 
 	updateTickmarks();
@@ -60,7 +60,7 @@
 	if ( y2<y1) { YB1=y2; YB2=y1; }
 	else { YB1=y1; YB2=y2; }
 
-	DataRect2 = DRect( XB1, YB1, XB2 - XB1, YB2 - YB1 );
+	DataRect2 = QRectF( XB1, YB1, XB2 - XB1, YB2 - YB1 );
 	updateTickmarks();
 }
 
@@ -71,10 +71,10 @@
 	for ( unsigned int i=0; i<2; ++i ) {
 		if ( i==0 ) {
 			type = xAxisType0();
-			Range = DataRect.x2() - DataRect.x();
+			Range = DataRect.width();
 		} else {
 			type = yAxisType0();
-			Range = DataRect.y2() - DataRect.y();
+			Range = DataRect.height();
 		}
 
 		//we switch from TIME type to DOUBLE type if :
--- trunk/KDE/kdeedu/kstars/kstars/widgets/kstarsplotwidget.h #489872:489873
@@ -62,9 +62,9 @@
 	void checkLimits();
 
 	double xb() const { return DataRect2.x(); }
-	double xb2() const { return DataRect2.x2(); }
+	double xb2() const { return DataRect2.x() + DataRect2.width(); }
 	double yb() const { return DataRect2.y(); }
-	double yb2() const { return DataRect2.y2(); }
+	double yb2() const { return DataRect2.y() + DataRect2.height(); }
 	double dataWidth2() const { return DataRect2.width(); }
 	double dataHeight2() const { return DataRect2.height(); }
 
@@ -122,7 +122,7 @@
 	int nmajX2, nminX2, nmajY2, nminY2;
 	AXIS_TYPE XAxisType, YAxisType, XAxisType_0, YAxisType_0;
 	double XScaleFactor, YScaleFactor;
-	DRect DataRect2;
+	QRectF DataRect2;
 
 	QString XAxisLabel2, YAxisLabel2;
 };