Download as
Browse Code »

Commit df77a202a2ba968fb5eecbf122f1b489fe47101d

Authored by Thiago Franco de Moraes
1 parent 9a51f984
Exists in master

Removing surface measures when closing project

Showing 1 changed file with 8 additions and 40 deletions   Show diff stats
invesalius/data/measures.py
  Diff comments   View file @df77a20
@@ -648,25 +648,11 @@ class LinearMeasure(object): @@ -648,25 +648,11 @@ class LinearMeasure(object):
648 return actors 648 return actors
649 649
650 def Remove(self): 650 def Remove(self):
651 - pass  
652 - # if self.point_actor1:  
653 - # self.renderer.RemoveActor(self.point_actor1)  
654 - # del self.point_actor1 651 + actors = self.GetActors()
  652 + Publisher.sendMessage("Remove actors " + str(const.SURFACE), (actors,))
655 653
656 - # if self.point_actor2:  
657 - # self.renderer.RemoveActor(self.point_actor2)  
658 - # del self.point_actor2  
659 -  
660 - # if self.line_actor:  
661 - # self.renderer.RemoveActor(self.line_actor)  
662 - # del self.line_actor  
663 -  
664 - # if self.text_actor:  
665 - # self.renderer.RemoveActor(self.text_actor)  
666 - # del self.text_actor  
667 -  
668 - # def __del__(self):  
669 - # self.Remove() 654 + def __del__(self):
  655 + self.Remove()
670 656
671 657
672 class AngularMeasure(object): 658 class AngularMeasure(object):
@@ -913,26 +899,8 @@ class AngularMeasure(object): @@ -913,26 +899,8 @@ class AngularMeasure(object):
913 return angle 899 return angle
914 900
915 def Remove(self): 901 def Remove(self):
916 - pass  
917 - # if self.point_actor1:  
918 - # self.renderer.RemoveActor(self.point_actor1)  
919 - # del self.point_actor1  
920 -  
921 - # if self.point_actor2:  
922 - # self.renderer.RemoveActor(self.point_actor2)  
923 - # del self.point_actor2  
924 -  
925 - # if self.point_actor3:  
926 - # self.renderer.RemoveActor(self.point_actor3)  
927 - # del self.point_actor3  
928 -  
929 - # if self.line_actor:  
930 - # self.renderer.RemoveActor(self.line_actor)  
931 - # del self.line_actor  
932 -  
933 - # if self.text_actor:  
934 - # self.renderer.RemoveActor(self.text_actor)  
935 - # del self.text_actor 902 + actors = self.GetActors()
  903 + Publisher.sendMessage("Remove actors " + str(const.SURFACE), (actors,))
936 904
937 def SetRenderer(self, renderer): 905 def SetRenderer(self, renderer):
938 if self.point_actor1: 906 if self.point_actor1:
@@ -957,5 +925,5 @@ class AngularMeasure(object): @@ -957,5 +925,5 @@ class AngularMeasure(object):
957 925
958 self.renderer = renderer 926 self.renderer = renderer
959 927
960 - # def __del__(self):  
961 - # self.Remove() 928 + def __del__(self):
  929 + self.Remove()