Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove component templates #491

Merged
merged 16 commits into from
Jul 21, 2015
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
All graphs working without templates
tcstewar committed Jul 16, 2015
commit 68a87b71b92e663f1f7786ce30b76b749b8ab727
5 changes: 4 additions & 1 deletion nengo_gui/components/pointer.py
Original file line number Diff line number Diff line change
@@ -14,12 +14,15 @@ class Pointer(Component):
def __init__(self, obj, **kwargs):
super(Pointer, self).__init__()
self.obj = obj
self.label = page.get_label(obj)
self.data = collections.deque()
self.override_target = None
self.target = kwargs.get('args', 'default')
self.vocab_out = obj.outputs[self.target][1]
self.vocab_in = obj.inputs[self.target][1]

def initialize(self, page, config, uid):
super(Pointer, self).initialize(page, config, uid)
self.label = page.get_label(self.obj)
self.vocab_out.include_pairs = config.show_pairs

def add_nengo_objects(self, page):
7 changes: 5 additions & 2 deletions nengo_gui/components/raster.py
Original file line number Diff line number Diff line change
@@ -14,12 +14,15 @@ def __init__(self, obj, n_neurons=None):
self.neuron_type = obj.neuron_type
self.obj = obj.neurons
self.data = collections.deque()
self.label = page.get_label(obj)
self.max_neurons = obj.n_neurons
if n_neurons is None:
n_neurons = min(self.max_neurons, 10)
self.n_neurons = n_neurons

def initialize(self, page, config, uid):
super(Raster, self).initialize(page, config, uid)
self.label = page.get_label(self.obj.ensemble)

def add_nengo_objects(self, page):
with page.model:
self.node = nengo.Node(self.gather_data, size_in=self.max_neurons)
@@ -48,6 +51,6 @@ def javascript(self):
return 'new Nengo.Raster(main, sim, %s);' % json

def code_python_args(self, uids):
return [uids[self.obj]]
return [uids[self.obj.ensemble]]

RasterTemplate = Raster
5 changes: 4 additions & 1 deletion nengo_gui/components/voltage.py
Original file line number Diff line number Diff line change
@@ -14,11 +14,14 @@ def __init__(self, obj, n_neurons=5):
super(Voltage, self).__init__()
self.obj = obj.neurons
self.data = []
self.label = page.get_label(obj)
self.max_neurons = int(self.obj.size_out)
self.n_neurons = min(n_neurons, self.max_neurons)
self.struct = struct.Struct('<%df' % (1 + self.n_neurons))

def initialize(self, page, config, uid):
super(Voltage, self).initialize(page, config, uid)
self.label = page.get_label(self.obj.ensemble)

def add_nengo_objects(self, page):
with page.model:
self.probe = nengo.Probe(self.obj[:self.n_neurons], 'voltage')
5 changes: 4 additions & 1 deletion nengo_gui/components/xyvalue.py
Original file line number Diff line number Diff line change
@@ -13,11 +13,14 @@ class XYValue(Component):
def __init__(self, obj):
super(XYValue, self).__init__()
self.obj = obj
self.label = page.get_label(obj)
self.data = collections.deque()
self.n_lines = int(obj.size_out)
self.struct = struct.Struct('<%df' % (1 + self.n_lines))

def initialize(self, page, config, uid):
super(XYValue, self).initialize(page, config, uid)
self.label = page.get_label(self.obj)

def add_nengo_objects(self, page):
with page.model:
self.node = nengo.Node(self.gather_data,