Changeset 2325 for branches/blt4/gui

Timestamp:

Jul 29, 2011 12:52:41 PM (13 years ago)

Author:

gah

Message:

remove -lrappture from build

Location:

branches/blt4/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• controls.tcl (modified) (1 diff)
• field.tcl (modified) (1 diff)
• heightmapviewer.tcl (modified) (4 diffs)
• page.tcl (modified) (3 diffs)
• visviewer.tcl (modified) (1 diff)

branches/blt4/gui/scripts/Makefile.in

@@ -50 +50 @@
                 $(srcdir)/energyLevels.tcl \
                 $(srcdir)/field.tcl \
+                $(srcdir)/fieldentry.tcl \
                 $(srcdir)/field2dresult.tcl \
                 $(srcdir)/field3dresult.tcl \

branches/blt4/gui/scripts/controls.tcl

@@ -581 +581 @@
                             set queue [lrange $queue 1 end]
                             set c [winfo class $w]
-                            if {[lsearch {DeviceEditor Note} $c] >= 0} {
+                            if {[lsearch {DeviceEditor FieldEditor Note} $c] >= 0} {
                                 set expandgroup 1
                                 break

branches/blt4/gui/scripts/field.tcl

@@ -153 +153 @@
 
     set rlist ""
+    puts stderr "children of field=[$_field children]"
 
     # BE CAREFUL: return component names in proper order
     foreach cname [$_field children -type component] {
+        puts stderr "cname=$cname"
         if {[info exists _comp2dims($cname)]
               && [string match $pattern $cname]} {

branches/blt4/gui/scripts/heightmapviewer.tcl

@@ -35 +35 @@
     inherit Rappture::VisViewer
 
+    itk_option define -device device Device ""
     itk_option define -plotforeground plotForeground Foreground ""
     itk_option define -plotbackground plotBackground Background ""
@@ -752 +753 @@
             # Tell the engine to expect some data
             set tag $dataobj-$comp
+            puts stderr "dataobj=$dataobj component=$comp tag=$tag"
             if { ![info exists _serverObjs($tag)] } {
                 set data [$dataobj blob $comp]
@@ -1050 +1052 @@
             set tag ""
             if {"" != $_first} {
+ puts stderr "first=$_first components=[$_first components]"
                 set comp [lindex [$_first components] 0]
                 set tag $_first-$comp
@@ -1420 +1423 @@
     $inner.format value  "PNG (Portable Network Graphics format)" 
 }
+
+# ----------------------------------------------------------------------
+# OPTION: -device
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::HeightmapViewer::device {
+    puts stderr "HeightmapViewer: device=$itk_option(-device)"
+    if {$itk_option(-device) != "" } {
+
+        if {![Rappture::library isvalid $itk_option(-device)]} {
+            error "bad value \"$itk_option(-device)\": should be Rappture::library object"
+        }
+        $this delete
+        $this add $itk_option(-device)
+    } else {
+        $this delete
+    }
+
+    if { [isconnected] } {
+        $_dispatcher event -idle !rebuild
+    }
+}
+

branches/blt4/gui/scripts/page.tcl

@@ -79 +79 @@
             continue
         }
-
+        puts stderr "type=$type"
         if {$type == "loader"} {
             #
@@ -126 +126 @@
                     $xmlobj put $path.$cname.current $obj
                 }
+            }
+
+            # if there's a link, then set up a callback to load from it
+            set link [$xmlobj get $path.$cname.link]
+            if {"" != $link} {
+                $_owner notify add $this $link \
+                    [itcl::code $this _link $xmlobj $link $w $path.$cname]
+            }
+        } elseif {$type == "fieldentry"} {
+            puts stderr "found $type"
+            #
+            # Add <structure>'s as the central element of the page.
+            #
+            set w "$frame.entry[incr num]"
+            ::Rappture::FieldEntry ::$w $_owner@$path.$cname.current
+            pack $w -expand yes -fill both
+            $_owner widgetfor $path.$cname $w
+            bind $w <<Value>> [list $_owner changed $path.$cname]
+
+            if {"" == $deveditor} {
+                set deveditor $w
+            }
+
+            # if there's a default value, load it now
+            if {"" != [$xmlobj element -as type $path.$cname.current]} {
+                set elem $path.$cname.current
+            } else {
+                set elem $path.$cname.default
+            }
+            if {"" != [$xmlobj element -as type $elem]} {
+                set dataobj [Rappture::Field ::\#auto $xmlobj $elem]
+                $w value $dataobj
             }
 
@@ -262 +294 @@
     $_owner changed $path2
 }
+

branches/blt4/gui/scripts/visviewer.tcl

@@ -527 +527 @@
 #
 itcl::body Rappture::VisViewer::SendEcho {channel {data ""}} {
-    #puts stderr ">>($data)"
+    puts stderr ">>($data)"
     if {[string length $itk_option(-sendcommand)] > 0} {
         uplevel #0 $itk_option(-sendcommand) [list $channel $data]