[Commit-gnuradio] [gnuradio] 11/46: zeromq: Rename "zmqblocks" to zeromq in examples

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4b8c849546573b32337835c4956dc59bc6dad636
Author: Johannes Schmitz <address@hidden>
Date:   Thu Mar 6 18:39:05 2014 +0100

    zeromq: Rename "zmqblocks" to zeromq in examples
---
 gr-zeromq/examples/client.py  | 14 +++++++-------
 gr-zeromq/examples/gui.py     |  8 ++++----
 gr-zeromq/examples/loop.py    | 14 +++++++-------
 gr-zeromq/examples/run_app.sh |  4 ++--
 gr-zeromq/examples/server.py  | 14 +++++++-------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/gr-zeromq/examples/client.py b/gr-zeromq/examples/client.py
index 455ae33..5c1a8e2 100755
--- a/gr-zeromq/examples/client.py
+++ b/gr-zeromq/examples/client.py
@@ -25,7 +25,7 @@
 ###############################################################################
 # Imports
 ###############################################################################
-import zmqblocks
+from gnuradio import zeromq
 from gnuradio import gr
 from gnuradio import blocks
 from gnuradio import analog
@@ -52,17 +52,17 @@ class top_block(gr.top_block):
         source_adr = "tcp://"+self.options.servername+":5555"
 
         # blocks
-        #self.zmq_source = 
zmqblocks.source_reqrep_nopoll(gr.sizeof_float,source_adr)
-        self.zmq_source = zmqblocks.source_reqrep(gr.sizeof_float,source_adr)
-        #self.zmq_source = 
zmqblocks.source_pushpull(gr.sizeof_float,source_adr)
-        #self.zmq_probe = zmqblocks.sink_pushpull(gr.sizeof_float,probe_adr)
-        self.zmq_probe = zmqblocks.sink_pubsub(gr.sizeof_float,probe_adr)
+        #self.zmq_source = 
zeromq.source_reqrep_nopoll(gr.sizeof_float,source_adr)
+        self.zmq_source = zeromq.source_reqrep(gr.sizeof_float,source_adr)
+        #self.zmq_source = zeromq.source_pushpull(gr.sizeof_float,source_adr)
+        #self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float,probe_adr)
+        self.zmq_probe = zeromq.sink_pubsub(gr.sizeof_float,probe_adr)
 
         # connects
         self.connect(self.zmq_source, self.zmq_probe)
 
         # ZeroMQ
-        self.rpc_manager = zmqblocks.rpc_manager()
+        self.rpc_manager = zeromq.rpc_manager()
         self.rpc_manager.set_reply_socket(rpc_adr)
         self.rpc_manager.add_interface("start_fg",self.start_fg)
         self.rpc_manager.add_interface("stop_fg",self.stop_fg)
diff --git a/gr-zeromq/examples/gui.py b/gr-zeromq/examples/gui.py
index eaa72da..5656fd9 100755
--- a/gr-zeromq/examples/gui.py
+++ b/gr-zeromq/examples/gui.py
@@ -30,7 +30,7 @@ import sys
 import os
 from PyQt4 import Qt, QtGui, QtCore, uic
 import PyQt4.Qwt5 as Qwt
-import zmqblocks
+import zeromq
 import signal
 
 class gui(QtGui.QMainWindow):
@@ -51,13 +51,13 @@ class gui(QtGui.QMainWindow):
         probe_adr_client = "tcp://"+options.clientname+":5557"
 
         # ZeroMQ
-        self.probe_manager = zmqblocks.probe_manager()
+        self.probe_manager = zeromq.probe_manager()
         self.probe_manager.add_socket(probe_adr_server, 'float32', 
self.plot_data_server)
         self.probe_manager.add_socket(probe_adr_client, 'float32', 
self.plot_data_client)
 
-        self.rpc_mgr_server = zmqblocks.rpc_manager()
+        self.rpc_mgr_server = zeromq.rpc_manager()
         self.rpc_mgr_server.set_request_socket(rpc_adr_server)
-        self.rpc_mgr_client = zmqblocks.rpc_manager()
+        self.rpc_mgr_client = zeromq.rpc_manager()
         self.rpc_mgr_client.set_request_socket(rpc_adr_client)
 
         self.gui.setWindowTitle(window_name)
diff --git a/gr-zeromq/examples/loop.py b/gr-zeromq/examples/loop.py
index d2c822b..2d6d750 100755
--- a/gr-zeromq/examples/loop.py
+++ b/gr-zeromq/examples/loop.py
@@ -24,7 +24,7 @@
 ###############################################################################
 # Imports
 ###############################################################################
-import zmqblocks
+from gnuradio import zeromq
 from gnuradio import gr
 from gnuradio import blocks
 from gnuradio import analog
