1 files changed, 50 insertions, 2 deletions
diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc
index e2475cb95..40cd8e974 100644
--- a/gr-qtgui/lib/displayform.cc
+++ b/gr-qtgui/lib/displayform.cc
@@ -47,6 +47,7 @@ DisplayForm::DisplayForm(int nplots, QWidget* parent)
   _grid_state = false;
 
   // Create a pop-up menu for manipulating the figure
+  _menu_on = true;
   _menu = new QMenu(this);
   _menu->addAction(_stop_act);
   _menu->addAction(_grid_act);
@@ -130,7 +131,7 @@ DisplayForm::resizeEvent( QResizeEvent *e )
 void
 DisplayForm::mousePressEvent( QMouseEvent * e)
 {
-  if(e->button() == Qt::RightButton) {
+  if((e->button() == Qt::RightButton) && (_menu_on)) {
     QwtPlotLayout *plt = _displayPlot->plotLayout();
     QRectF cvs = plt->canvasRect();
     
@@ -153,7 +154,7 @@ DisplayForm::mousePressEvent( QMouseEvent * e)
 
       // Update the line titles if changed externally
       for(int i = 0; i < _nplots; i++) {
-	_lines_menu[i]->setTitle(_displayPlot->lineLabel(i));
+	_lines_menu[i]->setTitle(_displayPlot->getLineLabel(i));
       }
       _menu->exec(e->globalPos());
     }
@@ -177,6 +178,11 @@ DisplayForm::Reset()
 {
 }
 
+void
+DisplayForm::enableMenu(bool en)
+{
+  _menu_on = en;
+}
 
 void
 DisplayForm::closeEvent( QCloseEvent *e )
@@ -240,6 +246,48 @@ DisplayForm::setMarkerAlpha(int which, int alpha)
   _displayPlot->replot();
 }
 
+QString
+DisplayForm::title()
+{
+  return _displayPlot->title().text();
+}
+
+QString
+DisplayForm::lineLabel(int which)
+{
+  return _displayPlot->getLineLabel(which);
+}
+
+QString
+DisplayForm::lineColor(int which)
+{
+  return _displayPlot->getLineColor(which).name();
+}
+
+int
+DisplayForm::lineWidth(int which)
+{
+  return _displayPlot->getLineWidth(which);
+}
+
+Qt::PenStyle
+DisplayForm::lineStyle(int which)
+{
+  return _displayPlot->getLineStyle(which);
+}
+
+QwtSymbol::Style
+DisplayForm::lineMarker(int which)
+{
+  return _displayPlot->getLineMarker(which);
+}
+
+int
+DisplayForm::markerAlpha(int which)
+{
+  return _displayPlot->getMarkerAlpha(which);
+}
+
 void
 DisplayForm::setStop(bool on)
 {