[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8156 - in grc/branches/grc_reloaded: notes src/grc sr
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8156 - in grc/branches/grc_reloaded: notes src/grc src/grc/gui src/grc/gui/elements src/grc_gnuradio/blocks src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/modulators src/grc_gnuradio/data |
|
Date: |
Wed, 2 Apr 2008 19:56:38 -0600 (MDT) |
Author: jblum
Date: 2008-04-02 19:56:37 -0600 (Wed, 02 Apr 2008)
New Revision: 8156
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_receiver_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_sync_cc.xml
Modified:
grc/branches/grc_reloaded/notes/todo.txt
grc/branches/grc_reloaded/src/grc/Constants.py
grc/branches/grc_reloaded/src/grc/gui/DrawingArea.py
grc/branches/grc_reloaded/src/grc/gui/elements/Block.py
grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/options.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
Log:
added blocks, gui expose tweak, constants
Modified: grc/branches/grc_reloaded/notes/todo.txt
===================================================================
--- grc/branches/grc_reloaded/notes/todo.txt 2008-04-02 16:49:15 UTC (rev
8155)
+++ grc/branches/grc_reloaded/notes/todo.txt 2008-04-03 01:56:37 UTC (rev
8156)
@@ -17,10 +17,13 @@
-save working directory after close
-create sub-flow graphs to be used in larger flow graphs
-copy and paste blocks
+
+############ Suggestions: ####################
-scope sink constructor needs average option and triggering option
-const sink constructor needs marker option
--clean up const sink display
--clean up scope sink display
+-clean up const sink display (hide x:t)
+-clean up scope sink display (hide x:t)
+-tune_result in usrp.py needs __str__ method
############ Get GTK Stock IDs: ####################
gtk.stock_list_ids()
Modified: grc/branches/grc_reloaded/src/grc/Constants.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/Constants.py 2008-04-02 16:49:15 UTC
(rev 8155)
+++ grc/branches/grc_reloaded/src/grc/Constants.py 2008-04-03 01:56:37 UTC
(rev 8156)
@@ -63,7 +63,7 @@
## Signal block rotations
######################################################################################################
-##List of possible angles (in degrees) that a signal block and its parameters
can be rotated to.
+##List of possible angles (in degrees) that a block can be rotated to.
POSSIBLE_ROTATIONS = (0, 90, 180, 270)
##direction of rotation left.
@@ -76,32 +76,22 @@
## Dimension constraints for the various windows (in pixels)
######################################################################################################
-##main window constraints @{
-DEFAULT_MAIN_WINDOW_WIDTH = 750
-
-DEFAULT_MAIN_WINDOW_HEIGHT = 550
address@hidden
-
-##flow graph window constraints @{
+##main window constraints @{
MIN_WINDOW_WIDTH = 600
-MAX_WINDOW_WIDTH = 2400
-
MIN_WINDOW_HEIGHT = 400
-MAX_WINDOW_HEIGHT = 1800
address@hidden
-##dialog constraints @{
+##dialog constraints @{
MIN_DIALOG_WIDTH = 400
MIN_DIALOG_HEIGHT = 500
address@hidden
-##misc window constraints @{
+##static height of reports window
REPORTS_WINDOW_HEIGHT = 100
+##static width of block selection window
BLOCK_SELECTION_WINDOW_WIDTH = 200
address@hidden
-
######################################################################################################
## Constraints on displayable labels and ports @{
######################################################################################################
Modified: grc/branches/grc_reloaded/src/grc/gui/DrawingArea.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/DrawingArea.py 2008-04-02
16:49:15 UTC (rev 8155)
+++ grc/branches/grc_reloaded/src/grc/gui/DrawingArea.py 2008-04-03
01:56:37 UTC (rev 8156)
@@ -23,6 +23,7 @@
import pygtk
pygtk.require('2.0')
import gtk
+from grc.Constants import *
class DrawingArea(gtk.DrawingArea):
"""
@@ -40,7 +41,7 @@
#inject drawing area into main_window
self._main_window.drawing_area = self
gtk.DrawingArea.__init__(self)
- self.set_size_request(800, 600)
+ self.set_size_request(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT)
self.connect('expose-event', self._handle_window_expose)
self.connect('motion-notify-event', self._handle_mouse_motion)
self.connect('button-press-event',
self._handle_mouse_button_press)
@@ -114,5 +115,5 @@
width, height = self.get_size_request()
if not self.pixmap or (width, height) !=
self.pixmap.get_size():
self.pixmap = gtk.gdk.Pixmap(self.window, width,
height, -1)
- self._main_window.get_flow_graph().update()
+ self._main_window.get_flow_graph().draw()
return True
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/Block.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/Block.py 2008-04-02
16:49:15 UTC (rev 8155)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/Block.py 2008-04-03
01:56:37 UTC (rev 8156)
@@ -61,7 +61,7 @@
Get the coordinate from the position param.
@return the coordinate tuple (x, y) or (0, 0) if failure
"""
- try: #should evaluate to dict
+ try: #should evaluate to tuple
coor =
eval(self.get_param('gui_coordinate').get_value())
x, y = map(int, coor)
fgW,fgH = self.get_parent().get_size()
@@ -94,8 +94,8 @@
rotation =
eval(self.get_param('gui_rotation').get_value())
return int(rotation)
except:
- self.set_rotation(0)
- return 0
+ self.set_rotation(POSSIBLE_ROTATIONS[0])
+ return POSSIBLE_ROTATIONS[0]
def set_rotation(self, rot):
"""!
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py 2008-04-02
16:49:15 UTC (rev 8155)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py 2008-04-03
01:56:37 UTC (rev 8156)
@@ -226,7 +226,7 @@
return element.what_is_selected(coor)
return None
- def draw(self, drawable=None):
+ def draw(self):
"""Draw the background and then all of the Elements in this
FlowGraph on the pixmap,
then draw the pixmap to the drawable window of this
FlowGraph."""
if self.get_gc():
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Peak Detector2
+###################################################
+ -->
+<block>
+ <name>Peak Detector2</name>
+ <key>gr_peak_detector2_fb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.peak_detector2_fb($threshold_factor_rise, $look_ahead,
$alpha)</make>
+ <callback>set_threshold_factor_rise($threshold_factor_rise)</callback>
+ <callback>set_look_ahead($look_ahead)</callback>
+ <callback>set_alpha($alpha)</callback>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ </option>
+ </param>
+ <param>
+ <name>TH Factor Rise</name>
+ <key>threshold_factor_rise</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Look Ahead</name>
+ <key>look_ahead</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Peak Detector
+###################################################
+ -->
+<block>
+ <name>Peak Detector</name>
+ <key>gr_peak_detector_xb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.peak_detector_$(type.fcn)b($threshold_factor_rise,
$threshold_factor_fall, $look_ahead, $alpha)</make>
+ <callback>set_threshold_factor_rise($threshold_factor_rise)</callback>
+ <callback>set_threshold_factor_fall($threshold_factor_fall)</callback>
+ <callback>set_look_ahead($look_ahead)</callback>
+ <callback>set_alpha($alpha)</callback>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ </option>
+ </param>
+ <param>
+ <name>TH Factor Rise</name>
+ <key>threshold_factor_rise</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>TH Factor Fall</name>
+ <key>threshold_factor_fall</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Look Ahead</name>
+ <key>look_ahead</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Sample and Hold
+###################################################
+ -->
+<block>
+ <name>Sample and Hold</name>
+ <key>gr_sample_and_hold_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.sample_and_hold_$(type.fcn)()</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:bb</opt>
+ </option>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <sink>
+ <name>ctrl</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Constellation Decoder
+###################################################
+ -->
+<block>
+ <name>Constellation Decoder</name>
+ <key>gr_constellation_decoder_cb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.constellation_decoder_cb($sym_position, $sym_value_out)</make>
+ <param>
+ <name>Symbol Position</name>
+ <key>sym_position</key>
+ <type>complex_vector</type>
+ </param>
+ <param>
+ <name>Symbol Value Out</name>
+ <key>sym_value_out</key>
+ <type>int_vector</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Differential Decoder
+###################################################
+ -->
+<block>
+ <name>Differential Decoder</name>
+ <key>gr_diff_decoder_bb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.diff_decoder_bb($modulus)</make>
+ <param>
+ <name>Modulus</name>
+ <key>modulus</key>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Differential Encoder
+###################################################
+ -->
+<block>
+ <name>Differential Encoder</name>
+ <key>gr_diff_encoder_bb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.diff_encoder_bb($modulus)</make>
+ <param>
+ <name>Modulus</name>
+ <key>modulus</key>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Differential Phasor
+###################################################
+ -->
+<block>
+ <name>Differential Phasor</name>
+ <key>gr_diff_phasor_cc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.diff_phasor_cc()</make>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_receiver_cc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_receiver_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_receiver_cc.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##MPSK Receiver
+###################################################
+ -->
+<block>
+ <name>MPSK Receiver</name>
+ <key>gr_mpsk_receiver_cc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.mpsk_receiver_cc($M, $theta, $alpha, $beta, $fmin, $fmax, $mu,
$gain_mu, $omega, $gain_omega, $omega_relative_limit)</make>
+ <callback>set_alpha($alpha)</callback>
+ <callback>set_beta($beta)</callback>
+ <callback>set_mu($mu)</callback>
+ <callback>set_gain_mu($gain_mu)</callback>
+ <callback>set_omega($omega)</callback>
+ <callback>set_gain_omega($gain_omega)</callback>
+ <param>
+ <name>M</name>
+ <key>M</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Theta</name>
+ <key>theta</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Beta</name>
+ <key>beta</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Min Freq</name>
+ <key>fmin</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Freq</name>
+ <key>fmax</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Mu</name>
+ <key>mu</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain Mu</name>
+ <key>gain_mu</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Omega</name>
+ <key>omega</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain Omega</name>
+ <key>gain_omega</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Omega Relative Limit</name>
+ <key>omega_relative_limit</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_sync_cc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_sync_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_mpsk_sync_cc.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##MPSK Sync
+###################################################
+ -->
+<block>
+ <name>MPSK Sync</name>
+ <key>gr_mpsk_sync_cc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.mpsk_sync_cc($alpha, $beta, $max_freq, $min_freq, $ref_phase,
$omega, $gain_omega, $mu, $gain_mu)</make>
+ <callback>set_mu($mu)</callback>
+ <callback>set_gain_mu($gain_mu)</callback>
+ <callback>set_omega($omega)</callback>
+ <callback>set_gain_omega($gain_omega)</callback>
+ <param>
+ <name>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Beta</name>
+ <key>beta</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Freq</name>
+ <key>max_freq</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Min Freq</name>
+ <key>min_freq</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Reference Phase</name>
+ <key>ref_phase</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Omega</name>
+ <key>omega</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain Omega</name>
+ <key>gain_omega</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Mu</name>
+ <key>mu</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain Mu</name>
+ <key>gain_mu</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/options.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/options.xml
2008-04-02 16:49:15 UTC (rev 8155)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/options.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -27,7 +27,7 @@
<param>
<name>Window Size</name>
<key>window_size</key>
- <value>1024, 768</value>
+ <value>1280, 1024</value>
<type>int_vector</type>
</param>
<param>
@@ -45,9 +45,9 @@
</option>
</param>
<check>len($window_size) == 2</check>
- <check>400 <= $(window_size)[0] <= 2048</check>
- <check>300 <= $(window_size)[1] <= 1536</check>
+ <check>300 <= $(window_size)[0] <= 2048</check>
+ <check>300 <= $(window_size)[1] <= 2048</check>
<doc>
-The window size in (width, height) must be between (400, 300) and (2048, 1536).
+The window size in (width, height) must be between (300, 300) and (2048, 2048).
</doc>
</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-04-02 16:49:15 UTC (rev 8155)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-04-03 01:56:37 UTC (rev 8156)
@@ -118,12 +118,15 @@
<cat>
<name>Level Controls</name>
<block>gr_dpll_bb</block>
- <block>gr_mute_xx</block>
+ <block>gr_peak_detector_xb</block>
+ <block>gr_peak_detector2_fb</block>
+ <block>gr_sample_and_hold_xx</block>
<block>gr_agc_xx</block>
<block>gr_agc2_xx</block>
- <block>gr_feedforward_agc_cc</block>
+ <block>gr_feedforward_agc_cc</block>
+ <block>gr_mute_xx</block>
<block>gr_simple_squelch_cc</block>
<block>blks2_standard_squelch</block>
<block>gr_pwr_squelch_xx</block>
@@ -157,6 +160,15 @@
<block>gr_phase_modulator_fc</block>
<block>gr_quadrature_demod_cf</block>
+ <block>gr_diff_phasor_cc</block>
+ <block>gr_constellation_decoder_cb</block>
+
+ <block>gr_diff_encoder_bb</block>
+ <block>gr_diff_decoder_bb</block>
+
+ <block>gr_mpsk_receiver_cc</block>
+ <block>gr_mpsk_sync_cc</block>
+
<block>blks2_wfm_tx</block>
<block>blks2_wfm_rcv</block>
<block>blks2_wfm_rcv_pll</block>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8156 - in grc/branches/grc_reloaded: notes src/grc src/grc/gui src/grc/gui/elements src/grc_gnuradio/blocks src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/modulators src/grc_gnuradio/data,
jblum <=