@@ -9,7 +9,6 import numpy | |||||
9 | import traceback |
|
9 | import traceback | |
10 |
|
10 | |||
11 | from time import sleep |
|
11 | from time import sleep | |
12 | from Queue import Queue |
|
|||
13 | from threading import Lock |
|
12 | from threading import Lock | |
14 | # from threading import Thread |
|
13 | # from threading import Thread | |
15 |
|
14 | |||
@@ -65,7 +64,8 class Plotter(Operation): | |||||
65 | packDict['name'] = self.name |
|
64 | packDict['name'] = self.name | |
66 | packDict['kwargs'] = kwargs |
|
65 | packDict['kwargs'] = kwargs | |
67 |
|
66 | |||
68 | packDict['data'] = obj2Dict(dataOut) |
|
67 | # packDict['data'] = obj2Dict(dataOut) | |
|
68 | packDict['data'] = dataOut | |||
69 |
|
69 | |||
70 | self.__queue.put(packDict) |
|
70 | self.__queue.put(packDict) | |
71 |
|
71 | |||
@@ -162,9 +162,11 class PlotManager(): | |||||
162 | plot_id = serial_data['id'] |
|
162 | plot_id = serial_data['id'] | |
163 | plot_name = serial_data['name'] |
|
163 | plot_name = serial_data['name'] | |
164 | kwargs = serial_data['kwargs'] |
|
164 | kwargs = serial_data['kwargs'] | |
165 | dataDict = serial_data['data'] |
|
165 | # dataDict = serial_data['data'] | |
|
166 | # | |||
|
167 | # dataPlot = dict2Obj(dataDict) | |||
166 |
|
168 | |||
167 |
dataPlot = |
|
169 | dataPlot = serial_data['data'] | |
168 |
|
170 | |||
169 | if plot_id not in self.plotInstanceDict.keys(): |
|
171 | if plot_id not in self.plotInstanceDict.keys(): | |
170 | className = eval(plot_name) |
|
172 | className = eval(plot_name) |
General Comments 0
You need to be logged in to leave comments.
Login now