[Plplot-cvs] SF.net SVN: plplot:[9766] trunk/drivers

[<ai...@us...>]

Revision: 9766
          http://plplot.svn.sourceforge.net/plplot/?rev=9766&view=rev
Author:   airwin
Date:     2009-03-21 16:54:17 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
Restore default height and width for epsqt and pdfqt devices for Qt-4.5 case.
Swap sense of x and y for bounding box in Qt-4.5 case.

Modified Paths:
--------------
    trunk/drivers/qt.cpp
    trunk/drivers/qt.h

Modified: trunk/drivers/qt.cpp
===================================================================
--- trunk/drivers/qt.cpp	2009-03-21 15:39:08 UTC (rev 9765)
+++ trunk/drivers/qt.cpp	2009-03-21 16:54:17 UTC (rev 9766)
@@ -1035,7 +1035,7 @@
 	setPageSize(QPrinter::A4);
 #else
 	setFullPage(true);
-	setPaperSize(QSizeF(i_iWidth, i_iHeight), QPrinter::Point);
+	setPaperSize(QSizeF(i_iHeight, i_iWidth), QPrinter::Point);
 #endif
 	setResolution(DPI);
 	setColorMode(QPrinter::Color);
@@ -1510,10 +1510,6 @@
 	QMainWindow * mw=new QMainWindow;
 	QtPLTabWidget* tabWidget;//=new QtPLTabWidget;
 
-// 	plsc->dev = (void*)tabWidget;
-// 	plsc->xlength = tabWidget->m_dWidth;
-// 	plsc->ylength = tabWidget->m_dHeight;
-	
 	if (pls->xlength <= 0 || pls->ylength <= 0)
 	{
 		tabWidget=new QtPLTabWidget;

Modified: trunk/drivers/qt.h
===================================================================
--- trunk/drivers/qt.h	2009-03-21 15:39:08 UTC (rev 9765)
+++ trunk/drivers/qt.h	2009-03-21 16:54:17 UTC (rev 9766)
@@ -169,8 +169,11 @@
 class QtEPSDevice: public QtPLDriver, public QPrinter
 {
 	public:
-		QtEPSDevice(int i_iWidth=-1,
-			    int i_iHeight=-1);
+#if QT_VERSION < 0x040400
+		QtEPSDevice(int i_iWidth=-1, int i_iHeight=-1);
+#else
+		QtEPSDevice(int i_iWidth=QT_DEFAULT_X, int i_iHeight=QT_DEFAULT_Y);
+#endif
 		
 		virtual ~QtEPSDevice();
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.