Changeset 5872 for trunk/gui/scripts
- Timestamp:
- Sep 17, 2015, 10:49:42 AM (9 years ago)
- Location:
- trunk/gui/scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/scripts/map.tcl
r5659 r5872 214 214 set wfs [$layers element -as type $layer.wfs] 215 215 if { $wfs != "" } { 216 foreach key { url typename outputformat maxfeatures request_buffer } {216 foreach key { url typename format maxfeatures request_buffer } { 217 217 set value [$layers get $layer.wfs.$key] 218 218 $_tree set $child "wfs.$key" $value -
trunk/gui/scripts/mapviewer.tcl
r5776 r5872 270 270 grid-type "geodetic" 271 271 legend 1 272 terrain-ambient 0.03 272 273 terrain-edges 0 273 274 terrain-lighting 0 … … 367 368 [itcl::code $this EventuallyResize %w %h] 368 369 370 set _useServerManip 1 369 371 EnablePanningMouseBindings 370 372 EnableRotationMouseBindings 371 373 EnableZoomMouseBindings 374 set _useServerManip 0 372 375 373 376 if {$_useServerManip} { … … 1215 1218 SetTerrainStyle $_mapsettings(style) 1216 1219 } else { 1217 InitSettings terrain- edges terrain-lighting \1220 InitSettings terrain-ambient terrain-edges terrain-lighting \ 1218 1221 terrain-vertscale terrain-wireframe 1219 1222 } … … 1450 1453 1451 1454 itcl::body Rappture::MapViewer::MouseMotion {} { 1452 #SendCmd "mouse motion $_motion(x) $_motion(y)"1453 SendCmd "map pin hover $_motion(x) $_motion(y)"1455 SendCmd "mouse motion $_motion(x) $_motion(y)" 1456 #SendCmd "map pin hover $_motion(x) $_motion(y)" 1454 1457 set _motion(pending) 0 1455 1458 } … … 1745 1748 SendCmd "camera throw $bool" 1746 1749 } 1750 "terrain-ambient" { 1751 set val $_settings($what) 1752 SendCmd "map terrain ambient $val" 1753 } 1747 1754 "terrain-edges" { 1748 1755 set bool $_settings($what) … … 1855 1862 } 1856 1863 1864 itk_component add ambient_l { 1865 label $inner.ambient_l -text "Ambient min." -font "Arial 9" 1866 } { 1867 ignore -font 1868 } 1869 itk_component add ambient { 1870 ::scale $inner.ambient -from 0 -to 1.0 -orient horizontal \ 1871 -resolution 0.01 \ 1872 -variable [itcl::scope _settings(terrain-ambient)] \ 1873 -width 10 \ 1874 -showvalue on \ 1875 -command [itcl::code $this AdjustSetting terrain-ambient] 1876 } 1877 1857 1878 blt::table $inner \ 1858 1879 0,0 $inner.posdisp -cspan 2 -anchor w -pady 2 \ … … 1861 1882 3,0 $inner.lighting -cspan 2 -anchor w -pady 2 \ 1862 1883 4,0 $inner.time_l -cspan 2 -anchor w -pady 2 \ 1863 4,1 $inner.time -cspan 2 -fill x -pady 2 1884 4,1 $inner.time -cspan 2 -fill x -pady 2 \ 1885 5,0 $inner.ambient_l -cspan 2 -anchor w -pady 2 \ 1886 5,1 $inner.ambient -cspan 2 -fill x -pady 2 1864 1887 # 4,0 $inner.edges -cspan 2 -anchor w -pady 2 1865 1888 1866 1889 blt::table configure $inner r* c* -resize none 1867 blt::table configure $inner r 5c1 -resize expand1890 blt::table configure $inner r6 c1 -resize expand 1868 1891 } 1869 1892 … … 2263 2286 itcl::body Rappture::MapViewer::SetTerrainStyle { style } { 2264 2287 array set settings { 2288 -ambient 0.03 2265 2289 -color white 2266 2290 -edgecolor black 2267 2291 -edges 0 2268 -lighting 02292 -lighting 1 2269 2293 -linewidth 1.0 2270 2294 -vertscale 1.0 … … 2273 2297 array set settings $style 2274 2298 2299 SendCmd "map terrain ambient $settings(-ambient)" 2300 set _settings(terrain-ambient) $settings(-ambient) 2275 2301 SendCmd "map terrain edges $settings(-edges)" 2276 2302 set _settings(terrain-edges) $settings(-edges) … … 2382 2408 set _opacity($layer) [expr $settings(-opacity) * 100] 2383 2409 foreach {r g b} [Color2RGB $settings(-color)] {} 2384 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2385 SendCmd [list map layer add $layer line $info(ogr.url) $r $g $b $settings(-width) $settings(-minrange) $settings(-maxrange)] 2386 } else { 2387 SendCmd [list map layer add $layer line $info(ogr.url) $r $g $b $settings(-width)] 2410 switch -- $info(driver) { 2411 "ogr" { 2412 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2413 SendCmd [list map layer add $layer line ogr {} {} $info(ogr.url) $r $g $b $settings(-width) $settings(-minrange) $settings(-maxrange)] 2414 } else { 2415 SendCmd [list map layer add $layer line ogr {} {} $info(ogr.url) $r $g $b $settings(-width)] 2416 } 2417 } 2418 "tfs" { 2419 set format "json" 2420 if {[info exists info(tfs.format)]} { 2421 set format $info(tfs.format) 2422 } 2423 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2424 SendCmd [list map layer add $layer line tfs $format {} $info(tfs.url) $r $g $b $settings(-width) $settings(-minrange) $settings(-maxrange)] 2425 } else { 2426 SendCmd [list map layer add $layer line tfs $format {} $info(tfs.url) $r $g $b $settings(-width)] 2427 } 2428 } 2429 "wfs" { 2430 set format "json" 2431 if {[info exists info(wfs.format)]} { 2432 set format $info(wfs.format) 2433 } 2434 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2435 SendCmd [list map layer add $layer line wfs $format $info(wfs.typename) $info(wfs.url) $r $g $b $settings(-width) $settings(-minrange) $settings(-maxrange)] 2436 } else { 2437 SendCmd [list map layer add $layer line wfs $format $info(wfs.typename) $info(wfs.url) $r $g $b $settings(-width)] 2438 } 2439 } 2388 2440 } 2389 2441 SendCmd "map layer opacity $settings(-opacity) $layer" … … 2404 2456 set _opacity($layer) [expr $settings(-opacity) * 100] 2405 2457 foreach {r g b} [Color2RGB $settings(-color)] {} 2406 SendCmd [list map layer add $layer point $info(ogr.url) $r $g $b $settings(-size)] 2458 switch -- $info(driver) { 2459 "ogr" { 2460 SendCmd [list map layer add $layer point ogr {} {} $info(ogr.url) $r $g $b $settings(-size)] 2461 } 2462 "tfs" { 2463 set format "json" 2464 if {[info exists info(tfs.format)]} { 2465 set format $info(tfs.format) 2466 } 2467 SendCmd [list map layer add $layer point tfs $format {} $info(ogr.url) $r $g $b $settings(-size)] 2468 } 2469 "wfs" { 2470 set format "json" 2471 if {[info exists info(wfs.format)]} { 2472 set format $info(wfs.format) 2473 } 2474 SendCmd [list map layer add $layer point wfs $format $info(wfs.typename) $info(ogr.url) $r $g $b $settings(-size)] 2475 } 2476 } 2477 SendCmd "map layer opacity $settings(-opacity) $layer" 2478 } 2479 "icon" { 2480 array set settings { 2481 -align "center_bottom" 2482 -declutter 1 2483 -heading {} 2484 -icon pin 2485 -minbias 1000 2486 -opacity 1.0 2487 -placement "vertex" 2488 -scale {} 2489 } 2490 if { [info exists info(style)] } { 2491 array set settings $info(style) 2492 } 2493 if { [info exists info(opacity)] } { 2494 set settings(-opacity) $info(opacity) 2495 } 2496 set _opacity($layer) [expr $settings(-opacity) * 100] 2497 switch -- $info(driver) { 2498 "ogr" { 2499 SendCmd [list map layer add $layer icon ogr {} {} $info(ogr.url) $settings(-icon) $settings(-scale) $settings(-heading) $settings(-declutter) $settings(-placement) $settings(-align)] 2500 } 2501 "tfs" { 2502 set format "json" 2503 if {[info exists info(tfs.format)]} { 2504 set format $info(tfs.format) 2505 } 2506 SendCmd [list map layer add $layer icon tfs $format {} $info(tfs.url) $settings(-icon) $settings(-scale) $settings(-heading) $settings(-declutter) $settings(-placement) $settings(-align)] 2507 } 2508 "wfs" { 2509 set format "json" 2510 if {[info exists info(wfs.format)]} { 2511 set format $info(wfs.format) 2512 } 2513 SendCmd [list map layer add $layer icon wfs $format $info(wfs.typename) $info(wfs.url) $settings(-icon) $settings(-scale) $settings(-heading) $settings(-declutter) $settings(-placement) $settings(-align)] 2514 } 2515 } 2407 2516 SendCmd "map layer opacity $settings(-opacity) $layer" 2408 2517 } … … 2421 2530 set _opacity($layer) [expr $settings(-opacity) * 100] 2422 2531 foreach {r g b} [Color2RGB $settings(-color)] {} 2423 SendCmd [list map layer add $layer polygon $info(ogr.url) $r $g $b] 2532 switch -- $info(driver) { 2533 "ogr" { 2534 SendCmd [list map layer add $layer polygon ogr {} {} $info(ogr.url) $r $g $b] 2535 } 2536 "tfs" { 2537 set format "json" 2538 if {[info exists info(tfs.format)]} { 2539 set format $info(tfs.format) 2540 } 2541 SendCmd [list map layer add $layer polygon tfs $format {} $info(tfs.url) $r $g $b] 2542 } 2543 "wfs" { 2544 set format "json" 2545 if {[info exists info(wfs.format)]} { 2546 set format $info(wfs.format) 2547 } 2548 SendCmd [list map layer add $layer polygon wfs $format $info(wfs.typename) $info(wfs.url) $r $g $b] 2549 } 2550 } 2424 2551 SendCmd "map layer opacity $settings(-opacity) $layer" 2425 2552 } … … 2437 2564 -opacity 1.0 2438 2565 -removedupes 1 2566 -xoffset 0 2567 -yoffset 0 2439 2568 } 2440 2569 if { [info exists info(style)] } { … … 2453 2582 foreach {fgR fgG fgB} [Color2RGB $settings(-color)] {} 2454 2583 foreach {bgR bgG bgB} [Color2RGB $settings(-halocolor)] {} 2455 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2456 SendCmd [list map layer add $layer text $info(ogr.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-minrange) $settings(-maxrange)] 2457 } else { 2458 SendCmd [list map layer add $layer text $info(ogr.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align)] 2584 switch -- $info(driver) { 2585 "ogr" { 2586 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2587 SendCmd [list map layer add $layer text ogr {} {} $info(ogr.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-xoffset) $settings(-yoffset) $settings(-minrange) $settings(-maxrange)] 2588 } else { 2589 SendCmd [list map layer add $layer text ogr {} {} $info(ogr.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-xoffset) $settings(-yoffset)] 2590 } 2591 } 2592 "tfs" { 2593 set format "json" 2594 if {[info exists info(tfs.format)]} { 2595 set format $info(tfs.format) 2596 } 2597 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2598 SendCmd [list map layer add $layer text tfs $format {} $info(tfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-xoffset) $settings(-yoffset) $settings(-minrange) $settings(-maxrange)] 2599 } else { 2600 SendCmd [list map layer add $layer text tfs $format {} $info(tfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-xoffset) $settings(-yoffset)] 2601 } 2602 } 2603 "wfs" { 2604 set format "json" 2605 if {[info exists info(wfs.format)]} { 2606 set format $info(wfs.format) 2607 } 2608 if {[info exists settings(-minrange)] && [info exists settings(-maxrange)]} { 2609 SendCmd [list map layer add $layer text wfs $format $info(wfs.typename) $info(wfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-xoffset) $settings(-yoffset) $settings(-minrange) $settings(-maxrange)] 2610 } else { 2611 SendCmd [list map layer add $layer text wfs $format $info(wfs.typename) $info(wfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $settings(-halowidth) $settings(-fontsize) $settings(-removedupes) $settings(-declutter) $settings(-align) $settings(-xoffset) $settings(-yoffset)] 2612 } 2613 } 2459 2614 } 2460 2615 SendCmd "map layer opacity $settings(-opacity) $layer"
Note: See TracChangeset
for help on using the changeset viewer.