Changeset 4520 for branches/1.3


Ignore:
Timestamp:
Jul 16, 2014 11:15:23 PM (6 years ago)
Author:
ldelgass
Message:

Merge r4502 from trunk (sync field.tcl)

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4502
  • branches/1.3/gui/scripts/field.tcl

    r4512 r4520  
    8989        # defined below
    9090    }
    91     public method blob { cname } 
     91    public method blob { cname }
    9292    public method components {args}
    9393    public method controls {option args}
     
    365365    }
    366366    if {[info exists _comp2dx($cname)]} {
    367         error "method \"values\" is not implemented for dx data"
     367        error "method \"values\" is not implemented for dx file data"
    368368    }
    369369    if {[info exists _comp2unirect2d($cname)]} {
     
    392392    }
    393393    if {[info exists _comp2dx($cname)]} {
    394         return $_comp2dx($cname)
     394        return $_comp2dx($cname)  ;# return gzipped, base64-encoded DX data
    395395    }
    396396    if {[info exists _comp2unirect2d($cname)]} {
     
    919919                continue;               # Ignore this component
    920920            }
    921             set vector ""
    922921            if 0 {
    923922                set f [open /tmp/$_path.$cname.dx "w"]
     
    948947                    [Rappture::FlowHints ::\#auto $_field $cname $_units]
    949948            }
    950             set _dim 3
    951949            incr _counter
    952950        } elseif { $type == "dicom"} {
Note: See TracChangeset for help on using the changeset viewer.