Changeset 6462


Ignore:
Timestamp:
Aug 2, 2016, 11:55:35 PM (8 years ago)
Author:
ldelgass
Message:

merge r6461 from trunk to 1.7 branch

Location:
branches/1.7
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/1.7

    • Property svn:mergeinfo changed
      /trunkmerged: 6461

  • branches/1.7/gui/scripts/vtkisosurfaceviewer.tcl

    r6411 r6462  
    23592359    SendCmd "contour3d edges $style(-edges) $tag"
    23602360    set _settings(-isosurfaceedges) $style(-edges)
    2361     #SendCmd "contour3d color [Color2RGB $style(-constcolor)] $tag"
     2361    SendCmd "contour3d color [Color2RGB $style(-constcolor)] $tag"
    23622362    SendCmd "contour3d lighting $style(-lighting) $tag"
    23632363    set _settings(-isosurfacelighting) $style(-lighting)

  • branches/1.7/gui/scripts/vtkmeshviewer.tcl

    r6364 r6462  
    15121512        -opacity 1.0
    15131513        -outline 0
     1514        -ptsize 1.0
    15141515        -visible 1
    15151516        -wireframe 0
    … …  
    15411542    SendCmd "polydata linecolor [Color2RGB $style(-edgecolor)] $tag"
    15421543    SendCmd "polydata linewidth $style(-linewidth) $tag"
     1544    SendCmd "polydata ptsize $style(-ptsize) $tag"
    15431545    SendCmd "polydata opacity $style(-opacity) $tag"
    15441546    set _settings(-polydataopacity) $style(-opacity)

  • branches/1.7/gui/scripts/vtkstreamlinesviewer.tcl

    r6411 r6462  
    20942094        -visible 1
    20952095    }
     2096    set style(-constcolor) $itk_option(-plotforeground)
    20962097    array set style [$dataobj style $comp]
    20972098

  • branches/1.7/gui/scripts/vtksurfaceviewer.tcl

    r6457 r6462  
    18931893        -opacity         1.0
    18941894        -outline         0
     1895        -ptsize          1.0
    18951896        -surfacevisible  1
    18961897        -wireframe       0
    18971898    }
     1899    set style(-constcolor) $itk_option(-plotforeground)
    18981900    array set style [$dataobj style $comp]
    18991901
    … …  
    19471949
    19481950    SendCmd "outline add $tag"
    1949     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
     1951    SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
    19501952    SendCmd "outline visible $style(-outline) $tag"
    19511953
    … …  
    19611963    SendCmd "polydata linecolor [Color2RGB $style(-edgecolor)] $tag"
    19621964    SendCmd "polydata linewidth $style(-linewidth) $tag"
     1965    SendCmd "polydata ptsize $style(-ptsize) $tag"
    19631966    SendCmd "polydata opacity $style(-opacity) $tag"
    19641967    set _settings(-surfaceopacity) [expr $style(-opacity) * 100.0]

  • branches/1.7/gui/scripts/vtkviewer.tcl

    r6455 r6462  
    27402740
    27412741            SendCmd "outline add $tag"
    2742             SendCmd "outline color [Color2RGB white] $tag"
     2742            SendCmd "outline color [Color2RGB $settings(-constcolor)] $tag"
    27432743            SendCmd "outline visible $settings(-outline) $tag"
    27442744            set _settings(molecule-outline) $settings(-outline)
Note: See TracChangeset for help on using the changeset viewer.