@@ -71,14 +71,14 @@ class top_block(gr.top_block):
         self.gr_sig_source = analog.sig_source_f(samp_rate, analog.GR_SIN_WAVE 
, 1000, 1, 0)
         self.null_source = blocks.null_source(gr.sizeof_float)
         self.throttle = blocks.throttle(gr.sizeof_float, samp_rate)
-        self.zmq_source = 
zmqblocks.source_pushpull_feedback(gr.sizeof_float,source_adr)
+        self.zmq_source = 
zeromq.source_pushpull_feedback(gr.sizeof_float,source_adr)
         self.mult_a = blocks.multiply_const_ff(1)
         self.mult_b = blocks.multiply_const_ff(0.5)
         self.add = blocks.add_ff(1)
-        #self.zmq_sink = zmqblocks.sink_reqrep_nopoll(gr.sizeof_float, 
sink_adr)
-        #self.zmq_sink = zmqblocks.sink_reqrep(gr.sizeof_float, sink_adr)
-        self.zmq_sink = zmqblocks.sink_pushpull(gr.sizeof_float, sink_adr)
-        self.zmq_probe = zmqblocks.sink_pushpull(gr.sizeof_float, probe_adr_fg)
+        #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr)
+        #self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr)
+        self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr)
+        self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr_fg)
         #self.null_sink = blocks.null_sink(gr.sizeof_float)
 
         # connects
@@ -89,7 +89,7 @@ class top_block(gr.top_block):
         self.connect(self.throttle, self.zmq_probe)
 
         # ZeroMQ
-        self.rpc_manager = zmqblocks.rpc_manager()
+        self.rpc_manager = zeromq.rpc_manager()
         self.rpc_manager.set_reply_socket(rpc_adr_reply)
         self.rpc_manager.add_interface("start_fg",self.start_fg)
         self.rpc_manager.add_interface("stop_fg",self.stop_fg)
diff --git a/gr-zeromq/examples/run_app.sh b/gr-zeromq/examples/run_app.sh
index a18ff14..59370d0 100755
--- a/gr-zeromq/examples/run_app.sh
+++ b/gr-zeromq/examples/run_app.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-export LD_LIBRARY_PATH="$PWD/../build/lib"
-export PYTHONPATH="$PWD/../build/swig:$PWD/../python"
+export LD_LIBRARY_PATH="$PWD/../build/gr-zeromq/lib"
+export PYTHONPATH="$PWD/../build/gr-zeromq/swig:$PWD/../python"
 /usr/bin/python $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/gr-zeromq/examples/server.py b/gr-zeromq/examples/server.py
index 46bfa59..34823ea 100755
--- a/gr-zeromq/examples/server.py
+++ b/gr-zeromq/examples/server.py
@@ -24,7 +24,7 @@
 ###############################################################################
 # Imports
 ###############################################################################
-import zmqblocks
+from gnuradio import zeromq
 from gnuradio import gr
 from gnuradio import blocks
 from gnuradio import analog
@@ -58,11 +58,11 @@ class top_block(gr.top_block):
         self.gr_sig_source = analog.sig_source_f(samp_rate, analog.GR_SIN_WAVE 
, 1000, 1, 0)
         self.throttle = blocks.throttle(gr.sizeof_float, samp_rate)
         self.mult = blocks.multiply_const_ff(1)
-        #self.zmq_sink = zmqblocks.sink_reqrep_nopoll(gr.sizeof_float, 
sink_adr)
-        self.zmq_sink = zmqblocks.sink_reqrep(gr.sizeof_float, sink_adr)
-        #self.zmq_sink = zmqblocks.sink_pushpull(gr.sizeof_float, sink_adr)
-        #self.zmq_probe = zmqblocks.sink_pushpull(gr.sizeof_float, probe_adr)
-        self.zmq_probe = zmqblocks.sink_pubsub(gr.sizeof_float, probe_adr)
+        #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr)
+        self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr)
+        #self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr)
+        #self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr)
+        self.zmq_probe = zeromq.sink_pubsub(gr.sizeof_float, probe_adr)
         #self.null_sink = blocks.null_sink(gr.sizeof_float)
 
         # connects
@@ -70,7 +70,7 @@ class top_block(gr.top_block):
         self.connect(self.throttle, self.zmq_probe)
 
         # ZeroMQ
-        self.rpc_manager = zmqblocks.rpc_manager()
+        self.rpc_manager = zeromq.rpc_manager()
         self.rpc_manager.set_reply_socket(rpc_adr)
         self.rpc_manager.add_interface("start_fg",self.start_fg)
         self.rpc_manager.add_interface("stop_fg",self.stop_fg)