Download as
Browse Code »

Commit 69aa6af451b77a223b85184fa93a794167b5df3f

Authored by tfmoraes
1 parent 371a7514
Exists in master and in 5 other branches beta3, beta4, inv3.0.1, usp-navegador, wxgtk3_b5

Working with the last version of gdcm

Showing 5 changed files with 80 additions and 85 deletions   Show diff stats
invesalius/control.py
  Diff comments   View file @69aa6af
@@ -123,10 +123,8 @@ class Controller(): @@ -123,10 +123,8 @@ class Controller():
123 # Import project 123 # Import project
124 dirpath = dialog.ShowImportDirDialog() 124 dirpath = dialog.ShowImportDirDialog()
125 if dirpath and not os.listdir(dirpath): 125 if dirpath and not os.listdir(dirpath):
126 - print "IFFFFFFFfff"  
127 dialog.ImportEmptyDirectory(dirpath) 126 dialog.ImportEmptyDirectory(dirpath)
128 elif dirpath: 127 elif dirpath:
129 - print "ELSE..........."  
130 self.StartImportPanel(dirpath) 128 self.StartImportPanel(dirpath)
131 ps.Publisher().sendMessage("Load data to import panel", dirpath) 129 ps.Publisher().sendMessage("Load data to import panel", dirpath)
132 130
@@ -289,8 +287,6 @@ class Controller(): @@ -289,8 +287,6 @@ class Controller():
289 data = evt.data 287 data = evt.data
290 if (data): 288 if (data):
291 message = _("Loading file %d of %d")%(data[0],data[1]) 289 message = _("Loading file %d of %d")%(data[0],data[1])
292 -  
293 - if (data):  
294 if not(self.progress_dialog): 290 if not(self.progress_dialog):
295 self.progress_dialog = dialog.ProgressDialog( 291 self.progress_dialog = dialog.ProgressDialog(
296 maximum = data[1], abort=1) 292 maximum = data[1], abort=1)
invesalius/data/imagedata_utils.py
  Diff comments   View file @69aa6af
@@ -472,7 +472,6 @@ def dcm2memmap(files, slice_size, orientation): @@ -472,7 +472,6 @@ def dcm2memmap(files, slice_size, orientation):
472 shape = slice_size[1], len(files), slice_size[0] 472 shape = slice_size[1], len(files), slice_size[0]
473 else: 473 else:
474 shape = len(files), slice_size[1], slice_size[0] 474 shape = len(files), slice_size[1], slice_size[0]
475 - print shape  
476 matrix = numpy.memmap(temp_file, mode='w+', dtype='int16', shape=shape) 475 matrix = numpy.memmap(temp_file, mode='w+', dtype='int16', shape=shape)
477 dcm_reader = vtkgdcm.vtkGDCMImageReader() 476 dcm_reader = vtkgdcm.vtkGDCMImageReader()
478 cont = 0 477 cont = 0
invesalius/gui/widgets/gradient.py
  Diff comments   View file @69aa6af
@@ -219,6 +219,7 @@ class GradientSlider(wx.Panel): @@ -219,6 +219,7 @@ class GradientSlider(wx.Panel):
219 evt.Skip() 219 evt.Skip()
220 220
221 def OnSize(self, evt): 221 def OnSize(self, evt):
  222 + print "OnSize gradient"
222 self.CalculateControlPositions() 223 self.CalculateControlPositions()
223 self.Refresh() 224 self.Refresh()
224 evt.Skip() 225 evt.Skip()
@@ -236,7 +237,6 @@ class GradientSlider(wx.Panel): @@ -236,7 +237,6 @@ class GradientSlider(wx.Panel):
236 proportion)) + PUSH_WIDTH 237 proportion)) + PUSH_WIDTH
237 self.max_position = int(round((self.maximun - self.min_range) * \ 238 self.max_position = int(round((self.maximun - self.min_range) * \
238 proportion)) + PUSH_WIDTH 239 proportion)) + PUSH_WIDTH
239 - print self.min_position, self.max_position  
240 240
241 def _max_position_to_maximun(self, max_position): 241 def _max_position_to_maximun(self, max_position):
242 """ 242 """
invesalius/reader/dicom.py
  Diff comments   View file @69aa6af
