Download as
Browse Code »

Commit 291b78c316e9a756607b35b874d844c061136ebc

Authored by Paulo Henrique Junqueira Amorim
1 parent 7d25dcfb
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: Date time formated. If tag is seconds

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
invesalius/reader/dicom.py
  Diff comments   View file @291b78c
@@ -1416,7 +1416,10 @@ class Parser(): @@ -1416,7 +1416,10 @@ class Parser():
1416 return "" 1416 return ""
1417 1417
1418 def __format_time(self,value): 1418 def __format_time(self,value):
1419 - if (len(value.split(".")) > 1): 1419 +
  1420 + if (len(value.split(".")) == 1):
  1421 + data = time.gmtime(float(value))
  1422 + elif (len(value.split(".")) > 1):
1420 data = time.strptime(value, "%H.%M.%S") 1423 data = time.strptime(value, "%H.%M.%S")
1421 elif(len(value.split(":")) > 1): 1424 elif(len(value.split(":")) > 1):
1422 data = time.strptime(value, "%H:%M:%S") 1425 data = time.strptime(value, "%H:%M:%S")
@@ -1674,6 +1677,7 @@ if __name__ == "__main__": @@ -1674,6 +1677,7 @@ if __name__ == "__main__":
1674 1677
1675 for i in xrange(1,total+1): 1678 for i in xrange(1,total+1):
1676 filename = "..//data//"+str(i)+".dcm" 1679 filename = "..//data//"+str(i)+".dcm"
  1680 +
1677 parser = Parser() 1681 parser = Parser()
1678 if parser.SetFileName(filename): 1682 if parser.SetFileName(filename):
1679 print "p:", parser.GetPatientName() 1683 print "p:", parser.GetPatientName()
invesalius/reader/dicom_grouper.py
  Diff comments   View file @291b78c
@@ -287,7 +287,7 @@ class DicomGroups: @@ -287,7 +287,7 @@ class DicomGroups:
287 287
288 key = tmp1.keys()[m] 288 key = tmp1.keys()[m]
289 information = tmp1[key] 289 information = tmp1[key]
290 - new_key = (information.patient.name, None, x, information.image.orientation_label) 290 + new_key = (information.patient.name, None, x, information.image.orientation_label, information.acquisition.time)
291 291
292 292
293 list = [information] 293 list = [information]