[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9514 - in gnuradio/branches/developers/jblum/grc_reor
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r9514 - in gnuradio/branches/developers/jblum/grc_reorganize/grc/src: grc_gnuradio/blks2 grc_gnuradio/usrp grc_gnuradio/wxgui gui platforms/base platforms/gui platforms/python platforms/python/utils utils |
|
Date: |
Sat, 6 Sep 2008 22:13:32 -0600 (MDT) |
Author: jblum
Date: 2008-09-06 22:13:30 -0600 (Sat, 06 Sep 2008)
New Revision: 9514
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/__init__.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/error_rate.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/packet.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/queue.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/selector.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/__init__.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/simple_usrp.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/__init__.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/callback_controls.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/top_block_gui.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ActionHandler.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Actions.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Bars.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/BlockTreeWindow.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Constants.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Dialogs.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/DrawingArea.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/FileDialogs.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/MainWindow.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Messages.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/NotebookPage.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ParamsDialog.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Preferences.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/StateCache.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Block.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Connection.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Constants.py.in
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Element.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/FlowGraph.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Param.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Platform.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Port.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Block.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Connection.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Constants.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Element.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/FlowGraph.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Param.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Platform.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Port.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Utils.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Block.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Connection.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Constants.py.in
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/FlowGraph.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Generator.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Param.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Platform.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Port.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/expr_utils.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/extract_docs.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/ParseXML.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/__init__.py
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/converter.py
Log:
source code cleanup
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/__init__.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/__init__.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/__init__.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,22 +1,22 @@
# Copyright 2008 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.
-#
+#
from queue import queue_sink_thread
from queue import queue_sink_c, queue_sink_f, queue_sink_i, queue_sink_s,
queue_sink_b
@@ -25,4 +25,3 @@
from selector import selector, valve
from packet import packet_encoder, packet_decoder
from error_rate import error_rate
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/error_rate.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/error_rate.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/error_rate.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,22 +1,22 @@
# Copyright 2008 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.
-#
+#
default_win_size = 1000
@@ -31,7 +31,7 @@
"""
Read samples from the message queue and hand them to the callback.
"""
-
+
def __init__(self, msgq, callback):
self._msgq = msgq
self._callback = callback
@@ -39,7 +39,7 @@
self.setDaemon(1)
self.keep_running = True
self.start()
-
+
def run(self):
r = ''
while True:
@@ -49,27 +49,27 @@
s = r + msg.to_string()
i = (nitems-nitems%2)*itemsize
r = s[i:]
- s = s[:i]
+ s = s[:i]
samples = numpy.fromstring(s, numpy.int8)
- self._callback(samples)
-
+ self._callback(samples)
+
class error_rate(gr.hier_block2):
"""
Sample the incoming data streams (byte) and calculate the bit or symbol
error rate.
Write the running rate to the output data stream (float).
"""
-
- def __init__(self, type='BER', win_size=default_win_size,
bits_per_symbol=2):
- """!
+
+ def __init__(self, type='BER', win_size=default_win_size,
bits_per_symbol=2):
+ """
Error rate constructor.
@param type a string 'BER' or 'SER'
@param win_size the number of samples to calculate over
@param bits_per_symbol the number of information bits per
symbol (BER only)
- """
+ """
#init
gr.hier_block2.__init__(
- self, 'error_rate',
- gr.io_signature(2, 2, gr.sizeof_char),
+ self, 'error_rate',
+ gr.io_signature(2, 2, gr.sizeof_char),
gr.io_signature(1, 1, gr.sizeof_float),
)
assert type in ('BER', 'SER')
@@ -95,12 +95,12 @@
self.connect((self, 0), (inter, 0))
self.connect((self, 1), (inter, 1))
self.connect(inter, msg_sink)
-
+
def _handler_ber(self, samples):
num = len(samples)/2
arr = numpy.zeros(num, numpy.float32)
for i in range(num):
- old_err = self._err_array[self._err_index]
+ old_err = self._err_array[self._err_index]
#record error
self._err_array[self._err_index] =
_1s_counts[samples[i*2] ^ samples[i*2 + 1]]
self._num_errs = self._num_errs +
self._err_array[self._err_index] - old_err
@@ -111,13 +111,13 @@
arr[i] =
float(self._num_errs)/float(self._num_samps*self._bits_per_symbol)
#write message
msg = gr.message_from_string(arr.tostring(), 0,
gr.sizeof_float, num)
- self._msgq_source.insert_tail(msg)
-
+ self._msgq_source.insert_tail(msg)
+
def _handler_ser(self, samples):
num = len(samples)/2
arr = numpy.zeros(num, numpy.float32)
for i in range(num):
- old_err = self._err_array[self._err_index]
+ old_err = self._err_array[self._err_index]
#record error
ref = samples[i*2]
res = samples[i*2 + 1]
@@ -134,5 +134,4 @@
arr[i] = float(self._num_errs)/float(self._num_samps)
#write message
msg = gr.message_from_string(arr.tostring(), 0,
gr.sizeof_float, num)
- self._msgq_source.insert_tail(msg)
-
+ self._msgq_source.insert_tail(msg)
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/packet.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/packet.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/packet.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,22 +1,22 @@
# Copyright 2008 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.
-#
+#
from gnuradio import gr, packet_utils
import gnuradio.gr.gr_threading as _threading
@@ -31,11 +31,11 @@
DEFAULT_THRESHOLD = 12
#######################################################################################
-## Packet Encoder
+## Packet Encoder
#######################################################################################
class _packet_encoder_thread(_threading.Thread):
-
+
def __init__(self, msgq, payload_length, send):
self._msgq = msgq
self._payload_length = payload_length
@@ -44,24 +44,24 @@
self.setDaemon(1)
self.keep_running = True
self.start()
-
+
def run(self):
sample = '' #residual sample
while self.keep_running:
msg = self._msgq.delete_head() #blocking read of
message queue
- sample = sample + msg.to_string() #get the body of the
msg as a string
- while len(sample) >= self._payload_length:
+ sample = sample + msg.to_string() #get the body of the
msg as a string
+ while len(sample) >= self._payload_length:
payload = sample[0:self._payload_length]
- sample = sample[self._payload_length:]
- self._send(payload)
+ sample = sample[self._payload_length:]
+ self._send(payload)
class packet_encoder(gr.hier_block2):
"""
Hierarchical block for wrapping packet-based modulators.
"""
-
+
def __init__(self, item_size_in, samples_per_symbol, bits_per_symbol,
access_code='', pad_for_usrp=True, payload_length=-1):
- """!
+ """
packet_mod constructor.
@param item_size_in the size of the input data stream in bytes
@param samples_per_symbol number of samples per symbol
@@ -79,8 +79,8 @@
access_code = packet_utils.default_access_code
if not packet_utils.is_1_0_string(access_code):
raise ValueError, "Invalid access_code %r. Must be
string of 1's and 0's" % (access_code,)
- self._access_code = access_code
- self._pad_for_usrp = pad_for_usrp
+ self._access_code = access_code
+ self._pad_for_usrp = pad_for_usrp
if payload_length < 0: #get payload length
payload_length = DEFAULT_PAYLOAD_LEN
if payload_length%self._item_size_in != 0: #verify that
packet length is a multiple of the stream size
@@ -88,12 +88,12 @@
self._payload_length = payload_length
#create blocks
msg_source = gr.message_source(gr.sizeof_char,
DEFAULT_MSGQ_LIMIT)
- self._msgq_out = msg_source.msgq()
+ self._msgq_out = msg_source.msgq()
self._msgq_in = gr.msg_queue(DEFAULT_MSGQ_LIMIT)
- msg_sink = gr.message_sink(self._item_size_in, self._msgq_in,
False) #False -> blocking
+ msg_sink = gr.message_sink(self._item_size_in, self._msgq_in,
False) #False -> blocking
#initialize hier2
gr.hier_block2.__init__(
- self,
+ self,
"packet_encoder",
gr.io_signature(1, 1, self._item_size_in), # Input
signature
gr.io_signature(1, 1, gr.sizeof_char) # Output signature
@@ -103,12 +103,12 @@
self.connect(msg_source, self)
#start thread
_packet_encoder_thread(self._msgq_in, self._payload_length,
self._send_packet)
-
+
def _send_packet(self, payload):
- """!
+ """
Wrap the payload in a packet and push onto the message queue.
@param payload string, data to send
- """
+ """
packet = packet_utils.make_packet(
payload,
self._samples_per_symbol,
@@ -118,13 +118,13 @@
)
msg = gr.message_from_string(packet)
self._msgq_out.insert_tail(msg)
-
+
#######################################################################################
-## Packet Decoder
+## Packet Decoder
#######################################################################################
class _packet_decoder_thread(_threading.Thread):
-
+
def __init__(self, msgq, callback):
_threading.Thread.__init__(self)
self.setDaemon(1)
@@ -144,9 +144,9 @@
"""
Hierarchical block for wrapping packet-based demodulators.
"""
-
+
def __init__(self, item_size_out, access_code='', threshold=-1):
- """!
+ """
packet_demod constructor.
@param item_size_out the size of the output data stream in bytes
@param access_code AKA sync vector
@@ -159,19 +159,19 @@
access_code = packet_utils.default_access_code
if not packet_utils.is_1_0_string(access_code):
raise ValueError, "Invalid access_code %r. Must be
string of 1's and 0's" % (access_code,)
- self._access_code = access_code
+ self._access_code = access_code
#threshold
- if threshold < 0: threshold = DEFAULT_THRESHOLD
- self._threshold = threshold
+ if threshold < 0: threshold = DEFAULT_THRESHOLD
+ self._threshold = threshold
#blocks
self._msgq_in = gr.msg_queue(DEFAULT_MSGQ_LIMIT) #holds packets
from the PHY
correlator = gr.correlate_access_code_bb(self._access_code,
self._threshold)
- framer_sink = gr.framer_sink_1(self._msgq_in)
+ framer_sink = gr.framer_sink_1(self._msgq_in)
msg_source = gr.message_source(self._item_size_out,
DEFAULT_MSGQ_LIMIT)
- self._msgq_out = msg_source.msgq()
+ self._msgq_out = msg_source.msgq()
#initialize hier2
gr.hier_block2.__init__(
- self,
+ self,
"packet_decoder",
gr.io_signature(1, 1, gr.sizeof_char), # Input signature
gr.io_signature(1, 1, self._item_size_out) # Output
signature
@@ -183,12 +183,10 @@
_packet_decoder_thread(self._msgq_in, self._recv_packet)
def _recv_packet(self, ok, payload):
- """!
+ """
Extract the payload from the packet and push onto message queue.
@param ok boolean ok
@param payload data received
"""
msg = gr.message_from_string(payload, 0, self._item_size_out,
len(payload)/self._item_size_out)
- if ok: self._msgq_out.insert_tail(msg)
-
-
+ if ok: self._msgq_out.insert_tail(msg)
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/queue.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/queue.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/queue.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,37 +1,37 @@
# Copyright 2008 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.
-#
+#
from gnuradio import gr
import gnuradio.gr.gr_threading as _threading
import numpy
#######################################################################################
-## Queue Sink Thread
+## Queue Sink Thread
#######################################################################################
class queue_sink_thread(_threading.Thread):
- """!
+ """
Read samples from the queue sink and execute the callback.
"""
-
+
def __init__(self, queue_sink, callback):
- """!
+ """
Queue sink thread contructor.
@param queue_sink the queue to pop messages from
@param callback the function of one argument
@@ -42,31 +42,31 @@
self.setDaemon(1)
self.keep_running = True
self.start()
-
+
def run(self):
while self.keep_running:
self._callback(self._queue_sink.pop())
#######################################################################################
-## Queue Sink
+## Queue Sink
#######################################################################################
class _queue_sink_base(gr.hier_block2):
- """!
+ """
Queue sink base, a queue sink for any size queue.
Easy read access to a gnuradio data stream from python.
Call pop to read a sample from a gnuradio data stream.
Samples are cast as python data types, complex, float, or int.
"""
-
+
def __init__(self, vlen=1):
- """!
+ """
Queue sink base contructor.
@param vlen the vector length
"""
self._vlen = vlen
#initialize hier2
gr.hier_block2.__init__(
- self,
+ self,
"queue_sink",
gr.io_signature(1, 1, self._item_size*self._vlen), #
Input signature
gr.io_signature(0, 0, 0) # Output signature
@@ -77,9 +77,9 @@
#connect
self.connect(self, message_sink)
self.arr = ''
-
+
def pop(self):
- """!
+ """
Pop a new sample off the front of the queue.
@return a new sample
"""
@@ -95,59 +95,59 @@
class queue_sink_c(_queue_sink_base):
_item_size = gr.sizeof_gr_complex
_numpy = numpy.complex64
- def _cast(self, arg): return complex(arg.real, arg.imag)
-
+ def _cast(self, arg): return complex(arg.real, arg.imag)
+
class queue_sink_f(_queue_sink_base):
_item_size = gr.sizeof_float
_numpy = numpy.float32
_cast = float
-
+
class queue_sink_i(_queue_sink_base):
_item_size = gr.sizeof_int
_numpy = numpy.int32
_cast = int
-
+
class queue_sink_s(_queue_sink_base):
_item_size = gr.sizeof_short
_numpy = numpy.int16
_cast = int
-
+
class queue_sink_b(_queue_sink_base):
_item_size = gr.sizeof_char
_numpy = numpy.int8
_cast = int
-
+
#######################################################################################
-## Queue Source
+## Queue Source
#######################################################################################
class _queue_source_base(gr.hier_block2):
- """!
+ """
Queue source base, a queue source for any size queue.
Easy write access to a gnuradio data stream from python.
Call push to to write a sample into the gnuradio data stream.
"""
-
+
def __init__(self, vlen=1):
- """!
+ """
Queue source base contructor.
@param vlen the vector length
"""
self._vlen = vlen
#initialize hier2
gr.hier_block2.__init__(
- self,
+ self,
"queue_source",
gr.io_signature(0, 0, 0), # Input signature
gr.io_signature(1, 1, self._item_size*self._vlen) #
Output signature
)
#create message sink
- message_source = gr.message_source(self._item_size*self._vlen,
1)
+ message_source = gr.message_source(self._item_size*self._vlen,
1)
self._msgq = message_source.msgq()
#connect
self.connect(message_source, self)
-
+
def push(self, item):
- """!
+ """
Push an item into the back of the queue.
@param item the item
"""
@@ -159,20 +159,19 @@
class queue_source_c(_queue_source_base):
_item_size = gr.sizeof_gr_complex
_numpy = numpy.complex64
-
+
class queue_source_f(_queue_source_base):
_item_size = gr.sizeof_float
_numpy = numpy.float32
-
+
class queue_source_i(_queue_source_base):
_item_size = gr.sizeof_int
_numpy = numpy.int32
-
+
class queue_source_s(_queue_source_base):
_item_size = gr.sizeof_short
_numpy = numpy.int16
-
+
class queue_source_b(_queue_source_base):
_item_size = gr.sizeof_char
_numpy = numpy.int8
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/selector.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/selector.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/blks2/selector.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,92 +1,92 @@
#!/usr/bin/env python
#
# Copyright 2008 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.
-#
+#
from gnuradio import gr
-
+
class selector(gr.hier_block2):
"""A hier2 block with N inputs and M outputs, where data is only
forwarded through input n to output m."""
- def __init__(self, item_size, num_inputs, num_outputs, input_index,
output_index):
- """!
+ def __init__(self, item_size, num_inputs, num_outputs, input_index,
output_index):
+ """
SelectorHelper constructor.
@param item_size the size of the gr data stream in bytes
@param num_inputs the number of inputs (integer)
@param num_outputs the number of outputs (integer)
@param input_index the index for the source data
@param output_index the index for the destination data
- """
+ """
gr.hier_block2.__init__(
- self, 'selector',
- gr.io_signature(num_inputs, num_inputs, item_size),
+ self, 'selector',
+ gr.io_signature(num_inputs, num_inputs, item_size),
gr.io_signature(num_outputs, num_outputs, item_size),
)
- #terminator blocks for unused inputs and outputs
+ #terminator blocks for unused inputs and outputs
self.input_terminators = [gr.null_sink(item_size)] * num_inputs
self.output_terminators = [gr.head(item_size, 0)] * num_outputs
self.copy = None
- #connections
+ #connections
for i in range(num_inputs): self.connect((self, i),
self.input_terminators[i])
- for i in range(num_outputs):
self.connect(gr.null_source(item_size), self.output_terminators[i], (self, i))
- self.item_size = item_size
+ for i in range(num_outputs):
self.connect(gr.null_source(item_size), self.output_terminators[i], (self, i))
+ self.item_size = item_size
self.input_index = input_index
- self.output_index = output_index
+ self.output_index = output_index
self.num_inputs = num_inputs
self.num_outputs = num_outputs
self._connect_current()
-
+
def _indexes_valid(self):
- """!
+ """
Are the input and output indexes within range of the number of
inputs and outputs?
@return true if input index and output index are in range
"""
return self.input_index in range(self.num_inputs) and
self.output_index in range(self.num_outputs)
-
+
def _connect_current(self):
- """If the input and output indexes are valid:
- disconnect the blocks at the input and output index from their
terminators,
+ """If the input and output indexes are valid:
+ disconnect the blocks at the input and output index from their
terminators,
and connect them to one another. Then connect the terminators
to one another."""
if self._indexes_valid():
- self.disconnect((self, self.input_index),
self.input_terminators[self.input_index])
+ self.disconnect((self, self.input_index),
self.input_terminators[self.input_index])
self.disconnect(self.output_terminators[self.output_index], (self,
self.output_index))
self.copy = gr.skiphead(self.item_size, 0)
self.connect((self, self.input_index), self.copy)
- self.connect(self.copy, (self, self.output_index))
-
self.connect(self.output_terminators[self.output_index],
self.input_terminators[self.input_index])
-
+ self.connect(self.copy, (self, self.output_index))
+
self.connect(self.output_terminators[self.output_index],
self.input_terminators[self.input_index])
+
def _disconnect_current(self):
- """If the input and output indexes are valid:
- disconnect the blocks at the input and output index from one
another,
+ """If the input and output indexes are valid:
+ disconnect the blocks at the input and output index from one
another,
and the terminators at the input and output index from one
another.
Reconnect the blocks to the terminators."""
if self._indexes_valid():
self.disconnect((self, self.input_index), self.copy)
self.disconnect(self.copy, (self, self.output_index))
self.disconnect(self.output_terminators[self.output_index],
self.input_terminators[self.input_index])
- del self.copy
- self.copy = None
+ del self.copy
+ self.copy = None
self.connect((self, self.input_index),
self.input_terminators[self.input_index])
self.connect(self.output_terminators[self.output_index], (self,
self.output_index))
-
+
def set_input_index(self, input_index):
- """!
+ """
Change the block to the new input index if the index changed.
@param input_index the new input index
"""
@@ -95,25 +95,25 @@
self._disconnect_current()
self.input_index = input_index
self._connect_current()
- self.unlock()
-
+ self.unlock()
+
def set_output_index(self, output_index):
- """!
+ """
Change the block to the new output index if the index changed.
@param output_index the new output index
- """
- if self.output_index != output_index:
+ """
+ if self.output_index != output_index:
self.lock()
self._disconnect_current()
self.output_index = output_index
- self._connect_current()
- self.unlock()
+ self._connect_current()
+ self.unlock()
class valve(selector):
"""Wrapper for selector with 1 input and 1 output."""
-
+
def __init__(self, item_size, open):
- """!
+ """
Constructor for valve.
@param item_size the size of the gr data stream in bytes
@param open true if initial valve state is open
@@ -121,13 +121,12 @@
if open: output_index = -1
else: output_index = 0
selector.__init__(self, item_size, 1, 1, 0, output_index)
-
+
def set_open(self, open):
- """!
+ """
Callback to set open state.
@param open true to set valve state to open
"""
if open: output_index = -1
else: output_index = 0
self.set_output_index(output_index)
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/__init__.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/__init__.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/__init__.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,25 +1,24 @@
# Copyright 2008 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.
-#
+#
from simple_usrp import simple_source_c, simple_source_s
from simple_usrp import dual_source_c, dual_source_s
from simple_usrp import simple_sink_c, simple_sink_s
from simple_usrp import dual_sink_c, dual_sink_s
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/simple_usrp.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/simple_usrp.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/usrp/simple_usrp.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -22,11 +22,11 @@
from gnuradio import usrp, gr
####################################################################
-# Helper Functions
+# Helper Functions
####################################################################
def _set_frequency(u, which, subdev, frequency, verbose=False):
- """!
+ """
Set the carrier frequency for the given subdevice.
@param u the usrp source/sink
@param which specifies the DDC/DUC number
@@ -44,7 +44,7 @@
else: print >> sys.stderr, 'Error calling tune on subdevice.'
def _setup_rx_subdev(u, subdev_spec, ddc, gain, frequency, auto_tr=None,
rx_ant=None):
- """!
+ """
Setup a usrp receive subdevice by setting gain and frequency.
Add the gain and frequency callbacks to the flow graph.
FlexRF: Handle auto transmit/receive and set the receive antenna.
@@ -65,7 +65,7 @@
return subdev
def _setup_tx_subdev(u, subdev_spec, gain, frequency, auto_tr=None,
tx_enb=None):
- """!
+ """
Setup a usrp receive subdevice by setting gain and frequency.
Add the gain and frequency callbacks to the flow graph.
FlexRF: Handle auto transmit/receive and enable the transmitter.
@@ -94,7 +94,7 @@
####################################################################
####################################################################
-# Simple USRP Base Classes
+# Simple USRP Base Classes
####################################################################
####################################################################
@@ -102,7 +102,7 @@
"""A single usrp source/sink base class."""
def __init__(self, u, subdev, which):
- """!
+ """
Create a simple usrp base class.
@param u the usrp object
@param subdev the subdevice object
@@ -113,41 +113,41 @@
self._which = which
def get_u(self):
- """!
+ """
Get the underlying usrp object.
@return the usrp source/sink object.
"""
return self._u
def get_subdev(self):
- """!
+ """
Get the underlying subdevice.
@return the subdev object.
"""
return self._subdev
def set_frequency(self, frequency):
- """!
+ """
Set the frequency of the subdevice.
@param frequency the frequency to tune
"""
_set_frequency(self.get_u(), self._which, self.get_subdev(),
frequency)
def set_gain(self, gain):
- """!
+ """
Set the gain of the subdevice.
@param gain the gain to set
"""
self.get_subdev().set_gain(gain)
####################################################################
-# Simple USRP Source
+# Simple USRP Source
####################################################################
class _simple_source(gr.hier_block2, _simple_usrp):
"""A single usrp source of IO type short or complex."""
def __init__(self, number, subdev_spec, frequency, decimation, gain,
mux=None, auto_tr=None, rx_ant=None):
- """!
+ """
USRP simple source contructor.
@param number the unit number
@param subdev_spec the sub-device specification tuple
@@ -181,13 +181,13 @@
class simple_source_s(_simple_source): constructor = usrp.source_s
####################################################################
-# Simple USRP Sink
+# Simple USRP Sink
####################################################################
class _simple_sink(gr.hier_block2, _simple_usrp):
"""A single usrp sink of IO type short or complex."""
def __init__(self, number, subdev_spec, frequency, interpolation, gain,
mux=None, auto_tr=None, tx_enb=None):
- """!
+ """
USRP simple sink contructor.
@param number the unit number
@param subdev_spec the sub-device specification tuple
@@ -222,7 +222,7 @@
####################################################################
####################################################################
-# Dual USRP Base Classes
+# Dual USRP Base Classes
####################################################################
####################################################################
@@ -230,7 +230,7 @@
"""A dual usrp source/sink base class."""
def __init__(self, u, subdev_a, subdev_b, which_a, which_b):
- """!
+ """
Create a dual usrp base class.
@param u the usrp object
@param subdev_a the subdevice object side a
@@ -245,62 +245,62 @@
self._which_b = which_b
def get_u(self):
- """!
+ """
Get the underlying usrp object.
@return the usrp source/sink object.
"""
return self._u
def get_subdev_a(self):
- """!
+ """
Get the underlying subdevice.
@return the subdev object.
"""
return self._subdev_a
def get_subdev_b(self):
- """!
+ """
Get the underlying subdevice.
@return the subdev object.
"""
return self._subdev_b
def set_frequency_a(self, frequency):
- """!
+ """
Set the frequency of the subdevice.
@param frequency the frequency to tune
"""
_set_frequency(self.get_u(), self._which_a,
self.get_subdev_a(), frequency)
def set_frequency_b(self, frequency):
- """!
+ """
Set the frequency of the subdevice.
@param frequency the frequency to tune
"""
_set_frequency(self.get_u(), self._which_b,
self.get_subdev_b(), frequency)
def set_gain_a(self, gain):
- """!
+ """
Set the gain of the subdevice.
@param gain the gain to set
"""
self.get_subdev_a().set_gain(gain)
def set_gain_b(self, gain):
- """!
+ """
Set the gain of the subdevice.
@param gain the gain to set
"""
self.get_subdev_b().set_gain(gain)
####################################################################
-# Dual USRP Source
+# Dual USRP Source
####################################################################
class _dual_source(gr.hier_block2, _dual_usrp):
"""A dual usrp source of IO type short or complex."""
def __init__(self, number, frequency_a, frequency_b, decimation,
gain_a, gain_b, mux=0x3210, auto_tr=None, rx_ant_a=None, rx_ant_b=None):
- """!
+ """
USRP dual source contructor.
@param number the unit number
@param frequency_a the frequency to tune side a
@@ -337,13 +337,13 @@
class dual_source_s(_dual_source): constructor = usrp.source_s
####################################################################
-# Dual USRP Sink
+# Dual USRP Sink
####################################################################
class _dual_sink(gr.hier_block2, _dual_usrp):
"""A dual usrp sink of IO type short or complex."""
def __init__(self, number, frequency_a, frequency_b, interpolation,
gain_a, gain_b, mux=0xba98, auto_tr=None, tx_enb_a=None, tx_enb_b=None):
- """!
+ """
USRP dual sink contructor.
@param number the unit number
@param subdev_spec the sub-device specification tuple
@@ -376,4 +376,3 @@
class dual_sink_c(_dual_sink): constructor = usrp.sink_c
class dual_sink_s(_dual_sink): constructor = usrp.sink_s
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/__init__.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/__init__.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/__init__.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,22 +1,22 @@
# Copyright 2008 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.
-#
+#
from callback_controls import \
button_control, \
@@ -27,4 +27,3 @@
slider_vertical_control, \
text_box_control
from top_block_gui import top_block_gui
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/callback_controls.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/callback_controls.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/callback_controls.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -48,7 +48,7 @@
"""House a drop down or radio buttons for variable control."""
def __init__(self, window, callback, label='Label', index=0,
choices=[0], labels=[]):
- """!
+ """
Chooser contructor.
Create the slider, text box, and label.
@param window the wx parent window
@@ -68,14 +68,14 @@
self._init()
def _handle_changed(self, event=None):
- """!
+ """
A change is detected. Call the callback.
"""
try: self.call()
except Exception, e: print >> sys.stderr, 'Error in exec
callback from handle changed.\n', e
def get_value(self):
- """!
+ """
Update the chooser.
@return one of the possible choices
"""
@@ -83,7 +83,7 @@
return self.choices[self.index]
##############################################################################################
-# Button Control
+# Button Control
##############################################################################################
class button_control(_chooser_control_base):
"""House a button for variable control."""
@@ -98,7 +98,7 @@
self.button.SetLabel(self.labels[self.index])
##############################################################################################
-# Drop Down Control
+# Drop Down Control
##############################################################################################
class drop_down_control(_chooser_control_base):
"""House a drop down for variable control."""
@@ -113,7 +113,7 @@
self.index = self.drop_down.GetSelection()
##############################################################################################
-# Radio Buttons Control
+# Radio Buttons Control
##############################################################################################
class _radio_buttons_control_base(_chooser_control_base):
"""House radio buttons for variable control."""
@@ -147,13 +147,13 @@
radio_button_align = wx.ALIGN_LEFT
##############################################################################################
-# Slider Control
+# Slider Control
##############################################################################################
class _slider_control_base(_control_base):
"""House a Slider and a Text Box for variable control."""
def __init__(self, window, callback, label='Label', value=50, min=0,
max=100, num_steps=100):
- """!
+ """
Slider contructor.
Create the slider, text box, and label.
@param window the wx parent window
@@ -191,14 +191,14 @@
self.text_box.SetValue(str(self._value))
def get_value(self):
- """!
+ """
Get the current set value.
@return the value (float)
"""
return self._value
def _set_slider_value(self, real_value):
- """!
+ """
Translate the real numerical value into a slider value and,
write the value to the slider.
@param real_value the numeric value the slider should represent
@@ -207,7 +207,7 @@
self.slider.SetValue(slider_value)
def _handle_scroll(self, event=None):
- """!
+ """
A scroll event is detected. Read the slider, call the callback.
"""
slider_value = self.slider.GetValue()
@@ -218,7 +218,7 @@
except Exception, e: print >> sys.stderr, 'Error in exec
callback from handle scroll.\n', e
def _handle_enter(self, event=None):
- """!
+ """
An enter key was pressed. Read the text box, call the callback.
"""
new_value = float(self.text_box.GetValue())
@@ -237,13 +237,13 @@
slider_size = 20, 200
##############################################################################################
-# Text Box Control
+# Text Box Control
##############################################################################################
class text_box_control(_control_base):
"""House a Text Box for variable control."""
def __init__(self, window, callback, label='Label', value=50):
- """!
+ """
Text box contructor.
Create the text box, and label.
@param window the wx parent window
@@ -264,14 +264,14 @@
self.text_box.SetValue(str(value))
def get_value(self):
- """!
+ """
Get the current set value.
@return the value (float)
"""
return self._value
def _handle_enter(self, event=None):
- """!
+ """
An enter key was pressed. Read the text box, call the callback.
If the text cannot be evaluated, do not try callback.
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/top_block_gui.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/top_block_gui.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/grc_gnuradio/wxgui/top_block_gui.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -28,7 +28,7 @@
"""gr top block with wx gui app and grid sizer."""
def __init__(self, title='', size=default_gui_size, icon=None):
- """!
+ """
Initialize the gr top block.
Create the wx gui elements.
@param title the main window title
@@ -48,21 +48,21 @@
self._wx_vbox = wx.BoxSizer(wx.VERTICAL)
def GetWin(self):
- """!
+ """
Get the window for wx elements to fit within.
@return the wx frame
"""
return self._wx_frame
def Add(self, win):
- """!
+ """
Add a window to the wx vbox.
@param win the wx window
"""
self._wx_vbox.Add(win, 0, wx.EXPAND)
def GridAdd(self, win, row, col, row_span=1, col_span=1):
- """!
+ """
Add a window to the wx grid at the given position.
@param win the wx window
@param row the row specification (integer >= 0)
@@ -73,7 +73,7 @@
self._wx_grid.Add(win, wx.GBPosition(row, col),
wx.GBSpan(row_span, col_span), wx.EXPAND)
def Run(self):
- """!
+ """
Setup the wx gui elements.
Start the gr top block.
Block with the wx main loop.
@@ -96,4 +96,3 @@
gr.top_block.start(self)
#blocking main loop
self._wx_app.MainLoop()
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ActionHandler.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ActionHandler.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ActionHandler.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -42,7 +42,7 @@
"""
def __init__(self, file_paths, platform):
- """!
+ """
ActionHandler constructor.
Create the main window, setup the message handler, import the
preferences,
and connect all of the action handlers. Finally, enter the gtk
main loop and block.
@@ -142,7 +142,7 @@
return self.get_focus_flag() and
self.get_flow_graph().is_selected()
def _quit(self, window, event):
- """!
+ """
Handle the delete event from the main window.
Generated by pressing X to close, alt+f4, or right click+close.
This method in turns calls the state handler to quit.
@@ -160,7 +160,7 @@
self.handle_states(event.get_name())
def handle_states(self, state=''):
- """!
+ """
Handle the state changes in the GUI.
Handle all of the state changes that arise from the action
handler or other gui and
inputs in the application. The state passed to the
handle_states method is a string descriping
@@ -408,7 +408,7 @@
class ExecFlowGraphThread(Thread):
"""Execute the flow graph as a new process and wait on it to finish."""
def __init__ (self, action_handler):
- """!
+ """
ExecFlowGraphThread constructor.
@param action_handler an instance of an ActionHandler
"""
@@ -443,4 +443,3 @@
self.page.set_pid(None)
self.update_exec_stop()
gtk.gdk.threads_leave()
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Actions.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Actions.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Actions.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -92,7 +92,7 @@
ACTIONS_DICT = dict((action.get_name(), action) for action in ACTIONS_LIST)
def get_action_from_name(action_name):
- """!
+ """
Retrieve the action from the action list.
Search the list and find an action with said name.
@param action_name the action name(string)
@@ -101,4 +101,3 @@
"""
if ACTIONS_DICT.has_key(action_name): return ACTIONS_DICT[action_name]
raise KeyError('Action Name: "%s" does not exist'%action_name)
-
Modified: gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Bars.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Bars.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Bars.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -137,4 +137,3 @@
main_menu.append(action.create_menu_item())
else: main_menu.append(gtk.SeparatorMenuItem())
main_menu.show_all() #this show all is required for the
separators to show
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/BlockTreeWindow.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/BlockTreeWindow.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/BlockTreeWindow.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -30,7 +30,7 @@
"""The block selection panel."""
def __init__(self, platform, get_flow_graph):
- """!
+ """
BlockTreeWindow constructor.
Create a tree view of the possible blocks in the platform.
The tree view nodes will be category names, the leaves will be
block names.
@@ -75,7 +75,7 @@
## Block Tree Methods
############################################################
def add_block(self, category, block=None):
- """!
+ """
Add a block with category to this selection window.
Add only the category when block is None.
@param category the category string
@@ -101,7 +101,7 @@
## Helper Methods
############################################################
def _get_selected_block_key(self):
- """!
+ """
Get the currently selected block key.
@return the key of the selected block or a empty string
"""
@@ -110,7 +110,7 @@
return iter and treestore.get_value(iter, KEY_INDEX) or ''
def _update_add_button(self):
- """!
+ """
Update the add button's sensitivity.
The button should be active only if a block is selected.
"""
@@ -118,7 +118,7 @@
self.add_button.set_sensitive(bool(key))
def _add_selected_block(self):
- """!
+ """
Add the selected block with the given key to the flow graph.
"""
key = self._get_selected_block_key()
@@ -128,7 +128,7 @@
## Event Handlers
############################################################
def _handle_mouse_button_press(self, widget, event):
- """!
+ """
Handle the mouse button press.
If a left double click is detected, call add selected block.
"""
@@ -136,16 +136,15 @@
self._add_selected_block()
def _handle_selection_change(self, selection):
- """!
+ """
Handle a selection change in the tree view.
If a selection changes, set the add button sensitive.
"""
self._update_add_button()
def _handle_add_button(self, widget):
- """!
+ """
Handle the add button clicked signal.
Call add selected block.
"""
self._add_selected_block()
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Constants.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Constants.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Constants.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -80,4 +80,3 @@
##The size of the state saving cache in the flow graph (for undo/redo
functionality)
STATE_CACHE_SIZE = 42
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Dialogs.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Dialogs.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Dialogs.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -30,7 +30,7 @@
"""A non editable gtk text view."""
def __init__(self, text=''):
- """!
+ """
TextDisplay constructor.
@param text the text to display (string)
"""
@@ -65,7 +65,7 @@
self.destroy()
def MessageDialogHelper(type, buttons, title=None, markup=None):
- """!
+ """
Create a modal message dialog and run it.
@param type the type of message: gtk.MESSAGE_INFO, gtk.MESSAGE_WARNING,
gtk.MESSAGE_QUESTION or gtk.MESSAGE_ERROR
@param buttons the predefined set of buttons to use:
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/DrawingArea.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/DrawingArea.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/DrawingArea.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -29,7 +29,7 @@
"""
def __init__(self, main_window):
- """!
+ """
DrawingArea contructor.
Connect event handlers.
@param main_window the main_window containing all flow graphs
@@ -61,7 +61,7 @@
self.gc = None
def draw(self):
- """!
+ """
Draw the pixmap onto this drawing area.
"""
self.window.draw_drawable(self.gc, self.pixmap, 0, 0, 0, 0, -1,
-1)
@@ -74,7 +74,7 @@
self._focus_flag = focus_flag
def _handle_mouse_button_press(self, widget, event):
- """!
+ """
Forward button click information to the flow graph.
"""
self.ctrl_mask = event.state & gtk.gdk.CONTROL_MASK
@@ -86,7 +86,7 @@
return True
def _handle_mouse_button_release(self, widget, event):
- """!
+ """
Forward button release information to the flow graph.
"""
self.ctrl_mask = event.state & gtk.gdk.CONTROL_MASK
@@ -97,7 +97,7 @@
return True
def _handle_mouse_motion(self, widget, event):
- """!
+ """
Forward mouse motion information to the flow graph.
"""
self.ctrl_mask = event.state & gtk.gdk.CONTROL_MASK
@@ -107,7 +107,7 @@
return True
def _handle_window_expose(self, widget, event):
- """!
+ """
Called when the window initially appears or is resized: create
a new pixmap, draw the flow graph.
"""
self.gc = self.window.new_gc()
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/FileDialogs.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/FileDialogs.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/FileDialogs.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -54,7 +54,7 @@
"""
def __init__(self, action, title):
- """!
+ """
FileDialogHelper contructor.
Create a save or open dialog with cancel and ok buttons.
Use standard settings: no multiple selection, local files only,
and the * filter.
@@ -71,7 +71,7 @@
"""A dialog box to save or open flow graph files. This is a base class,
do not use."""
def __init__(self, current_file_path=''):
- """!
+ """
FileDialog constructor.
@param current_file_path the current directory or path to the
open flow graph
"""
@@ -92,7 +92,7 @@
self.set_current_folder(path.dirname(current_file_path))
#current directory
def add_and_set_filter(self, filter):
- """!
+ """
Add the gtk file filter to the list of filters and set it as
the default file filter.
@param filter a gtk file filter.
"""
@@ -100,7 +100,7 @@
self.set_filter(filter)
def get_rectified_filename(self):
- """!
+ """
Run the dialog and get the filename.
If this is a save dialog and the file name is missing the
extension, append the file extension.
If the file name with the extension already exists, show a
overwrite dialog.
@@ -141,7 +141,7 @@
return filenames
def run(self):
- """!
+ """
Get the filename and destroy the dialog.
@return the filename or None if a close/cancel occured.
"""
@@ -152,4 +152,3 @@
class OpenFlowGraphFileDialog(FileDialog): type = OPEN_FLOW_GRAPH
class SaveFlowGraphFileDialog(FileDialog): type = SAVE_FLOW_GRAPH
class SaveImageFileDialog(FileDialog): type = SAVE_IMAGE
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/MainWindow.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/MainWindow.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/MainWindow.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -43,7 +43,7 @@
"""The topmost window with menus, the tool bar, and other major
windows."""
def __init__(self, handle_states, platform):
- """!
+ """
MainWindow contructor.
@param handle_states the callback function
"""
@@ -101,7 +101,7 @@
############################################################
def _quit(self, window, event):
- """!
+ """
Handle the delete event from the main window.
Generated by pressing X to close, alt+f4, or right click+close.
This method in turns calls the state handler to quit.
@@ -111,7 +111,7 @@
return True
def _handle_page_change(self, notebook, page, page_num):
- """!
+ """
Handle a page change. When the user clicks on a new tab,
reload the flow graph to update the vars window and
call handle states (select nothing) to update the buttons.
@@ -128,7 +128,7 @@
############################################################
def add_report_line(self, line):
- """!
+ """
Place line at the end of the text buffer, then scroll its
window all the way down.
@param line the new text
"""
@@ -138,7 +138,7 @@
vadj.emit('changed')
def _show_reports_window(self, show):
- """!
+ """
Show the reports window when show is True.
Hide the reports window when show is False.
@param show boolean flag
@@ -151,7 +151,7 @@
############################################################
def new_page(self, file_path='', show=False):
- """!
+ """
Create a new notebook page.
Set the tab to be selected.
@param file_path optional file to load into the flow graph
@@ -233,7 +233,7 @@
############################################################
def update(self):
- """!
+ """
Set the title of the main window.
Set the titles on the page tabs.
Show/hide the reports window.
@@ -253,10 +253,10 @@
for page in self._get_pages():
title = os.path.basename(page.get_file_path())
#strip file extension #TEMP
- if title.endswith('.xml'):
+ if title.endswith('.xml'):
title = title[0:-len('.xml')]
#strip file extension
- if title.endswith(FLOW_GRAPH_FILE_EXTENSION):
+ if title.endswith(FLOW_GRAPH_FILE_EXTENSION):
title = title[0:-len(FLOW_GRAPH_FILE_EXTENSION)]
page.set_text(''.join((
(title or NEW_FLOGRAPH_TITLE),
@@ -271,14 +271,14 @@
else: self.notebook.hide()
def get_page(self):
- """!
+ """
Get the selected page.
@return the selected page
"""
return self.current_page
def get_flow_graph(self):
- """!
+ """
Get the selected flow graph.
@return the selected flow graph
"""
@@ -289,7 +289,7 @@
############################################################
def _set_page(self, page):
- """!
+ """
Set the current page.
@param page the page widget
"""
@@ -297,7 +297,7 @@
self.notebook.set_current_page(self.notebook.page_num(self.current_page))
def _save_changes(self):
- """!
+ """
Save changes to flow graph?
@return true if yes
"""
@@ -319,4 +319,3 @@
@return list of pages
"""
return [self.notebook.get_nth_page(page_num) for page_num in
range(self.notebook.get_n_pages())]
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Messages.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Messages.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Messages.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -21,18 +21,18 @@
import traceback
import sys
-## A list of functions that can receive a message.
+## A list of functions that can receive a message.
MESSENGERS_LIST = list()
def register_messenger(messenger):
- """!
+ """
Append the given messenger to the list of messengers.
@param messenger a method thats takes a string
"""
MESSENGERS_LIST.append(messenger)
def send(message):
- """!
+ """
Give the message to each of the messengers.
@param message a message string
"""
@@ -42,7 +42,7 @@
register_messenger(sys.stdout.write)
###########################################################################
-# Special functions for specific program functionalities
+# Special functions for specific program functionalities
###########################################################################
def send_init():
send("""<<< Welcome to GRC %s >>>\n"""%VERSION)
@@ -50,7 +50,7 @@
def send_page_switch(file_path):
send('\nShowing: "%s"\n'%file_path)
-################# functions for loading flow graphs
########################################
+################# functions for loading flow graphs
########################################
def send_start_load(file_path):
send('\nLoading: "%s"'%file_path + '\n')
@@ -66,7 +66,7 @@
send(">>> Failue\n")
traceback.print_exc()
-################# functions for generating flow graphs
########################################
+################# functions for generating flow graphs
########################################
def send_start_gen(file_path):
send('\nGenerating: "%s"'%file_path + '\n')
@@ -75,7 +75,7 @@
send(">>> Failue\n")
traceback.print_exc()
-################# functions for executing flow graphs
########################################
+################# functions for executing flow graphs
########################################
def send_start_exec(file_path):
send('\nExecuting: "%s"'%file_path + '\n')
@@ -85,18 +85,17 @@
def send_end_exec():
send("\n>>> Done\n")
-################# functions for saving flow graphs
########################################
+################# functions for saving flow graphs
########################################
def send_fail_save(file_path):
send('>>> Error: Cannot save: %s\n'%file_path)
-################# functions for connections
########################################
+################# functions for connections
########################################
def send_fail_connection():
send('>>> Warning: A connection can only be created between a source
and an unconnected sink.\n')
-################# functions for preferences
########################################
+################# functions for preferences
########################################
def send_fail_load_preferences(prefs_file_path):
send('>>> Error: Cannot load preferences file: "%s"\n'%prefs_file_path)
def send_fail_save_preferences(prefs_file_path):
send('>>> Error: Cannot save preferences file: "%s"\n'%prefs_file_path)
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/NotebookPage.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/NotebookPage.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/NotebookPage.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -27,7 +27,7 @@
import os
############################################################
-## Notebook Page
+## Notebook Page
############################################################
class NotebookPage(gtk.HBox):
@@ -82,7 +82,7 @@
self.tab.show_all()
def get_generator(self):
- """!
+ """
Get the generator object for this flow graph.
@return generator
"""
@@ -115,35 +115,35 @@
return self.tab
def get_pid(self):
- """!
+ """
Get the pid for the flow graph.
@return the pid number
"""
return self.pid
def set_pid(self, pid):
- """!
+ """
Set the pid number.
@param pid the new pid number
"""
self.pid = pid
def get_flow_graph(self):
- """!
+ """
Get the flow graph.
@return the flow graph
"""
return self._flow_graph
def get_file_path(self):
- """!
+ """
Get the file path for the flow graph.
@return the file path or ''
"""
return self.file_path
def set_file_path(self, file_path=''):
- """!
+ """
Set the file path, '' for no file path.
@param file_path file path string
"""
@@ -151,23 +151,22 @@
else: self.file_path = ''
def get_saved(self):
- """!
+ """
Get the saved status for the flow graph.
@return true if saved
"""
return self.saved
def set_saved(self, saved=True):
- """!
+ """
Set the saved status.
@param saved boolean status
"""
self.saved = saved
def get_state_cache(self):
- """!
+ """
Get the state cache for the flow graph.
@return the state cache
"""
return self.state_cache
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ParamsDialog.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ParamsDialog.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ParamsDialog.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -25,7 +25,7 @@
from Constants import MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT
def get_title_label(title):
- """!
+ """
Get a title label for the params window.
The title will be bold, underlined, and left justified.
@param title the text of the title
@@ -41,7 +41,7 @@
"""A dialog box to set block parameters."""
def __init__(self, block):
- """!
+ """
SignalBlockParamsDialog contructor.
@param block the signal block
"""
@@ -90,7 +90,7 @@
self._error_messages_text_display.set_text(messages)
def _handle_key_press(self, widget, event):
- """!
+ """
Handle key presses from the keyboard.
Call the ok response when enter is pressed.
@return false to forward the keypress
@@ -100,7 +100,7 @@
return False #forward the keypress
def _handle_changed(self, param):
- """!
+ """
A change occured, update any dependent parameters:
The enum inside the variable type may have changed and,
the variable param will need an external update.
@@ -116,7 +116,7 @@
return True
def run(self):
- """!
+ """
Call run().
@return true if a change occured.
"""
@@ -129,4 +129,3 @@
for param in self.block.get_params():
new_data.append(param.get_value())
return original_data != new_data
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Preferences.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Preferences.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/Preferences.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -91,7 +91,7 @@
]
###########################################################################
-# Special methods for specific program functionalities
+# Special methods for specific program functionalities
###########################################################################
def window_size(size=None):
@@ -128,4 +128,3 @@
def show_id():
return _get_prefs().show_id_param.get_value() == 'show'
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/StateCache.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/StateCache.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/StateCache.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -25,10 +25,10 @@
The state cache is an interface to a list to record data/states and to
revert to previous states.
States are recorded into the list in a circular fassion by using an
index for the current state,
and counters for the range where states are stored.
- """
-
+ """
+
def __init__(self, initial_state):
- """!
+ """
StateCache constructor.
@param initial_state the intial state (nested data)
"""
@@ -38,30 +38,30 @@
self.num_next_states = 0
self.states[0] = initial_state
self.update_actions()
-
+
def save_new_state(self, state):
- """!
+ """
Save a new state.
Place the new state at the next index and add one to the number
of previous states.
@param state the new state
"""
self.current_state_index = (self.current_state_index +
1)%STATE_CACHE_SIZE
- self.states[self.current_state_index] = state
+ self.states[self.current_state_index] = state
self.num_prev_states = self.num_prev_states + 1
if self.num_prev_states == STATE_CACHE_SIZE:
self.num_prev_states = STATE_CACHE_SIZE - 1
self.num_next_states = 0
self.update_actions()
-
+
def get_current_state(self):
- """!
+ """
Get the state at the current index.
@return the current state (nested data)
"""
self.update_actions()
- return self.states[self.current_state_index]
-
+ return self.states[self.current_state_index]
+
def get_prev_state(self):
- """!
+ """
Get the previous state and decrement the current index.
@return the previous state or None
"""
@@ -70,10 +70,10 @@
self.num_next_states = self.num_next_states + 1
self.num_prev_states = self.num_prev_states - 1
return self.get_current_state()
- return None
-
+ return None
+
def get_next_state(self):
- """!
+ """
Get the nest state and increment the current index.
@return the next state or None
"""
@@ -83,12 +83,10 @@
self.num_prev_states = self.num_prev_states + 1
return self.get_current_state()
return None
-
+
def update_actions(self):
"""
Update the undo and redo actions based on the number of next
and prev states.
"""
get_action_from_name(FLOW_GRAPH_REDO).set_sensitive(self.num_next_states != 0)
get_action_from_name(FLOW_GRAPH_UNDO).set_sensitive(self.num_prev_states != 0)
-
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Block.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Block.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Block.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -119,13 +119,13 @@
self.test()
def test(self):
- """!
+ """
Call test on all children.
"""
map(lambda c: c.test(), self.get_params() + self.get_sinks() +
self.get_sources())
def get_enabled(self):
- """!
+ """
Get the enabled state of the block.
@return true for enabled
"""
@@ -133,7 +133,7 @@
except: return True
def set_enabled(self, enabled):
- """!
+ """
Set the enabled state of the block.
@param enabled true for enabled
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Connection.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Connection.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Connection.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -23,7 +23,7 @@
class Connection(Element):
def __init__(self, flow_graph, porta, portb):
- """!
+ """
Make a new connection given the parent and 2 ports.
@param flow_graph the parent of this element
@param porta a port (any direction)
@@ -59,7 +59,7 @@
except AssertionError: self._add_error_message('Source type
"%s" does not match sink type "%s".'%(source_type, sink_type))
def get_enabled(self):
- """!
+ """
Get the enabled state of this connection.
@return true if source and sink blocks are enabled
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Constants.py.in
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Constants.py.in
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Constants.py.in
2008-09-07 04:13:30 UTC (rev 9514)
@@ -42,4 +42,3 @@
##The users home directory.
HOME_DIR = os.path.expanduser('~')
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Element.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Element.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Element.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -91,4 +91,3 @@
def is_sink(self): return False
def is_port(self): return False
def is_param(self): return False
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/FlowGraph.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/FlowGraph.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/FlowGraph.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -27,7 +27,7 @@
class FlowGraph(Element):
def __init__(self, platform):
- """!
+ """
Make a flow graph from the arguments.
@param platform a platforms with blocks and contrcutors
@return the flow graph object
@@ -42,7 +42,7 @@
def __str__(self): return 'FlowGraph - "%s"'%self.get_option('name')
def get_option(self, key):
- """!
+ """
Get the option for a given key.
The option comes from the special options block.
@param key the param key for the options block
@@ -59,7 +59,7 @@
def get_blocks(self): return filter(lambda e: e.is_block(),
self.get_elements())
def get_connections(self): return filter(lambda e: e.is_connection(),
self.get_elements())
def get_elements(self):
- """!
+ """
Get a list of all the elements.
Always ensure that the options block is in the list.
@return the element list
@@ -76,21 +76,21 @@
return self._elements
def get_enabled_blocks(self):
- """!
+ """
Get a list of all blocks that are enabled.
@return a list of blocks
"""
return filter(lambda b: b.get_enabled(), self.get_blocks())
def get_enabled_connections(self):
- """!
+ """
Get a list of all connections that are enabled.
@return a list of connections
"""
return filter(lambda c: c.get_enabled(), self.get_connections())
def get_new_block(self, key):
- """!
+ """
Get a new block of the specified key.
Add the block to the list of elements.
@param key the block key
@@ -103,7 +103,7 @@
return block
def connect(self, porta, portb):
- """!
+ """
Create a connection between porta and portb.
@param porta a port
@param portb another port
@@ -116,7 +116,7 @@
return connection
def remove_element(self, element):
- """!
+ """
Remove the element from the list of elements.
If the element is a port, remove the whole block.
If the element is a block, remove its connections.
@@ -136,7 +136,7 @@
self.get_elements().remove(element)
def evaluate(self, expr):
- """!
+ """
Evaluate the expression.
@param expr the string expression
@throw NotImplementedError
@@ -229,4 +229,3 @@
self.connect(source, sink)
except AssertionError:
Messages.send_error_load('Connection between %s(%s) and %s(%s) could not be
made.'%(source_block_id, source_key, sink_block_id, sink_key))
self.validate()
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Param.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Param.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Param.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -150,14 +150,14 @@
except AssertionError: self._add_error_message('Type "%s" is
not a possible type.'%self.get_type())
def evaluate(self):
- """!
+ """
Evaluate the value of this param.
@throw NotImplementedError
"""
raise NotImplementedError
def to_code(self):
- """!
+ """
Convert the value to code.
@throw NotImplementedError
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Platform.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Platform.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Platform.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -31,7 +31,7 @@
class Platform(_Element):
def __init__(self, name, key, block_paths, block_dtd, block_tree,
default_flow_graph, generator):
- """!
+ """
Make a platform from the arguments.
@param name the platform name
@param key the unique platform key
@@ -65,7 +65,7 @@
def get_prefs_block(self): return
self.get_new_flow_graph().get_new_block('preferences')
def _load_block(self, f):
- """!
+ """
Load the block wrapper from the file path.
The block wrapper must pass validation, and have a unique block
key.
If any of the checks fail, exit with error.
@@ -84,7 +84,7 @@
self._blocks_n[key] = n
def load_block_tree(self, block_tree):
- """!
+ """
Load a block tree with categories and blocks.
Step 1: Load all blocks from the xml specification.
Step 2: Load blocks with builtin category specifications.
@@ -98,7 +98,7 @@
#recursive call to load sub categories
map(lambda c: load_category(c, parent),
utils.listify(cat_n, 'cat'))
#add blocks in this category
- for block_key in utils.listify(cat_n, 'block'):
+ for block_key in utils.listify(cat_n, 'block'):
block_tree.add_block(parent,
self.get_block(block_key))
#load the block tree
f = self._block_tree
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Port.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Port.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/base/Port.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -43,7 +43,7 @@
self._type = type
def validate(self):
- """!
+ """
Validate the port.
The port must be non-empty and type must a possible type.
"""
@@ -73,7 +73,7 @@
def get_type(self): return
self.get_parent().resolve_dependencies(self._type)
def get_connections(self):
- """!
+ """
Get all connections that use this port.
@return a list of connection objects
"""
@@ -82,14 +82,14 @@
return connections
def is_connected(self):
- """!
+ """
Is this port connected?
@return true if at least one connection
"""
return bool(self.get_connections())
def is_full(self):
- """!
+ """
Is this port full of connections?
Generally a sink can handle one connection and a source can
handle many.
@return true if the port is full
@@ -98,7 +98,7 @@
if self.is_sink(): return bool(self.get_connections())
def is_empty(self):
- """!
+ """
Is this port empty?
An empty port has no connections.
@return true if empty
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Block.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Block.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Block.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -36,7 +36,7 @@
"""The graphical signal block."""
def __init__(self, *args, **kwargs):
- """!
+ """
Block contructor.
Add graphics related params to the block.
"""
@@ -64,7 +64,7 @@
Element.__init__(self)
def get_coordinate(self):
- """!
+ """
Get the coordinate from the position param.
@return the coordinate tuple (x, y) or (0, 0) if failure
"""
@@ -86,14 +86,14 @@
return (0, 0)
def set_coordinate(self, coor):
- """!
+ """
Set the coordinate into the position param.
@param coor the coordinate tuple (x, y)
"""
self.get_param('_coordinate').set_value(str(coor))
def get_rotation(self):
- """!
+ """
Get the rotation from the position param.
@return the rotation in degrees or 0 if failure
"""
@@ -105,7 +105,7 @@
return POSSIBLE_ROTATIONS[0]
def set_rotation(self, rot):
- """!
+ """
Set the rotation into the position param.
@param rot the rotation in degrees
"""
@@ -167,7 +167,7 @@
for j in range(height): vimage.put_pixel(j,
width-i-1, image.get_pixel(i, j))
def draw(self, window):
- """!
+ """
Draw the signal block with label and inputs/outputs.
@param window the gtk window to draw on
"""
@@ -184,7 +184,7 @@
map(lambda p: p.draw(window), self.get_ports())
def what_is_selected(self, coor, coor_m=None):
- """!
+ """
Get the element that is selected.
@param coor the (x,y) tuple
@param coor_m the (x_m, y_m) tuple
@@ -194,4 +194,3 @@
port_selected = port.what_is_selected(coor, coor_m)
if port_selected: return port_selected
return Element.what_is_selected(self, coor, coor_m)
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Connection.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Connection.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Connection.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -26,7 +26,7 @@
"""A graphical connection for ports."""
def get_coordinate(self):
- """!
+ """
Get the 0,0 coordinate.
Coordinates are irrelevant in connection.
@return 0, 0
@@ -34,7 +34,7 @@
return (0, 0)
def get_rotation(self):
- """!
+ """
Get the 0 degree rotation.
Rotations are irrelevant in connection.
@return 0
@@ -105,7 +105,7 @@
self.add_line((x2, y2), points[0])
def draw(self, window):
- """!
+ """
Draw the connection.
@param window the gtk window to draw on
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Constants.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Constants.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Constants.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -1,18 +1,18 @@
#
# Copyright 2008 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,
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Element.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Element.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Element.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -33,7 +33,7 @@
"""
def __init__(self, *args, **kwargs):
- """!
+ """
Make a new list of rectangular areas and lines, and set the
coordinate and the rotation.
"""
self.set_rotation(POSSIBLE_ROTATIONS[0])
@@ -42,7 +42,7 @@
self.set_highlighted(False)
def is_horizontal(self, rotation=None):
- """!
+ """
Is this element horizontal?
If rotation is None, use this element's rotation.
@param rotation the optional rotation
@@ -52,7 +52,7 @@
return rotation in (0, 180)
def is_vertical(self, rotation=None):
- """!
+ """
Is this element vertical?
If rotation is None, use this element's rotation.
@param rotation the optional rotation
@@ -64,7 +64,7 @@
def get_gc(self): return self._gc
def draw(self, window, BG_color=Colors.BG_COLOR,
FG_color=Colors.FG_COLOR):
- """!
+ """
Draw in the given window.
@param window the gtk window to draw on
@param BG_color the background color
@@ -85,7 +85,7 @@
window.draw_line(gc, X+x1, Y+y1, X+x2, Y+y2)
def rotate(self, direction):
- """!
+ """
Rotate all of the areas by 90 degrees.
@param direction 90 or 270 degrees
"""
@@ -97,41 +97,41 @@
self.lines_dict = dict((rotation, list()) for rotation in
POSSIBLE_ROTATIONS)
def set_coordinate(self, coor):
- """!
+ """
Set the reference coordinate.
@param coor the coordinate tuple (x,y)
"""
self.coor = coor
def get_parent(self):
- """!
+ """
Get the parent of this element.
@return the parent
"""
return self.parent
def set_highlighted(self, highlighted):
- """!
+ """
Set the highlight status.
@param highlighted true to enable highlighting
"""
self.highlighted = highlighted
def is_highlighted(self):
- """!
+ """
Get the highlight status.
@return true if highlighted
"""
return self.highlighted
def get_coordinate(self):
- """!Get the coordinate.
+ """Get the coordinate.
@return the coordinate tuple (x,y)
"""
return self.coor
def move(self, delta_coor):
- """!
+ """
Move the element by adding the delta_coor to the current
coordinate.
@param delta_coor (delta_x,delta_y) tuple
"""
@@ -140,7 +140,7 @@
self.set_coordinate((X+deltaX, Y+deltaY))
def add_area(self, rel_coor, area, rotation=None):
- """!
+ """
Add an area to the area list.
An area is actually a coordinate relative to the main coordinate
with a width/height pair relative to the area coordinate.
@@ -155,7 +155,7 @@
self.areas_dict[rotation or
self.get_rotation()].append((rel_coor, area))
def add_line(self, rel_coor1, rel_coor2, rotation=None):
- """!
+ """
Add a line to the line list.
A line is defined by 2 relative coordinates.
Lines must be horizontal or vertical.
@@ -168,7 +168,7 @@
self.lines_dict[rotation or
self.get_rotation()].append((rel_coor1, rel_coor2))
def what_is_selected(self, coor, coor_m=None):
- """!
+ """
One coordinate specified:
Is this element selected at given coordinate?
ie: is the coordinate encompassed by one of the areas
or lines?
@@ -210,14 +210,14 @@
return None
def get_rotation(self):
- """!
+ """
Get the rotation in degrees.
@return the rotation
"""
return self.rotation
def set_rotation(self, rotation):
- """!
+ """
Set the rotation in degrees.
@param rotation the rotation"""
if rotation not in POSSIBLE_ROTATIONS:
@@ -227,5 +227,3 @@
def update(self):
"""Do nothing for the update. Dummy method."""
pass
-
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/FlowGraph.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/FlowGraph.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/FlowGraph.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -45,7 +45,7 @@
"""
def __init__(self, *args, **kwargs):
- """!
+ """
FlowGraph contructor.
Create a list for signal blocks and connections. Connect mouse
handlers.
"""
@@ -63,7 +63,7 @@
self._new_selected_port = None
def _get_unique_id(self, base_id=''):
- """!
+ """
Get a unique id starting with the base id.
@param base_id the id starts with this and appends a count
@return a unique id
@@ -88,7 +88,7 @@
def get_ctrl_mask(self): return self.drawing_area.ctrl_mask
def add_new_block(self, key):
- """!
+ """
Add a block of the given key to this flow graph.
@param key the block key
"""
@@ -109,7 +109,7 @@
# Copy Paste
###########################################################################
def copy_to_clipboard(self):
- """!
+ """
Copy the selected blocks and connections into the clipboard.
@return the clipboard
"""
@@ -135,7 +135,7 @@
return clipboard
def paste_from_clipboard(self, clipboard):
- """!
+ """
Paste the blocks and connections from the clipboard.
@param clipboard the nested data of blocks, connections
"""
@@ -180,7 +180,7 @@
# Modify Selected
###########################################################################
def type_controller_modify_selected(self, direction):
- """!
+ """
Change the registered type controller for the selected signal
blocks.
@param direction +1 or -1
@return true for change
@@ -205,7 +205,7 @@
return changed
def port_controller_modify_selected(self, direction):
- """!
+ """
Change port controller for the selected signal blocks.
@param direction +1 or -1
@return true for changed
@@ -228,7 +228,7 @@
return changed
def param_modify_selected(self):
- """!
+ """
Create and show a param modification dialog for the selected
block.
@return true if parameters were changed
"""
@@ -238,7 +238,7 @@
return False
def enable_selected(self, enable):
- """!
+ """
Enable/disable the selected blocks.
@param enable true to enable
@return true if changed
@@ -251,7 +251,7 @@
return changed
def move_selected(self, delta_coordinate):
- """!
+ """
Move the element and by the change in coordinates.
@param delta_coordinate the change in coordinates
"""
@@ -260,7 +260,7 @@
self.element_moved = True
def rotate_selected(self, direction):
- """!
+ """
Rotate the selected blocks by 90 degrees.
@param direction DIR_LEFT or DIR_RIGHT
@return true if changed, otherwise false.
@@ -288,7 +288,7 @@
return True
def remove_selected(self):
- """!
+ """
Remove selected elements
@return true if changed.
"""
@@ -299,7 +299,7 @@
return changed
def draw(self):
- """!
+ """
Draw the background and grid if enabled.
Draw all of the elements in this flow graph onto the pixmap.
Draw the pixmap to the drawable window of this flow graph.
@@ -340,14 +340,14 @@
self.get_drawing_area().draw()
def update(self):
- """!
+ """
Update highlighting so only the selected is highlighted.
Call update on all elements.
Resize the window if size changed.
"""
#update highlighting
map(lambda e: e.set_highlighted(False), self.get_elements())
- for selected_element in self.get_selected_elements():
+ for selected_element in self.get_selected_elements():
selected_element.set_highlighted(True)
#update all elements
map(lambda e: e.update(), self.get_elements())
@@ -361,13 +361,13 @@
## Get Selected
##########################################################################
def unselect(self):
- """!
+ """
Set selected elements to an empty set.
"""
self._selected_elements = []
def what_is_selected(self, coor, coor_m=None):
- """!
+ """
What is selected?
At the given coordinate, return the elements found to be
selected.
If coor_m is unspecified, return a list of only the first
element found to be selected:
@@ -385,7 +385,7 @@
selected_element = element.what_is_selected(coor,
coor_m)
if not selected_element: continue
#update the selected port information
- if selected_element.is_port():
+ if selected_element.is_port():
if not coor_m: selected_port = selected_element
selected_element = selected_element.get_parent()
selected.add(selected_element)
@@ -400,7 +400,7 @@
return list(selected)
def get_selected_connections(self):
- """!
+ """
Get a group of selected connections.
@return sub set of connections in this flow graph
"""
@@ -410,7 +410,7 @@
return list(selected)
def get_selected_blocks(self):
- """!
+ """
Get a group of selected blocks.
@return sub set of blocks in this flow graph
"""
@@ -420,28 +420,28 @@
return list(selected)
def get_selected_block(self):
- """!
+ """
Get the selected block when a block or port is selected.
@return a block or None
"""
return self.get_selected_blocks() and
self.get_selected_blocks()[0] or None
def get_selected_elements(self):
- """!
+ """
Get the group of selected elements.
@return sub set of elements in this flow graph
"""
return self._selected_elements
def get_selected_element(self):
- """!
+ """
Get the selected element.
@return a block, port, or connection or None
"""
return self.get_selected_elements() and
self.get_selected_elements()[0] or None
def update_selected_elements(self):
- """!
+ """
Update the selected elements.
The update behavior depends on the state of the mouse button.
When the mouse button pressed the selection will change when
@@ -488,7 +488,7 @@
## Event Handlers
##########################################################################
def handle_mouse_button_press(self, left_click, double_click,
coordinate):
- """!
+ """
A mouse button is pressed, only respond to left clicks.
Find the selected element. Attempt a new connection if possible.
Open the block params window on a double click.
@@ -506,7 +506,7 @@
self.handle_states(BLOCK_PARAM_MODIFY)
def handle_mouse_button_release(self, left_click, coordinate):
- """!
+ """
A mouse button is released, record the state.
"""
if not left_click: return
@@ -530,7 +530,7 @@
self.draw()
def handle_mouse_motion(self, coordinate):
- """!
+ """
The mouse has moved, respond to mouse dragging.
Move a selected element to the new coordinate.
Auto-scroll the scroll bars at the boundaries.
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Param.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Param.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Param.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -116,14 +116,14 @@
"""The graphical parameter."""
def update(self):
- """!
+ """
Called when an external change occurs.
Update the graphical input by calling the change handler.
"""
if hasattr(self, 'input'): self._handle_changed()
def get_input_object(self, callback=None):
- """!
+ """
Get the graphical gtk class to represent this parameter.
Create the input object with this data type and the handle
changed method.
@param callback a function of one argument(this param) to be
called from the change handler
@@ -137,7 +137,7 @@
return self.input
def _handle_changed(self, widget=None):
- """!
+ """
When the input changes, write the inputs to the data type.
Finish by calling the exteral callback.
"""
@@ -165,7 +165,7 @@
if self.callback: self.callback(self)
def get_markup(self):
- """!
+ """
Create a markup to display the Param as a label on the
SignalBlock.
If the data type is an Enum type, use the cname of the Enum's
current choice.
Otherwise, use parsed the data type and use its string
representation.
@@ -209,7 +209,7 @@
else: return '<span foreground="red"><b>%s:</b>
error</span>'%Utils.xml_encode(self.get_name())
def get_layout(self):
- """!
+ """
Create a layout based on the current markup.
@return the pango layout
"""
@@ -218,4 +218,3 @@
desc = pango.FontDescription(PARAM_FONT)
layout.set_font_description(desc)
return layout
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Platform.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Platform.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Platform.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -46,4 +46,3 @@
c = conjoin_classes(attr, old_value, value)
setattr(platform, attr, c)
return platform
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Port.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Port.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Port.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -32,7 +32,7 @@
"""The graphical port."""
def __init__(self, *args, **kwargs):
- """!
+ """
Port contructor.
Create list of connector coordinates.
"""
@@ -101,7 +101,7 @@
for j in range(h): vimage.put_pixel(j, w-i-1,
image.get_pixel(i, j))
def draw(self, window):
- """!
+ """
Draw the socket with a label.
@param window the gtk window to draw on
"""
@@ -116,7 +116,7 @@
window.draw_image(gc, self.vertical_label, 0, 0,
x+X+(PORT_HEIGHT-self.h)/2, y+Y+(PORT_WIDTH-self.w)/2, -1, -1)
def get_connector_coordinate(self):
- """!
+ """
Get the coordinate where connections may attach to.
@return the connector coordinate (x, y) tuple
"""
@@ -125,7 +125,7 @@
return (x+X, y+Y)
def get_connector_direction(self):
- """!
+ """
Get the direction that the socket points: 0,90,180,270.
This is the rotation degree if the socket is an output or
the rotation degree + 180 if the socket is an input.
@@ -135,7 +135,7 @@
elif self.is_sink(): return (self.get_rotation() + 180)%360
def get_connector_length(self):
- """!
+ """
Get the length of the connector.
The connector length increases as the port index changes.
@return the length in pixels
@@ -143,42 +143,42 @@
return self._connector_length
def get_rotation(self):
- """!
+ """
Get the parent's rotation rather than self.
@return the parent's rotation
"""
return self.get_parent().get_rotation()
def move(self, delta_coor):
- """!
+ """
Move the parent rather than self.
@param delta_corr the (delta_x, delta_y) tuple
"""
self.get_parent().move(delta_coor)
def rotate(self, direction):
- """!
+ """
Rotate the parent rather than self.
@param direction degrees to rotate
"""
self.get_parent().rotate(direction)
def get_coordinate(self):
- """!
+ """
Get the parent's coordinate rather than self.
@return the parents coordinate
"""
return self.get_parent().get_coordinate()
def set_highlighted(self, highlight):
- """!
+ """
Set the parent highlight rather than self.
@param highlight true to enable highlighting
"""
self.get_parent().set_highlighted(highlight)
def is_highlighted(self):
- """!
+ """
Get the parent's is highlight rather than self.
@return the parent's highlighting status
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Utils.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Utils.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Utils.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -20,7 +20,7 @@
from Constants import POSSIBLE_ROTATIONS
def get_rotated_coordinate(coor, rotation):
- """!
+ """
Rotate the coordinate by the given rotation.
@param coor the coordinate x, y tuple
@param rotation the angle in degrees
@@ -40,7 +40,7 @@
return (x*cos_r + y*sin_r, -x*sin_r + y*cos_r)
def get_angle_from_coordinates((x1,y1), (x2,y2)):
- """!
+ """
Given two points, calculate the vector direction from point1 to point2,
directions are multiples of 90 degrees.
@param (x1,y1) the coordinate of point 1
@param (x2,y2) the coordinate of point 2
@@ -69,4 +69,3 @@
("'", '''),
): string = string.replace(char, safe)
return string
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Block.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Block.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Block.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -54,7 +54,7 @@
self._checks = checks
def validate(self):
- """!
+ """
Validate this block.
Call the base class validate.
Evaluate the checks: each check must evaluate to True.
@@ -109,7 +109,7 @@
return '\n'.join([doc,
extract_docs.extract(self.get_key())]).strip('\n')
def get_imports(self):
- """!
+ """
Resolve all import statements.
Split each import statement at newlines.
Combine all import statments into a list.
@@ -121,7 +121,7 @@
def get_make(self): return self.resolve_dependencies(self._make)
def get_callbacks(self):
- """!
+ """
Get a list of function callbacks for this block.
@return a list of strings
"""
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Connection.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Connection.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Connection.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -32,4 +32,3 @@
sink_vlen = self.get_sink().get_vlen()
try: assert(source_vlen == sink_vlen)
except AssertionError: self._add_error_message('Source vector
length "%s" does not match sink vector length "%s".'%(source_vlen, sink_vlen))
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Constants.py.in
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Constants.py.in
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Constants.py.in
2008-09-07 04:13:30 UTC (rev 9514)
@@ -38,4 +38,3 @@
BLOCK_DTD = os.path.join(DATA_DIR, 'block.dtd')
BLOCK_TREE = os.path.join(DATA_DIR, 'block_tree.xml')
DEFAULT_FLOW_GRAPH = os.path.join(DATA_DIR, 'default_flow_graph.grc.xml')
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/FlowGraph.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/FlowGraph.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/FlowGraph.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -23,7 +23,7 @@
from Connection import Connection
def get_variable_code(variable):
- """!
+ """
Get the code representation for a variable.
Normally this is the value parameter.
For the variable chooser, use the index and choices.
@@ -41,7 +41,7 @@
class FlowGraph(_FlowGraph):
def _get_io_signature(self, pad_key):
- """!
+ """
Get an io signature for this flow graph.
The pad key determines the directionality of the io signature.
@param pad_key a string of pad_source or pad_sink
@@ -64,7 +64,7 @@
}
def get_input_signature(self):
- """!
+ """
Get the io signature for the input side of this flow graph.
The io signature with be "0", "0" if no pad source is present.
@return a string tuple of type, num_ports, port_size
@@ -72,7 +72,7 @@
return self._get_io_signature('pad_source')
def get_output_signature(self):
- """!
+ """
Get the io signature for the output side of this flow graph.
The io signature with be "0", "0" if no pad sink is present.
@return a string tuple of type, num_ports, port_size
@@ -80,7 +80,7 @@
return self._get_io_signature('pad_sink')
def get_imports(self):
- """!
+ """
Get a set of all import statments in this flow graph namespace.
@return a set of import statements
"""
@@ -89,7 +89,7 @@
return imports
def get_variables(self):
- """!
+ """
Get a list of all variables in this flow graph namespace.
Exclude paramterized variables.
@return a sorted list of variable blocks in order of dependency
(indep -> dep)
@@ -109,7 +109,7 @@
return variables
def get_parameters(self):
- """!
+ """
Get a list of all paramterized variables in this flow graph
namespace.
@return a list of paramterized variables
"""
@@ -117,7 +117,7 @@
return parameters
def evaluate(self, expr):
- """!
+ """
Evaluate the expression.
@param expr the string expression
@throw Exception bad expression
@@ -150,4 +150,3 @@
#evaluate
e = eval(expr, self.n, self.n)
return e
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Generator.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Generator.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Generator.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -30,7 +30,7 @@
class Generator(object):
def __init__(self, flow_graph, file_path):
- """!
+ """
Initialize the generator object.
Determine the file to generate.
@param flow_graph the flow graph object
@@ -58,7 +58,7 @@
os.chmod(self.get_file_path(), self._mode)
def get_popen(self):
- """!
+ """
Execute this python flow graph.
@return a popen object
"""
@@ -70,7 +70,7 @@
return p
def __str__(self):
- """!
+ """
Convert the flow graph to python code.
@return a string of python code
"""
@@ -132,4 +132,3 @@
#build the template
t = Template(open(FLOW_GRAPH_TEMPLATE, 'r').read(), namespace)
return str(t)
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Param.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Param.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Param.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -37,7 +37,7 @@
]
def get_hide(self):
- """!
+ """
Get the hide value from the base class.
If hide was empty, and this is a type controller, set hide to
part.
If hide was empty, and this is an id of a non variable, set
hide to part.
@@ -55,7 +55,7 @@
return hide
def evaluate(self):
- """!
+ """
Evaluate the value.
@return evaluated type
"""
@@ -219,7 +219,7 @@
else: raise TypeError, 'Type "%s" not handled'%t
def to_code(self):
- """!
+ """
Convert the value to code.
@return a string representing the code
"""
@@ -244,10 +244,9 @@
return v
def get_all_params(self, type):
- """!
+ """
Get all the params from the flowgraph that have the given type.
@param type the specified type
@return a list of params
"""
return sum([filter(lambda p: p.get_type() == type,
block.get_params()) for block in self.get_parent().get_parent().get_blocks()],
[])
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Platform.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Platform.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Platform.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -34,7 +34,7 @@
class Platform(_Platform):
def __init__(self, block_paths_internal_only=[],
block_paths_external=[]):
- """!
+ """
Make a platform for gnuradio.
The internal only list will replace the current block path.
@param block_paths_internal_only a list of blocks internal to
this platform
@@ -43,7 +43,7 @@
#ensure hier dir
if not os.path.exists(HIER_BLOCKS_LIB_DIR):
os.mkdir(HIER_BLOCKS_LIB_DIR)
#handle internal/only
- if block_paths_internal_only:
+ if block_paths_internal_only:
block_paths = map(lambda b: os.path.join(BLOCKS_DIR,
b), ['options.xml'] + block_paths_internal_only)
else: block_paths = [BLOCKS_DIR]
#handle external
@@ -71,4 +71,3 @@
Source = Source
Sink = Sink
Param = _Param
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Port.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Port.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Port.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -98,7 +98,7 @@
except: return _Port.get_color(self)
def is_empty(self):
- """!
+ """
Is this port empty?
An empty port has no connections.
Not empty of optional is set.
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/expr_utils.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/expr_utils.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/expr_utils.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -21,7 +21,7 @@
VAR_CHARS = string.letters + string.digits + '_'
class graph(object):
- """!
+ """
Simple graph structure held in a dictionary.
"""
@@ -50,7 +50,7 @@
def get_edges(self, node_key): return self._graph[node_key]
def expr_split(expr):
- """!
+ """
Split up an expression by non alphanumeric characters, including
underscore.
Leave strings in-tact.
#TODO ignore escaped quotes, use raw strings.
@@ -76,7 +76,7 @@
return filter(lambda t: t, toks)
def expr_prepend(expr, vars, prepend):
- """!
+ """
Search for vars in the expression and add the prepend.
@param expr an expression string
@param vars a list of variable names
@@ -89,7 +89,7 @@
return ''.join(expr_splits)
def get_variable_dependencies(expr, vars):
- """!
+ """
Return a set of variables used in this expression.
@param expr an expression string
@param vars a list of variable names
@@ -99,7 +99,7 @@
return set(filter(lambda v: v in expr_toks, vars))
def get_graph(exprs):
- """!
+ """
Get a graph representing the variable dependencies
@param exprs a mapping of variable name to expression
@return a graph of variable deps
@@ -114,7 +114,7 @@
return var_graph
def sort_variables(exprs):
- """!
+ """
Get a list of variables in order of dependencies.
@param exprs a mapping of variable name to expression
@return a list of variable names
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/extract_docs.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/extract_docs.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/utils/extract_docs.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -28,7 +28,7 @@
DOXYGEN_DETAILDESC_BLKS2_XPATH =
'/doxygen/compounddef/address@hidden"public-func"]/memberdef/detaileddescription'
def extract_txt(xml, parent_text=None):
- """!
+ """
Recursivly pull the text out of an xml tree.
@param xml the xml tree
@param parent_text the text of the parent element
@@ -41,7 +41,7 @@
) + tail
def is_match(key, file):
- """!
+ """
Is the block key a match for the given file name?
@param key block key
@param file the xml file name
@@ -71,7 +71,7 @@
return True
def extract(key):
- """!
+ """
Extract the documentation from the doxygen generated xml files.
If multiple files match, combine the docs.
@param key the block key
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/ParseXML.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/ParseXML.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/ParseXML.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -23,7 +23,7 @@
XMLSyntaxError = etree.XMLSyntaxError
def validate_dtd(xml_file, dtd_file=None):
- """!
+ """
Validate an xml file against its dtd.
@param xml_file the xml file
@param dtd_file the optional dtd file
@@ -41,7 +41,7 @@
raise XMLSyntaxError, '\n'.join(map(str,
parser.error_log.filter_from_errors()))
def from_file(xml_file):
- """!
+ """
Create nested data from an xml file using the from xml helper.
@param xml_file the xml file path
@return the nested data
@@ -50,7 +50,7 @@
return _from_file(xml)
def _from_file(xml):
- """!
+ """
Recursivly parse the xml tree into nested data format.
@param xml the xml tree
@return the nested data
@@ -69,7 +69,7 @@
return odict({tag: nested_data})
def to_file(nested_data, xml_file):
- """!
+ """
Write an xml file and use the to xml helper method to load it.
@param nested_data the nested data
@param xml_file the xml file path
@@ -78,7 +78,7 @@
open(xml_file, 'w').write(etree.tostring(xml, xml_declaration=True,
pretty_print=True))
def _to_file(nested_data):
- """!
+ """
Recursivly parse the nested data into xml tree format.
@param nested_data the nested data
@return the xml tree filled with child nodes
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/__init__.py
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/__init__.py
2008-09-07 03:50:35 UTC (rev 9513)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/__init__.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -54,5 +54,3 @@
obj = exists_or_else(d, key, [])
if isinstance(obj, list): return obj
return [obj]
-
-
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/converter.py
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/converter.py
2008-09-07 03:50:35 UTC (rev 9513)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/converter.py
2008-09-07 04:13:30 UTC (rev 9514)
@@ -25,7 +25,7 @@
import os
def _make_param(key, value):
- """!
+ """
Make a paramater dict from the key/value pair.
@param key the key
@param value the value
@@ -37,7 +37,7 @@
return param
def _get_blocks(blocks, tag):
- """!
+ """
Get a list of blocks with the tag.
@param blocks the old block list
@param tag the tag name
@@ -46,7 +46,7 @@
return filter(lambda b: b['tag'] == tag, blocks)
def _get_params(block):
- """!
+ """
Get a list of params.
@param block the old block
@retun a list of params
@@ -56,7 +56,7 @@
return params
def _convert_id(id):
- """!
+ """
Convert an old id to a new safe id.
Replace spaces with underscores.
Lower case the odl id.
@@ -65,7 +65,7 @@
return id.lower().replace(' ', '_')
def convert(file_path, platform):
- """!
+ """
Convert the flow graph to the new format.
Make a backup of the old file.
Save a reformated flow graph to the file path.
@@ -144,7 +144,7 @@
############################################################
# conversion - variables
############################################################
- x = 100
+ x = 100
for variable in variables:
key = variable['key']
value = variable['value']
@@ -245,4 +245,3 @@
os.rename(file_path, file_path+'.bak')
#save new flow graph to file path
ParseXML.to_file({'flow_graph': new_n}, file_path)
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9514 - in gnuradio/branches/developers/jblum/grc_reorganize/grc/src: grc_gnuradio/blks2 grc_gnuradio/usrp grc_gnuradio/wxgui gui platforms/base platforms/gui platforms/python platforms/python/utils utils,
jblum <=