[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9784 - in gnuradio/trunk/grc: data/platforms/python/b
From: |
jblum |
Subject: |
[Commit-gnuradio] r9784 - in gnuradio/trunk/grc: data/platforms/python/blocks src/grc_gnuradio/wxgui src/platforms/python |
Date: |
Sun, 12 Oct 2008 12:40:30 -0600 (MDT) |
Author: jblum
Date: 2008-10-12 12:40:30 -0600 (Sun, 12 Oct 2008)
New Revision: 9784
Modified:
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_selector.xml
gnuradio/trunk/grc/data/platforms/python/blocks/variable_slider.xml
gnuradio/trunk/grc/src/grc_gnuradio/wxgui/callback_controls.py
gnuradio/trunk/grc/src/platforms/python/Param.py
Log:
autohide grid pos and slider len, added slider len param
Modified: gnuradio/trunk/grc/data/platforms/python/blocks/blks2_selector.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/blks2_selector.xml
2008-10-12 17:32:41 UTC (rev 9783)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/blks2_selector.xml
2008-10-12 18:40:30 UTC (rev 9784)
@@ -16,8 +16,8 @@
input_index=$input_index,
output_index=$output_index,
)</make>
- <callback>set_input_index($input_index)</callback>
- <callback>set_output_index($output_index)</callback>
+ <callback>set_input_index(int($input_index))</callback>
+ <callback>set_output_index(int($output_index))</callback>
<param>
<name>Type</name>
<key>type</key>
Modified: gnuradio/trunk/grc/data/platforms/python/blocks/variable_slider.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/variable_slider.xml
2008-10-12 17:32:41 UTC (rev 9783)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/variable_slider.xml
2008-10-12 18:40:30 UTC (rev 9784)
@@ -20,6 +20,7 @@
min=$min,
max=$max,
num_steps=$num_steps,
+ slider_length=$slider_length,
)
#set $grid_pos = $grid_pos.eval
#if not grid_pos
@@ -56,8 +57,16 @@
<key>num_steps</key>
<value>100</value>
<type>int</type>
+ <hide>part</hide>
</param>
- <param>
+ <param>
+ <name>Slider Length (px)</name>
+ <key>slider_length</key>
+ <value>200</value>
+ <type>int</type>
+ <hide>part</hide>
+ </param>
+ <param>
<name>Slider Type</name>
<key>slider_type</key>
<value>horizontal</value>
Modified: gnuradio/trunk/grc/src/grc_gnuradio/wxgui/callback_controls.py
===================================================================
--- gnuradio/trunk/grc/src/grc_gnuradio/wxgui/callback_controls.py
2008-10-12 17:32:41 UTC (rev 9783)
+++ gnuradio/trunk/grc/src/grc_gnuradio/wxgui/callback_controls.py
2008-10-12 18:40:30 UTC (rev 9784)
@@ -152,7 +152,7 @@
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):
+ def __init__(self, window, callback, label='Label', value=50, min=0,
max=100, num_steps=100, slider_length=200):
"""
Slider contructor.
Create the slider, text box, and label.
@@ -163,12 +163,14 @@
@param min the min
@param max the max
@param num_steps the number of steps
+ @param slider_length the length of the slider bar in pixels
"""
#initialize
_control_base.__init__(self, window, callback)
self.min = float(min)
self.max = float(max)
self.num_steps = int(num_steps)
+ self.slider_length = slider_length
#create gui elements
label_text_sizer = wx.BoxSizer(self.label_text_orientation)
#label and text box container
label_text = LabelText(self.get_window(), '%s: '%str(label))
@@ -178,7 +180,7 @@
label_text_sizer.Add(obj, 0,
wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
self.Add(label_text_sizer, 0, wx.ALIGN_CENTER)
#make the slider
- self.slider = slider = wx.Slider(self.get_window(), -1,
size=wx.Size(*self.slider_size), style=self.slider_style)
+ self.slider = slider = wx.Slider(self.get_window(), -1,
size=wx.Size(*self.get_slider_size()), style=self.slider_style)
try: slider.SetRange(0, num_steps)
except Exception, e:
print >> sys.stderr, 'Error in set slider range:
"%s".'%e
@@ -230,11 +232,11 @@
class slider_horizontal_control(_slider_control_base):
label_text_orientation = wx.HORIZONTAL
slider_style = wx.SL_HORIZONTAL
- slider_size = 200, 20
+ def get_slider_size(self): return self.slider_length, 20
class slider_vertical_control(_slider_control_base):
label_text_orientation = wx.VERTICAL
slider_style = wx.SL_VERTICAL
- slider_size = 20, 200
+ def get_slider_size(self): return 20, self.slider_length
##############################################################################################
# Text Box Control
Modified: gnuradio/trunk/grc/src/platforms/python/Param.py
===================================================================
--- gnuradio/trunk/grc/src/platforms/python/Param.py 2008-10-12 17:32:41 UTC
(rev 9783)
+++ gnuradio/trunk/grc/src/platforms/python/Param.py 2008-10-12 18:40:30 UTC
(rev 9784)
@@ -77,6 +77,7 @@
Get the hide value from the base class.
Hide the ID parameter for most blocks. Exceptions below.
If the parameter controls a port type, vlen, or nports, return
part.
+ If the parameter is an empty grid position, return part.
These parameters are redundant to display in the flow graph
view.
@return hide the hide property string
"""
@@ -90,6 +91,8 @@
if self.get_key() in ' '.join(map(
lambda p: ' '.join([p._type, p._vlen, p._nports]),
self.get_parent().get_ports())
): return 'part'
+ #hide empty grid positions
+ if self.get_key() == 'grid_pos' and not self.get_value():
return 'part'
return hide
def evaluate(self):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9784 - in gnuradio/trunk/grc: data/platforms/python/blocks src/grc_gnuradio/wxgui src/platforms/python,
jblum <=