diff --git a/invesalius/data/measures.py b/invesalius/data/measures.py index 9e2a9ce..bd2f56c 100644 --- a/invesalius/data/measures.py +++ b/invesalius/data/measures.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] diff --git a/invesalius/gui/data_notebook.py b/invesalius/gui/data_notebook.py index cd1b90f..079bff0 100644 --- a/invesalius/gui/data_notebook.py +++ b/invesalius/gui/data_notebook.py @@ -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]) -- libgit2 0.21.2