Download as
Browse Code »

Commit af75e942c576b6f62a661d9d68e06e6988eb8977

Authored by Paulo Henrique Junqueira Amorim
1 parent a0f3adda
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

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
  Diff comments   View file @af75e94
@@ -58,6 +58,8 @@ class Viewer(wx.Panel): @@ -58,6 +58,8 @@ class Viewer(wx.Panel):
58 58
59 self.__bind_events() 59 self.__bind_events()
60 self.__bind_events_wx() 60 self.__bind_events_wx()
  61 +
  62 + self.first_reposition_actor = 0
61 63
62 def __bind_events(self): 64 def __bind_events(self):
63 ps.Publisher().subscribe(self.LoadActor, 'Load surface actor into viewer') 65 ps.Publisher().subscribe(self.LoadActor, 'Load surface actor into viewer')
@@ -87,7 +89,12 @@ class Viewer(wx.Panel): @@ -87,7 +89,12 @@ class Viewer(wx.Panel):
87 volume, colour = pubsub_evt.data 89 volume, colour = pubsub_evt.data
88 self.light = self.ren.GetLights().GetNextItem() 90 self.light = self.ren.GetLights().GetNextItem()
89 self.ren.AddVolume(volume) 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 self.UpdateRender() 98 self.UpdateRender()
92 99
93 def ChangeBackgroundColour(self, pubsub_evt): 100 def ChangeBackgroundColour(self, pubsub_evt):
@@ -97,11 +104,16 @@ class Viewer(wx.Panel): @@ -97,11 +104,16 @@ class Viewer(wx.Panel):
97 104
98 def LoadActor(self, pubsub_evt): 105 def LoadActor(self, pubsub_evt):
99 actor = pubsub_evt.data 106 actor = pubsub_evt.data
100 - 107 +
101 ren = self.ren 108 ren = self.ren
102 ren.AddActor(actor) 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 self.iren.Render() 118 self.iren.Render()
107 119