@@ -200,7 +200,7 @@ class Parser(): @@ -200,7 +200,7 @@ class Parser():
200 to the number of columns on the image. 200 to the number of columns on the image.
201 Return "" if not defined. 201 Return "" if not defined.
202 """ 202 """
203 - data = self.data_image['0028']['0011'] 203 + data = self.data_image[0x028][0x011]
204 if (data): 204 if (data):
205 return int(str(data)) 205 return int(str(data))
206 return "" 206 return ""
@@ -212,7 +212,7 @@ class Parser(): @@ -212,7 +212,7 @@ class Parser():
212 to the number of rows on the image. 212 to the number of rows on the image.
213 Return "" if not defined. 213 Return "" if not defined.
214 """ 214 """
215 - data = self.data_image['0028']['0010'] 215 + data = self.data_image[0x028][0x010]
216 if (data): 216 if (data):
217 return int(str(data)) 217 return int(str(data))
218 return "" 218 return ""
@@ -299,7 +299,7 @@ class Parser(): @@ -299,7 +299,7 @@ class Parser():
299 """ 299 """
300 # TODO: internationalize data 300 # TODO: internationalize data
301 try: 301 try:
302 - date = self.data_image['0008']['0022'] 302 + date = self.data_image[0x0008][0x0022]
303 except(KeyError): 303 except(KeyError):
304 return "" 304 return ""
305 305
@@ -314,7 +314,7 @@ class Parser(): @@ -314,7 +314,7 @@ class Parser():
314 314
315 DICOM standard tag (0x0020, 0x0012) was used. 315 DICOM standard tag (0x0020, 0x0012) was used.
316 """ 316 """
317 - data = self.data_image['0020']['0012'] 317 + data = self.data_image[0x0020][0x0012]
318 if (data): 318 if (data):
319 return int(str(data)) 319 return int(str(data))
320 return "" 320 return ""
@@ -325,7 +325,7 @@ class Parser(): @@ -325,7 +325,7 @@ class Parser():
325 325
326 DICOM standard tag (0x0008, 0x0050) was used. 326 DICOM standard tag (0x0008, 0x0050) was used.
327 """ 327 """
328 - data = self.data_image['0008']['0050'] 328 + data = self.data_image[0x008][0x050]
329 if (data): 329 if (data):
330 try: 330 try:
331 value = int(str(data)) 331 value = int(str(data))
@@ -342,7 +342,7 @@ class Parser(): @@ -342,7 +342,7 @@ class Parser():
342 342
343 DICOM standard tag (0x0008,0x0032) was used. 343 DICOM standard tag (0x0008,0x0032) was used.
344 """ 344 """
345 - data = self.data_image['0008']['0032'] 345 + data = self.data_image[0x008][0x032]
346 if (data) and (data != ''): 346 if (data) and (data != ''):
347 return self.__format_time(str(data)) 347 return self.__format_time(str(data))
348 return "" 348 return ""
@@ -377,7 +377,7 @@ class Parser(): @@ -377,7 +377,7 @@ class Parser():
377 DICOM standard tag (0x0028,0x1050) was used. 377 DICOM standard tag (0x0028,0x1050) was used.
378 """ 378 """
379 try: 379 try:
380 - data = self.data_image['0028']['1050'] 380 + data = self.data_image[0x028][0x1050]
381 except(KeyError): 381 except(KeyError):
382 return "300" 382 return "300"
383 if (data): 383 if (data):
@@ -409,7 +409,7 @@ class Parser(): @@ -409,7 +409,7 @@ class Parser():
409 DICOM standard tag (0x0028,0x1051) was used. 409 DICOM standard tag (0x0028,0x1051) was used.
410 """ 410 """
411 try: 411 try:
412 - data = self.data_image['0028']['1051'] 412 + data = self.data_image[0x028][0x1051]
413 except(KeyError): 413 except(KeyError):
414 return "2000" 414 return "2000"
415 415
@@ -438,7 +438,7 @@ class Parser(): @@ -438,7 +438,7 @@ class Parser():
438 DICOM standard tag (0x0020, 0x0032) was used. 438 DICOM standard tag (0x0020, 0x0032) was used.
439 """ 439 """
440 try: 440 try:
441 - data = self.data_image['0020']['0032'] 441 + data = self.data_image[0x020][0x032]
442 except(KeyError): 442 except(KeyError):
443 return "" 443 return ""
444 if (data): 444 if (data):
@@ -453,7 +453,7 @@ class Parser(): @@ -453,7 +453,7 @@ class Parser():
453 453
454 DICOM standard tag (0x0020, 0x0032) was used. 454 DICOM standard tag (0x0020, 0x0032) was used.
455 """ 455 """
456 - data = self.data_image['0020']['1041'] 456 + data = self.data_image[0x020][0x1041]
457 if (data): 457 if (data):
458 return eval(data) 458 return eval(data)
459 return "" 459 return ""
@@ -466,7 +466,7 @@ class Parser(): @@ -466,7 +466,7 @@ class Parser():
466 DICOM standard tag (0x7fe0, 0x0010) was used. 466 DICOM standard tag (0x7fe0, 0x0010) was used.
467 """ 467 """
468 try: 468 try:
469 - data = self.data_image['7fe0']['0010'] 469 + data = self.data_image[0x7fe0][0x0010]
470 except(KeyError): 470 except(KeyError):
471 return "" 471 return ""
472 472
@@ -484,7 +484,7 @@ class Parser(): @@ -484,7 +484,7 @@ class Parser():
484 DICOM standard tag (0x0020, 0x0011) was used. 484 DICOM standard tag (0x0020, 0x0011) was used.
485 """ 485 """
486 try: 486 try:
487 - data = self.data_image['0020']['0011'] 487 + data = self.data_image[0x020][0x011]
488 except(KeyError): 488 except(KeyError):
489 return "" 489 return ""
490 490
@@ -504,7 +504,7 @@ class Parser(): @@ -504,7 +504,7 @@ class Parser():
504 DICOM standard tag (0x0028, 0x0030) was used. 504 DICOM standard tag (0x0028, 0x0030) was used.
505 """ 505 """
506 try: 506 try:
507 - data = self.data_image['0028']['0030'] 507 + data = self.data_image[0x0028][0x0030]
508 except(KeyError): 508 except(KeyError):
509 return "" 509 return ""
510 if (data): 510 if (data):
@@ -519,7 +519,7 @@ class Parser(): @@ -519,7 +519,7 @@ class Parser():
519 DICOM standard tag (0x0010, 0x1030) was used. 519 DICOM standard tag (0x0010, 0x1030) was used.
520 """ 520 """
521 try: 521 try:
522 - data = self.data_image['0010']['1030'] 522 + data = self.data_image[0x0010][0x1030]
523 except(KeyError): 523 except(KeyError):
524 return "" 524 return ""
525 525
@@ -535,7 +535,7 @@ class Parser(): @@ -535,7 +535,7 @@ class Parser():
535 DICOM standard tag (0x0010, 0x1030) was used. 535 DICOM standard tag (0x0010, 0x1030) was used.
536 """ 536 """
537 try: 537 try:
538 - data = self.data_image['0010']['1020'] 538 + data = self.data_image[0x010][0x1020]
539 except(KeyError): 539 except(KeyError):
540 return "" 540 return ""
541 541
@@ -550,7 +550,7 @@ class Parser(): @@ -550,7 +550,7 @@ class Parser():
550 DICOM standard tag (0x0010, 0x1040) was used. 550 DICOM standard tag (0x0010, 0x1040) was used.
551 """ 551 """
552 try: 552 try:
553 - data = self.data_image['0010']['1040'] 553 + data = self.data_image[0x010][0x1040]
554 except(KeyError): 554 except(KeyError):
555 return "" 555 return ""
556 if (data): 556 if (data):
@@ -565,7 +565,7 @@ class Parser(): @@ -565,7 +565,7 @@ class Parser():
565 DICOM standard tag (0x0010, 0x1080) was used. 565 DICOM standard tag (0x0010, 0x1080) was used.
566 """ 566 """
567 try: 567 try:
568 - data = self.data_image['0010']['1080'] 568 + data = self.data_image[0x010][0x1080]
569 except(KeyError): 569 except(KeyError):
570 return "" 570 return ""
571 if (data): 571 if (data):
@@ -582,7 +582,7 @@ class Parser(): @@ -582,7 +582,7 @@ class Parser():
582 DICOM standard tag (0x0010, 0x1081) was used. 582 DICOM standard tag (0x0010, 0x1081) was used.
583 """ 583 """
584 try: 584 try:
585 - data = self.data_image['0010']['1081'] 585 + data = self.data_image[0x010][0x1081]
586 except(KeyError): 586 except(KeyError):
587 return "" 587 return ""
588 if (data): 588 if (data):
@@ -598,7 +598,7 @@ class Parser(): @@ -598,7 +598,7 @@ class Parser():
598 DICOM standard tag (0x0010, 0x2150) was used. 598 DICOM standard tag (0x0010, 0x2150) was used.
599 """ 599 """
600 try: 600 try:
601 - data = self.data_image['0010']['2150'] 601 + data = self.data_image[0x0010][0x2150]
602 except(KeyError): 602 except(KeyError):
603 return "" 603 return ""
604 604
@@ -615,7 +615,7 @@ class Parser(): @@ -615,7 +615,7 @@ class Parser():
615 DICOM standard tag (0x0010, 0x2152) was used. 615 DICOM standard tag (0x0010, 0x2152) was used.
616 """ 616 """
617 try: 617 try:
618 - data = self.data_image['0010']['2152'] 618 + data = self.data_image[0x0010][0x2152]
619 except(KeyError): 619 except(KeyError):
620 return "" 620 return ""
621 621
@@ -631,7 +631,7 @@ class Parser(): @@ -631,7 +631,7 @@ class Parser():
631 DICOM standard tag (0x0010, 0x2154) was used. 631 DICOM standard tag (0x0010, 0x2154) was used.
632 """ 632 """
633 try: 633 try:
634 - data = self.data_image['0010']['2154'] 634 + data = self.data_image[0x0010][0x2154]
635 except(KeyError): 635 except(KeyError):
636 return "" 636 return ""
637 637
@@ -648,7 +648,7 @@ class Parser(): @@ -648,7 +648,7 @@ class Parser():
648 DICOM standard tag (0x0010, 0x2297) was used. 648 DICOM standard tag (0x0010, 0x2297) was used.
649 """ 649 """
650 try: 650 try:
651 - data = self.data_image['0010']['2297'] 651 + data = self.data_image[0x0010][0x2297]
652 except(KeyError): 652 except(KeyError):
653 return "" 653 return ""
654 654
@@ -665,7 +665,7 @@ class Parser(): @@ -665,7 +665,7 @@ class Parser():
665 DICOM standard tag (0x0010, 0x2298) was used. 665 DICOM standard tag (0x0010, 0x2298) was used.
666 """ 666 """
667 try: 667 try:
668 - data = self.data_image['0010']['2298'] 668 + data = self.data_image[0x0010][0x2298]
669 except(KeyError): 669 except(KeyError):
670 return "" 670 return ""
671 671
@@ -682,7 +682,7 @@ class Parser(): @@ -682,7 +682,7 @@ class Parser():
682 DICOM standard tag (0x0010, 0x2299) was used. 682 DICOM standard tag (0x0010, 0x2299) was used.
683 """ 683 """
684 try: 684 try:
685 - data = self.data_image['0010']['2299'] 685 + data = self.data_image[0x0010][0x2299]
686 except(KeyError): 686 except(KeyError):
687 return "" 687 return ""
688 688
@@ -699,7 +699,7 @@ class Parser(): @@ -699,7 +699,7 @@ class Parser():
699 DICOM standard tag (0x0010, 0x2000) was used. 699 DICOM standard tag (0x0010, 0x2000) was used.
700 """ 700 """
701 try: 701 try:
702 - data = self.data_image['0010']['2000'] 702 + data = self.data_image[0x0010][0x2000]
703 except(KeyError): 703 except(KeyError):
704 return "" 704 return ""
705 705
@@ -716,7 +716,7 @@ class Parser(): @@ -716,7 +716,7 @@ class Parser():
716 DICOM standard tag (0x0008, 0x2110) was used. 716 DICOM standard tag (0x0008, 0x2110) was used.
717 """ 717 """
718 try: 718 try:
719 - data = self.data_image['0008']['2110'] 719 + data = self.data_image[0x0008][0x2110]
720 except(KeyError): 720 except(KeyError):
721 return "" 721 return ""
722 722
@@ -734,7 +734,7 @@ class Parser(): @@ -734,7 +734,7 @@ class Parser():
734 DICOM standard tag (0x0008, 0x0090) was used. 734 DICOM standard tag (0x0008, 0x0090) was used.
735 """ 735 """
736 try: 736 try:
737 - data = self.data_image['0008']['0090'] 737 + data = self.data_image[0x0008][0x0090]
738 except(KeyError): 738 except(KeyError):
739 return "" 739 return ""
740 740
@@ -753,7 +753,7 @@ class Parser(): @@ -753,7 +753,7 @@ class Parser():
753 DICOM standard tag (0x0008, 0x0092) was used. 753 DICOM standard tag (0x0008, 0x0092) was used.
754 """ 754 """
755 try: 755 try:
756 - data = self.data_image['0008']['0092'] 756 + data = self.data_image[0x0008][0x0092]
757 except(KeyError): 757 except(KeyError):
758 return "" 758 return ""
759 759
@@ -769,7 +769,7 @@ class Parser(): @@ -769,7 +769,7 @@ class Parser():
769 DICOM standard tag (0x0008, 0x0094) was used. 769 DICOM standard tag (0x0008, 0x0094) was used.
770 """ 770 """
771 try: 771 try:
772 - data = self.data_image['0008']['0094'] 772 + data = self.data_image[0x0008][0x0094]
773 except(KeyError): 773 except(KeyError):
774 return "" 774 return ""
775 775
@@ -785,7 +785,7 @@ class Parser(): @@ -785,7 +785,7 @@ class Parser():
785 DICOM standard tag (0x0018, 0x1030) was used. 785 DICOM standard tag (0x0018, 0x1030) was used.
786 """ 786 """
787 try: 787 try:
788 - data = self.data_image['0018']['1030'] 788 + data = self.data_image[0x0018][0x1030]
789 except(KeyError): 789 except(KeyError):
790 return None 790 return None
791 791
@@ -803,7 +803,7 @@ class Parser(): @@ -803,7 +803,7 @@ class Parser():
803 Critical DICOM tag (0x0008, 0x0008). Cannot be editted. 803 Critical DICOM tag (0x0008, 0x0008). Cannot be editted.
804 """ 804 """
805 try: 805 try:
806 - data = self.data_image['0008']['0008'] 806 + data = self.data_image[0x008][0x008]
807 except(IndexError): 807 except(IndexError):
808 return [] 808 return []
809 809
@@ -823,7 +823,7 @@ class Parser(): @@ -823,7 +823,7 @@ class Parser():
823 Critical DICOM tag (0x0008, 0x0016). Cannot be edited. 823 Critical DICOM tag (0x0008, 0x0016). Cannot be edited.
824 """ 824 """
825 try: 825 try:
826 - data = self.data_image['0008']['0016'] 826 + data = self.data_image[0x0008][0x0016]
827 except(KeyError): 827 except(KeyError):
828 return "" 828 return ""
829 829
@@ -840,7 +840,7 @@ class Parser(): @@ -840,7 +840,7 @@ class Parser():
840 Critical DICOM tag (0x0008, 0x0018). Cannot be edited. 840 Critical DICOM tag (0x0008, 0x0018). Cannot be edited.
841 """ 841 """
842 try: 842 try:
843 - data = self.data_image['0008']['0018'] 843 + data = self.data_image[0x0008][0x0018]
844 except(KeyError): 844 except(KeyError):
845 return "" 845 return ""
846 846
@@ -855,7 +855,7 @@ class Parser(): @@ -855,7 +855,7 @@ class Parser():
855 DICOM tag (0x0008, 0x1030). Cannot be edited. 855 DICOM tag (0x0008, 0x1030). Cannot be edited.
856 """ 856 """
857 try: 857 try:
858 - data = self.data_image['0008']['1030'] 858 + data = self.data_image[0x0008][0x1030]
859 except(KeyError): 859 except(KeyError):
860 return "" 860 return ""
861 861
@@ -872,7 +872,7 @@ class Parser(): @@ -872,7 +872,7 @@ class Parser():
872 Critical DICOM Tag (0x0020,0x000D). Cannot be edited. 872 Critical DICOM Tag (0x0020,0x000D). Cannot be edited.
873 """ 873 """
874 try: 874 try:
875 - data = self.data_image['0020']['000D'] 875 + data = self.data_image[0x0020][0x000D]
876 except(KeyError): 876 except(KeyError):
877 return "" 877 return ""
878 878
@@ -892,7 +892,7 @@ class Parser(): @@ -892,7 +892,7 @@ class Parser():
892 Critical DICOM tag (0x0020,0x0037). Cannot be edited. 892 Critical DICOM tag (0x0020,0x0037). Cannot be edited.
893 """ 893 """
894 try: 894 try:
895 - data = self.data_image['0020']['0037'] 895 + data = self.data_image[0x0020][0x0037]
896 except(KeyError): 896 except(KeyError):
897 return [1.0, 0.0, 0.0, 0.0, 1.0, 0.0] 897 return [1.0, 0.0, 0.0, 0.0, 1.0, 0.0]
898 898
@@ -910,7 +910,7 @@ class Parser(): @@ -910,7 +910,7 @@ class Parser():
910 Critical DICOM tag (0x0020,0x0037). Cannot be edited. 910 Critical DICOM tag (0x0020,0x0037). Cannot be edited.
911 """ 911 """
912 try: 912 try:
913 - data = self.data_image['0020']['0037'] 913 + data = self.data_image[0x0020][0x0037]
914 except(KeyError): 914 except(KeyError):
915 return [0.0, 1.0, 0.0] 915 return [0.0, 1.0, 0.0]
916 916
@@ -928,7 +928,7 @@ class Parser(): @@ -928,7 +928,7 @@ class Parser():
928 Critical DICOM tag (0x0020,0x0037). Cannot be edited. 928 Critical DICOM tag (0x0020,0x0037). Cannot be edited.
929 """ 929 """
930 try: 930 try:
931 - data = self.data_image['0020']['0037'] 931 + data = self.data_image[0x0020][0x0037]
932 except(KeyError): 932 except(KeyError):
933 return [1.0, 0.0, 0.0] 933 return [1.0, 0.0, 0.0]
934 934
@@ -944,7 +944,7 @@ class Parser(): @@ -944,7 +944,7 @@ class Parser():
944 Critical DICOM tag (0x0020,0x0052). Cannot be edited. 944 Critical DICOM tag (0x0020,0x0052). Cannot be edited.
945 """ 945 """
946 try: 946 try:
947 - data = self.data_image['0020']['0052'] 947 + data = self.data_image[0x0020][0x0052]
948 except(KeyError): 948 except(KeyError):
949 return "" 949 return ""
950 950
@@ -1024,7 +1024,7 @@ class Parser(): @@ -1024,7 +1024,7 @@ class Parser():
1024 DICOM standard tag (0x0018, 0x1030) was used. 1024 DICOM standard tag (0x0018, 0x1030) was used.
1025 """ 1025 """
1026 try: 1026 try:
1027 - data = self.data_image['0018']['1030'] 1027 + data = self.data_image[0x0018][0x1030]
1028 if (data): 1028 if (data):
1029 return data 1029 return data
1030 except(KeyError): 1030 except(KeyError):
@@ -1048,7 +1048,7 @@ class Parser(): @@ -1048,7 +1048,7 @@ class Parser():
1048 Critical DICOM tag (0x0018, 0x0020). Cannot be edited. 1048 Critical DICOM tag (0x0018, 0x0020). Cannot be edited.
1049 """ 1049 """
1050 try: 1050 try:
1051 - data = self.data_image['0018']['0020'] 1051 + data = self.data_image[0x0018][0x0020]
1052 except(KeyError): 1052 except(KeyError):
1053 return "" 1053 return ""
1054 1054
@@ -1064,7 +1064,7 @@ class Parser(): @@ -1064,7 +1064,7 @@ class Parser():
1064 DICOM standard tag (0x0008, 0x0080) was used. 1064 DICOM standard tag (0x0008, 0x0080) was used.
1065 """ 1065 """
1066 try: 1066 try:
1067 - data = self.data_image['0008']['0080'] 1067 + data = self.data_image[0x0008][0x0080]
1068 except(KeyError): 1068 except(KeyError):
1069 return "" 1069 return ""
1070 1070
@@ -1082,7 +1082,7 @@ class Parser(): @@ -1082,7 +1082,7 @@ class Parser():
1082 DICOM standard tag (0x0008, 0x0081) was used. 1082 DICOM standard tag (0x0008, 0x0081) was used.
1083 """ 1083 """
1084 try: 1084 try:
1085 - data = self.data_image['0008']['0081'] 1085 + data = self.data_image[0x0008][0x0081]
1086 except(KeyError): 1086 except(KeyError):
1087 return "" 1087 return ""
1088 1088
@@ -1099,7 +1099,7 @@ class Parser(): @@ -1099,7 +1099,7 @@ class Parser():
1099 Critical DICOM tag (0x0020, 0x000D). Cannot be edited. 1099 Critical DICOM tag (0x0020, 0x000D). Cannot be edited.
1100 """ 1100 """
1101 try: 1101 try:
1102 - data = self.data_image['0020']['000D'] 1102 + data = self.data_image[0x0020][0x000D]
1103 except(KeyError): 1103 except(KeyError):
1104 return "" 1104 return ""
1105 1105
@@ -1115,7 +1115,7 @@ class Parser(): @@ -1115,7 +1115,7 @@ class Parser():
1115 DICOM standard tag (0x0010,0x2180) was used. 1115 DICOM standard tag (0x0010,0x2180) was used.
1116 """ 1116 """
1117 try: 1117 try:
1118 - data = self.data_image['0010']['2180'] 1118 + data = self.data_image[0x0010][0x2180]
1119 except(KeyError): 1119 except(KeyError):
1120 return "" 1120 return ""
1121 1121
@@ -1153,7 +1153,7 @@ class Parser(): @@ -1153,7 +1153,7 @@ class Parser():
1153 #sf.SetFile(self.gdcm_reader.GetFile()) 1153 #sf.SetFile(self.gdcm_reader.GetFile())
1154 #res = sf.ToStringPair(tag) 1154 #res = sf.ToStringPair(tag)
1155 try: 1155 try:
1156 - data = self.data_image['0028']['0100'] 1156 + data = self.data_image[0x0028][0x0100]
1157 except(KeyError): 1157 except(KeyError):
1158 return "" 1158 return ""
1159 1159
@@ -1172,7 +1172,7 @@ class Parser(): @@ -1172,7 +1172,7 @@ class Parser():
1172 """ 1172 """
1173 # TODO: internationalize data 1173 # TODO: internationalize data
1174 try: 1174 try:
1175 - data = self.data_image['0010']['0030'] 1175 + data = self.data_image[0x0010][0x0030]
1176 except(KeyError): 1176 except(KeyError):
1177 return "" 1177 return ""
1178 1178
@@ -1189,7 +1189,7 @@ class Parser(): @@ -1189,7 +1189,7 @@ class Parser():
1189 DICOM standard tag (0x0020,0x0010) was used. 1189 DICOM standard tag (0x0020,0x0010) was used.
1190 """ 1190 """
1191 try: 1191 try:
1192 - data = self.data_image['0020']['0010'] 1192 + data = self.data_image[0x0020][0x0010]
1193 except(KeyError): 1193 except(KeyError):
1194 return "" 1194 return ""
1195 1195
@@ -1206,7 +1206,7 @@ class Parser(): @@ -1206,7 +1206,7 @@ class Parser():
1206 DICOM standard tag (0x0018,0x1120) was used. 1206 DICOM standard tag (0x0018,0x1120) was used.
1207 """ 1207 """
1208 try: 1208 try:
1209 - data = self.data_image['0018']['1120'] 1209 + data = self.data_image[0x0018][0x1120]
1210 except(KeyError): 1210 except(KeyError):
1211 return 0.0 1211 return 0.0
1212 1212
@@ -1225,7 +1225,7 @@ class Parser(): @@ -1225,7 +1225,7 @@ class Parser():
1225 DICOM standard tag (0x0010,0x0040) was used. 1225 DICOM standard tag (0x0010,0x0040) was used.
1226 """ 1226 """
1227 try: 1227 try:
1228 - data = self.data_image['0010']['0040'] 1228 + data = self.data_image[0x0010][0x0040]
1229 except(KeyError): 1229 except(KeyError):
1230 return "" 1230 return ""
1231 1231
@@ -1242,7 +1242,7 @@ class Parser(): @@ -1242,7 +1242,7 @@ class Parser():
1242 DICOM standard tag (0x0010, 0x1010) was used. 1242 DICOM standard tag (0x0010, 0x1010) was used.
1243 """ 1243 """
1244 try: 1244 try:
1245 - data = self.data_image['0010']['1010'] 1245 + data = self.data_image[0x0010][0x1010]
1246 except(KeyError): 1246 except(KeyError):
1247 return "" 1247 return ""
1248 1248
@@ -1262,7 +1262,7 @@ class Parser(): @@ -1262,7 +1262,7 @@ class Parser():
1262 DICOM standard tag (0x0010,0x0010) was used. 1262 DICOM standard tag (0x0010,0x0010) was used.
1263 """ 1263 """
1264 try: 1264 try:
1265 - data = self.data_image['0010']['0010'] 1265 + data = self.data_image[0x0010][0x0010]
1266 except(KeyError): 1266 except(KeyError):
1267 return "" 1267 return ""
1268 1268
@@ -1282,7 +1282,7 @@ class Parser(): @@ -1282,7 +1282,7 @@ class Parser():
1282 DICOM standard tag (0x0010,0x0020) was used. 1282 DICOM standard tag (0x0010,0x0020) was used.
1283 """ 1283 """
1284 try: 1284 try:
1285 - data = self.data_image['0010']['0020'] 1285 + data = self.data_image[0x0010][0x0020]
1286 except(KeyError): 1286 except(KeyError):
1287 return "" 1287 return ""
1288 1288
@@ -1302,7 +1302,7 @@ class Parser(): @@ -1302,7 +1302,7 @@ class Parser():
1302 DICOM standard tag (0x0018,0x1151) was used. 1302 DICOM standard tag (0x0018,0x1151) was used.
1303 """ 1303 """
1304 try: 1304 try:
1305 - data = self.data_image['0018']['1151'] 1305 + data = self.data_image[0x0018][0x1151]
1306 except(KeyError): 1306 except(KeyError):
1307 return "" 1307 return ""
1308 1308
@@ -1319,7 +1319,7 @@ class Parser(): @@ -1319,7 +1319,7 @@ class Parser():
1319 DICOM standard tag (0x0018, 0x1152) was used. 1319 DICOM standard tag (0x0018, 0x1152) was used.
1320 """ 1320 """
1321 try: 1321 try:
1322 - data = self.data_image['0018']['1152'] 1322 + data = self.data_image[0x0018][0x1152]
1323 except(KeyError): 1323 except(KeyError):
1324 return "" 1324 return ""
1325 1325
@@ -1336,7 +1336,7 @@ class Parser(): @@ -1336,7 +1336,7 @@ class Parser():
1336 DICOM standard tag (0x0018,0x0060) was used. 1336 DICOM standard tag (0x0018,0x0060) was used.
1337 """ 1337 """
1338 try: 1338 try:
1339 - data = self.data_image['0018']['0060'] 1339 + data = self.data_image[0x0018][0x0060]
1340 except(KeyError): 1340 except(KeyError):
1341 return "" 1341 return ""
1342 1342
@@ -1353,7 +1353,7 @@ class Parser(): @@ -1353,7 +1353,7 @@ class Parser():
1353 DICOM standard tag (0x0018,0x0050) was used. 1353 DICOM standard tag (0x0018,0x0050) was used.
1354 """ 1354 """
1355 try: 1355 try:
1356 - data = self.data_image['0018']['0050'] 1356 + data = self.data_image[0x0018][0x0050]
1357 except(KeyError): 1357 except(KeyError):
1358 return 0 1358 return 0
1359 if (data): 1359 if (data):
@@ -1371,7 +1371,7 @@ class Parser(): @@ -1371,7 +1371,7 @@ class Parser():
1371 DICOM standard tag (0x0018,0x1210) was used. 1371 DICOM standard tag (0x0018,0x1210) was used.
1372 """ 1372 """
1373 try: 1373 try:
1374 - data = self.data_image['0018']['1210'] 1374 + data = self.data_image[0x0018][0x1210]
1375 except(KeyError): 1375 except(KeyError):
1376 return "" 1376 return ""
1377 1377
@@ -1388,7 +1388,7 @@ class Parser(): @@ -1388,7 +1388,7 @@ class Parser():
1388 DICOM standard tag (0x0008,0x0080) was used. 1388 DICOM standard tag (0x0008,0x0080) was used.
1389 """ 1389 """
1390 try: 1390 try:
1391 - data = self.data_image['0008']['0080'] 1391 + data = self.data_image[0x0008][0x0080]
1392 except(KeyError): 1392 except(KeyError):
1393 return "" 1393 return ""
1394 1394
@@ -1405,7 +1405,7 @@ class Parser(): @@ -1405,7 +1405,7 @@ class Parser():
1405 DICOM standard tag (0x0008, 0x1010) was used. 1405 DICOM standard tag (0x0008, 0x1010) was used.
1406 """ 1406 """
1407 try: 1407 try:
1408 - data = self.data_image['0008']['1010'] 1408 + data = self.data_image[0x0008][0x1010]
1409 except(KeyError): 1409 except(KeyError):
1410 return "" 1410 return ""
1411 1411
@@ -1422,7 +1422,7 @@ class Parser(): @@ -1422,7 +1422,7 @@ class Parser():
1422 DICOM standard tag (0x0008,0x1090) was used. 1422 DICOM standard tag (0x0008,0x1090) was used.
1423 """ 1423 """
1424 try: 1424 try:
1425 - data = self.data_image['0008']['1090'] 1425 + data = self.data_image[0x0008][0x1090]
1426 except(KeyError): 1426 except(KeyError):
1427 return "" 1427 return ""
1428 1428
@@ -1438,7 +1438,7 @@ class Parser(): @@ -1438,7 +1438,7 @@ class Parser():
1438 DICOM standard tag (0x0008, 0x1010) was used. 1438 DICOM standard tag (0x0008, 0x1010) was used.
1439 """ 1439 """
1440 try: 1440 try:
1441 - data = self.data_image['0008']['1010'] 1441 + data = self.data_image[0x0008][0x1010]
1442 except(KeyError): 1442 except(KeyError):
1443 return "" 1443 return ""
1444 1444
@@ -1456,7 +1456,7 @@ class Parser(): @@ -1456,7 +1456,7 @@ class Parser():
1456 DICOM standard tag (0x0008,0x0060) was used. 1456 DICOM standard tag (0x0008,0x0060) was used.
1457 """ 1457 """
1458 try: 1458 try:
1459 - data = self.data_image['0008']['0060'] 1459 + data = self.data_image[0x0008][0x0060]
1460 except(KeyError): 1460 except(KeyError):
1461 return "" 1461 return ""
1462 1462
@@ -1473,7 +1473,7 @@ class Parser(): @@ -1473,7 +1473,7 @@ class Parser():
1473 DICOM standard tag (0x0020,0x0013) was used. 1473 DICOM standard tag (0x0020,0x0013) was used.
1474 """ 1474 """
1475 try: 1475 try:
1476 - data = self.data_image['0020']['0013'] 1476 + data = self.data_image[0x0020][0x0013]
1477 except(KeyError): 1477 except(KeyError):
1478 return "" 1478 return ""
1479 1479
@@ -1489,7 +1489,7 @@ class Parser(): @@ -1489,7 +1489,7 @@ class Parser():
1489 DICOM standard tag (0x0008,0x1030) was used. 1489 DICOM standard tag (0x0008,0x1030) was used.
1490 """ 1490 """
1491 try: 1491 try:
1492 - data = self.data_image['0008']['1030'] 1492 + data = self.data_image[0x0008][0x1030]
1493 if (data): 1493 if (data):
1494 encoding = self.GetEncoding() 1494 encoding = self.GetEncoding()
1495 return data.decode(encoding) 1495 return data.decode(encoding)
@@ -1520,7 +1520,7 @@ class Parser(): @@ -1520,7 +1520,7 @@ class Parser():
1520 DICOM standard tag (0x0008, 0x103E) was used. 1520 DICOM standard tag (0x0008, 0x103E) was used.
1521 """ 1521 """
1522 try: 1522 try:
1523 - data = self.data_image['0008']['103E'] 1523 + data = self.data_image[0x0008][0x103E]
1524 if data == "None": 1524 if data == "None":
1525 return _("unnamed") 1525 return _("unnamed")
1526 if (data): 1526 if (data):
@@ -1534,7 +1534,7 @@ class Parser(): @@ -1534,7 +1534,7 @@ class Parser():
1534 DICOM standard tag (0x0008,0x0033) was used. 1534 DICOM standard tag (0x0008,0x0033) was used.
1535 """ 1535 """
1536 try: 1536 try:
1537 - data = self.data_image['0008']['0033'] 1537 + data = self.data_image[0x0008][0x0033]
1538 except(KeyError): 1538 except(KeyError):
1539 return "" 1539 return ""
1540 1540
@@ -1548,7 +1548,7 @@ class Parser(): @@ -1548,7 +1548,7 @@ class Parser():
1548 DICOM standard tag (0x0008,0x032) was used. 1548 DICOM standard tag (0x0008,0x032) was used.
1549 """ 1549 """
1550 try: 1550 try:
1551 - data = self.data_image['0008']['0032'] 1551 + data = self.data_image[0x0008][0x0032]
1552 except(KeyError): 1552 except(KeyError):
1553 return "" 1553 return ""
1554 1554
@@ -1562,7 +1562,7 @@ class Parser(): @@ -1562,7 +1562,7 @@ class Parser():
1562 DICOM standard tag (0x0020, 0x0011) was used. 1562 DICOM standard tag (0x0020, 0x0011) was used.
1563 """ 1563 """
1564 try: 1564 try:
1565 - data = self.data_image['0020']['0011'] 1565 + data = self.data_image[0x0020][0x0011]
1566 except(KeyError): 1566 except(KeyError):
1567 return "" 1567 return ""
1568 1568
@@ -1576,7 +1576,7 @@ class Parser(): @@ -1576,7 +1576,7 @@ class Parser():
1576 DICOM standard tag (0x0008, 0x0005) was used. 1576 DICOM standard tag (0x0008, 0x0005) was used.
1577 """ 1577 """
1578 try: 1578 try:
1579 - encoding = self.data_image['0008']['0005'] 1579 + encoding = self.data_image[0x0008][0x0005]
1580 except(KeyError): 1580 except(KeyError):
1581 return 'ISO_IR_100' 1581 return 'ISO_IR_100'
1582 1582
invesalius/reader/dicom_reader.py
  Diff comments   View file @69aa6af
