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

applets/simple: send embed RPC

This commit is contained in:
Sebastien Bourdeauducq 2016-01-07 20:22:44 +08:00
parent 8778aef6a1
commit adbb217d55
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
artiq/applets/simple.py
View File

@ -1,9 +1,10 @@
import argparse import argparse
import asyncio import asyncio
from quamash import QEventLoop, QtWidgets, QtCore from quamash import QEventLoop, QtWidgets, QtGui, QtCore
from artiq.protocols.sync_struct import Subscriber from artiq.protocols.sync_struct import Subscriber
from artiq.protocols.pc_rpc import Client
class SimpleApplet: class SimpleApplet:
@ -13,11 +14,20 @@ class SimpleApplet:
self.argparser = argparse.ArgumentParser(description=cmd_description) self.argparser = argparse.ArgumentParser(description=cmd_description)
group = self.argparser.add_argument_group("data server") group = self.argparser.add_argument_group("data server")
group.add_argument( group.add_argument(
"--server", default="::1", "--server-notify", default="::1",
help="hostname or IP to connect to") help="hostname or IP to connect to for dataset notifications")
group.add_argument( group.add_argument(
"--port", default=3250, type=int, "--port-notify", default=3250, type=int,
help="TCP port to connect to") help="TCP port to connect to for dataset notifications")
group = self.argparser.add_argument_group("GUI server")
group.add_argument(
"--server-gui", default="::1",
help="hostname or IP to connect to for GUI control")
group.add_argument(
"--port-gui", default=6501, type=int,
help="TCP port to connect to for GUI control")
group.add_argument("--embed", default=None, type=int,
help="embed main widget into existing window")
self._arggroup_datasets = self.argparser.add_argument_group("datasets") self._arggroup_datasets = self.argparser.add_argument_group("datasets")
def add_dataset(self, name, help=None): def add_dataset(self, name, help=None):
@ -36,6 +46,22 @@ class SimpleApplet:
def create_main_widget(self): def create_main_widget(self):
self.main_widget = self.main_widget_class(self.args) self.main_widget = self.main_widget_class(self.args)
# Qt window embedding is ridiculously buggy, and empirical testing
# has shown that the following procedure must be followed exactly:
# 1. applet creates widget
# 2. applet creates native window without showing it, and get its ID
# 3. applet sends the ID to host, host embeds the widget
# 4. applet shows the widget
# Doing embedding the other way around (using QWindow.setParent in the
# applet) breaks resizing; furthermore the host needs to know our
# window ID to request graceful termination by closing the window.
if self.args.embed is not None:
win_id = int(self.main_widget.winId())
remote = Client(self.args.server_gui, self.args.port_gui, "applets")
try:
remote.embed(self.args.embed, win_id)
finally:
remote.close_rpc()
self.main_widget.show() self.main_widget.show()
def sub_init(self, data): def sub_init(self, data):
@ -49,7 +75,7 @@ class SimpleApplet:
self.subscriber = Subscriber("datasets", self.subscriber = Subscriber("datasets",
self.sub_init, self.sub_mod) self.sub_init, self.sub_mod)
self.loop.run_until_complete(self.subscriber.connect( self.loop.run_until_complete(self.subscriber.connect(
self.args.server, self.args.port)) self.args.server_notify, self.args.port_notify))
def run(self): def run(self):
self.args_init() self.args_init()