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

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars
From:       Andreas Nicolai <Andreas.Nicolai () gmx ! net>
Date:       2005-06-18 17:43:26
Message-ID: 1119116606.209096.30251.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 426839 by ghorwin:

- made the plot widget use the new axis data sets instead of accessing
  KPlotWidget member variables directly
- make KStars link against installed kdeeduplot library



 M  +1 -1      Makefile.am  
 M  +5 -5      tools/kstarsplotwidget.cpp  
 M  +1 -1      tools/kstarsplotwidget.h  


--- trunk/KDE/kdeedu/kstars/kstars/Makefile.am #426838:426839
@@ -28,7 +28,7 @@
 kde_kcfg_DATA = kstars.kcfg
 kde_conf_DATA = kstarsrc
 
-kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a \
$(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/extdate/libextdate.la \
-lkdeprint -lknewstuff -lm -lz +kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a \
-lkdeeduplot $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz  
 SUBDIRS = indi tools . data icons 
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/kstarsplotwidget.cpp #426838:426839
@@ -321,7 +321,7 @@
 	p->setPen( fgColor() );
 	p->setBrush( Qt::NoBrush );
 
-	if ( ShowAxes ) p->drawRect( PixRect ); //box outline
+	if ( LeftAxis.isVisible() || BottomAxis.isVisible() ) p->drawRect( PixRect ); //box outline
 
 	if ( ShowTickMarks ) {
 		//spacing between minor tickmarks (in data units)
@@ -609,9 +609,9 @@
 	} //end if ( showTickmarks )
 
 	//Draw X Axis Label(s)
-	if ( ! XAxisLabel.isEmpty() ) {
+	if ( ! BottomAxis.label().isEmpty() ) {
 		QRect r( 0, PixRect.height() + 2*YPADDING, PixRect.width(), YPADDING );
-		p->drawText( r, Qt::AlignCenter | Qt::DontClip, XAxisLabel );
+		p->drawText( r, Qt::AlignCenter | Qt::DontClip, BottomAxis.label() );
 	}
 	if ( ! XAxisLabel2.isEmpty() ) {
 		QRect r( 0, -3*YPADDING, PixRect.width(), YPADDING );
@@ -619,7 +619,7 @@
 	}
 
 	//Draw Y Axis Label(s).  We need to draw the text sideways.
-	if ( ! YAxisLabel.isEmpty() ) {
+	if ( ! LeftAxis.label().isEmpty() ) {
 		//store current painter translation/rotation state
 		p->save();
 
@@ -628,7 +628,7 @@
 		p->rotate( -90.0 );
 
 		QRect r( 0, 0, PixRect.height(), XPADDING );
-		p->drawText( r, Qt::AlignCenter | Qt::DontClip, YAxisLabel ); //draw the label, now that we are \
sideways +		p->drawText( r, Qt::AlignCenter | Qt::DontClip, LeftAxis.label() ); //draw the label, now \
that we are sideways  
 		p->restore();  //restore translation/rotation state
 	}
--- trunk/KDE/kdeedu/kstars/kstars/tools/kstarsplotwidget.h #426838:426839
@@ -19,7 +19,7 @@
 #define _KSTARSPLOTWIDGET_H_
 
 #include <qwidget.h>
-#include "libkdeedu/kdeeduplot/kplotwidget.h"
+#include <libkdeedu/kplotwidget.h>
 
 #define BIGTICKSIZE 10
 #define SMALLTICKSIZE 4


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