Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid

Conflicts:
	volk/Makefile.common
	volk/lib/qa_utils.cc

1 files changed, 50 insertions, 0 deletions

diff --git a/gr-qtgui/lib/qtgui_util.h b/gr-qtgui/lib/qtgui_util.h
new file mode 100644
index 000000000..a519c66a2
--- /dev/null
+++ b/gr-qtgui/lib/qtgui_util.h
@@ -0,0 +1,50 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QTGUI_UTIL_H
+#define INCLUDED_QTGUI_UTIL_H
+
+#include <qevent.h>
+
+#include <qwt_plot_picker.h>
+#include <qwt_picker_machine.h>
+
+
+class QwtDblClickPlotPicker: public QwtPlotPicker
+{
+public:
+    QwtDblClickPlotPicker(QwtPlotCanvas *);
+    ~QwtDblClickPlotPicker();
+
+    virtual QwtPickerMachine * stateMachine(int) const;
+};
+
+class QwtPickerDblClickPointMachine: public QwtPickerMachine
+{
+public:
+  QwtPickerDblClickPointMachine();
+  ~QwtPickerDblClickPointMachine();
+  
+  virtual CommandList transition( const QwtEventPattern &eventPattern, const QEvent *e);
+};
+
+#endif /* INCLUDED_QTGUI_UTIL_H */