Changeset 3076 for trunk/gui/scripts

Timestamp:

Jul 5, 2012, 1:31:40 PM (12 years ago)

Author:

gah

Message:

don't enable cloned drawing controls

Location:

trunk/gui/scripts

Files:

• drawingcontrols.tcl (modified) (4 diffs)
• drawingentry.tcl (modified) (4 diffs)

trunk/gui/scripts/drawingcontrols.tcl

@@ -39 +39 @@
     private method FormatLabel {str}
     private method Monitor {name state}
-    
     private variable _dispatcher ""
     private variable _controls ""
@@ -181 +180 @@
         set _name2info($name-disablestyle) $disablestyle
     }
+
+    if 0 {
     #
     # If this element has an <enable> expression, then register
@@ -232 +233 @@
             }
         }
-
         foreach cpath $deps {
             $_owner dependenciesfor $cpath $path
         }
     }
-    set _name2info($name-enable) $enable
+    }
+    set _name2info($name-enable) yes
 
     #set wid [$_owner widgetfor $path]
@@ -534 +535 @@
     $_dispatcher event -idle !layout
 }
+

trunk/gui/scripts/drawingentry.tcl

@@ -45 +45 @@
         # defined below 
     }
-    destructor {} {
+    destructor {
         # defined below
     }
@@ -78 +78 @@
     private method Withdraw {} 
     private method Hotspot { option cname item args } 
+    private method IsEnabled { path } 
 }
 
@@ -921 +922 @@
         $inner.controls delete all
     }
+    set count 0
     foreach path $controls {
-        $inner.controls add $path
+        if { [IsEnabled $path] } {
+            $inner.controls add $path
+            incr count
+        }
+    }
+    if { $count == 0 } {
+        return
     }
     update
@@ -1000 +1008 @@
     return [string trim [$_parser eval [list subst -nocommands $value]]]
 }
+
+itcl::body Rappture::DrawingEntry::IsEnabled { path } {
+    set enable [string trim [$_owner xml get $path.about.enable]]
+    if {"" == $enable} {
+        return 1
+    }
+    if {![string is boolean $enable]} {
+        set re {([a-zA-Z_]+[0-9]*|\([^\(\)]+\)|[a-zA-Z_]+[0-9]*\([^\(\)]+\))(\.([a-zA-Z_]+[0-9]*|\([^\(\)]+\)|[a-zA-Z_]+[0-9]*\([^\(\)]+\)))*(:[-a-zA-Z0-9/]+)?}
+        set rest $enable
+        set enable ""
+        set deps ""
+        while {1} {
+            if {[regexp -indices $re $rest match]} {
+                foreach {s0 s1} $match break
+
+                if {[string index $rest [expr {$s0-1}]] == "\""
+                      && [string index $rest [expr {$s1+1}]] == "\""} {
+                    # string in ""'s? then leave it alone
+                    append enable [string range $rest 0 $s1]
+                    set rest [string range $rest [expr {$s1+1}] end]
+                } else {
+                    #
+                    # This is a symbol which should be substituted
+                    # it can be either:
+                    #   input.foo.bar
+                    #   input.foo.bar:units
+                    #
+                    set cpath [string range $rest $s0 $s1]
+                    set parts [split $cpath :]
+                    set ccpath [lindex $parts 0]
+                    set units [lindex $parts 1]
+
+                    # make sure we have the standard path notation
+                    set stdpath [$_owner regularize $ccpath]
+                    if {"" == $stdpath} {
+                        puts stderr "WARNING: don't recognize parameter $cpath in <enable> expression for $path.  This may be buried in a structure that is not yet loaded."
+                        set stdpath $ccpath
+                    }
+                    # substitute [_controlValue ...] call in place of path
+                    append enable [string range $rest 0 [expr {$s0-1}]]
+                    append enable [format {[_controlValue %s %s]} $stdpath $units]
+                    lappend deps $stdpath
+                    set rest [string range $rest [expr {$s1+1}] end]
+                }
+            } else {
+                append enable $rest
+                break
+            }
+        }
+    }
+    return $enable
+}