afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

commit before splitting files

Browse source
This commit is contained in:
Huy Pham 2019-12-05 10:39:53 -08:00
parent 6d4c437d2d
commit 8c30ad6af5
2 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
coretk/coretk/coreclient.py
View file

@ -7,13 +7,12 @@ import os
import time import time
from core.api.grpc import client, core_pb2 from core.api.grpc import client, core_pb2
from coretk import appconfig from coretk import appconfig, parsedata
from coretk.dialogs.mobilityplayer import MobilityPlayer from coretk.dialogs.mobilityplayer import MobilityPlayer
from coretk.dialogs.sessions import SessionsDialog from coretk.dialogs.sessions import SessionsDialog
from coretk.interface import InterfaceManager from coretk.interface import InterfaceManager
from coretk.nodeutils import NodeDraw, NodeUtils from coretk.nodeutils import NodeDraw, NodeUtils
from coretk.shape import Shape, ShapeData
# from coretk.shape import Shape, ShapeData
OBSERVERS = { OBSERVERS = {
"processes": "ps", "processes": "ps",
@ -283,36 +282,46 @@ class CoreClient:
return self.state == core_pb2.SessionState.RUNTIME return self.state == core_pb2.SessionState.RUNTIME
def parse_metadata(self, config): def parse_metadata(self, config):
# for key, value in config.items(): for key, value in config.items():
# if "global_options" != key: if "global_options" != key:
# canvas_config = parsedata.parse(value) canvas_config = parsedata.parse(value)
# print(canvas_config) print(canvas_config)
# if canvas_config.get("type"): if canvas_config.get("type"):
# if canvas_config["type"] == "rectangle": config_type = canvas_config["type"]
# data = ShapeData(False, canvas_config["label"], if config_type == "rectangle" or config_type == "oval":
# canvas_config["fontfamily"], data = ShapeData(
# canvas_config["fontsize"], False,
# canvas_config["labelcolor"], canvas_config["label"],
# canvas_config["color"], canvas_config["fontfamily"],
# canvas_config["border"], canvas_config["fontsize"],
# canvas_config["width"], canvas_config["labelcolor"],
# ) canvas_config["color"],
# coords = tuple([float(x) for x in canvas_config["iconcoords"].split()]) canvas_config["border"],
# print(coords) canvas_config["width"],
# shape = Shape(self.app, self.app.canvas, None, None, coords, data, canvas_config["type"]) )
# self.app.canvas.shapes[shape.id] = shape coords = tuple(
# elif canvas_config["type"] == "oval": [float(x) for x in canvas_config["iconcoords"].split()]
# print("not implemented") )
# elif canvas_config["type"] == "text": shape = Shape(
# print("not implemented") self.app,
# else: self.app.canvas,
# if "wallpaper" in canvas_config: None,
# logging.info("canvas metadata: %s", canvas_config) None,
# wallpaper_style = canvas_config["wallpaper-style"] coords,
# self.app.canvas.scale_option.set(wallpaper_style) data,
# wallpaper = canvas_config["wallpaper"] config_type,
# wallpaper = str(appconfig.BACKGROUNDS_PATH.joinpath(wallpaper)) )
# self.app.canvas.set_wallpaper(wallpaper) self.app.canvas.shapes[shape.id] = shape
elif canvas_config["type"] == "text":
print("not implemented")
else:
if "wallpaper" in canvas_config:
logging.info("canvas metadata: %s", canvas_config)
wallpaper_style = canvas_config["wallpaper-style"]
self.app.canvas.scale_option.set(wallpaper_style)
wallpaper = canvas_config["wallpaper"]
wallpaper = str(appconfig.BACKGROUNDS_PATH.joinpath(wallpaper))
self.app.canvas.set_wallpaper(wallpaper)
# canvas settings # canvas settings
canvas_config = config.get("canvas") canvas_config = config.get("canvas")
if canvas_config: if canvas_config:

1
coretk/coretk/parsedata.py
View file

@ -1,7 +1,6 @@
""" """
parse meta data parse meta data
""" """
# from coretk.graph import ScaleOption
def parse(meta_string): def parse(meta_string):