srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

gui/explib: add to artiq top-level import

This commit is contained in:
Sebastien Bourdeauducq 2015-02-05 19:50:03 +08:00
parent e029ebb23f
commit 4167e669d2
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/__init__.py
View File

@ -3,3 +3,4 @@ from artiq.language.db import *
from artiq.language.units import check_unit from artiq.language.units import check_unit
from artiq.language.units import ps, ns, us, ms, s from artiq.language.units import ps, ns, us, ms, s
from artiq.language.units import Hz, kHz, MHz, GHz from artiq.language.units import Hz, kHz, MHz, GHz
from artiq.gui.explib import *

13
artiq/gui/explib.py
View File

@ -1,13 +1,11 @@
import asyncio import asyncio as _aio
from gi.repository import Gtk
class BaseControls: class BaseControls:
def __init__(self, facilities): def __init__(self, facilities):
self.facilities = facilities self.facilities = facilities
@asyncio.coroutine @_aio.coroutine
def build(self): def build(self):
self.finalize() self.finalize()
@ -21,8 +19,13 @@ class GladeControls(BaseControls):
self.glade_file = glade_file self.glade_file = glade_file
self.top_widget_name = top_widget_name self.top_widget_name = top_widget_name
@asyncio.coroutine @_aio.coroutine
def build(self): def build(self):
# lazy import GTK so that the artiq top-level
# (which imports from us) can be imported on systems
# without GTK installed
from gi.repository import Gtk
self.builder = Gtk.Builder() self.builder = Gtk.Builder()
data = yield from self.facilities.get_data(self.glade_file) data = yield from self.facilities.get_data(self.glade_file)
self.builder.add_from_string(data) self.builder.add_from_string(data)

2
examples/flopping_f_simulation_gui.py
View File

@ -1,4 +1,4 @@
from artiq.gui.explib import GladeControls from artiq import GladeControls
class Controls(GladeControls): class Controls(GladeControls):