diff options
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/base/Block.py | 4 | ||||
| -rw-r--r-- | grc/base/Param.py | 12 | ||||
| -rw-r--r-- | grc/gui/Param.py | 77 | ||||
| -rw-r--r-- | grc/python/Param.py | 44 | ||||
| -rw-r--r-- | grc/python/block.dtd | 3 |
5 files changed, 82 insertions, 58 deletions
diff --git a/grc/base/Block.py b/grc/base/Block.py index faa48d99b4..5a91810b7d 100644 --- a/grc/base/Block.py +++ b/grc/base/Block.py @@ -23,7 +23,7 @@ from Element import Element from Cheetah.Template import Template from UserDict import UserDict - +from itertools import imap class TemplateArg(UserDict): """ @@ -103,7 +103,7 @@ class Block(Element): 'hide': 'all', }) )) - for param in map(lambda n: self.get_parent().get_parent().Param(block=self, n=n), params): + for param in imap(lambda n: self.get_parent().get_parent().Param(block=self, n=n), params): key = param.get_key() #test against repeated keys if key in self.get_param_keys(): diff --git a/grc/base/Param.py b/grc/base/Param.py index f8bfe0d256..33ba7c3dbb 100644 --- a/grc/base/Param.py +++ b/grc/base/Param.py @@ -68,11 +68,19 @@ class Param(Element): block: the parent element n: the nested odict """ - #grab the data + # if the base key is a valid param key, copy its data and overlay this params data + base_key = n.find('base_key') + if base_key and base_key in block.get_param_keys(): + n_expanded = block.get_param(base_key)._n.copy() + n_expanded.update(n) + n = n_expanded + # save odict in case this param will be base for another + self._n = n + # parse the data self._name = n.find('name') self._key = n.find('key') value = n.find('value') or '' - self._type = n.find('type') + self._type = n.find('type') or 'raw' self._hide = n.find('hide') or '' self._tab_label = n.find('tab') or block.get_param_tab_labels()[0] if not self._tab_label in block.get_param_tab_labels(): diff --git a/grc/gui/Param.py b/grc/gui/Param.py index f0e5a2fcb2..2ca20fab2a 100644 --- a/grc/gui/Param.py +++ b/grc/gui/Param.py @@ -23,6 +23,7 @@ import pygtk pygtk.require('2.0') import gtk import Colors +import os class InputParam(gtk.HBox): """The base class for an input parameter inside the input parameters dialog.""" @@ -36,6 +37,7 @@ class InputParam(gtk.HBox): self.pack_start(self.label, False) self.set_markup = lambda m: self.label.set_markup(m) self.tp = None + self._changed_but_unchecked = False #connect events self.connect('show', self._update_gui) def set_color(self, color): pass @@ -49,7 +51,9 @@ class InputParam(gtk.HBox): has_cb = \ hasattr(self.param.get_parent(), 'get_callbacks') and \ filter(lambda c: self.param.get_key() in c, self.param.get_parent()._callbacks) - self.set_markup(Utils.parse_template(PARAM_LABEL_MARKUP_TMPL, param=self.param, has_cb=has_cb)) + self.set_markup(Utils.parse_template(PARAM_LABEL_MARKUP_TMPL, + param=self.param, has_cb=has_cb, + modified=self._changed_but_unchecked)) #set the color self.set_color(self.param.get_color()) #set the tooltip @@ -60,7 +64,14 @@ class InputParam(gtk.HBox): if self.param.get_hide() == 'all': self.hide_all() else: self.show_all() - def _handle_changed(self, *args): + def _mark_changed(self, *args): + """ + Mark this param as modified on change, but validate only on focus-lost + """ + self._changed_but_unchecked = True + self._update_gui() + + def _apply_change(self, *args): """ Handle a gui change by setting the new param value, calling the callback (if applicable), and updating. @@ -71,6 +82,7 @@ class InputParam(gtk.HBox): if self._callback: self._callback(*args) else: self.param.validate() #gui update + self._changed_but_unchecked = False self._update_gui() class EntryParam(InputParam): @@ -80,7 +92,8 @@ class EntryParam(InputParam): InputParam.__init__(self, *args, **kwargs) self._input = gtk.Entry() self._input.set_text(self.param.get_value()) - self._input.connect('changed', self._handle_changed) + self._input.connect('changed', self._mark_changed) + self._input.connect('focus-out-event', self._apply_change) self.pack_start(self._input, True) def get_text(self): return self._input.get_text() def set_color(self, color): @@ -96,7 +109,7 @@ class EnumParam(InputParam): self._input = gtk.combo_box_new_text() for option in self.param.get_options(): self._input.append_text(option.get_name()) self._input.set_active(self.param.get_option_keys().index(self.param.get_value())) - self._input.connect('changed', self._handle_changed) + self._input.connect('changed', self._apply_change) self.pack_start(self._input, False) def get_text(self): return self.param.get_option_keys()[self._input.get_active()] def set_tooltip_text(self, text): self._input.set_tooltip_text(text) @@ -112,8 +125,9 @@ class EnumEntryParam(InputParam): except: self._input.set_active(-1) self._input.get_child().set_text(self.param.get_value()) - self._input.connect('changed', self._handle_changed) - self._input.get_child().connect('changed', self._handle_changed) + self._input.connect('changed', self._apply_change) + self._input.get_child().connect('changed', self._mark_changed) + self._input.get_child().connect('focus-out-event', self._apply_change) self.pack_start(self._input, False) def get_text(self): if self._input.get_active() == -1: return self._input.get_child().get_text() @@ -130,12 +144,50 @@ class EnumEntryParam(InputParam): self._input.get_child().modify_base(gtk.STATE_NORMAL, Colors.ENTRYENUM_CUSTOM_COLOR) self._input.get_child().modify_text(gtk.STATE_NORMAL, Colors.PARAM_ENTRY_TEXT_COLOR) + +class FileParam(EntryParam): + """Provide an entry box for filename and a button to browse for a file.""" + + def __init__(self, *args, **kwargs): + EntryParam.__init__(self, *args, **kwargs) + input = gtk.Button('...') + input.connect('clicked', self._handle_clicked) + self.pack_start(input, False) + + def _handle_clicked(self, widget=None): + """ + If the button was clicked, open a file dialog in open/save format. + Replace the text in the entry with the new filename from the file dialog. + """ + #get the paths + file_path = self.param.is_valid() and self.param.get_evaluated() or '' + (dirname, basename) = os.path.isfile(file_path) and os.path.split(file_path) or (file_path, '') + if not os.path.exists(dirname): dirname = os.getcwd() #fix bad paths + #build the dialog + if self.param.get_type() == 'file_open': + file_dialog = gtk.FileChooserDialog('Open a Data File...', None, + gtk.FILE_CHOOSER_ACTION_OPEN, ('gtk-cancel',gtk.RESPONSE_CANCEL,'gtk-open',gtk.RESPONSE_OK)) + elif self.param.get_type() == 'file_save': + file_dialog = gtk.FileChooserDialog('Save a Data File...', None, + gtk.FILE_CHOOSER_ACTION_SAVE, ('gtk-cancel',gtk.RESPONSE_CANCEL, 'gtk-save',gtk.RESPONSE_OK)) + file_dialog.set_do_overwrite_confirmation(True) + file_dialog.set_current_name(basename) #show the current filename + file_dialog.set_current_folder(dirname) #current directory + file_dialog.set_select_multiple(False) + file_dialog.set_local_only(True) + if gtk.RESPONSE_OK == file_dialog.run(): #run the dialog + file_path = file_dialog.get_filename() #get the file path + self._input.set_text(file_path) + self._apply_change() + file_dialog.destroy() #destroy the dialog + + PARAM_MARKUP_TMPL="""\ #set $foreground = $param.is_valid() and 'black' or 'red' <span foreground="$foreground" font_desc="Sans 7.5"><b>$encode($param.get_name()): </b>$encode(repr($param))</span>""" PARAM_LABEL_MARKUP_TMPL="""\ -#set $foreground = $param.is_valid() and 'black' or 'red' +#set $foreground = $modified and 'blue' or $param.is_valid() and 'black' or 'red' #set $underline = $has_cb and 'low' or 'none' <span underline="$underline" foreground="$foreground" font_desc="Sans 9">$encode($param.get_name())</span>""" @@ -179,8 +231,15 @@ class Param(Element): Returns: gtk input class """ - if self.is_enum(): return EnumParam(self, *args, **kwargs) - if self.get_options(): return EnumEntryParam(self, *args, **kwargs) + if self.get_type() in ('file_open', 'file_save'): + return FileParam(self, *args, **kwargs) + + elif self.is_enum(): + return EnumParam(self, *args, **kwargs) + + elif self.get_options(): + return EnumEntryParam(self, *args, **kwargs) + return EntryParam(self, *args, **kwargs) def get_markup(self): diff --git a/grc/python/Param.py b/grc/python/Param.py index 3daa37f637..3d9e52e25f 100644 --- a/grc/python/Param.py +++ b/grc/python/Param.py @@ -19,13 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from .. base.Param import Param as _Param from .. gui.Param import Param as _GUIParam -from .. gui.Param import EntryParam import Constants import numpy -import os -import pygtk -pygtk.require('2.0') -import gtk from gnuradio import eng_notation import re from gnuradio import gr @@ -33,41 +28,6 @@ from gnuradio import gr _check_id_matcher = re.compile('^[a-z|A-Z]\w*$') _show_id_matcher = re.compile('^(variable\w*|parameter|options|notebook)$') -class FileParam(EntryParam): - """Provide an entry box for filename and a button to browse for a file.""" - - def __init__(self, *args, **kwargs): - EntryParam.__init__(self, *args, **kwargs) - input = gtk.Button('...') - input.connect('clicked', self._handle_clicked) - self.pack_start(input, False) - - def _handle_clicked(self, widget=None): - """ - If the button was clicked, open a file dialog in open/save format. - Replace the text in the entry with the new filename from the file dialog. - """ - #get the paths - file_path = self.param.is_valid() and self.param.get_evaluated() or '' - (dirname, basename) = os.path.isfile(file_path) and os.path.split(file_path) or (file_path, '') - if not os.path.exists(dirname): dirname = os.getcwd() #fix bad paths - #build the dialog - if self.param.get_type() == 'file_open': - file_dialog = gtk.FileChooserDialog('Open a Data File...', None, - gtk.FILE_CHOOSER_ACTION_OPEN, ('gtk-cancel',gtk.RESPONSE_CANCEL,'gtk-open',gtk.RESPONSE_OK)) - elif self.param.get_type() == 'file_save': - file_dialog = gtk.FileChooserDialog('Save a Data File...', None, - gtk.FILE_CHOOSER_ACTION_SAVE, ('gtk-cancel',gtk.RESPONSE_CANCEL, 'gtk-save',gtk.RESPONSE_OK)) - file_dialog.set_do_overwrite_confirmation(True) - file_dialog.set_current_name(basename) #show the current filename - file_dialog.set_current_folder(dirname) #current directory - file_dialog.set_select_multiple(False) - file_dialog.set_local_only(True) - if gtk.RESPONSE_OK == file_dialog.run(): #run the dialog - file_path = file_dialog.get_filename() #get the file path - self._input.set_text(file_path) - self._handle_changed() - file_dialog.destroy() #destroy the dialog #blacklist certain ids, its not complete, but should help import __builtin__ @@ -162,10 +122,6 @@ class Param(_Param, _GUIParam): ################################################## return _truncate(dt_str, truncate) - def get_input(self, *args, **kwargs): - if self.get_type() in ('file_open', 'file_save'): return FileParam(self, *args, **kwargs) - return _GUIParam.get_input(self, *args, **kwargs) - def get_color(self): """ Get the color that represents this param's type. diff --git a/grc/python/block.dtd b/grc/python/block.dtd index b37c0ff760..18e53fda2a 100644 --- a/grc/python/block.dtd +++ b/grc/python/block.dtd @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Sub level elements. --> <!ELEMENT param_tab_order (tab+)> -<!ELEMENT param (name, key, value?, type, hide?, option*, tab?)> +<!ELEMENT param (base_key?, name, key, value?, type?, hide?, option*, tab?)> <!ELEMENT option (name, key, opt*)> <!ELEMENT sink (name, type, vlen?, nports?, optional?)> <!ELEMENT source (name, type, vlen?, nports?, optional?)> @@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA <!ELEMENT grc_source (#PCDATA)> <!ELEMENT tab (#PCDATA)> <!ELEMENT name (#PCDATA)> +<!ELEMENT base_key (#PCDATA)> <!ELEMENT key (#PCDATA)> <!ELEMENT check (#PCDATA)> <!ELEMENT bus_sink (#PCDATA)> |