Download as
Browse Code »

Commit 508c5f6e75ff0ece83f145bf2682e8b8754b0668

Authored by tfmoraes
1 parent 7a321d6f
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

ENH: Window width & level working with 8 bit raycasting preset

Showing 1 changed file with 27 additions and 26 deletions   Show diff stats
invesalius/data/volume.py
  Diff comments   View file @508c5f6
... ... @@ -138,35 +138,36 @@ class Volume():
138 138 def SetWWWL(self, pubsub_evt):
139 139 ww, wl, n = pubsub_evt.data
140 140 print "Setting ww, wl", ww, wl
141   - curve = self.config['16bitClutCurves'][n]
142   -
143   - p1 = curve[0]
144   - p2 = curve[-1]
145   - half = (p2['x'] - p1['x']) / 2.0
146   - middle = p1['x'] + half
147   -
148   - shiftWL = wl - middle
149   - shiftWW = p1['x'] + shiftWL - (wl - 0.5 * ww)
150   -
151   - factor = 1.0
152   - for n,i in enumerate(curve):
153   - factor = abs(i['x'] - middle) / half
154   - if factor < 0:
155   - factor = 0
156   - i['x'] += shiftWL
157   - if n < len(curve)/2.0:
158   - i['x'] -= shiftWW * factor
159   - else:
160   - i['x'] += shiftWW * factor
161   -
162   - self.Create16bColorTable(self.scale)
163   - self.CreateOpacityTable(self.scale)
164   - print curve
  141 + if self.config['advancedCLUT']:
  142 + curve = self.config['16bitClutCurves'][n]
  143 +
  144 + p1 = curve[0]
  145 + p2 = curve[-1]
  146 + half = (p2['x'] - p1['x']) / 2.0
  147 + middle = p1['x'] + half
  148 +
  149 + shiftWL = wl - middle
  150 + shiftWW = p1['x'] + shiftWL - (wl - 0.5 * ww)
  151 +
  152 + factor = 1.0
  153 + for n,i in enumerate(curve):
  154 + factor = abs(i['x'] - middle) / half
  155 + if factor < 0:
  156 + factor = 0
  157 + i['x'] += shiftWL
  158 + if n < len(curve)/2.0:
  159 + i['x'] -= shiftWW * factor
  160 + else:
  161 + i['x'] += shiftWW * factor
  162 + else:
  163 + self.config['wl'] = wl
  164 + self.config['ww'] = ww
  165 +
  166 + self.__config_preset()
165 167 ps.Publisher().sendMessage('Render volume viewer', None)
166 168  
167 169 def Refresh(self, pubsub_evt):
168   - self.Create16bColorTable(self.scale)
169   - self.CreateOpacityTable(self.scale)
  170 + self.__config_preset()
170 171  
171 172 #***************
172 173 def Create16bColorTable(self, scale):
... ...