Download as
Browse Code »

Commit 28307a22309530ce90f7cf85ab813bcfa4ccb262

Authored by ruppert
1 parent 68249849
Exists in master and in 67 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, 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

FIX: psutil problem

Showing 1 changed file with 9 additions and 3 deletions   Show diff stats
invesalius/utils.py
  Diff comments   View file @28307a2
... ... @@ -224,9 +224,15 @@ def calculate_resizing_tofitmemory(x_size,y_size,n_slices,byte):
224 224  
225 225 # USING PSUTIL
226 226 import psutil
227   - ram_free = psutil.phymem_usage().free + psutil.cached_phymem() + psutil.phymem_buffers()
228   - ram_total = psutil.phymem_usage().total
229   - swap_free = psutil.virtmem_usage().free
  227 + if (psutil.version_info<(0,6,0)):
  228 + ram_free = psutil.phymem_usage().free + psutil.cached_phymem() + psutil.phymem_buffers()
  229 + ram_total = psutil.phymem_usage().total
  230 + swap_free = psutil.virtmem_usage().free
  231 + else:
  232 + ram_free = psutil.virtual_memory().available
  233 + ram_total = psutil.virtual_memory().total
  234 + swap_free = psutil.swap_memory().free
  235 +
230 236 print "RAM_FREE=", ram_free
231 237 print "RAM_TOTAL=", ram_total
232 238  
... ...