- Timestamp:
- Mar 22, 2015, 11:42:50 PM (10 years ago)
- Location:
- trunk/gui/scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/scripts/map.tcl
r5125 r5163 248 248 set child [$_tree insert $parent -label $name] 249 249 $_tree set $child "name" $viewpoint 250 set haveX 0 251 set haveZ 0 252 set haveSRS 0 253 set haveVertDatum 0 250 254 foreach key { label description x y z distance heading pitch srs verticalDatum } { 251 255 set val [$viewpoints get $viewpoint.$key] 252 $_tree set $child $key $val 256 if {$val != ""} { 257 if {$key == "x"} { 258 set haveX 1 259 } elseif {$key == "z"} { 260 set haveZ 1 261 } elseif {$key == "srs"} { 262 set haveSRS 1 263 } elseif {$key == "verticalDatum"} { 264 set haveVertDatum 1 265 } 266 $_tree set $child $key $val 267 } 268 } 269 if {!$haveX} { 270 set lat [$viewpoints get $viewpoint.latitude] 271 set long [$viewpoints get $viewpoint.longitude] 272 $_tree set $child x $long 273 $_tree set $child y $lat 274 if {!$haveSRS} { 275 $_tree set $child srs wgs84 276 } 277 if {!$haveVertDatum} { 278 $_tree set $child verticalDatum "" 279 } 280 } 281 if {!$haveZ} { 282 set z [$viewpoints get $viewpoint.altitude] 283 if {$z != ""} { 284 $_tree set $child z $z 285 } 253 286 } 254 287 } -
trunk/gui/scripts/mapviewer.tcl
r5153 r5163 2173 2173 2174 2174 itcl::body Rappture::MapViewer::GoToViewpoint { dataobj viewpoint } { 2175 if 0 { 2176 array set view { 2175 array set view [subst { 2177 2176 x 0 2178 2177 y 0 2179 2178 z 0 2180 2179 heading 0 2181 pitch -89.999 2182 distance 0 2183 srs "" 2184 verticalDatum "" 2185 } 2186 } 2180 pitch -90 2181 distance $_view(distance) 2182 srs $_view(srs) 2183 verticalDatum $_view(verticalDatum) 2184 }] 2187 2185 array set view [$dataobj viewpoint $viewpoint] 2188 2186 foreach key {x y z heading pitch distance srs verticalDatum} { … … 2190 2188 set _view($key) $view($key) 2191 2189 } 2190 } 2191 # If map is projected, ignore pitch 2192 if {![MapIsGeocentric]} { 2193 set _view(pitch) -90 2192 2194 } 2193 2195 set duration 2.0
Note: See TracChangeset
for help on using the changeset viewer.