Changeset 4706 for branches/1.3


Ignore:
Timestamp:
Nov 12, 2014, 8:37:49 PM (5 years ago)
Author:
ldelgass
Message:

merge r4699 from trunk

Location:
branches/1.3
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4699
  • branches/1.3/gui/scripts/mapviewer.tcl

    r4512 r4706  
    6060    public method get {args}
    6161    public method isconnected {}
    62     public method limits { colormap }
    6362    public method parameters {title args} {
    6463        # do nothing
     
    13891388        #SendCmd "color background $r $g $b"
    13901389    }
    1391 }
    1392 
    1393 itcl::body Rappture::MapViewer::limits { dataobj } {
    1394     error "no limits"
    13951390}
    13961391
  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r4676 r4706  
    5757    public method get {args}
    5858    public method isconnected {}
    59     public method limits { colormap }
    6059    public method parameters {title args} {
    6160        # do nothing
     
    15361535}
    15371536
    1538 itcl::body Rappture::VtkGlyphViewer::limits { dataobj } {
    1539     foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
    1540     foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
    1541     foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
    1542     foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
    1543     return [array get limits]
    1544 }
    1545 
    15461537itcl::body Rappture::VtkGlyphViewer::BuildGlyphTab {} {
    15471538
  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r4676 r4706  
    5858    public method get {args}
    5959    public method isconnected {}
    60     public method limits3 { dataobj }
    6160    public method parameters {title args} {
    6261        # do nothing
     
    18321831        }
    18331832    }
    1834 }
    1835 
    1836 itcl::body Rappture::VtkHeightmapViewer::limits3 { dataobj } {
    1837     lappend limits x [$dataobj limits x]
    1838     lappend limits y [$dataobj limits y]
    1839     if { [catch { $dataobj limits $_curFldName } vlim] != 0 } {
    1840         set vlim [$dataobj limits v]
    1841     }
    1842     lappend limits v $vlim
    1843     return $limits
    18441833}
    18451834
  • branches/1.3/gui/scripts/vtkimageviewer.tcl

    r4694 r4706  
    5858    public method get {args}
    5959    public method isconnected {}
    60     public method limits3 { dataobj }
    6160    public method parameters {title args} {
    6261        # do nothing
     
    16281627        }
    16291628    }
    1630 }
    1631 
    1632 itcl::body Rappture::VtkImageViewer::limits3 { dataobj } {
    1633     lappend limits x [$dataobj limits x]
    1634     lappend limits y [$dataobj limits y]
    1635     if { [catch { $dataobj limits $_curFldName } vlim] != 0 } {
    1636         set vlim [$dataobj limits v]
    1637     }
    1638     lappend limits v $vlim
    1639     return $limits
    16401629}
    16411630
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4705 r4706  
    5757    public method get {args}
    5858    public method isconnected {}
    59     public method limits { colormap }
    6059    public method parameters {title args} {
    6160        # do nothing
     
    15991598}
    16001599
    1601 itcl::body Rappture::VtkIsosurfaceViewer::limits { dataobj } {
    1602     foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
    1603     foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
    1604     foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
    1605     foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
    1606     return [array get limits]
    1607 }
    1608 
    16091600itcl::body Rappture::VtkIsosurfaceViewer::BuildIsosurfaceTab {} {
    16101601
  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r4683 r4706  
    5757    public method get {args}
    5858    public method isconnected {}
    59     public method limits { colormap }
    6059    public method parameters {title args} {
    6160        # do nothing
     
    15001499        SendCmd "outline color $rgb"
    15011500    }
    1502 }
    1503 
    1504 itcl::body Rappture::VtkSurfaceViewer::limits { dataobj } {
    1505     foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
    1506     foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
    1507     foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
    1508     foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
    1509     return [array get limits]
    15101501}
    15111502
  • branches/1.3/gui/scripts/vtkviewer.tcl

    r4696 r4706  
    5757    public method get {args}
    5858    public method isconnected {}
    59     public method limits { colormap }
     59    public method limits { dataobj }
    6060    public method parameters {title args} {
    6161        # do nothing
     
    27032703                -bondstyle "cylinder"
    27042704                -bondsvisible 1
     2705                -color "elementDefault"
    27052706                -edgecolor black
    27062707                -edges 0
Note: See TracChangeset for help on using the changeset viewer.