[Rinside-commits] r190 - pkg/inst/examples/qt

[noreply at r-forge.r-project.org]

Author: edd
Date: 2011-03-24 19:43:02 +0100 (Thu, 24 Mar 2011)
New Revision: 190

Modified:
   pkg/inst/examples/qt/qtdensity.cpp
   pkg/inst/examples/qt/qtdensity.pro
Log:
added, tried and commented-out again support for SVG graphics as Qt only supports 'SVG tiny' 
whereas Cairo and cairoDevice for R produce full SVG files -- one needs to s/symbol/g/ to allow display of such files


Modified: pkg/inst/examples/qt/qtdensity.cpp
===================================================================
--- pkg/inst/examples/qt/qtdensity.cpp	2011-03-17 01:42:44 UTC (rev 189)
+++ pkg/inst/examples/qt/qtdensity.cpp	2011-03-24 18:43:02 UTC (rev 190)
@@ -6,6 +6,7 @@
 // Copyright (C) 2011  Dirk Eddelbuettel and Romain Francois
 
 #include <QtGui>
+//#include <QSvgWidget>
 
 #include "qtdensity.h"
 
@@ -17,6 +18,7 @@
 
     m_R["bw"] = m_bw;		// pass bandwidth to R, and have R compute a temp.file name
     m_tempfile = Rcpp::as<std::string>(m_R.parseEval("tfile <- tempfile()"));
+    //m_R.parseEvalQ("library(cairoDevice)");
 
     setupDisplay();
 }
@@ -93,18 +95,23 @@
     QHBoxLayout *lowerlayout = new QHBoxLayout;
     lowerlayout->addWidget(imageLabel);
 
+    //QSvgWidget *svg = new QSvgWidget("/tmp/foo.svg");
+    //QHBoxLayout *svglayout = new QHBoxLayout;
+    //svglayout->addWidget(svg);
+
     QVBoxLayout *outer = new QVBoxLayout;
     outer->addLayout(upperlayout);
     outer->addLayout(lowerlayout);
+    //outer->addLayout(svglayout);
     window->setLayout(outer);
     window->show();
-    window->resize(650, 750);
+    window->resize(625, 725);
 }
 
 QtDensity::~QtDensity() {
     //std::cerr << "Dtor" << std::endl;
     m_R.parseEvalQ("q('no')");	// we never needed that before -- but maybe the Qt threads get in the way
-    //std::cerr << "Dtor R stopped" << std::endl; // not reached !!
+    //std::cerr << "Dtor R stopped" << std::endl; // never reached ?
 }
 
 void QtDensity::plot(void) {
@@ -112,6 +119,7 @@
     m_R["bw"] = m_bw;
     m_R["kernel"] = kernelstrings[m_kernel]; // that passes the string to R
     std::string cmd1 = "png(tfile,600,600); plot(density(y, bw=bw/100, kernel=kernel), xlim=range(y)+c(-2,2), main=\"Kernel: ";
+    //std::string cmd1 = "Cairo_svg(tfile,6,6); plot(density(y, bw=bw/100, kernel=kernel), xlim=range(y)+c(-2,2), main=\"Kernel: ";
     std::string cmd2 = "\"); points(y, rep(0, length(y)), pch=16, col=rgb(0,0,0,1/4));  dev.off()";
     std::string cmd = cmd1 + kernelstrings[m_kernel] + cmd2;
     m_R.parseEvalQ(cmd);

Modified: pkg/inst/examples/qt/qtdensity.pro
===================================================================
--- pkg/inst/examples/qt/qtdensity.pro	2011-03-17 01:42:44 UTC (rev 189)
+++ pkg/inst/examples/qt/qtdensity.pro	2011-03-24 18:43:02 UTC (rev 190)
@@ -9,6 +9,7 @@
 HEADERS =		qtdensity.h 
 SOURCES = 		qtdensity.cpp main.cpp
 
+#QT += 			svg
 
 ## comment this out if you need a different version of R, 
 ## and set set R_HOME accordingly as an environment variable