Changeset 5503 for branches/1.3

Timestamp:

May 12, 2015 4:10:32 PM (9 years ago)

Author:

ldelgass

Message:

Sync glyph viewer with trunk: enables new settings controls

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/nanovisviewer.tcl (modified) (1 diff)
• gui/scripts/vtkglyphviewer.tcl (modified) (3 diffs)

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -209 +209 @@
         -thickness              350
         -volume                 1
-        -xcutplaneposition      0
+        -xcutplaneposition      50
         -xcutplanevisible       0
         -xpan                   $_view(-xpan)
-        -ycutplaneposition      0
+        -ycutplaneposition      50
         -ycutplanevisible       0
         -ypan                   $_view(-ypan)
-        -zcutplaneposition      0
+        -zcutplaneposition      50
         -zcutplanevisible       0
         -zoom                   $_view(-zoom)

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -1037 +1037 @@
         InitSettings \
             -field \
-            -glyphedges -glyphlighting -glyphopacity \
-            -glyphwireframe
+            -glyphedges -glyphlighting -glyphnormscale -glyphopacity \
+            -glyphorient -glyphscale -glyphscalemode -glyphshape -glyphwireframe
 
         #-cutplanexposition -cutplaneyposition -cutplanezposition \
@@ -1740 +1740 @@
 
     blt::table $inner \
-        0,0 $inner.field_l      -anchor w -pady 2  \
-        0,1 $inner.field        -anchor w -pady 2  -fill x \
-        1,0 $inner.colormap_l   -anchor w -pady 2  \
-        1,1 $inner.colormap     -anchor w -pady 2  -fill x \
+        0,0 $inner.field_l      -anchor w -pady 2 \
+        0,1 $inner.field        -anchor w -pady 2 -fill x \
+        1,0 $inner.colormap_l   -anchor w -pady 2 \
+        1,1 $inner.colormap     -anchor w -pady 2 -fill x \
+        2,0 $inner.gshape_l     -anchor w -pady 2 \
+        2,1 $inner.gshape       -anchor w -pady 2 -fill x \
         3,0 $inner.background_l -anchor w -pady 2 \
-        3,1 $inner.background   -anchor w -pady 2  -fill x \
-        5,0 $inner.wireframe    -anchor w -pady 2 -cspan 2 \
-        6,0 $inner.lighting     -anchor w -pady 2 -cspan 2 \
-        7,0 $inner.edges        -anchor w -pady 2 -cspan 2 \
-        8,0 $inner.outline      -anchor w -pady 2 -cspan 2 \
-        9,0 $inner.legend       -anchor w -pady 2 \
-        10,0 $inner.opacity_l   -anchor w -pady 2 \
-        10,1 $inner.opacity     -fill x   -pady 2 -fill x \
+        3,1 $inner.background   -anchor w -pady 2 -fill x \
+        4,0 $inner.scaleMode_l  -anchor w -pady 2 \
+        4,1 $inner.scaleMode    -anchor w -pady 2 -fill x \
+        5,0 $inner.gscale_l     -anchor w -pady 2 \
+        5,1 $inner.gscale       -anchor w -pady 2  -fill x \
+        6,0 $inner.normscale    -anchor w -pady 2 -cspan 2 \
+        7,0 $inner.gorient      -anchor w -pady 2 -cspan 2 \
+        8,0 $inner.wireframe    -anchor w -pady 2 -cspan 2 \
+        9,0 $inner.lighting     -anchor w -pady 2 -cspan 2 \
+        10,0 $inner.edges        -anchor w -pady 2 -cspan 2 \
+        11,0 $inner.outline      -anchor w -pady 2 -cspan 2 \
+        12,0 $inner.legend       -anchor w -pady 2 \
+        13,0 $inner.opacity_l   -anchor w -pady 2 \
+        13,1 $inner.opacity     -fill x   -pady 2 -fill x \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r11 c1 -resize expand
+    blt::table configure $inner r14 c1 -resize expand
 }
 
@@ -2155 +2163 @@
         -ptsize 1.0
         -quality 1
-        -scalemode "vmag"
-        -shape "arrow"
+        -scalemode vmag
+        -shape arrow
         -wireframe 0
     }