Changeset 5283 for branches/1.4
- Timestamp:
- Apr 21, 2015, 2:56:27 PM (9 years ago)
- Location:
- branches/1.4
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.4
- Property svn:mergeinfo changed
/trunk merged: 3899,3901
- Property svn:mergeinfo changed
-
branches/1.4/gui/scripts/flowvisviewer.tcl
r5278 r5283 244 244 $this-opacity 50 245 245 $this-thickness 350 246 $this-xcutplane 0 246 $this-cutplaneVisible 0 247 $this-xcutplane 1 247 248 $this-xcutposition 0 248 $this-ycutplane 0249 $this-ycutplane 1 249 250 $this-ycutposition 0 250 $this-zcutplane 0251 $this-zcutplane 1 251 252 $this-zcutposition 0 252 253 }] … … 309 310 "Toggle the volume cloud on/off" 310 311 pack $itk_component(volume) -padx 2 -pady 2 312 313 itk_component add cutplane { 314 Rappture::PushButton $f.cutplane \ 315 -onimage [Rappture::icon cutbutton] \ 316 -offimage [Rappture::icon cutbutton] \ 317 -variable [itcl::scope _settings($this-cutplaneVisible)] \ 318 -command [itcl::code $this AdjustSetting cutplaneVisible] 319 } 320 Rappture::Tooltip::for $itk_component(cutplane) \ 321 "Show/Hide cutplanes" 322 pack $itk_component(cutplane) -padx 2 -pady 2 311 323 312 324 if { [catch { … … 1167 1179 set _first [lindex [get] 0] 1168 1180 1181 # Turn off cutplanes for all volumes 1182 foreach axis {x y z} { 1183 SendCmd "cutplane state 0 $axis" 1184 } 1185 1169 1186 # Reset the camera and other view parameters 1170 InitSettings light2side light opacity isosurface grid axes volume outline 1171 1187 InitSettings light2side light opacity isosurface grid axes volume outline \ 1188 cutplaneVisible xcutplane ycutplane zcutplane 1189 1172 1190 # nothing to send -- activate the proper volume 1173 1191 if {"" != $_first} { … … 1221 1239 set vols [CurrentVolumeIds -cutplanes] 1222 1240 foreach axis {x y z} { 1223 SendCmd "cutplane state $_settings($this-${axis}cutplane) $axis $vols"1224 1241 set pos [expr {0.01*$_settings($this-${axis}cutposition)}] 1225 1242 SendCmd "cutplane position $pos $axis $vols" … … 1521 1538 SendCmd "$tag configure -volume $_settings($this-volume)" 1522 1539 } 1540 } 1541 "cutplaneVisible" { 1542 set bool $_settings($this-$what) 1543 set datasets [CurrentVolumeIds -cutplanes] 1544 set tag [lindex $datasets 0] 1545 SendCmd "cutplane visible $bool $tag" 1523 1546 } 1524 1547 "xcutplane" - "ycutplane" - "zcutplane" { … … 2088 2111 Rappture::Tooltip::for $itk_component(xCutButton) \ 2089 2112 "Toggle the X cut plane on/off" 2113 $itk_component(xCutButton) select 2090 2114 2091 2115 itk_component add xCutScale { … … 2115 2139 Rappture::Tooltip::for $itk_component(yCutButton) \ 2116 2140 "Toggle the Y cut plane on/off" 2141 $itk_component(yCutButton) select 2117 2142 2118 2143 itk_component add yCutScale { … … 2142 2167 Rappture::Tooltip::for $itk_component(zCutButton) \ 2143 2168 "Toggle the Z cut plane on/off" 2169 $itk_component(zCutButton) select 2144 2170 2145 2171 itk_component add zCutScale { -
branches/1.4/gui/scripts/nanovisviewer.tcl
r5282 r5283 967 967 968 968 InitSettings -light2side -light -volumeopacity \ 969 -isosurfaceshading -gridvisible -axesvisible 969 -isosurfaceshading -gridvisible -axesvisible \ 970 -xcutplanevisible -ycutplanevisible -zcutplanevisible 970 971 971 972 if {"" != $_first} {
Note: See TracChangeset
for help on using the changeset viewer.