Commit af75e942c576b6f62a661d9d68e06e6988eb8977
1 parent
a0f3adda
Exists in
master
and in
6 other branches
ADD: Volume or Surface of Front position, created first
Showing
1 changed file
with
16 additions
and
4 deletions
Show diff stats
invesalius/data/viewer_volume.py
... | ... | @@ -58,6 +58,8 @@ class Viewer(wx.Panel): |
58 | 58 | |
59 | 59 | self.__bind_events() |
60 | 60 | self.__bind_events_wx() |
61 | + | |
62 | + self.first_reposition_actor = 0 | |
61 | 63 | |
62 | 64 | def __bind_events(self): |
63 | 65 | ps.Publisher().subscribe(self.LoadActor, 'Load surface actor into viewer') |
... | ... | @@ -87,7 +89,12 @@ class Viewer(wx.Panel): |
87 | 89 | volume, colour = pubsub_evt.data |
88 | 90 | self.light = self.ren.GetLights().GetNextItem() |
89 | 91 | self.ren.AddVolume(volume) |
90 | - self.RepositionActor() | |
92 | + if not (self.first_reposition_actor): | |
93 | + self.RepositionActor() | |
94 | + self.first_reposition_actor = 1 | |
95 | + else: | |
96 | + ren.ResetCamera() | |
97 | + ren.ResetCameraClippingRange() | |
91 | 98 | self.UpdateRender() |
92 | 99 | |
93 | 100 | def ChangeBackgroundColour(self, pubsub_evt): |
... | ... | @@ -97,11 +104,16 @@ class Viewer(wx.Panel): |
97 | 104 | |
98 | 105 | def LoadActor(self, pubsub_evt): |
99 | 106 | actor = pubsub_evt.data |
100 | - | |
107 | + | |
101 | 108 | ren = self.ren |
102 | 109 | ren.AddActor(actor) |
103 | - ren.ResetCamera() | |
104 | - ren.ResetCameraClippingRange() | |
110 | + | |
111 | + if not (self.first_reposition_actor): | |
112 | + self.RepositionActor() | |
113 | + self.first_reposition_actor = 1 | |
114 | + else: | |
115 | + ren.ResetCamera() | |
116 | + ren.ResetCameraClippingRange() | |
105 | 117 | |
106 | 118 | self.iren.Render() |
107 | 119 | ... | ... |