- Timestamp:
- Mar 1, 2013, 1:07:44 PM (12 years ago)
- Location:
- trunk/gui
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/scripts/field.tcl
r3365 r3405 56 56 private variable _xmlobj "" ; # ref to XML obj with field data 57 57 private variable _limits ; # maps box name => {z0 z1} limits 58 private variable _f ield""59 private variable _ fieldNames "" ; # list offield names.60 private variable _field Units "" ; # list of units of each field name.61 private variable _field Labels "" ; # list of labels of each field name.62 private variable _ viewer ""58 private variable _fldObj "" 59 private variable _comp2fields ; # cname => field names. 60 private variable _field2Components; # field name => number of components 61 private variable _field2Label; # field name => label 62 private variable _field2Units; # field name => units 63 63 private variable _hints 64 64 private variable _viewer ""; # Hints which viewer to use 65 65 constructor {xmlobj path} { 66 66 # defined below … … 86 86 } 87 87 public method vtkdata {cname} 88 88 public method fieldnames { cname } { 89 if { ![info exists _comp2fields($cname)] } { 90 return "" 91 } 92 return $_comp2fields($cname) 93 } 94 public method fieldinfo { fname } { 95 lappend out $_field2Label($fname) 96 lappend out $_field2Units($fname) 97 lappend out $_field2Components($fname) 98 return $out 99 } 89 100 protected method Build {} 90 101 protected method _getValue {expr} … … 125 136 set _xmlobj $xmlobj 126 137 set _path $path 127 set _f ield[$xmlobj element -as object $path]128 set _units [$_f ieldget units]138 set _fldObj [$xmlobj element -as object $path] 139 set _units [$_fldObj get units] 129 140 130 141 set xunits [$xmlobj get units] … … 163 174 # ---------------------------------------------------------------------- 164 175 itcl::body Rappture::Field::destructor {} { 165 itcl::delete object $_f ield176 itcl::delete object $_fldObj 166 177 # don't destroy the _xmlobj! we don't own it! 167 178 … … 218 229 219 230 # BE CAREFUL: return component names in proper order 220 foreach cname [$_f ieldchildren -type component] {231 foreach cname [$_fldObj children -type component] { 221 232 if {[info exists _comp2dims($cname)] 222 233 && [string match $pattern $cname]} { … … 439 450 } 440 451 blt::vector destroy tmp zero 441 set val [$_f ieldget "${axis}axis.min"]452 set val [$_fldObj get "${axis}axis.min"] 442 453 if {"" != $val && "" != $min} { 443 454 if {$val > $min} { … … 446 457 } 447 458 } 448 set val [$_f ieldget "${axis}axis.max"]459 set val [$_fldObj get "${axis}axis.max"] 449 460 if {"" != $val && "" != $max} { 450 461 if {$val < $max} { … … 550 561 itcl::body Rappture::Field::hints {{keyword ""}} { 551 562 if { ![info exists _hints] } { 552 set _hints(fieldnames) $_fieldNames553 set _hints(fieldunits) $_fieldUnits554 set _hints(fieldlabels) $_fieldLabels555 563 foreach {key path} { 556 564 camera camera.position … … 559 567 group about.group 560 568 label about.label 561 fieldnames about.fieldnames562 fieldunits about.fieldunits563 fieldlabels about.fieldlabels564 569 scale about.scale 565 570 seeds about.seeds … … 576 581 vectors about.vectors 577 582 } { 578 set str [$_f ieldget $path]583 set str [$_fldObj get $path] 579 584 if { "" != $str } { 580 585 set _hints($key) $str … … 642 647 # vectors for each part. 643 648 # 644 foreach cname [$_f ieldchildren -type component] {649 foreach cname [$_fldObj children -type component] { 645 650 set type "" 646 if { ([$_f ieldelement $cname.constant] != "" &&647 [$_f ieldelement $cname.domain] != "") ||648 [$_f ieldelement $cname.xy] != "" } {651 if { ([$_fldObj element $cname.constant] != "" && 652 [$_fldObj element $cname.domain] != "") || 653 [$_fldObj element $cname.xy] != "" } { 649 654 set type "1D" 650 } elseif { [$_f ieldelement $cname.mesh] != "" &&651 [$_f ieldelement $cname.values] != ""} {655 } elseif { [$_fldObj element $cname.mesh] != "" && 656 [$_fldObj element $cname.values] != ""} { 652 657 set type "points-on-mesh" 653 } elseif { [$_f ieldelement $cname.vtk] != ""} {654 set viewer [$_f ieldget "about.view"]658 } elseif { [$_fldObj element $cname.vtk] != ""} { 659 set viewer [$_fldObj get "about.view"] 655 660 set type "vtk" 656 661 if { $viewer != "" } { 657 662 set _viewer $viewer 658 663 } 659 } elseif {[$_f ieldelement $cname.opendx] != ""} {664 } elseif {[$_fldObj element $cname.opendx] != ""} { 660 665 global env 661 666 if { [info exists env(VTKVOLUME)] } { … … 664 669 set type "dx" 665 670 } 666 } elseif {[$_f ieldelement $cname.dx] != ""} {671 } elseif {[$_fldObj element $cname.dx] != ""} { 667 672 global env 668 673 if { [info exists env(VTKVOLUME)] } { … … 675 680 676 681 # Save the extents of the component 677 if { [$_f ieldelement $cname.extents] != "" } {678 set extents [$_f ieldget $cname.extents]682 if { [$_fldObj element $cname.extents] != "" } { 683 set extents [$_fldObj get $cname.extents] 679 684 } else { 680 685 set extents 1 … … 690 695 set yv "" 691 696 692 set val [$_f ieldget $cname.constant]697 set val [$_fldObj get $cname.constant] 693 698 if {$val != ""} { 694 set domain [$_f ieldget $cname.domain]699 set domain [$_fldObj get $cname.domain] 695 700 if {$domain == "" || ![info exists _limits($domain)]} { 696 701 set z0 0 … … 712 717 } 713 718 } else { 714 set xydata [$_f ieldget $cname.xy]719 set xydata [$_fldObj get $cname.xy] 715 720 if {"" != $xydata} { 716 721 set xv [blt::vector create x$_counter] … … 733 738 BuildPointsOnMesh $cname 734 739 } elseif {$type == "vtk"} { 735 set vtkdata [$_f ieldget $cname.vtk]740 set vtkdata [$_fldObj get $cname.vtk] 736 741 ReadVtkDataSet $cname $vtkdata 737 742 set _comp2vtk($cname) $vtkdata 738 set _comp2style($cname) [$_f ieldget $cname.style]743 set _comp2style($cname) [$_fldObj get $cname.style] 739 744 incr _counter 740 745 } elseif {$type == "dx" } { … … 746 751 set _viewer "nanovis" 747 752 set _comp2dims($cname) "3D" 748 set _comp2dx($cname) [$_f ieldget -decode no $cname.dx]753 set _comp2dx($cname) [$_fldObj get -decode no $cname.dx] 749 754 if 1 { 750 set data [$_f ieldget -decode yes $cname.dx]755 set data [$_fldObj get -decode yes $cname.dx] 751 756 set file "/tmp/junk.dx" 752 757 set f [open $file "w"] … … 759 764 } 760 765 } 761 set _comp2style($cname) [$_f ieldget $cname.style]762 if {[$_f ieldelement $cname.flow] != ""} {766 set _comp2style($cname) [$_fldObj get $cname.style] 767 if {[$_fldObj element $cname.flow] != ""} { 763 768 set _comp2flowhints($cname) \ 764 [Rappture::FlowHints ::\#auto $_f ield$cname $_units]769 [Rappture::FlowHints ::\#auto $_fldObj $cname $_units] 765 770 } 766 771 incr _counter … … 773 778 set _viewer "nanovis" 774 779 set _comp2dims($cname) "3D" 775 set data [$_f ieldget -decode yes $cname.opendx]780 set data [$_fldObj get -decode yes $cname.opendx] 776 781 set data "<ODX>$data" 777 782 set data [Rappture::encoding::encode -as zb64 $data] 778 783 set _comp2dx($cname) $data 779 set _comp2style($cname) [$_f ieldget $cname.style]780 if {[$_f ieldelement $cname.flow] != ""} {784 set _comp2style($cname) [$_fldObj get $cname.style] 785 if {[$_fldObj element $cname.flow] != ""} { 781 786 set _comp2flowhints($cname) \ 782 [Rapture::FlowHints ::\#auto $_f ield$cname $_units]787 [Rapture::FlowHints ::\#auto $_fldObj $cname $_units] 783 788 } 784 789 incr _counter 785 } elseif {[$_f ieldelement $cname.ucd] != ""} {790 } elseif {[$_fldObj element $cname.ucd] != ""} { 786 791 set _viewer "isosurface" 787 792 set _comp2dims($cname) "3D" 788 set contents [$_f ieldget $cname.ucd]793 set contents [$_fldObj get $cname.ucd] 789 794 set vtkdata [AvsToVtk $cname $contents] 790 795 ReadVtkDataSet $cname $vtkdata 791 796 set _comp2vtk($cname) $vtkdata 792 set _comp2style($cname) [$_f ieldget $cname.style]797 set _comp2style($cname) [$_fldObj get $cname.style] 793 798 incr _counter 794 799 } … … 805 810 error "field can't have components of different dimensions: [join [array get _comp2dims] ,]" 806 811 } 812 } 813 # FIXME: about.scalars and about.vectors are temporary. With views 814 # the user will specify the label, units or each field there. 815 # 816 # Override what we found in the VTK file with names that the user 817 # selected. We override the field label and units. 818 foreach { fname label units } [$_fldObj get about.scalars] { 819 if { ![info exists _field2Name($fname)] } { 820 set _field2Name($fname) $fname 821 set _field2Components($fname) 1 822 } 823 set _field2Label($fname) $label 824 set _field2Units($fname) $units 825 } 826 foreach { fname label units } [$_fldObj get about.vectors] { 827 if { ![info exists _field2Name($fname)] } { 828 set _field2Name($fname) $fname 829 set _field2Components($fname) 3 830 } 831 set _field2Label($fname) $label 832 set _field2Units($fname) $units 807 833 } 808 834 } … … 910 936 if {$cname == "-overall" } { 911 937 set max 0 912 foreach cname [$_f ieldchildren -type component] {938 foreach cname [$_fldObj children -type component] { 913 939 if { ![info exists _comp2unirect3d($cname)] && 914 940 ![info exists _comp2extents($cname)] } { … … 1074 1100 for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} { 1075 1101 set array [$dataAttrs GetArray $i] 1076 set name [$dataAttrs GetArrayName $i]1102 set fname [$dataAttrs GetArrayName $i] 1077 1103 foreach {min max} [$array GetRange] break 1078 lappend limits $name [list $min $max] 1079 lappend _fieldNames $name 1080 lappend _fieldUnits "" 1081 lappend _fieldLabels $name 1104 lappend limits $fname [list $min $max] 1105 set _field2Units($fname) "" 1106 set _field2Label($fname) $fname 1107 set _field2Components($fname) [$array GetNumberOfComponents] 1108 lappend _comp2fields($cname) $fname 1082 1109 } 1083 1110 } … … 1145 1172 # object and an associated vector for field values. 1146 1173 # 1147 set path [$_f ieldget $cname.mesh]1174 set path [$_fldObj get $cname.mesh] 1148 1175 if {[$_xmlobj element $path] == ""} { 1149 1176 # Unknown mesh designated. … … 1151 1178 } 1152 1179 set element [$_xmlobj element -as type $path] 1153 lappend _fieldNames $cname 1154 lappend _fieldLabels $cname 1155 lappend _fieldUnits "" 1180 set name $cname 1181 regsub -all { } $name {_} name 1182 set _field2Label($name) $cname 1183 set label [hints zlabel] 1184 if { $label != "" } { 1185 set _field2Label($name) $label 1186 } 1187 set _field2Units($name) [hints zlabel] 1188 set _field2Components($name) 1 1189 lappend _comp2fields($cname) $name 1156 1190 1157 1191 # Handle bizarre cases that hopefully will be deprecated. 1158 1192 if { $element == "unirect3d" } { 1159 1193 # Special case: unirect3d (should be deprecated) + flow. 1160 if { [$_f ieldelement $cname.extents] != "" } {1161 set extents [$_f ieldget $cname.extents]1194 if { [$_fldObj element $cname.extents] != "" } { 1195 set extents [$_fldObj get $cname.extents] 1162 1196 } else { 1163 1197 set extents 1 … … 1167 1201 set _comp2dims($cname) "3D" 1168 1202 set _comp2unirect3d($cname) \ 1169 [Rappture::Unirect3d \#auto $_xmlobj $_f ield$cname $extents]1170 set _comp2style($cname) [$_f ieldget $cname.style]1171 if {[$_f ieldelement $cname.flow] != ""} {1203 [Rappture::Unirect3d \#auto $_xmlobj $_fldObj $cname $extents] 1204 set _comp2style($cname) [$_fldObj get $cname.style] 1205 if {[$_fldObj element $cname.flow] != ""} { 1172 1206 set _comp2flowhints($cname) \ 1173 [Rappture::FlowHints ::\#auto $_f ield$cname $_units]1207 [Rappture::FlowHints ::\#auto $_fldObj $cname $_units] 1174 1208 } 1175 1209 incr _counter 1176 1210 return 1177 1211 } 1178 if { $element == "unirect2d" && [$_f ieldelement $cname.flow] != "" } {1212 if { $element == "unirect2d" && [$_fldObj element $cname.flow] != "" } { 1179 1213 # Special case: unirect2d (normally deprecated) + flow. 1180 if { [$_f ieldelement $cname.extents] != "" } {1181 set extents [$_f ieldget $cname.extents]1214 if { [$_fldObj element $cname.extents] != "" } { 1215 set extents [$_fldObj get $cname.extents] 1182 1216 } else { 1183 1217 set extents 1 … … 1188 1222 set _comp2unirect2d($cname) \ 1189 1223 [Rappture::Unirect2d \#auto $_xmlobj $path] 1190 set _comp2style($cname) [$_f ieldget $cname.style]1224 set _comp2style($cname) [$_fldObj get $cname.style] 1191 1225 set _comp2flowhints($cname) \ 1192 [Rappture::FlowHints ::\#auto $_f ield$cname $_units]1193 set _values [$_f ieldget $cname.values]1226 [Rappture::FlowHints ::\#auto $_fldObj $cname $_units] 1227 set _values [$_fldObj get $cname.values] 1194 1228 set limits {} 1195 1229 foreach axis { x y } { … … 1245 1279 set _type "heightmap" 1246 1280 set vector [blt::vector create \#auto] 1247 $vector set [$_f ieldget $cname.values]1281 $vector set [$_fldObj get $cname.values] 1248 1282 set _comp2dims($cname) "[$mesh dimensions]D" 1249 1283 set _comp2mesh($cname) [list $mesh $vector] 1250 set _comp2style($cname) [$_f ieldget $cname.style]1284 set _comp2style($cname) [$_fldObj get $cname.style] 1251 1285 incr _counter 1252 set label [hints zlabel]1253 if { $label != "" } {1254 set _fieldLabels $label1255 set _fieldNames $label1256 regsub -all { } $_fieldNames {_} _fieldNames1257 }1258 set units [hints zunits]1259 if { $units != "" } {1260 set _fieldUnits $units1261 }1262 1286 array unset _comp2limits $cname 1263 1287 lappend _comp2limits($cname) x [$mesh limits x] … … 1270 1294 # 3D data: Store cloud/field as components 1271 1295 # 1272 set values [$_f ieldget $cname.values]1296 set values [$_fldObj get $cname.values] 1273 1297 set farray [vtkFloatArray ::vals$_counter] 1274 1298 foreach v $values { … … 1282 1306 set _type "isosurface" 1283 1307 set vector [blt::vector create \#auto] 1284 $vector set [$_f ieldget $cname.values]1308 $vector set [$_fldObj get $cname.values] 1285 1309 set _comp2dims($cname) "[$mesh dimensions]D" 1286 1310 set _comp2mesh($cname) [list $mesh $vector] 1287 set _comp2style($cname) [$_f ieldget $cname.style]1311 set _comp2style($cname) [$_fldObj get $cname.style] 1288 1312 incr _counter 1289 set label [hints zlabel]1290 if { $label != "" } {1291 set _fieldNames $label1292 regsub -all { } $_fieldNames {_} _fieldNames1293 set _fieldLabels $label1294 }1295 set units [hints zunits]1296 if { $units != "" } {1297 set _fieldUnits $units1298 }1299 1313 lappend _comp2limits($cname) x [$mesh limits x] 1300 1314 lappend _comp2limits($cname) y [$mesh limits y] … … 1304 1318 return 1305 1319 } 1306 error "unhandled case in field "1320 error "unhandled case in field dim=$_dim element=$element" 1307 1321 } 1308 1322 -
trunk/gui/scripts/mesh.tcl
r3330 r3405 515 515 if { $_dim == 0 } { 516 516 # No data found. 517 puts stderr "no relevant subelements found in <mesh><grid>" 517 518 return 0 518 519 } -
trunk/gui/scripts/vtkheightmapviewer.tcl
r3394 r3405 968 968 if { ![info exists _datasets($tag)] } { 969 969 set bytes [$dataobj vtkdata $comp] 970 if 0{970 if 1 { 971 971 set f [open /tmp/vtkheightmap.vtk "w"] 972 972 puts $f $bytes … … 1001 1001 } 1002 1002 } 1003 if { $_first != "" && $_reset } { 1004 set _fieldNames [$_first hints fieldnames] 1005 set _fieldUnits [$_first hints fieldunits] 1006 set _fieldLabels [$_first hints fieldlabels] 1003 if { $_first != "" } { 1007 1004 $itk_component(field) choices delete 0 end 1008 1005 $itk_component(fieldmenu) delete 0 end 1009 1006 array unset _fields 1010 foreach name $_fieldNames title $_fieldLabels units $_fieldUnits { 1011 SendCmd "dataset maprange explicit $_limits(v) $name" 1012 if { $title == "" } { 1013 set title $name 1014 } 1015 $itk_component(field) choices insert end "$name" "$title" 1016 $itk_component(fieldmenu) add radiobutton -label "$title" \ 1017 -value $title -variable [itcl::scope _curFldName] \ 1018 -selectcolor red \ 1019 -activebackground $itk_option(-plotbackground) \ 1020 -activeforeground $itk_option(-plotforeground) \ 1021 -font "Arial 8" \ 1022 -command [itcl::code $this Combo invoke] 1023 set _fields($name) [list $title $units] 1024 set _curFldName $name 1025 } 1007 foreach cname [$_first components] { 1008 foreach fname [$_first fieldnames $cname] { 1009 if { [info exists _fields($fname)] } { 1010 continue 1011 } 1012 foreach { label units components } \ 1013 [$_first fieldinfo $fname] break 1014 SendCmd "dataset maprange explicit $_limits(v) $fname" 1015 $itk_component(field) choices insert end "$fname" "$label" 1016 $itk_component(fieldmenu) add radiobutton -label "$label" \ 1017 -value $label -variable [itcl::scope _curFldName] \ 1018 -selectcolor red \ 1019 -activebackground $itk_option(-plotbackground) \ 1020 -activeforeground $itk_option(-plotforeground) \ 1021 -font "Arial 8" \ 1022 -command [itcl::code $this Combo invoke] 1023 set _fields($fname) [list $label $units $components] 1024 set _curFldName $fname 1025 } 1026 } 1026 1027 if { [array size _fields] == 1 } { 1027 set _curFldName $_fieldLabels1028 set _curFldName [array names _fields] 1028 1029 if { $_curFldName == "" } { 1029 1030 puts stderr "no default name from field" … … 1655 1656 set bMin [expr $heightScale * $dataScale * $vmin] 1656 1657 set bMax [expr $heightScale * $dataScale * $vmax] 1657 set fieldName [lindex $_fields($_curFldName) 0]1658 set fieldName $_curFldName 1658 1659 SendCmd "dataset maprange explicit $_limits(v) $fieldName" 1659 1660 SendCmd "axis bounds z $bMin $bMax" -
trunk/gui/scripts/vtkstreamlinesviewer.tcl
r3402 r3405 152 152 private variable _scalarFields 153 153 private variable _fields 154 private variable _currentField "" 154 private variable _curFldName "" 155 private variable _curFldLabel "" 155 156 private variable _field "" 156 157 private variable _numSeeds 200 … … 1050 1051 set bytes [$dataobj vtkdata $comp] 1051 1052 set length [string length $bytes] 1053 if 1 { 1054 set f [open /tmp/vtkstreamlines.vtk "w"] 1055 fconfigure $f -translation binary -encoding binary 1056 puts $f $bytes 1057 close $f 1058 } 1052 1059 if 1 { 1053 1060 set info {} … … 1087 1094 } 1088 1095 } 1096 if 0 { 1089 1097 array unset _scalarFields 1090 1098 array unset _vectorFields 1091 set _cur rentField[$_first hints default]1099 set _curFldLabel [$_first hints default] 1092 1100 $itk_component(field) choices delete 0 end 1093 1101 $itk_component(fieldmenu) delete 0 end … … 1097 1105 $itk_component(field) choices insert end "$name" "$title" 1098 1106 $itk_component(fieldmenu) add radiobutton -label "$title" \ 1099 -value $title -variable [itcl::scope _cur rentField] \1107 -value $title -variable [itcl::scope _curFldLabel] \ 1100 1108 -selectcolor red \ 1101 1109 -activebackground black \ … … 1109 1117 $itk_component(field) choices insert end "$name" "$title" 1110 1118 $itk_component(fieldmenu) add radiobutton -label "$title" \ 1111 -value $title -variable [itcl::scope _cur rentField] \1119 -value $title -variable [itcl::scope _curFldLabel] \ 1112 1120 -selectcolor red \ 1113 1121 -activebackground black \ … … 1117 1125 set _fields($name) [list $title $units] 1118 1126 } 1119 $itk_component(field) value $_currentField 1127 $itk_component(field) value $_curFldLabel 1128 } 1129 $itk_component(field) choices delete 0 end 1130 $itk_component(fieldmenu) delete 0 end 1131 array unset _fields 1132 foreach cname [$_first components] { 1133 foreach fname [$_first fieldnames $cname] { 1134 if { [info exists _fields($fname)] } { 1135 continue 1136 } 1137 foreach { label units components } \ 1138 [$_first fieldinfo $fname] break 1139 $itk_component(field) choices insert end "$fname" "$label" 1140 $itk_component(fieldmenu) add radiobutton -label "$label" \ 1141 -value $label -variable [itcl::scope _curFldLabel] \ 1142 -selectcolor red \ 1143 -activebackground $itk_option(-plotbackground) \ 1144 -activeforeground $itk_option(-plotforeground) \ 1145 -font "Arial 8" \ 1146 -command [itcl::code $this Combo invoke] 1147 set _fields($fname) [list $label $units $components] 1148 set _curFldName $fname 1149 set _curFldLabel $label 1150 } 1151 } 1152 $itk_component(field) value $_curFldLabel 1120 1153 } 1121 1154 … … 1536 1569 } 1537 1570 "streamlinesField" { 1538 set new [$itk_component(field) value] 1539 set value [$itk_component(field) translate $new] 1540 set _settings(streamlinesField) $value 1541 if { [info exists _scalarFields($new)] } { 1542 set name $_scalarFields($new) 1543 set _colorMode scalar 1544 set _currentField $new 1545 } elseif { [info exists _vectorFields($new)] } { 1546 set name $_vectorFields($new) 1547 set _colorMode vmag 1548 set _currentField $new 1571 set label [$itk_component(field) value] 1572 set fname [$itk_component(field) translate $label] 1573 set _settings(streamlinesField) $fname 1574 if { [info exists _fields($fname)] } { 1575 foreach { label units components } $_fields($fname) break 1576 if { $components > 1 } { 1577 set _colorMode vmag 1578 } else { 1579 set _colorMode scalar 1580 } 1581 set _curFldName $fname 1582 set _curFldLabel $label 1549 1583 } else { 1550 puts stderr "unknown field \"$ new\""1584 puts stderr "unknown field \"$fname\"" 1551 1585 return 1552 1586 } 1553 SendCmd "streamlines colormode $_colorMode ${ name}"1554 SendCmd "cutplane colormode $_colorMode ${ name}"1587 SendCmd "streamlines colormode $_colorMode ${fname}" 1588 SendCmd "cutplane colormode $_colorMode ${fname}" 1555 1589 set _legendPending 1 1556 1590 } … … 1577 1611 return 1578 1612 } 1579 if { [info exists _scalarFields($_currentField)] } {1580 set name $_scalarFields($_currentField)1581 } elseif { [info exists _vectorFields($_currentField)] } {1582 set name $_vectorFields($_currentField)1583 } else {1584 return1585 }1586 1613 # Set the legend on the first streamlines dataset. 1587 1614 foreach dataset [CurrentDatasets -visible $_first] { … … 1589 1616 if { [info exists _dataset2style($dataset)] } { 1590 1617 SendCmdNoSplash \ 1591 "legend $_dataset2style($dataset) $_colorMode $ name {} $w $h 0"1618 "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0" 1592 1619 break; 1593 1620 } … … 2563 2590 } 2564 2591 invoke { 2565 $itk_component(field) value $_cur rentField2592 $itk_component(field) value $_curFldLabel 2566 2593 AdjustSetting streamlinesField 2567 2594 } -
trunk/gui/src/RpCanvHotspot.c
r3177 r3405 1677 1677 TkCanvas *canvasPtr; 1678 1678 int id; 1679 long lid; 1679 1680 Tcl_HashEntry *hPtr; 1680 1681 Tk_Window tkwin; … … 1705 1706 } 1706 1707 string = Tcl_GetString(itemObjPtr); 1707 hPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char *)id); 1708 1709 lid = id; 1710 hPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char *)lid); 1708 1711 if (hPtr == NULL) { 1709 1712 Tcl_AppendResult(interp, "can't find canvas item \"", string,
Note: See TracChangeset
for help on using the changeset viewer.