Changeset 3966 for trunk/gui

Timestamp:

Sep 30, 2013 6:29:29 PM (11 years ago)

Author:

ldelgass

Message:

Allow overriding viewer for DICOM (with about.view), fixes for styles in
isosurface viewer. Also, make isosurface opaque if there is only one level
as translucency is expensive to render.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (4 diffs)
• vtkisosurfaceviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/field.tcl

@@ -953 +953 @@
             set contents [$_field get $cname.dicom]
             if { $contents == "" } {
-                continue;               # Ignore this compoennt
+                continue;               # Ignore this component
             }
             set vtkdata [DicomToVtk $cname $contents]
+            set viewer [$_field get "about.view"]
+            if { $viewer != "" } {
+                set _viewer $viewer
+            }
             if { $_viewer == "" } {
                 set _viewer [expr {($_dim == 3) ? "nanovis" : "contour"}]
@@ -965 +969 @@
             set contents [$_field get $cname.ucd]
             if { $contents == "" } {
-                continue;               # Ignore this compoennt
+                continue;               # Ignore this component
             }
             set vtkdata [AvsToVtk $cname $contents]
@@ -974 +978 @@
         }
         set _isValidComponent($cname) 1
+        #puts stderr "Field $cname type is: $_type"
     }
     if { [array size _isValidComponent] == 0 } {
@@ -992 +997 @@
         }
     }
+
     # FIXME: about.scalars and about.vectors are temporary.  With views
     #        the label and units for each field will be specified there.

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -2117 +2117 @@
     }
     array set style [$dataobj style $comp]
-    if { $dataobj != $_first } {
+    if { $dataobj != $_first || $style(-levels) == 1 } {
         set style(-opacity) 1
-    }
-    if { $_currentColormap == "" } {
-        set stylelist [$dataobj style $comp]
-        if { $stylelist != "" } {
-            array set style $stylelist
-            set stylelist [array get style]
-            SetCurrentColormap $stylelist
-        }
-        $itk_component(colormap) value $style(-color)
     }
     SendCmd "cutplane add $tag"
@@ -2151 +2142 @@
     }
     if { $_currentColormap == "" } {
+        SetCurrentColormap $style(-color)
         $itk_component(colormap) value $style(-color)
     }
@@ -2497 +2489 @@
     set _currentColormap $name
     SendCmd "contour3d colormap $_currentColormap"
+    SendCmd "cutplane colormap $_currentColormap"
 }