opengl option - removed prints

src/gofbpm.cpp

@@ -44,7 +44,8 @@
 #define TAB_TBT 4
 
 #include <QApplication>
-#include <QSplashScreen>
+#include <QCommandLineOption>
+#include <QCommandLineParser>
 #include <qulabelbase.h>
 #include <quplotoptions.h>
 #include <quwatcher.h>
@@ -56,6 +57,14 @@ gofbpm::gofbpm(QWidget *parent) : QWidget(parent) {
     CuModuleLoader mloader(a->cumbiaPool(), a->fpool(), &m_log_impl);
     ui = new Ui::bpm;
     ui->setupUi(this);
+    QCommandLineParser pa;
+    QCommandLineOption ogl(QStringList() << "o" << "opengl", "plots with OpenGL canvas");
+    pa.addHelpOption();
+    pa.addOption(ogl);
+    pa.parse(a->arguments());
+    bool opengl = pa.isSet(ogl);
+    printf("gofbpm: opengl mode: %s\e[0m\n", opengl ? "\e[1;32mYES" : "\e[1;34mNO");
+
     cu_pool = a->cumbiaPool();
     m_ctrl_factory_pool = *a->fpool();
     // mloader.modules() to get the list of loaded modules
@@ -63,7 +72,7 @@ gofbpm::gofbpm(QWidget *parent) : QWidget(parent) {
 
     QVBoxLayout *slowlo = new QVBoxLayout(ui->wSlow);
     foreach(const QString& n, QStringList() << "pX" << "pY" << "pSum") {
-        GofBpmPlot *p = new GofBpmPlot(ui->wSlow, cu_pool, m_ctrl_factory_pool);
+        GofBpmPlot *p = new GofBpmPlot(ui->wSlow, cu_pool, m_ctrl_factory_pool, opengl);
         p->setObjectName(n);
         slowlo->addWidget(p);
     }
@@ -71,14 +80,14 @@ gofbpm::gofbpm(QWidget *parent) : QWidget(parent) {
     // QVBoxLayout *fastlo = new QVBoxLayout(ui->tabWidget->widget(Fast));
     QLayout *fastlo = ui->tabWidget->widget(Fast)->layout();
     foreach(const QString& n, QStringList() << "pXFast" << "pYFast" << "pSumFast") {
-        GofBpmPlot *p = new GofBpmPlot(ui->tabWidget->widget(Fast), cu_pool, m_ctrl_factory_pool);
+        GofBpmPlot *p = new GofBpmPlot(ui->tabWidget->widget(Fast), cu_pool, m_ctrl_factory_pool, opengl);
         p->setObjectName(n);
         fastlo->addWidget(p);
     }
 
     QVBoxLayout *fftlo = new QVBoxLayout(ui->wFFT);
     foreach(const QString& n, QStringList() << "pFFTX" << "pFFTY" << "pFFTSum") {
-        GofBpmPlot *p = new GofBpmPlot(ui->wFFT, cu_pool, m_ctrl_factory_pool);
+        GofBpmPlot *p = new GofBpmPlot(ui->wFFT, cu_pool, m_ctrl_factory_pool, opengl);
         p->setObjectName(n);
         fftlo->addWidget(p);
     }
@@ -86,20 +95,20 @@ gofbpm::gofbpm(QWidget *parent) : QWidget(parent) {
     // QVBoxLayout *evtlo = new QVBoxLayout(ui->tabWidget->widget(Event));
     QLayout* evtlo = ui->tabWidget->widget(Event)->layout();
     foreach(const QString& n, QStringList() << "pEventH" << "pEventV" << "pEventSum") {
-        GofBpmPlot *p = new GofBpmPlot(ui->tabWidget->widget(Event), cu_pool, m_ctrl_factory_pool);
+        GofBpmPlot *p = new GofBpmPlot(ui->tabWidget->widget(Event), cu_pool, m_ctrl_factory_pool, opengl);
         p->setObjectName(n);
         evtlo->addWidget(p);
     }
 
     QVBoxLayout *evtfftlo = new QVBoxLayout(ui->wEventFFT);
     foreach(const QString& n, QStringList() << "pEventFFTH" << "pEventFFTV" << "pEventFFTSum") {
-        GofBpmPlot *p = new GofBpmPlot(ui->wEventFFT, cu_pool, m_ctrl_factory_pool);
+        GofBpmPlot *p = new GofBpmPlot(ui->wEventFFT, cu_pool, m_ctrl_factory_pool, opengl);
         p->setObjectName(n);
         evtfftlo->addWidget(p);
     }
 
     QVBoxLayout *rawlo = new QVBoxLayout(ui->wRAW);
-    GofBpmPlot *p = new GofBpmPlot(ui->wRAW, cu_pool, m_ctrl_factory_pool);
+    GofBpmPlot *p = new GofBpmPlot(ui->wRAW, cu_pool, m_ctrl_factory_pool, opengl);
     p->setObjectName("pTBTX");
     rawlo->addWidget(p);
 

src/gofbpmplot.cpp

@@ -9,11 +9,21 @@
 #include <quplotdataconnector.h>
 #include <quplotoptions.h>
 #include <quaxiseventfilter.h>
+#include <qwt_plot_grid.h>
 #include <QMenu>
+#include <QwtPlotOpenGLCanvas>
 
-GofBpmPlot::GofBpmPlot(QWidget *parent, CumbiaPool *cu_pool, const CuControlsFactoryPool &fp)
-    : QuArrayPlot(parent),  m_fftsiz(-1), m_freq(-1.0),
+GofBpmPlot::GofBpmPlot(QWidget *parent, CumbiaPool *cu_pool, const CuControlsFactoryPool &fp, bool opengl)
+    : QuArrayPlot(parent, opengl),  m_fftsiz(-1), m_freq(-1.0),
     m_regenerate_x(true), m_update_y_scale(true), m_period(100) {
+    QwtPlotGrid * grid = static_cast<QwtPlotGrid *>(itemList(QwtPlotGrid::Rtti_PlotGrid).first());
+    grid->setPen(QColor(Qt::lightGray), 0.0);
+    QPalette p = axisWidget(QwtPlot::xBottom)->palette();
+    p.setColor(QPalette::WindowText, Qt::darkGray);
+    for(int id = 0; id < QwtPlot::axisCnt; id++) {
+        axisWidget(id)->setPalette(p);
+    }
+
     QuAxisEventFilter *af = new QuAxisEventFilter(this);
     connect(af, SIGNAL(doubleClicked()), this, SLOT(updateYScale()));
     connect(af, SIGNAL(contextMenuRequest()), this, SLOT(axisContextMenuRequest()));
@@ -38,7 +48,8 @@ void GofBpmPlot::unsetSources() {
 
 void GofBpmPlot::setOptions(const CuData& o) {
     m_conn->getContext()->setOptions(o);
-    m_conn->getContext()->sendData(o);
+    if(m_conn->getContext()->readers().size() > 0) // prevent link not initialized error msg
+        m_conn->getContext()->sendData(o);
 }
 
 void GofBpmPlot::updateYScale() {
@@ -63,7 +74,6 @@ void GofBpmPlot::fftSizChanged(const CuData &v) {
 
 void GofBpmPlot::fastFreqChanged(float f) {
     if(m_freq != f) {
-        printf("x scale changed \e[1;32m from %f to %f\e[0m -- fft siz is %ld\n", m_freq, f, m_fftsiz);
         m_freq = f;
         m_regenerate_x = m_fftsiz > 0;
     }

src/gofbpmplot.h

@@ -13,7 +13,7 @@ class GofBpmPlot : public QuArrayPlot	//	 ## added by qumbiaprojectwizard
 {
     Q_OBJECT
 public:
-    GofBpmPlot(QWidget *parent, CumbiaPool *cu_pool, const CuControlsFactoryPool &fp);
+    GofBpmPlot(QWidget *parent, CumbiaPool *cu_pool, const CuControlsFactoryPool &fp, bool opengl);
 
 public slots:
     void configure(QwtPlot *p, const CuData &da);