From cb32053a2824a07a74f9cec22cdc56b98bdbf6f8 Mon Sep 17 00:00:00 2001 From: Jan Gosmann Date: Sat, 12 Jan 2019 20:28:31 +0100 Subject: [PATCH 1/2] Remove 'if' that will never be true. --- nengo_gui/page.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/nengo_gui/page.py b/nengo_gui/page.py index 7ddf340c..6cdb7026 100644 --- a/nengo_gui/page.py +++ b/nengo_gui/page.py @@ -380,8 +380,6 @@ def get_label(self, obj, default_labels=None): assert label is not None if '.' in label: label = label.rsplit('.', 1)[1] - if label is None: - label = repr(obj) return label def get_uid(self, obj, default_labels=None): From b6fded542198f5695b1476fccc1ad210e78f3cbf Mon Sep 17 00:00:00 2001 From: Jan Gosmann Date: Sat, 12 Jan 2019 20:34:13 +0100 Subject: [PATCH 2/2] Use network's class name if more informative. --- CHANGES.rst | 1 + nengo_gui/page.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 0d6be431..a41ace73 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -23,6 +23,7 @@ Release History 0.4.5 (unreleased) ================== +- Improvement: subclasses of Network use their class name as a default label - Bugfix: Removed duplicate response headers (fixes loading in Chrome) - Bugfix: Fix for running with Tornado 6 - Bugfix: Handle recent changes to nengo.Process API (backwards-compatible) diff --git a/nengo_gui/page.py b/nengo_gui/page.py index 6cdb7026..89d226da 100644 --- a/nengo_gui/page.py +++ b/nengo_gui/page.py @@ -3,6 +3,7 @@ import json import logging import os +import re import socket import threading import time @@ -380,6 +381,9 @@ def get_label(self, obj, default_labels=None): assert label is not None if '.' in label: label = label.rsplit('.', 1)[1] + if (re.match(r'networks\[\d+\]', label) + and obj.__class__.__name__ != 'Network'): + label = obj.__class__.__name__ return label def get_uid(self, obj, default_labels=None):