@@ -134,8 +134,9 @@ class LoadDicom: @@ -134,8 +134,9 @@ class LoadDicom:
134 data = stf.ToStringPair(tag) 134 data = stf.ToStringPair(tag)
135 stag = tag.PrintAsPipeSeparatedString() 135 stag = tag.PrintAsPipeSeparatedString()
136 136
137 - group = stag.split("|")[0][1:]  
138 - field = stag.split("|")[1][:-1] 137 + group = tag.GetGroup()
  138 + field = tag.GetElement()
  139 +
139 tag_labels[stag] = data[0] 140 tag_labels[stag] = data[0]
140 141
141 if not group in data_dict.keys(): 142 if not group in data_dict.keys():
@@ -157,8 +158,9 @@ class LoadDicom: @@ -157,8 +158,9 @@ class LoadDicom:
157 data = stf.ToStringPair(tag) 158 data = stf.ToStringPair(tag)
158 stag = tag.PrintAsPipeSeparatedString() 159 stag = tag.PrintAsPipeSeparatedString()
159 160
160 - group = stag.split("|")[0][1:]  
161 - field = stag.split("|")[1][:-1] 161 + group = tag.GetGroup()
  162 + field = tag.GetElement()
  163 +
162 tag_labels[stag] = data[0] 164 tag_labels[stag] = data[0]
163 165
164 if not group in data_dict.keys(): 166 if not group in data_dict.keys():
@@ -177,9 +179,9 @@ class LoadDicom: @@ -177,9 +179,9 @@ class LoadDicom:
177 rvtk.Update() 179 rvtk.Update()
178 180
179 try: 181 try:
180 - data = data_dict['0028']['1050'] 182 + data = data_dict[0x028][0x1050]
181 level = [float(value) for value in data.split('\\')][0] 183 level = [float(value) for value in data.split('\\')][0]
182 - data = data_dict['0028']['1051'] 184 + data = data_dict[0x028][0x1051]
183 window = [float(value) for value in data.split('\\')][0] 185 window = [float(value) for value in data.split('\\')][0]
184 except(KeyError): 186 except(KeyError):
185 level = 300.0 187 level = 300.0
@@ -227,7 +229,7 @@ class LoadDicom: @@ -227,7 +229,7 @@ class LoadDicom:
227 #---------- Verify is DICOMDir ------------------------------- 229 #---------- Verify is DICOMDir -------------------------------
228 is_dicom_dir = 1 230 is_dicom_dir = 1
229 try: 231 try:
230 - if (data_dict['0002']['0002'] != "1.2.840.10008.1.3.10"): #DICOMDIR 232 + if (data_dict[0x002][0x002] != "1.2.840.10008.1.3.10"): #DICOMDIR
231 is_dicom_dir = 0 233 is_dicom_dir = 0
232 except(KeyError): 234 except(KeyError):
233 is_dicom_dir = 0 235 is_dicom_dir = 0
@@ -336,8 +338,6 @@ class ProgressDicomReader: @@ -336,8 +338,6 @@ class ProgressDicomReader:
336 fow.SetFileName(log_path) 338 fow.SetFileName(log_path)
337 ow = vtk.vtkOutputWindow() 339 ow = vtk.vtkOutputWindow()
338 ow.SetInstance(fow) 340 ow.SetInstance(fow)
339 - print "=====>>> Progress... dicom_reader.py 367"  
340 -  
341 341
342 y = yGetDicomGroups(path, recursive) 342 y = yGetDicomGroups(path, recursive)
343 for value_progress in y: 343 for value_progress in y: