diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-06-15 20:27:21 -0700 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-07-13 16:33:28 +0200 |
| commit | 5f4d39e233e041b8a2f5006439a636a49d6e56ea (patch) | |
| tree | ca3a245c2cf42613662a562cfa07c42668f4e5e0 | |
| parent | 38dc5e454b78b0f3e7e8af40c4b6e2a6cb15eec9 (diff) | |
grc-refactor: Block: remove name getter
| -rw-r--r-- | grc/core/Block.py | 11 | ||||
| -rw-r--r-- | grc/gui/Block.py | 2 | ||||
| -rw-r--r-- | grc/gui/BlockTreeWindow.py | 4 | ||||
| -rw-r--r-- | grc/gui/PropsDialog.py | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/grc/core/Block.py b/grc/core/Block.py index 91bbeecee6..503f1e66d4 100644 --- a/grc/core/Block.py +++ b/grc/core/Block.py @@ -68,7 +68,7 @@ class Block(Element): """ Element.__init__(self, parent=flow_graph) - self._name = n['name'] + self.name = n['name'] self._key = n['key'] self.category = [cat.strip() for cat in n.get('category', '').split('/') if cat.strip()] self._flags = n.get('flags', '') @@ -189,7 +189,7 @@ class Block(Element): def check_generate_mode(label, flag, valid_options): block_requires_mode = ( flag in self.get_flags() or - self.get_name().upper().startswith(label) + self.name.upper().startswith(label) ) if block_requires_mode and current_generate_option not in valid_options: self.add_error_message("Can't generate this block in mode: {} ".format( @@ -339,7 +339,7 @@ class Block(Element): # print "Rewriting embedded python block {!r}".format(self.get_id()) self._epy_source_hash = src_hash - self._name = blk_io.name or blk_io.cls + self.name = blk_io.name or blk_io.cls self._doc = blk_io.doc self._imports[0] = 'import ' + self.get_id() self._make = '{0}.{1}({2})'.format(self.get_id(), blk_io.cls, ', '.join( @@ -492,14 +492,11 @@ class Block(Element): return True def __str__(self): - return 'Block - {} - {}({})'.format(self.get_id(), self.get_name(), self.get_key()) + return 'Block - {} - {}({})'.format(self.get_id(), self.name, self.get_key()) def get_id(self): return self.get_param('id').get_value() - def get_name(self): - return self._name - def get_key(self): return self._key diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 49bba4f3db..fd6612b8c2 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -127,7 +127,7 @@ class Block(Element, _Block): #create the main layout layout = Gtk.DrawingArea().create_pango_layout('') layout.set_markup('<span foreground="{foreground}" font_desc="{font}"><b>{name}</b></span>'.format( - foreground='black' if self.is_valid() else 'red', font=BLOCK_FONT, name=Utils.encode(self.get_name()) + foreground='black' if self.is_valid() else 'red', font=BLOCK_FONT, name=Utils.encode(self.name) )) self.label_width, self.label_height = layout.get_pixel_size() self.layouts.append(layout) diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py index d62fedf0a3..8522390fc1 100644 --- a/grc/gui/BlockTreeWindow.py +++ b/grc/gui/BlockTreeWindow.py @@ -176,8 +176,8 @@ class BlockTreeWindow(Gtk.VBox): categories[parent_category] = iter_ # add block iter_ = treestore.insert_before(categories[category], None) - treestore.set_value(iter_, NAME_INDEX, block.get_name()) treestore.set_value(iter_, KEY_INDEX, block.get_key()) + treestore.set_value(iter_, NAME_INDEX, block.name) treestore.set_value(iter_, DOC_INDEX, _format_doc(block.documentation)) def update_docs(self): @@ -230,7 +230,7 @@ class BlockTreeWindow(Gtk.VBox): self.expand_module_in_tree() else: matching_blocks = [b for b in list(self.platform.blocks.values()) - if key in b.get_key().lower() or key in b.get_name().lower()] + if key in b.get_key().lower() or key in b.name.lower()] self.treestore_search.clear() self._categories_search = {tuple(): None} diff --git a/grc/gui/PropsDialog.py b/grc/gui/PropsDialog.py index 152681237e..d7722adff7 100644 --- a/grc/gui/PropsDialog.py +++ b/grc/gui/PropsDialog.py @@ -40,7 +40,7 @@ class PropsDialog(Gtk.Dialog): Gtk.Dialog.__init__( self, - title='Properties: ' + block.get_name(), + title='Properties: ' + block.name, transient_for=parent, modal=True, ) |