Changeset 6548 for branches/blt4_trunk/gui

Timestamp:

Sep 15, 2016 11:29:21 PM (8 years ago)

Author:

ldelgass

Message:

merge from trunk to blt4_trunk branch

Location:

branches/blt4_trunk

Files:

• . (modified) (1 prop)
• gui/scripts/combochecks.tcl (modified) (2 diffs)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/map.tcl (modified) (2 diffs)
• gui/scripts/mapviewer.tcl (modified) (7 diffs)

branches/blt4_trunk/gui/scripts/combochecks.tcl

@@ -130 +130 @@
         $itk_component(ddlist) reset
         foreach part $newval {
+            set oldpart $part
             set part [translate $part]
+            if {[string compare $part ""] == 0} {
+                # part could not be translated to a component
+                error "bad value \"$oldpart\": should be one of \"[join [choices get -label] {, }]\""
+            }
             $itk_component(ddlist) state $part 1
         }
@@ -261 +266 @@
             set newval [$itk_component(ddlist) current -label]
             set val [$itk_component(entry) get]
-            if {$newval ne "" && $newval ne $val} {
+            if {$newval eq ""} {
+                # all options are unchecked, use the old val
+                # wrap val (from entry) in a list to protect embedded whitespace
+                value [list $val]
+            } elseif {$newval ne $val} {
+                # new value selected, update the widget
                 value $newval
                 if {[string length $itk_option(-interactcommand)] > 0} {
                     uplevel #0 $itk_option(-interactcommand)
                 }
-            }
-            if {$newval eq ""} {
-                value $val
             }
         }

branches/blt4_trunk/gui/scripts/field.tcl

@@ -1172 +1172 @@
     package require vtk
 
-    set reader $this-datasetreader
-    vtkDataSetReader $reader
-
-    # Write the contents to a file just in case it's binary.
-    set tmpfile file[pid].vtk
-    set f [open "$tmpfile" "w"]
-    fconfigure $f -translation binary -encoding binary
-    puts $f $contents
-    close $f
-
-    $reader SetFileName $tmpfile
-    $reader ReadAllNormalsOn
-    $reader ReadAllTCoordsOn
-    $reader ReadAllScalarsOn
-    $reader ReadAllColorScalarsOn
-    $reader ReadAllVectorsOn
-    $reader ReadAllTensorsOn
-    $reader ReadAllFieldsOn
-    $reader Update
-    file delete $tmpfile
-
-    set dataset [$reader GetOutput]
+    if {[string index $contents 0] == "<"} {
+        set reader $this-xmlreader
+        vtkXMLGenericDataObjectReader $reader
+
+        # Write the contents to a file, since the XML reader
+        # can't read from a memory buffer
+        set tmpfile file[pid]-vtk.xml
+        set f [open "$tmpfile" "w"]
+        fconfigure $f -translation binary -encoding binary
+        puts $f $contents
+        close $f
+
+        $reader SetFileName $tmpfile
+        $reader Update
+        file delete $tmpfile
+
+        set dataset [$reader GetOutputAsDataSet]
+    } else {
+        set reader $this-datasetreader
+        vtkDataSetReader $reader
+
+        # Write the contents to a file just in case it's binary.
+        set tmpfile file[pid].vtk
+        set f [open "$tmpfile" "w"]
+        fconfigure $f -translation binary -encoding binary
+        puts $f $contents
+        close $f
+
+        $reader SetFileName $tmpfile
+        $reader ReadAllNormalsOn
+        $reader ReadAllTCoordsOn
+        $reader ReadAllScalarsOn
+        $reader ReadAllColorScalarsOn
+        $reader ReadAllVectorsOn
+        $reader ReadAllTensorsOn
+        $reader ReadAllFieldsOn
+        $reader Update
+        file delete $tmpfile
+
+        set dataset [$reader GetOutput]
+    }
     if { $dataset == "" } {
         puts stderr "Failed to parse VTK file"

branches/blt4_trunk/gui/scripts/map.tcl

@@ -180 +180 @@
         return
     }
+    # If there is a <current>, use it
+    set current [$map element -as object "current"]
+    if {$current != ""} {
+        set map $current
+    }
 
     # Set global map properties
@@ -235 +240 @@
     set parent [$_tree findchild root "layers"]
     set layers [$map element -as object "layers"]
