Changeset 4187 for branches/1.3

Timestamp:

Feb 20, 2014, 3:18:27 PM (11 years ago)

Author:

ldelgass

Message:

merge trunk version of glyph viewer

File:

• branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) (11 diffs)

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -230 +230 @@
         cutplaneEdges           0
         cutplaneLighting        1
-        cutplanePreinterp       0
+        cutplanePreinterp       1
         cutplaneOpacity         100
         cutplaneVisible         0
@@ -765 +765 @@
         if { $_reportClientInfo }  {
             # Tell the server the viewer, hub, user and session.
-            # Do this immediately on connect before buffing any commands
+            # Do this immediately on connect before buffering any commands
             global env
 
@@ -868 +868 @@
         set _hardcopy($tag) $bytes
     }
-    EventuallyRequestLegend
 }
 
@@ -971 +970 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [$dataobj vtkdata $comp]
-                if 1 { 
+                if 0 { 
                     set f [open "/tmp/glyph.vtk" "w"]
                     puts $f $bytes
@@ -1486 +1485 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(view)
     set w 12
     set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -1719 +1717 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axisMode) value "static"
@@ -2052 +2050 @@
     array set style {
         -color BCGYR
+        -edgecolor black
         -edges 0
-        -edgecolor black
+        -gscale 1
+        -lighting 1
         -linewidth 1.0
+        -normscale 1
         -opacity 1.0
+        -orientGlyphs 1
+        -outline 0
+        -ptsize 1.0
+        -quality 1
+        -scaleMode "vmag"
+        -shape "arrow"
         -wireframe 0
-        -lighting 1
-        -outline 0
-        -levels 10
+    }
+    set numComponents [$dataobj numComponents $comp]
+    if {$numComponents == 3} {
+        set style(-shape) "arrow"
+        set style(-orientGlyphs) 1
+        set style(-scaleMode) "vmag"
+    } else {
+        set style(-shape) "sphere"
+        set style(-orientGlyphs) 0
+        set style(-scaleMode) "scalar"
     }
     array set style [$dataobj style $comp]
@@ -2065 +2079 @@
         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)
-    }
     if 0 {
     SendCmd "cutplane add $tag"
-    SendCmd "cutplane edges 0 $tag"
-    SendCmd "cutplane wireframe 0 $tag"
-    SendCmd "cutplane lighting 1 $tag"
-    SendCmd "cutplane linewidth 1 $tag"
-
-    foreach axis { x y z } {
-        SendCmd "cutplane slice $axis 0.5 $tag"
-        SendCmd "cutplane axis $axis 0 $tag"
-    }
+    SendCmd "cutplane visible 0 $tag"
     }
     # This is too complicated.  We want to set the colormap, number of
@@ -2105 +2102 @@
     }
     set _currentOpacity $style(-opacity)
-    SendCmd "glyphs add arrow $tag"
+    SendCmd "glyphs add $style(-shape) $tag"
     SendCmd "glyphs edges $style(-edges) $tag"
     # normscale=1 and gscale=1 are defaults
-    #SendCmd "glyphs normscale 1 $tag"
-    #SendCmd "glyphs gscale 1 $tag"
-
+    if {$style(-normscale) != 1} {
+        SendCmd "glyphs normscale $style(-normscale) $tag"
+    }
+    if {$style(-gscale) != 1} {
+        SendCmd "glyphs gscale $style(-gscale) $tag"
+    }
     SendCmd "outline add $tag"
     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
@@ -2116 +2116 @@
     set _settings(glyphOutline) $style(-outline)
     set _settings(glyphEdges) $style(-edges)
-    #SendCmd "glyphs color [Color2RGB $settings(-color)] $tag"
+    # constant color only used if colormode set to constant
+    SendCmd "glyphs color [Color2RGB $itk_option(-plotforeground)] $tag"
+    # Omitting field name for gorient and smode commands
+    # defaults to active scalars or vectors depending on mode
+    SendCmd "glyphs gorient $style(-orientGlyphs) {} $tag"
+    SendCmd "glyphs smode $style(-scaleMode) {} $tag"
+    SendCmd "glyphs quality $style(-quality) $tag"
     SendCmd "glyphs lighting $style(-lighting) $tag"
     set _settings(glyphLighting) $style(-lighting)
     SendCmd "glyphs linecolor [Color2RGB $style(-edgecolor)] $tag"
     SendCmd "glyphs linewidth $style(-linewidth) $tag"
+    SendCmd "glyphs ptsize $style(-ptsize) $tag"
     SendCmd "glyphs opacity $_currentOpacity $tag"
     set _settings(glyphOpacity) $style(-opacity)
@@ -2234 +2241 @@
         "move" {
             set axis [lindex $args 0]
-            set a [string toupper $axis]
-            set oldval $_settings(cutplane${a}Position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {