Changeset 3965 for trunk/gui

Timestamp:

Sep 28, 2013 9:07:58 PM (11 years ago)

Author:

gah

Message:

update dicom in field.tcl to handle both 2D and 3D data.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (4 diffs)
• filechoiceentry.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -147 +147 @@
 
     private method AvsToVtk { cname contents } 
-    private method DicomSeriesToVtk { cname contents } 
+    private method DicomToVtk { cname contents } 
     private method BuildPointsOnMesh { cname } 
     private method ConvertToVtkData { cname } 
@@ -955 +955 @@
                 continue;               # Ignore this compoennt
             }
-            if { ![file isdir $contents] } {
-                puts stderr "dicom path \"$contents\" is not a directory."
-                return 0
-            }
-            set vtkdata [DicomSeriesToVtk $cname $contents]
+            set vtkdata [DicomToVtk $cname $contents]
             if { $_viewer == "" } {
-                set _viewer "nanovis"
+                set _viewer [expr {($_dim == 3) ? "nanovis" : "contour"}]
             }
             set _comp2vtk($cname) $vtkdata
             set _comp2style($cname) [$_field get $cname.style]
-            set _dim 3
             incr _counter
         } elseif { $type == "ucd"} {
@@ -1736 +1731 @@
 }
 
-itcl::body Rappture::Field::DicomSeriesToVtk { cname path } {
+itcl::body Rappture::Field::DicomToVtk { cname path } {
     package require vtk
 
+    if { ![file exists $path] } {
+        puts stderr "path \"$path\" doesn't exist."
+        return 0
+    }
     set reader $this-datasetreader
     vtkDICOMImageReader $reader
-
-    set files [glob -nocomplain $path/*.dcm]
-    if { [llength $files] == 0 } {
-        puts stderr "no dicom files found in \"$path\""
-        return 0
-    }        
-    $reader SetDirectoryName $path
+    if { [file isdir $path] } {
+        set files [glob -nocomplain $path/*.dcm]
+        if { [llength $files] == 0 } {
+            puts stderr "no dicom files found in \"$path\""
+            return 0
+        }        
+        $reader SetDirectoryName $path
+    } else {
+        $reader SetFileName $path
+    }
     $reader Update
     
@@ -1763 +1765 @@
         incr _dim
     }
+
     set _comp2dims($cname) "${_dim}D"
 

trunk/gui/scripts/filechoiceentry.tcl

@@ -305 +305 @@
         }
     }
-    return $files
+    return [lsort -dictionary $files]
 }