-    foreach layer [$layers children -type layer] {
+    set layerList [list]
+    if {$layers != ""} {
+        set layerList [$layers children -type layer]
+    }
+    foreach layer $layerList {
         # Unique identifier for layer.
         set name [$layers element -as id "$layer"]

branches/blt4_trunk/gui/scripts/mapviewer.tcl

@@ -2143 +2143 @@
         2,0 $inner.wireframe -cspan 2 -anchor w -pady 2 \
         3,0 $inner.lighting  -cspan 2 -anchor w -pady 2 \
-        4,0 $inner.time_l    -cspan 2 -anchor w -pady 2 \
-        4,1 $inner.time      -cspan 2 -fill x   -pady 2 \
-        5,0 $inner.ambient_l -cspan 2 -anchor w -pady 2 \
-        5,1 $inner.ambient   -cspan 2 -fill x   -pady 2
+        4,0 $inner.time_l             -anchor w -pady 2 \
+        4,1 $inner.time               -fill x   -pady 2 \
+        5,0 $inner.ambient_l          -anchor w -pady 2 \
+        5,1 $inner.ambient            -fill x   -pady 2
 #        4,0 $inner.edges     -cspan 2  -anchor w -pady 2
 
@@ -3315 +3315 @@
                     -text $info(label) \
                     -font "Arial 9" -anchor w
-                blt::table $f $row,1 $f.${ctlname}_lbl -anchor w -pady 2 -cspan 2
+                blt::table $f $row,1 $f.${ctlname}_lbl -anchor w -pady 2
                 Rappture::Tooltip::for $f.${ctlname}_lbl [join $tooltip \n]
             } else {
@@ -3324 +3324 @@
                     -command [itcl::code $this \
                                   SetLayerVisibility $dataobj $layer]
-                blt::table $f $row,1 $f.${ctlname}_visible -anchor w -pady 2 -cspan 2
+                blt::table $f $row,1 $f.${ctlname}_visible -anchor w -pady 2
                 Rappture::Tooltip::for $f.${ctlname}_visible [join $tooltip \n]
             }
@@ -3332 +3332 @@
                 if { $info(driver) == "colorramp" } {
                     set colormap $ctlname
+                    set f2 $f.cmap_$ctlname
+                    frame $f2
                     if { ![info exists _image(legend-$colormap)] } {
                         set _image(legend-$colormap) [image create photo]
                     }
                     itk_component add legend-$colormap-min {
-                        label $f.legend-$colormap-min -text 0
+                        label $f2.legend-$colormap-min -text 0
                     }
                     itk_component add legend-$colormap-max {
-                        label $f.legend-$colormap-max -text 1
+                        label $f2.legend-$colormap-max -text 1
                     }
                     itk_component add legend-$colormap {
-                        label $f.legend-$colormap -image $_image(legend-$colormap)
-                    }
-                    blt::table $f $row,0 $f.legend-$colormap-min -anchor w -pady 0 -cspan 2
-                    blt::table $f $row,2 $f.legend-$colormap-max -anchor e -pady 0
-                    incr row
-                    blt::table $f $row,0 $f.legend-$colormap -anchor w -pady 2 -cspan 3
+                        label $f2.legend-$colormap -image $_image(legend-$colormap)
+                    }
+                    blt::table $f2 0,0 $f2.legend-$colormap-min -anchor w -pady 0
+                    blt::table $f2 0,1 $f2.legend-$colormap-max -anchor e -pady 0
+                    blt::table $f2 1,0 $f2.legend-$colormap -anchor w -pady 2 -cspan 2
+
+                    blt::table $f $row,0 $f2 -anchor w -pady 0 -cspan 2
                     incr row
                     RequestLegend $colormap 256 16
@@ -3355 +3358 @@
                  $info(type) != "mask" &&
                 ($info(type) != "image" || $imgIdx > 1) } {
-                label $f.${ctlname}_opacity_l -text "Opacity" -font "Arial 9"
-                ::scale $f.${ctlname}_opacity -from 0 -to 100 \
+                set f2 $f.op_$ctlname
+                frame $f2
+                label $f2.${ctlname}_opacity_l -text "Opacity" -font "Arial 9"
+                ::scale $f2.${ctlname}_opacity -from 0 -to 100 \
                     -orient horizontal -showvalue off \
                     -variable [itcl::scope _opacity($tag)] \
@@ -3362 +3367 @@
                     -command [itcl::code $this \
                                   SetLayerOpacity $dataobj $layer]
-                Rappture::Tooltip::for $f.${ctlname}_opacity "Set opacity of $info(label) layer"
-                blt::table $f $row,0 $f.${ctlname}_opacity_l -anchor w -pady 2 -cspan 2
-                blt::table $f $row,2 $f.${ctlname}_opacity -anchor w -pady 2
+                Rappture::Tooltip::for $f2.${ctlname}_opacity "Set opacity of $info(label) layer"
+                blt::table $f2 0,0 $f2.${ctlname}_opacity_l -anchor w -pady 2
+                blt::table $f2 0,1 $f2.${ctlname}_opacity -anchor w -pady 2
+
+                blt::table $f $row,0 $f2 -anchor w -pady 0 -cspan 2
                 incr row
             }
@@ -3375 +3382 @@
     SendCmd "[list map attrib [encoding convertto utf-8 [join $attrib ,]]]"
     label $f.map_attrib -text [join $attrib \n] -font "Arial 9"
-    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 3
+    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 2
     #incr row
     if { $row > 0 } {
         blt::table configure $f r* c* -resize none
-        blt::table configure $f r$row c2 -resize expand
+        blt::table configure $f r$row c1 -resize expand
     }
 }