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.

Sign up for GitHub

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

Jump to bottom

Fix dir #15

Merged
merged 3 commits into from
Feb 1, 2016
Merged

Fix dir #15

merged 3 commits into from
Feb 1, 2016

Conversation

alexcjohnson
Copy link
Contributor

@AdriaanRol replaces the safe_getattr function with a mixin class DelegateAttributes that handles delegation to both dictionary keys (and can handle multiple dictionaries, like parameters and functions) and objects (making DataArray behave like a numpy.ndarray) and updates __dir__ so dir() and autocomplete work.

Also (sorry, right after saying PRs should be single-topic 😱 ) two small fixes: I had forgotten Station.snapshot, and I broke the tests with my last addition to the subprocess PR.

@alexcjohnson
Station.snapshot
6b69667
@alexcjohnson
fix multiprocessing tests
58a8692 
apparently I didn't rerun these tests after adding the in_notebook test...
@alexcjohnson
safe_getattr -> DelegateAttributes
48bf25a
@AdriaanRol
Copy link
Contributor

Awesome! I'll try to check this out tomorrow, I'll be very happy with this.

AdriaanRol
AdriaanRol reviewed Jan 31, 2016
View reviewed changes
qcodes/utils/helpers.py
msg = "'{}' object has no attribute or {} item '{}'".format(
obj.__class__.__name__, attr_dict, key)
raise AttributeError(msg) from None
class DelegateAttributes(object):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better name than safe_getatrr.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because it's doing much better things 😄
If you're happy with this, give it a 💃 and I'll merge it in.

@AdriaanRol
Copy link
Contributor

Just tested it out on my laptop. Got to say I'm very happy with it, I'll pull it in today 💃

alexcjohnson added a commit that referenced this pull request Feb 1, 2016
@alexcjohnson
Merge pull request #15 from qdev-dk/fix-dir
e04568e 
Fix dir
@alexcjohnson alexcjohnson merged commit e04568e into master Feb 1, 2016
@alexcjohnson alexcjohnson deleted the fix-dir branch February 1, 2016 07:51
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Apr 3, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
227e6e1 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Apr 10, 2017
@giulioungaretti
Feature/monitor (#15)
8633b7f 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes May 2, 2017
@giulioungaretti
Feature/monitor (#15)
55b582f 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Jun 1, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
d0232b2 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Jun 22, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
e57709c 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Jun 27, 2017
@giulioungaretti @WilliamHPNielsen
Feature/monitor (#15)
a1ef42e 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Jul 7, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
095e758 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Jul 18, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
c2974f8 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 3, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
a9cc140 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 3, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
0ae687b 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 7, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
fe42a49 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 9, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
5a6aaa2 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 10, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
d1ead8e 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 16, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
38591b9 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 18, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
3eb2b10 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Aug 22, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
36836b4 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Sep 11, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
321d39d 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
jenshnielsen referenced this pull request in jenshnielsen/Qcodes Sep 21, 2017
@giulioungaretti @jenshnielsen
Feature/monitor (#15)
6264a66 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
nataliejpg pushed a commit to nataliejpg/Qcodes that referenced this pull request Oct 11, 2017
@giulioungaretti @WilliamHPNielsen
Feature/monitor (microsoft#15)
809b1c9 
* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open
WilliamHPNielsen pushed a commit that referenced this pull request Oct 16, 2017
@jenshnielsen @WilliamHPNielsen
Backport monitor (#731)
c036866 
* Feature/monitor (#15)

* First monitor commit, now 🍔 !

* polish things up

* types for the masses

* chore: Refactor monitor

* fix: Add todo remove space

* refactor

* silm api

* better monitor

* fix: Add static files to pacakge setup

* fix: Add websocket dependency

* fix: Use http with webbrowser open

* fix: Include static, add init

* move server to onw  scripts

* feat: make monitor server standalone

* fix: Sleep before thread starts!

* fix: Update monitor GUI

* Fix monitor for channel parameters (#61)

* The monitor does not work correctly with ws34

* make websockets a soft dependency

Everything but the monitor can be used without it

* remove unused pass statment

* add simple monitor readme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alexcjohnson @AdriaanRol