mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-25 11:18:27 +08:00
gui/explib: add to artiq top-level import
This commit is contained in:
parent
e029ebb23f
commit
4167e669d2
@ -3,3 +3,4 @@ from artiq.language.db import *
|
||||
from artiq.language.units import check_unit
|
||||
from artiq.language.units import ps, ns, us, ms, s
|
||||
from artiq.language.units import Hz, kHz, MHz, GHz
|
||||
from artiq.gui.explib import *
|
||||
|
@ -1,13 +1,11 @@
|
||||
import asyncio
|
||||
|
||||
from gi.repository import Gtk
|
||||
import asyncio as _aio
|
||||
|
||||
|
||||
class BaseControls:
|
||||
def __init__(self, facilities):
|
||||
self.facilities = facilities
|
||||
|
||||
@asyncio.coroutine
|
||||
@_aio.coroutine
|
||||
def build(self):
|
||||
self.finalize()
|
||||
|
||||
@ -21,8 +19,13 @@ class GladeControls(BaseControls):
|
||||
self.glade_file = glade_file
|
||||
self.top_widget_name = top_widget_name
|
||||
|
||||
@asyncio.coroutine
|
||||
@_aio.coroutine
|
||||
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()
|
||||
data = yield from self.facilities.get_data(self.glade_file)
|
||||
self.builder.add_from_string(data)
|
||||
|
@ -1,4 +1,4 @@
|
||||
from artiq.gui.explib import GladeControls
|
||||
from artiq import GladeControls
|
||||
|
||||
|
||||
class Controls(GladeControls):
|
||||
|
Loading…
Reference in New Issue
Block a user