Changeset 4768 for branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

Timestamp:

Nov 23, 2014, 3:29:00 AM (10 years ago)

Author:

ldelgass

Message:

merge r4767 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (14 diffs)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -7 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -63 +63 @@
 
     # The following methods are only used by this class.
-
     private method AdjustSetting {what {value ""}}
     private method BuildAxisTab {}
@@ -229 +228 @@
         -xpan            0
         -ypan            0
-        -zoom            1.0 
+        -zoom            1.0
     }
     set _arcball [blt::arcball create 100 100]
@@ -241 +240 @@
     }
     array set _settings {
-        -axesvisible                    1
-        -axislabels                     1
-        -axisminorticks                 1
-        -axismode                       "static"
-        -background                     black
-        -colormap                       BCGYR
-        -colormapvisible                1
-        -cutplaneedges                  0
-        -cutplanelighting               1
-        -cutplaneopacity                1.0
-        -cutplanepreinterp              1
-        -cutplanesvisible               0
-        -cutplanewireframe              0
-        -field                          "Default"
-        -isolinecolor                   white
-        -isosurfaceedges                0
-        -isosurfacelighting             1
-        -isosurfaceopacity              0.6
-        -isosurfacevisible              1
-        -isosurfacewireframe            0
-        -legendvisible                  1
-        -numcontours                    10
-        -outline                        0
-        -xcutplaneposition              50
-        -xcutplanevisible               1
-        -xgrid                          0
-        -ycutplaneposition              50
-        -ycutplanevisible               1
-        -ygrid                          0
-        -zcutplaneposition              50
-        -zcutplanevisible               1
-        -zgrid                          0
+        -axesvisible                1
+        -axislabels                 1
+        -axisminorticks             1
+        -axismode                   "static"
+        -background                 black
+        -colormap                   BCGYR
+        -colormapvisible            1
+        -cutplaneedges              0
+        -cutplanelighting           1
+        -cutplaneopacity            1.0
+        -cutplanepreinterp          1
+        -cutplanesvisible           0
+        -cutplanewireframe          0
+        -field                      "Default"
+        -isolinecolor               white
+        -isosurfaceedges            0
+        -isosurfacelighting         1
+        -isosurfaceopacity          0.6
+        -isosurfacevisible          1
+        -isosurfacewireframe        0
+        -legendvisible              1
+        -numcontours                10
+        -outline                    0
+        -xcutplaneposition          50
+        -xcutplanevisible           1
+        -xgrid                      0
+        -ycutplaneposition          50
+        -ycutplanevisible           1
+        -ygrid                      0
+        -zcutplaneposition          50
+        -zcutplanevisible           1
+        -zgrid                      0
     }
     array set _changed {
@@ -390 +389 @@
         puts stderr errs=$errs
     }
+
     # Legend
-
     set _image(legend) [image create photo]
     itk_component add legend {
@@ -596 +595 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
@@ -908 +906 @@
     if { $info(-type) == "image" } {
         if 0 {
-            set f [open "last.ppm" "w"] 
-            puts $f $bytes
+            set f [open "last.ppm" "w"]
+            fconfigure $f -encoding binary
+            puts -nonewline $f $bytes
             close $f
         }
@@ -990 +989 @@
     # generates a new call to Rebuild).   
     StartBufferingCommands
+
     if { $_reset } {
         set _width $w
@@ -1023 +1023 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [$dataobj vtkdata $comp]
-                if 0 { 
-                    set f [open "/tmp/isosurface.vtk" "w"]
-                    puts $f $bytes
-                    close $f
+                if 0 {
+                    set f [open "/tmp/isosurface.vtk" "w"]
+                    fconfigure $f -translation binary -encoding binary
+                    puts -nonewline $f $bytes
+                    close $f
                 }
                 set length [string length $bytes]
@@ -1076 +1077 @@
                 set label [string toupper $axis]
             }
+            # May be a space in the axis label
             SendCmd [list axis name $axis $label]
         }
@@ -1185 +1187 @@
     SendCmd "camera pan $x $y"
 }
-
 
 # ----------------------------------------------------------------------
@@ -1536 +1537 @@
     }
 }
-
 
 #
@@ -2322 +2322 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: Slice move x|y|z <newval>
@@ -2390 +2389 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     if { [string match "component*" $fname] } {
         set title ""