[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11002 - in gnuradio/branches/releases/3.2: . gnuradio
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11002 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gr-qtgui/src/lib gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python/blocks |
|
Date: |
Tue, 12 May 2009 07:35:43 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-12 07:35:42 -0600 (Tue, 12 May 2009)
New Revision: 11002
Modified:
gnuradio/branches/releases/3.2/
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.h
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.h
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.h
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui.i
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.h
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.h
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.cc
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.h
gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital_window.ui
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
Log:
Applied changeset r10918:10923 to release 3.2 branch.
Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
Property changes on:
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
Modified:
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -55,11 +55,13 @@
canvas()->setPalette(palette);
setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine);
- setAxisScale(QwtPlot::xBottom, -1.0, 1.0);
+ //setAxisScale(QwtPlot::xBottom, -1.0, 1.0);
+ set_xaxis(-2.0, 2.0);
setAxisTitle(QwtPlot::xBottom, "In-phase");
setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine);
- setAxisScale(QwtPlot::yLeft, -1.0, 1.0);
+ //setAxisScale(QwtPlot::yLeft, -1.0, 1.0);
+ set_yaxis(-2.0, 2.0);
setAxisTitle(QwtPlot::yLeft, "Quadrature");
// Automatically deleted when parent is deleted
@@ -112,8 +114,26 @@
// _zoomer and _panner deleted when parent deleted
}
+void
+ConstellationDisplayPlot::set_xaxis(double min, double max)
+{
+ setAxisScale(QwtPlot::xBottom, min, max);
+}
+void
+ConstellationDisplayPlot::set_yaxis(double min, double max)
+{
+ setAxisScale(QwtPlot::yLeft, min, max);
+}
+void
+ConstellationDisplayPlot::set_axis(double xmin, double xmax,
+ double ymin, double ymax)
+{
+ set_xaxis(xmin, xmax);
+ set_yaxis(ymin, ymax);
+}
+
void ConstellationDisplayPlot::replot(){
const timespec startTime = get_highres_clock();
Modified:
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/ConstellationDisplayPlot.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -25,6 +25,11 @@
virtual void replot();
+ void set_xaxis(double min, double max);
+ void set_yaxis(double min, double max);
+ void set_axis(double xmin, double xmax,
+ double ymin, double ymax);
+
protected slots:
void LegendEntryChecked(QwtPlotItem *plotItem, bool on);
Modified:
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -118,7 +118,7 @@
setAxisTitle(QwtPlot::xBottom, "Frequency (Hz)");
setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine);
- setAxisScale(QwtPlot::yLeft, -210, 5);
+ set_yaxis(-210, 5);
setAxisTitle(QwtPlot::yLeft, "Power (dB)");
// Automatically deleted when parent is deleted
@@ -223,6 +223,12 @@
}
void
+FrequencyDisplayPlot::set_yaxis(double min, double max)
+{
+ setAxisScale(QwtPlot::yLeft, min, max);
+}
+
+void
FrequencyDisplayPlot::SetFrequencyRange(const double constStartFreq,
const double constStopFreq,
const double constCenterFreq,
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/FrequencyDisplayPlot.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -39,6 +39,8 @@
virtual void replot();
+ void set_yaxis(double min, double max);
+
public slots:
void SetLowerIntensityLevel(const double);
void SetUpperIntensityLevel(const double);
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -430,5 +430,24 @@
return (QWidget*)_spectrumDisplayForm;
}
+void
+SpectrumGUIClass::SetTimeDomainAxis(double min, double max)
+{
+ _spectrumDisplayForm->SetTimeDomainAxis(min, max);
+}
+void
+SpectrumGUIClass::SetConstellationAxis(double xmin, double xmax,
+ double ymin, double ymax)
+{
+ _spectrumDisplayForm->SetConstellationAxis(xmin, xmax, ymin, ymax);
+
+}
+
+void
+SpectrumGUIClass::SetFrequencyAxis(double min, double max)
+{
+ _spectrumDisplayForm->SetFrequencyAxis(min, max);
+}
+
#endif /* SPECTRUM_GUI_CLASS_CPP */
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/SpectrumGUIClass.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -70,6 +70,11 @@
QWidget* qwidget();
+ void SetTimeDomainAxis(double min, double max);
+ void SetConstellationAxis(double xmin, double xmax,
+ double ymin, double ymax);
+ void SetFrequencyAxis(double min, double max);
+
protected:
private:
Modified:
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -60,7 +60,7 @@
setAxisTitle(QwtPlot::xBottom, "Sample Number");
setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine);
- setAxisScale(QwtPlot::yLeft, -1.0, 1.0);
+ set_yaxis(-2.0, 2.0);
setAxisTitle(QwtPlot::yLeft, "Normalized Voltage");
// Automatically deleted when parent is deleted
@@ -125,8 +125,12 @@
// _zoomer and _panner deleted when parent deleted
}
+void
+TimeDomainDisplayPlot::set_yaxis(double min, double max)
+{
+ setAxisScale(QwtPlot::yLeft, min, max);
+}
-
void TimeDomainDisplayPlot::replot(){
const timespec startTime = get_highres_clock();
Modified:
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -26,6 +26,8 @@
virtual void replot();
+ void set_yaxis(double min, double max);
+
protected slots:
void LegendEntryChecked(QwtPlotItem *plotItem, bool on);
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui.i
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui.i 2009-05-11
16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui.i 2009-05-12
13:35:42 UTC (rev 11002)
@@ -62,6 +62,10 @@
void set_frequency_range(const double centerfreq,
const double startfreq,
const double stopfreq);
+ void set_time_domain_axis(double min, double max);
+ void set_constellation_axis(double xmin, double xmax,
+ double ymin, double ymax);
+ void set_frequency_axis(double min, double max);
};
@@ -100,5 +104,13 @@
public:
void exec_();
PyObject* pyqwidget();
+
+ void set_frequency_range(const double centerfreq,
+ const double startfreq,
+ const double stopfreq);
+ void set_time_domain_axis(double min, double max);
+ void set_constellation_axis(double xmin, double xmax,
+ double ymin, double ymax);
+ void set_frequency_axis(double min, double max);
};
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -163,6 +163,25 @@
}
void
+qtgui_sink_c::set_time_domain_axis(double min, double max)
+{
+ d_main_gui->SetTimeDomainAxis(min, max);
+}
+
+void
+qtgui_sink_c::set_constellation_axis(double xmin, double xmax,
+ double ymin, double ymax)
+{
+ d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax);
+}
+
+void
+qtgui_sink_c::set_frequency_axis(double min, double max)
+{
+ d_main_gui->SetFrequencyAxis(min, max);
+}
+
+void
qtgui_sink_c::fft(const gr_complex *data_in, int size, gr_complex *data_out)
{
if (d_window.size()) {
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_c.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -100,6 +100,11 @@
const double startfreq,
const double stopfreq);
+ void set_time_domain_axis(double min, double max);
+ void set_constellation_axis(double xmin, double xmax,
+ double ymin, double ymax);
+ void set_frequency_axis(double min, double max);
+
QApplication *d_qApplication;
qtgui_obj *d_object;
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -161,6 +161,25 @@
}
void
+qtgui_sink_f::set_time_domain_axis(double min, double max)
+{
+ d_main_gui->SetTimeDomainAxis(min, max);
+}
+
+void
+qtgui_sink_f::set_constellation_axis(double xmin, double xmax,
+ double ymin, double ymax)
+{
+ d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax);
+}
+
+void
+qtgui_sink_f::set_frequency_axis(double min, double max)
+{
+ d_main_gui->SetFrequencyAxis(min, max);
+}
+
+void
qtgui_sink_f::fft(const float *data_in, int size, gr_complex *data_out)
{
if (d_window.size()) {
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/qtgui_sink_f.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -100,6 +100,11 @@
const double startfreq,
const double stopfreq);
+ void set_time_domain_axis(double min, double max);
+ void set_constellation_axis(double xmin, double xmax,
+ double ymin, double ymax);
+ void set_frequency_axis(double min, double max);
+
QApplication *d_qApplication;
qtgui_obj *d_object;
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.cc
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.cc
2009-05-12 13:35:42 UTC (rev 11002)
@@ -856,3 +856,23 @@
d_plot_constellation = -1;
}
}
+
+
+void
+SpectrumDisplayForm::SetTimeDomainAxis(double min, double max)
+{
+ _timeDomainDisplayPlot->set_yaxis(min, max);
+}
+
+void
+SpectrumDisplayForm::SetConstellationAxis(double xmin, double xmax,
+ double ymin, double ymax)
+{
+ _constellationDisplayPlot->set_axis(xmin, xmax, ymin, ymax);
+}
+
+void
+SpectrumDisplayForm::SetFrequencyAxis(double min, double max)
+{
+ _frequencyDisplayPlot->set_yaxis(min, max);
+}
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.h
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.h
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/spectrumdisplayform.h
2009-05-12 13:35:42 UTC (rev 11002)
@@ -64,6 +64,10 @@
void ToggleTabTime(const bool state);
void ToggleTabConstellation(const bool state);
+ void SetTimeDomainAxis(double min, double max);
+ void SetConstellationAxis(double xmin, double xmax,
+ double ymin, double ymax);
+ void SetFrequencyAxis(double min, double max);
private slots:
void newFrequencyData( const SpectrumUpdateEvent* );
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
2009-05-12 13:35:42 UTC (rev 11002)
@@ -2,6 +2,7 @@
from gnuradio import gr, blks2
from gnuradio.qtgui import qtgui
+from gnuradio import eng_notation
from PyQt4 import QtGui, QtCore
import sys, sip
import scipy
@@ -14,98 +15,182 @@
sys.exit(1)
class dialog_box(QtGui.QMainWindow):
- def __init__(self, snkTx, snkRx, channel, parent=None):
+ def __init__(self, snkTx, snkRx, fg, parent=None):
QtGui.QWidget.__init__(self, parent)
self.gui = Ui_DigitalWindow()
self.gui.setupUi(self)
- self.channel = channel
+ self.fg = fg
+ self.set_sample_rate(self.fg.sample_rate())
+
+ self.set_snr(self.fg.snr())
+ self.set_frequency(self.fg.frequency_offset())
+ self.set_time_offset(self.fg.timing_offset())
+
+ self.set_gain_mu(self.fg.rx_gain_mu())
+ self.set_alpha(self.fg.rx_alpha())
+
# Add the qtsnk widgets to the hlayout box
self.gui.sinkLayout.addWidget(snkTx)
self.gui.sinkLayout.addWidget(snkRx)
+
# Connect up some signals
- self.connect(self.gui.noiseEdit, QtCore.SIGNAL("editingFinished()"),
- self.noiseEditText)
+ self.connect(self.gui.pauseButton, QtCore.SIGNAL("clicked()"),
+ self.pauseFg)
+
+ self.connect(self.gui.sampleRateEdit,
QtCore.SIGNAL("editingFinished()"),
+ self.sampleRateEditText)
+
+ self.connect(self.gui.snrEdit, QtCore.SIGNAL("editingFinished()"),
+ self.snrEditText)
self.connect(self.gui.freqEdit, QtCore.SIGNAL("editingFinished()"),
self.freqEditText)
self.connect(self.gui.timeEdit, QtCore.SIGNAL("editingFinished()"),
self.timeEditText)
-
- def set_noise(self, noise):
- self.noise = noise
- self.gui.noiseEdit.setText(QtCore.QString("%1").arg(self.noise))
- def set_frequency(self, freq):
- self.freq = freq
- self.gui.freqEdit.setText(QtCore.QString("%1").arg(self.freq))
+ self.connect(self.gui.gainMuEdit, QtCore.SIGNAL("editingFinished()"),
+ self.gainMuEditText)
+ self.connect(self.gui.alphaEdit, QtCore.SIGNAL("editingFinished()"),
+ self.alphaEditText)
+
+ def pauseFg(self):
+ if(self.gui.pauseButton.text() == "Pause"):
+ self.fg.stop()
+ self.fg.wait()
+ self.gui.pauseButton.setText("Unpause")
+ else:
+ self.fg.start()
+ self.gui.pauseButton.setText("Pause")
+
+ # Accessor functions for Gui to manipulate system parameters
+ def set_sample_rate(self, sr):
+ ssr = eng_notation.num_to_str(sr)
+ self.gui.sampleRateEdit.setText(QtCore.QString("%1").arg(ssr))
+
+ def sampleRateEditText(self):
+ try:
+ rate = self.gui.sampleRateEdit.text().toAscii()
+ srate = eng_notation.str_to_num(rate)
+ self.fg.set_sample_rate(srate)
+ except RuntimeError:
+ pass
+
+
+ # Accessor functions for Gui to manipulate channel model
+ def set_snr(self, snr):
+ self.gui.snrEdit.setText(QtCore.QString("%1").arg(snr))
+
+ def set_frequency(self, fo):
+ self.gui.freqEdit.setText(QtCore.QString("%1").arg(fo))
+
def set_time_offset(self, to):
- self.timing_offset = to
- self.gui.timeEdit.setText(QtCore.QString("%1").arg(self.timing_offset))
+ self.gui.timeEdit.setText(QtCore.QString("%1").arg(to))
- def noiseEditText(self):
+ def snrEditText(self):
try:
- noise = self.gui.noiseEdit.text().toDouble()[0]
- self.channel.set_noise_voltage(noise)
-
- self.noise = noise
+ snr = self.gui.snrEdit.text().toDouble()[0]
+ self.fg.set_snr(snr)
except RuntimeError:
pass
def freqEditText(self):
try:
freq = self.gui.freqEdit.text().toDouble()[0]
- self.channel.set_frequency_offset(freq)
-
- self.freq = freq
+ self.fg.set_frequency_offset(freq)
except RuntimeError:
pass
def timeEditText(self):
try:
to = self.gui.timeEdit.text().toDouble()[0]
- self.channel.set_timing_offset(to)
+ self.fg.set_timing_offset(to)
+ except RuntimeError:
+ pass
- self.timing_offset = to
+
+ # Accessor functions for Gui to manipulate receiver parameters
+ def set_gain_mu(self, gain):
+ self.gui.gainMuEdit.setText(QtCore.QString("%1").arg(gain))
+
+ def set_alpha(self, alpha):
+ self.gui.alphaEdit.setText(QtCore.QString("%1").arg(alpha))
+
+ def alphaEditText(self):
+ try:
+ alpha = self.gui.alphaEdit.text().toDouble()[0]
+ self.fg.set_rx_alpha(alpha)
except RuntimeError:
pass
+ def gainMuEditText(self):
+ try:
+ gain = self.gui.gainMuEdit.text().toDouble()[0]
+ self.fg.set_rx_gain_mu(gain)
+ except RuntimeError:
+ pass
+
class my_top_block(gr.top_block):
def __init__(self):
gr.top_block.__init__(self)
self.qapp = QtGui.QApplication(sys.argv)
- sps = 2
- excess_bw = 0.35
- gray_code = True
+ self._sample_rate = 200e3
+
+ self.sps = 2
+ self.excess_bw = 0.35
+ self.gray_code = True
fftsize = 2048
- data = scipy.random.randint(0, 255, 1000)
- src = gr.vector_source_b(data, True)
- mod = blks2.dqpsk_mod(sps, excess_bw, gray_code, False, False)
+ self.data = scipy.random.randint(0, 255, 1000)
+ self.src = gr.vector_source_b(self.data, True)
+ self.mod = blks2.dqpsk_mod(self.sps, self.excess_bw, self.gray_code,
False, False)
- rrctaps = gr.firdes.root_raised_cosine(1, sps, 1, excess_bw, 21)
- rx_rrc = gr.fir_filter_ccf(sps, rrctaps)
+ self.rrctaps = gr.firdes.root_raised_cosine(1, self.sps, 1,
self.excess_bw, 21)
+ self.rx_rrc = gr.fir_filter_ccf(1, self.rrctaps)
- noise = 1e-7
- fo = 1e-6
- to = 1.0
- channel = gr.channel_model(noise, fo, to)
- thr = gr.throttle(gr.sizeof_gr_complex, 10*fftsize)
+ # Set up the carrier & clock recovery parameters
+ self.arity = 4
+ self.mu = 0.5
+ self.gain_mu = 0.05
+ self.omega = self.sps
+ self.gain_omega = .25 * self.gain_mu * self.gain_mu
+ self.omega_rel_lim = 0.05
+
+ self.alpha = 0.15
+ self.beta = 0.25 * self.alpha * self.alpha
+ self.fmin = -1000/self.sample_rate()
+ self.fmax = 1000/self.sample_rate()
+
+ self.receiver = gr.mpsk_receiver_cc(self.arity, 0,
+ self.alpha, self.beta,
+ self.fmin, self.fmax,
+ self.mu, self.gain_mu,
+ self.omega, self.gain_omega,
+ self.omega_rel_lim)
+
+
+ self.snr_dB = 15
+ noise = self.get_noise_voltage(self.snr_dB)
+ self.fo = 100/self.sample_rate()
+ self.to = 1.0
+ self.channel = gr.channel_model(noise, self.fo, self.to)
+
+ self.thr = gr.throttle(gr.sizeof_char, 10*fftsize)
self.snk_tx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-1/2, 1/2,
"Tx", True, True, False, True, True)
self.snk_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-1/2, 1/2,
"Rx", True, True, False, True, True)
- self.connect(src, mod, channel, self.snk_tx)
- self.connect(channel, rx_rrc, thr, self.snk_rx)
+ self.connect(self.src, self.thr, self.mod, self.channel, self.snk_tx)
+ self.connect(self.channel, self.rx_rrc, self.receiver, self.snk_rx)
pyTxQt = self.snk_tx.pyqwidget()
pyTx = sip.wrapinstance(pyTxQt, QtGui.QWidget)
@@ -113,14 +198,76 @@
pyRxQt = self.snk_rx.pyqwidget()
pyRx = sip.wrapinstance(pyRxQt, QtGui.QWidget)
- self.main_box = dialog_box(pyTx, pyRx, channel);
- self.main_box.set_noise(noise)
- self.main_box.set_frequency(fo)
- self.main_box.set_time_offset(to)
+ self.main_box = dialog_box(pyTx, pyRx, self);
self.main_box.show()
+ def get_noise_voltage(self, SNR):
+ S = 0 # dBm, assuming signal power
normalized
+ N = S - SNR # dBm
+ npwr = pow(10.0, N/10.0) # ratio
+ nv = scipy.sqrt(npwr * self.sps) # convert the noise voltage
+ return nv
+
+
+ # System Parameters
+ def sample_rate(self):
+ return self._sample_rate
+ def set_sample_rate(self, sr):
+ self._sample_rate = sr
+
+
+ # Channel Model Parameters
+ def snr(self):
+ return self.snr_dB
+
+ def set_snr(self, snr):
+ self.snr_dB = snr
+ noise = self.get_noise_voltage(self.snr_dB)
+ self.channel.set_noise_voltage(noise)
+
+ def frequency_offset(self):
+ return self.fo * self.sample_rate()
+
+ def set_frequency_offset(self, fo):
+ self.fo = fo / self.sample_rate()
+ self.channel.set_frequency_offset(self.fo)
+
+ def timing_offset(self):
+ return self.to
+
+ def set_timing_offset(self, to):
+ self.to = to
+ self.channel.set_timing_offset(self.to)
+
+
+ # Receiver Parameters
+ def rx_gain_mu(self):
+ return self.gain_mu
+
+ def rx_gain_omega(self):
+ return self.gain_omega
+
+ def set_rx_gain_mu(self, gain):
+ self.gain_mu = gain
+ self.gain_omega = .25 * self.gain_mu * self.gain_mu
+ self.receiver.set_gain_mu(self.gain_mu)
+ self.receiver.set_gain_omega(self.gain_omega)
+
+ def rx_alpha(self):
+ return self.alpha
+
+ def rx_beta(self):
+ return self.beta
+
+ def set_rx_alpha(self, alpha):
+ self.alpha = alpha
+ self.beta = .25 * self.alpha * self.alpha
+ self.receiver.set_alpha(self.alpha)
+ self.receiver.set_beta(self.beta)
+
+
if __name__ == "__main__":
tb = my_top_block();
tb.start()
Modified:
gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital_window.ui
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital_window.ui
2009-05-11 16:03:59 UTC (rev 11001)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital_window.ui
2009-05-12 13:35:42 UTC (rev 11002)
@@ -1,155 +1,277 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>DigitalWindow</class>
- <widget class="QMainWindow" name="DigitalWindow" >
- <property name="geometry" >
+ <widget class="QMainWindow" name="DigitalWindow">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1236</width>
- <height>655</height>
+ <height>739</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>MainWindow</string>
</property>
- <widget class="QWidget" name="centralwidget" >
- <widget class="QLineEdit" name="noiseEdit" >
- <property name="geometry" >
+ <widget class="QWidget" name="centralwidget">
+ <widget class="QPushButton" name="closeButton">
+ <property name="geometry">
<rect>
- <x>120</x>
- <y>520</y>
- <width>113</width>
- <height>23</height>
+ <x>1120</x>
+ <y>650</y>
+ <width>101</width>
+ <height>31</height>
</rect>
</property>
+ <property name="text">
+ <string>Close</string>
+ </property>
</widget>
- <widget class="QLabel" name="noiseLabel" >
- <property name="geometry" >
+ <widget class="QFrame" name="sinkFrame">
+ <property name="geometry">
<rect>
<x>10</x>
- <y>520</y>
- <width>111</width>
- <height>20</height>
+ <y>10</y>
+ <width>1221</width>
+ <height>501</height>
</rect>
</property>
- <property name="text" >
- <string>Noise Amplitude</string>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <widget class="QWidget" name="horizontalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>1201</width>
+ <height>481</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="sinkLayout"/>
+ </widget>
</widget>
- <widget class="QPushButton" name="closeButton" >
- <property name="geometry" >
+ <widget class="QGroupBox" name="channelModeBox">
+ <property name="geometry">
<rect>
- <x>260</x>
- <y>580</y>
- <width>80</width>
- <height>27</height>
+ <x>290</x>
+ <y>520</y>
+ <width>291</width>
+ <height>161</height>
</rect>
</property>
- <property name="text" >
- <string>Close</string>
+ <property name="title">
+ <string>Channel Model Parameters</string>
</property>
+ <widget class="QLabel" name="timeLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>101</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Timing Offset</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="timeEdit">
+ <property name="geometry">
+ <rect>
+ <x>160</x>
+ <y>90</y>
+ <width>113</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="snrEdit">
+ <property name="geometry">
+ <rect>
+ <x>160</x>
+ <y>30</y>
+ <width>113</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="snrLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>111</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>SNR (dB)</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="freqEdit">
+ <property name="geometry">
+ <rect>
+ <x>160</x>
+ <y>60</y>
+ <width>113</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="freqLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>60</y>
+ <width>141</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Frequency Offset (Hz)</string>
+ </property>
+ </widget>
</widget>
- <widget class="QLineEdit" name="freqEdit" >
- <property name="geometry" >
+ <widget class="QGroupBox" name="rxBox">
+ <property name="geometry">
<rect>
- <x>120</x>
- <y>550</y>
- <width>113</width>
- <height>23</height>
+ <x>590</x>
+ <y>520</y>
+ <width>251</width>
+ <height>161</height>
</rect>
</property>
- </widget>
- <widget class="QLineEdit" name="timeEdit" >
- <property name="geometry" >
- <rect>
- <x>120</x>
- <y>580</y>
- <width>113</width>
- <height>23</height>
- </rect>
+ <property name="title">
+ <string>Receiver Parameters</string>
</property>
+ <widget class="QLineEdit" name="gainMuEdit">
+ <property name="geometry">
+ <rect>
+ <x>120</x>
+ <y>30</y>
+ <width>113</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="gainMuLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>111</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Gain mu</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="alphaEdit">
+ <property name="geometry">
+ <rect>
+ <x>120</x>
+ <y>60</y>
+ <width>113</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="alphaLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>60</y>
+ <width>111</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Alpha</string>
+ </property>
+ </widget>
</widget>
- <widget class="QLabel" name="freqLabel" >
- <property name="geometry" >
+ <widget class="QGroupBox" name="sysBox">
+ <property name="geometry">
<rect>
- <x>10</x>
- <y>550</y>
- <width>101</width>
- <height>17</height>
+ <x>20</x>
+ <y>520</y>
+ <width>261</width>
+ <height>161</height>
</rect>
</property>
- <property name="text" >
- <string>Frequency Offset</string>
+ <property name="title">
+ <string>System Parameters</string>
</property>
+ <widget class="QLineEdit" name="sampleRateEdit">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>30</y>
+ <width>113</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="sampleRateLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>121</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Sample Rate (sps)</string>
+ </property>
+ </widget>
</widget>
- <widget class="QLabel" name="timeLabel" >
- <property name="geometry" >
+ <widget class="QPushButton" name="pauseButton">
+ <property name="geometry">
<rect>
- <x>10</x>
- <y>580</y>
+ <x>1120</x>
+ <y>520</y>
<width>101</width>
- <height>17</height>
+ <height>31</height>
</rect>
</property>
- <property name="text" >
- <string>Timing Offset</string>
+ <property name="text">
+ <string>Pause</string>
</property>
</widget>
- <widget class="QFrame" name="sinkFrame" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>10</y>
- <width>1221</width>
- <height>501</height>
- </rect>
- </property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
- </property>
- <widget class="QWidget" name="horizontalLayoutWidget" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>10</y>
- <width>1201</width>
- <height>481</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="sinkLayout" />
- </widget>
- </widget>
</widget>
- <widget class="QMenuBar" name="menubar" >
- <property name="geometry" >
+ <widget class="QMenuBar" name="menubar">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1236</width>
- <height>22</height>
+ <height>25</height>
</rect>
</property>
- <widget class="QMenu" name="menuFile" >
- <property name="title" >
+ <widget class="QMenu" name="menuFile">
+ <property name="title">
<string>&File</string>
</property>
- <addaction name="actionExit" />
+ <addaction name="actionExit"/>
</widget>
- <addaction name="menuFile" />
+ <addaction name="menuFile"/>
</widget>
- <widget class="QStatusBar" name="statusbar" />
- <action name="actionExit" >
- <property name="text" >
+ <widget class="QStatusBar" name="statusbar"/>
+ <action name="actionExit">
+ <property name="text">
<string>E&xit</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>closeButton</tabstop>
- <tabstop>noiseEdit</tabstop>
+ <tabstop>snrEdit</tabstop>
<tabstop>freqEdit</tabstop>
<tabstop>timeEdit</tabstop>
</tabstops>
@@ -161,11 +283,11 @@
<receiver>DigitalWindow</receiver>
<slot>close()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>322</x>
<y>623</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>66</x>
<y>561</y>
</hint>
@@ -177,11 +299,11 @@
<receiver>DigitalWindow</receiver>
<slot>close()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>617</x>
<y>327</y>
</hint>
Property changes on:
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
Property changes on:
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11002 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gr-qtgui/src/lib gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python/blocks,
jcorgan <=