From 8c30ad6af57bfde50e8a4c90fdf0bb958ecbd57c Mon Sep 17 00:00:00 2001
From: Huy Pham <42948410+hpham@users.noreply.github.com>
Date: Thu, 5 Dec 2019 10:39:53 -0800
Subject: [PATCH] commit before splitting files

---
 coretk/coretk/coreclient.py | 75 +++++++++++++++++++++----------------
 coretk/coretk/parsedata.py  |  1 -
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/coretk/coretk/coreclient.py b/coretk/coretk/coreclient.py
index 79bc5359..1a7d06e3 100644
--- a/coretk/coretk/coreclient.py
+++ b/coretk/coretk/coreclient.py
@@ -7,13 +7,12 @@ import os
 import time
 
 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.sessions import SessionsDialog
 from coretk.interface import InterfaceManager
 from coretk.nodeutils import NodeDraw, NodeUtils
-
-# from coretk.shape import Shape, ShapeData
+from coretk.shape import Shape, ShapeData
 
 OBSERVERS = {
     "processes": "ps",
@@ -283,36 +282,46 @@ class CoreClient:
         return self.state == core_pb2.SessionState.RUNTIME
 
     def parse_metadata(self, config):
-        # for key, value in config.items():
-        #     if "global_options" != key:
-        #         canvas_config = parsedata.parse(value)
-        #         print(canvas_config)
-        #         if canvas_config.get("type"):
-        #             if canvas_config["type"] == "rectangle":
-        #                 data = ShapeData(False, canvas_config["label"],
-        #                                  canvas_config["fontfamily"],
-        #                                  canvas_config["fontsize"],
-        #                                  canvas_config["labelcolor"],
-        #                                  canvas_config["color"],
-        #                                  canvas_config["border"],
-        #                                  canvas_config["width"],
-        #                                  )
-        #                 coords = tuple([float(x) for x in canvas_config["iconcoords"].split()])
-        #                 print(coords)
-        #                 shape = Shape(self.app, self.app.canvas, None, None, coords, data, canvas_config["type"])
-        #                 self.app.canvas.shapes[shape.id] = shape
-        #             elif canvas_config["type"] == "oval":
-        #                 print("not implemented")
-        #             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)
+        for key, value in config.items():
+            if "global_options" != key:
+                canvas_config = parsedata.parse(value)
+                print(canvas_config)
+                if canvas_config.get("type"):
+                    config_type = canvas_config["type"]
+                    if config_type == "rectangle" or config_type == "oval":
+                        data = ShapeData(
+                            False,
+                            canvas_config["label"],
+                            canvas_config["fontfamily"],
+                            canvas_config["fontsize"],
+                            canvas_config["labelcolor"],
+                            canvas_config["color"],
+                            canvas_config["border"],
+                            canvas_config["width"],
+                        )
+                        coords = tuple(
+                            [float(x) for x in canvas_config["iconcoords"].split()]
+                        )
+                        shape = Shape(
+                            self.app,
+                            self.app.canvas,
+                            None,
+                            None,
+                            coords,
+                            data,
+                            config_type,
+                        )
+                        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_config = config.get("canvas")
         if canvas_config:
diff --git a/coretk/coretk/parsedata.py b/coretk/coretk/parsedata.py
index 9afff3e2..e4312846 100644
--- a/coretk/coretk/parsedata.py
+++ b/coretk/coretk/parsedata.py
@@ -1,7 +1,6 @@
 """
 parse meta data
 """
-# from coretk.graph import ScaleOption
 
 
 def parse(meta_string):