Changeset 4417 for trunk

Timestamp:

Jun 23, 2014 3:42:45 PM (10 years ago)

Author:

ldelgass

Message:

Add flag to test DX->VTK conversion in nanovis. By default, only convert for
VTK viewers and send DX to nanovis. Also, remove old Tcl-based DICOM reader.

File:

• trunk/gui/scripts/field.tcl (modified) (4 diffs)

trunk/gui/scripts/field.tcl

@@ -82 +82 @@
                                         # valid data.
     private variable _isValidComponent; #  Array of valid components found
+    private variable _alwaysConvertDX 0;
+
     constructor {xmlobj path} { 
         # defined below 
@@ -152 +154 @@
     private method AvsToVtk { cname contents } 
     private method DicomToVtk { cname contents } 
-    private method DicomToVtk.old { cname contents } 
     private method BuildPointsOnMesh { cname } 
     protected method GetAssociation { cname } 
@@ -930 +931 @@
                 close $f
             }
-            if { $_viewer != "nanovis" && $_viewer != "flowvis" } {
+            if { $_alwaysConvertDX ||
+                 ($_viewer != "nanovis" && $_viewer != "flowvis") } {
                 set _type "vtk"
                 set _comp2vtk($cname) $vtkdata
@@ -1719 +1721 @@
 }
 
-itcl::body Rappture::Field::DicomToVtk.old { cname path } {
-    package require vtk
-
-    if { ![file exists $path] } {
-        puts stderr "path \"$path\" doesn't exist."
-        return 0
-    }
-    set reader $this-datasetreader
-    vtkDICOMImageReader $reader
-    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
-    
-    set dataset [$reader GetOutput]
-    set limits {}
-    foreach {xmin xmax ymin ymax zmin zmax} [$dataset GetBounds] break
-    set _dim 0
-    if { $xmax > $xmin } {
-        incr _dim
-    }
-    if { $ymax > $ymin } {
-        incr _dim
-    }
-    if { $zmax > $zmin } {
-        incr _dim
-    }
-
-    set _comp2dims($cname) "${_dim}D"
-
-    lappend limits x [list $xmin $xmax] 
-    lappend limits y [list $ymin $ymax] 
-    lappend limits z [list $zmin $zmax]
-    set dataAttrs [$dataset GetPointData]
-    if { $dataAttrs == ""} {
-        puts stderr "WARNING: No point data found in \"$_path\""
-        rename $reader ""
-        return 0
-    }
-    set vmin 0
-    set vmax 1
-    set numArrays [$dataAttrs GetNumberOfArrays]
-    if { $numArrays > 0 } {
-        for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} {
-            set array [$dataAttrs GetArray $i]
-            set fname  [$dataAttrs GetArrayName $i]
-            foreach {min max} [$array GetRange -1] break
-            if {$i == 0} {
-                set vmin $min
-                set vmax $max
-            }
-            lappend limits $fname [list $min $max]
-            set _fld2Units($fname) ""
-            set _fld2Label($fname) $fname
-            # Let the VTK file override the <type> designated.
-            set _fld2Components($fname) [$array GetNumberOfComponents]
-            lappend _comp2fldName($cname) $fname
-        }
-    }
-    lappend limits v [list $vmin $vmax]
-    set _comp2limits($cname) $limits
-
-    set tmpfile $this-$cname.vtk
-    set writer $this-datasetwriter
-    vtkDataSetWriter $writer
-    $writer SetInputConnection [$reader GetOutputPort]
-    $writer SetFileName $tmpfile
-    $writer SetFileTypeToBinary
-    $writer Write
-    rename $reader ""
-    rename $writer ""
-
-    set f [open "$tmpfile" "r"]
-    fconfigure $f -translation binary -encoding binary
-    set vtkdata [read $f]
-    close $f
-    file delete $tmpfile
-    return $vtkdata
-}
-
 itcl::body Rappture::Field::GetTypeAndSize { cname } {
     array set type2components {