Changeset 5230 for branches/1.3


Ignore:
Timestamp:
Apr 15, 2015, 1:48:25 AM (5 years ago)
Author:
ldelgass
Message:

merge r5184 from trunk (amap)

Location:
branches/1.3
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 5184
  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r5229 r5230  
    18661866    set first [lindex $isovalues 0]
    18671867    set last [lindex $isovalues end]
    1868     set wmap ""
     1868    set amap ""
    18691869    if { $first == "" || $first != 0.0 } {
    1870         lappend wmap 0.0 0.0
     1870        lappend amap 0.0 0.0
    18711871    }
    18721872    foreach x $isovalues {
     
    18961896        }
    18971897        # add spikes in the middle
    1898         lappend wmap $x1 0.0
    1899         lappend wmap $x2 $max
    1900         lappend wmap $x3 $max
    1901         lappend wmap $x4 0.0
     1898        lappend amap $x1 0.0
     1899        lappend amap $x2 $max
     1900        lappend amap $x3 $max
     1901        lappend amap $x4 0.0
    19021902    }
    19031903    if { $last == "" || $last != 1.0 } {
    1904         lappend wmap 1.0 0.0
    1905     }
    1906     SendCmd "transfunc define $tf { $cmap } { $wmap }"
     1904        lappend amap 1.0 0.0
     1905    }
     1906    SendCmd "transfunc define $tf { $cmap } { $amap }"
    19071907    return [SendCmd "$dataobj-$comp configure -transferfunction $tf"]
    19081908}
  • branches/1.3/gui/scripts/nanovisviewer.tcl

    r5229 r5230  
    14091409    set first [lindex $isovalues 0]
    14101410    set last [lindex $isovalues end]
    1411     set wmap ""
     1411    set amap ""
    14121412    if { $first == "" || $first != 0.0 } {
    1413         lappend wmap 0.0 0.0
     1413        lappend amap 0.0 0.0
    14141414    }
    14151415    foreach x $isovalues {
     
    14391439        }
    14401440        # add spikes in the middle
    1441         lappend wmap $x1 0.0
    1442         lappend wmap $x2 $max
    1443         lappend wmap $x3 $max
    1444         lappend wmap $x4 0.0
     1441        lappend amap $x1 0.0
     1442        lappend amap $x2 $max
     1443        lappend amap $x3 $max
     1444        lappend amap $x4 0.0
    14451445    }
    14461446    if { $last == "" || $last != 1.0 } {
    1447         lappend wmap 1.0 0.0
    1448     }
    1449     SendCmd "transfunc define $tf { $cmap } { $wmap }"
     1447        lappend amap 1.0 0.0
     1448    }
     1449    SendCmd "transfunc define $tf { $cmap } { $amap }"
    14501450}
    14511451
  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r5219 r5230  
    25472547        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    25482548    }
    2549     set wmap "0.0 1.0 1.0 1.0"
    2550     SendCmd "colormap add $name { $cmap } { $wmap }"
     2549    set amap "0.0 1.0 1.0 1.0"
     2550    SendCmd "colormap add $name { $cmap } { $amap }"
    25512551}
    25522552
  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r5219 r5230  
    18071807        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    18081808    }
    1809     set wmap "0.0 1.0 1.0 1.0"
    1810     SendCmd "colormap add $name { $cmap } { $wmap }"
     1809    set amap "0.0 1.0 1.0 1.0"
     1810    SendCmd "colormap add $name { $cmap } { $amap }"
    18111811}
    18121812
  • branches/1.3/gui/scripts/vtkimageviewer.tcl

    r5219 r5230  
    15941594        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    15951595    }
    1596     set wmap "0.0 1.0 1.0 1.0"
    1597     SendCmd "colormap add $name { $cmap } { $wmap }"
     1596    set amap "0.0 1.0 1.0 1.0"
     1597    SendCmd "colormap add $name { $cmap } { $amap }"
    15981598}
    15991599
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r5219 r5230  
    30883088        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    30893089    }
    3090     set wmap "0.0 1.0 1.0 1.0"
    3091     SendCmd "colormap add $name { $cmap } { $wmap }"
     3090    set amap "0.0 1.0 1.0 1.0"
     3091    SendCmd "colormap add $name { $cmap } { $amap }"
    30923092}
    30933093
  • branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

    r5219 r5230  
    15951595    set max $_settings(-volumeopacity)
    15961596
    1597     set wmap "0.0 1.0 1.0 1.0"
    1598     SendCmd "colormap add $name { $cmap } { $wmap }"
     1597    set amap "0.0 1.0 1.0 1.0"
     1598    SendCmd "colormap add $name { $cmap } { $amap }"
    15991599}
    16001600
  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r5219 r5230  
    22832283        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    22842284    }
    2285     set wmap "0.0 1.0 1.0 1.0"
    2286     SendCmd "colormap add $name { $cmap } { $wmap }"
     2285    set amap "0.0 1.0 1.0 1.0"
     2286    SendCmd "colormap add $name { $cmap } { $amap }"
    22872287}
    22882288
  • branches/1.3/gui/scripts/vtkviewer.tcl

    r5219 r5230  
    18781878    set max $_settings(polydata-opacity)
    18791879
    1880     set wmap "0.0 1.0 1.0 1.0"
    1881     SendCmd "colormap add $name { $cmap } { $wmap }"
     1880    set amap "0.0 1.0 1.0 1.0"
     1881    SendCmd "colormap add $name { $cmap } { $amap }"
    18821882}
    18831883
Note: See TracChangeset for help on using the changeset viewer.