Changeset 5214

Timestamp:

Apr 13, 2015, 10:02:21 PM (9 years ago)

Author:

ldelgass

Message:

Merge r5205,r5210:5211

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (1 diff)
• gui/scripts/nanovisviewer.tcl (modified) (2 diffs)

branches/1.3/gui/scripts/flowvisviewer.tcl

@@ -624 +624 @@
     set op [lindex $args 0]
     switch -- $op {
-      -objects {
-        # put the dataobj list in order according to -raise options
-        set dlist $_dlist
-        foreach obj $dlist {
-            if {[info exists _obj2ovride($obj-raise)] && $_obj2ovride($obj-raise)} {
-                set i [lsearch -exact $dlist $obj]
-                if {$i >= 0} {
-                    set dlist [lreplace $dlist $i $i]
-                    lappend dlist $obj
+        -objects {
+            # put the dataobj list in order according to -raise options
+            set dlist $_dlist
+            foreach obj $dlist {
+                if {[info exists _obj2ovride($obj-raise)] &&
+                    $_obj2ovride($obj-raise)} {
+                    set i [lsearch -exact $dlist $obj]
+                    if {$i >= 0} {
+                        set dlist [lreplace $dlist $i $i]
+                        lappend dlist $obj
+                    }
                 }
             }
-        }
-        return $dlist
-      }
-      -image {
-        if {[llength $args] != 2} {
-            error "wrong # args: should be \"get -image 3dview|legend\""
-        }
-        switch -- [lindex $args end] {
-            3dview {
-                return $_image(plot)
-            }
-            legend {
-                return $_image(legend)
-            }
-            default {
-                error "bad image name \"[lindex $args end]\": should be 3dview or legend"
-            }
-        }
-      }
-      default {
-        error "bad option \"$op\": should be -objects or -image"
-      }
+            return $dlist
+        }
+        -image {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be \"get -image 3dview|legend\""
+            }
+            switch -- [lindex $args end] {
+                3dview {
+                    return $_image(plot)
+                }
+                legend {
+                    return $_image(legend)
+                }
+                default {
+                    error "bad image name \"[lindex $args end]\": should be 3dview or legend"
+                }
+            }
+        }
+        default {
+            error "bad option \"$op\": should be -objects or -image"
+        }
     }
 }

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -439 +439 @@
     set op [lindex $args 0]
     switch -- $op {
-      -objects {
-        # put the dataobj list in order according to -raise options
-        set dlist $_dlist
-        foreach obj $dlist {
-            if {[info exists _obj2ovride($obj-raise)] && $_obj2ovride($obj-raise)} {
-                set i [lsearch -exact $dlist $obj]
-                if {$i >= 0} {
-                    set dlist [lreplace $dlist $i $i]
-                    lappend dlist $obj
+        -objects {
+            # put the dataobj list in order according to -raise options
+            set dlist $_dlist
+            foreach obj $dlist {
+                if {[info exists _obj2ovride($obj-raise)] &&
+                    $_obj2ovride($obj-raise)} {
+                    set i [lsearch -exact $dlist $obj]
+                    if {$i >= 0} {
+                        set dlist [lreplace $dlist $i $i]
+                        lappend dlist $obj
+                    }
                 }
             }
-        }
-        return $dlist
-      }
-      -image {
-        if {[llength $args] != 2} {
-            error "wrong # args: should be \"get -image 3dview|legend\""
-        }
-        switch -- [lindex $args end] {
-            3dview {
-                return $_image(plot)
-            }
-            legend {
-                return $_image(legend)
-            }
-            default {
-                error "bad image name \"[lindex $args end]\": should be 3dview or legend"
-            }
-        }
-      }
-      default {
-        error "bad option \"$op\": should be -objects or -image"
-      }
+            return $dlist
+        }
+        -image {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be \"get -image 3dview|legend\""
+            }
+            switch -- [lindex $args end] {
+                3dview {
+                    return $_image(plot)
+                }
+                legend {
+                    return $_image(legend)
+                }
+                default {
+                    error "bad image name \"[lindex $args end]\": should be 3dview or legend"
+                }
+            }
+        }
+        default {
+            error "bad option \"$op\": should be -objects or -image"
+        }
     }
 }
@@ -947 +948 @@
         InitSettings light2side light transp isosurface grid axes
 
+        # Turn off cutplanes for all volumes
         foreach axis {x y z} {
-            # Turn off cutplanes for all volumes
             SendCmd "cutplane state 0 $axis"
         }