ENH: In the process of load measures to viewers

tatiana
1 parent 238015b5
Showing 2 changed files with 24 additions and 1 deletions Show diff stats
invesalius/data/measures.py
invesalius/gui/data_notebook.py
@@ -35,6 +35,30 @@ class MeasurementManager(object):
         ps.Publisher().subscribe(self._change_name, "Change measurement name")
         ps.Publisher().subscribe(self._remove_measurements, "Remove measurements")
         ps.Publisher().subscribe(self._set_visibility, "Show measurement")
+        ps.Publisher().subscribe(self._load_measurements, "Load measurement dict")
+
+
+    def _load_measurements(self, pubsub_evt):
+        print "_load_measurements"
+        dict = pubsub_evt.data
+        for i in dict:
+            m = dict[i]
+            if m.type == const.LINEAR:
+                mr = LinearMeasure(m.colour)
+            else:
+                mr = AngularMeasure(m.colour)
+            self.current = (m, mr)
+            self.measures.append(self.current)
+            print "m.index", m.index
+            print "m.points",  m.points
+            for point in m.points:
+                print "-- point", point
+                x, y, z = point
+                actors = mr.AddPoint(x, y, z)
+                ps.Publisher().sendMessage(("Add actors", m.location),
+                    (actors, m.slice_number))
+            print "----"
+
  
     def _add_point(self, pubsub_evt):
         position = pubsub_evt.data[0]
@@ -1120,7 +1120,6 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
  
     def InsertNewItem(self, index=0, label="Measurement 1", colour=None,
                       type_="LINEAR", location="SURFACE", value="0 mm"):
-        print index, label, colour, type_, location, value
         self.InsertStringItem(index, "")
         self.SetStringItem(index, 1, label,
                             imageId = self._list_index[index])
...	...	@@ -35,6 +35,30 @@ class MeasurementManager(object):
35	35	ps.Publisher().subscribe(self._change_name, "Change measurement name")
36	36	ps.Publisher().subscribe(self._remove_measurements, "Remove measurements")
37	37	ps.Publisher().subscribe(self._set_visibility, "Show measurement")
	38	+ ps.Publisher().subscribe(self._load_measurements, "Load measurement dict")
	39	+
	40	+
	41	+ def _load_measurements(self, pubsub_evt):
	42	+ print "_load_measurements"
	43	+ dict = pubsub_evt.data
	44	+ for i in dict:
	45	+ m = dict[i]
	46	+ if m.type == const.LINEAR:
	47	+ mr = LinearMeasure(m.colour)
	48	+ else:
	49	+ mr = AngularMeasure(m.colour)
	50	+ self.current = (m, mr)
	51	+ self.measures.append(self.current)
	52	+ print "m.index", m.index
	53	+ print "m.points", m.points
	54	+ for point in m.points:
	55	+ print "-- point", point
	56	+ x, y, z = point
	57	+ actors = mr.AddPoint(x, y, z)
	58	+ ps.Publisher().sendMessage(("Add actors", m.location),
	59	+ (actors, m.slice_number))
	60	+ print "----"
	61	+
38	62
39	63	def _add_point(self, pubsub_evt):
40	64	position = pubsub_evt.data[0]
...	...
...	...	@@ -1120,7 +1120,6 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
1120	1120
1121	1121	def InsertNewItem(self, index=0, label="Measurement 1", colour=None,
1122	1122	type_="LINEAR", location="SURFACE", value="0 mm"):
1123		- print index, label, colour, type_, location, value
1124	1123	self.InsertStringItem(index, "")
1125	1124	self.SetStringItem(index, 1, label,
1126	1125	imageId = self._list_index[index])
...	...