Revision 495

View differences:

2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/src/main/java/org/gvsig/view3d/swing/impl/DefaultMapControl3D.java
368 368
    }
369 369

  
370 370
    protected void setBlueMarbelLayerVisibility(boolean visibility) {
371
        if (visibility) {
372
            showWWLayer("Blue Marble May 2004");
373
        } else {
374
            hideWWLayer("Blue Marble May 2004");
375
        }
371
        setWWLayerVisibility("Blue Marble May 2004", visibility);
376 372
    }
377 373

  
378 374
    protected void setDefaultElevationVisibility(boolean visibility) {
......
399 395
    }
400 396

  
401 397
    protected void setNasaLandsatLayerVisibility(boolean visibility) {
402
        if (visibility) {
403
            showWWLayer("i-cubed Landsat");
404
        } else {
405
            hideWWLayer("i-cubed Landsat");
406
        }
398
        setWWLayerVisibility("i-cubed Landsat", visibility);
407 399
    }
408 400

  
409 401
    @SuppressWarnings("rawtypes")
410
    private void showWWLayer(Class layerClazz) {
402
    private void setWWLayerVisibility(Class layerClazz, boolean visiblity) {
411 403
        LayerList layerList = getWwd().getModel().getLayers();
412 404

  
413 405
        for (Layer layer : layerList) {
414
            layer.setEnabled(true);
406
            layer.setEnabled(visiblity);
415 407
        }
416 408
    };
417 409

  
418
    private void showWWLayer(String layerName) {
410
    private void setWWLayerVisibility(String layerName, boolean visibilty) {
419 411
        Layer layer = getWwd().getModel().getLayers().getLayerByName(layerName);
420 412
        if (layer != null) {
421
            layer.setEnabled(true);
413
            layer.setEnabled(visibilty);
422 414
        }
423 415
    };
424 416

  
......
554 546
    }
555 547

  
556 548
    public void hideAtmosphere() {
557
        hideWWLayer(SkyGradientLayer.class);
549
        setWWLayerVisibility(SkyGradientLayer.class, false);
558 550
    }
559 551

  
560
    @SuppressWarnings("rawtypes")
561
    private void hideWWLayer(Class layerClazz) {
562
        LayerList layers = getWwd().getModel().getLayers();
563
        List<Layer> layersByClass = layers.getLayersByClass(layerClazz);
564
        for (Layer layer : layersByClass) {
565
            layer.setEnabled(false);
566
        }
567
    }
552
//    @SuppressWarnings("rawtypes")
553
//    private void hideWWLayer(Class layerClazz) {
554
//        LayerList layers = getWwd().getModel().getLayers();
555
//        List<Layer> layersByClass = layers.getLayersByClass(layerClazz);
556
//        for (Layer layer : layersByClass) {
557
//            layer.setEnabled(false);
558
//        }
559
//    }
568 560

  
569
    private void hideWWLayer(String layerName) {
570
        LayerList layers = getWwd().getModel().getLayers();
571
        Layer layerByName = layers.getLayerByName(layerName);
572
        if (layerByName != null) {
573
            layerByName.setEnabled(false);
574
        }
575
    }
561
//    private void getWWLayerVisib(String layerName) {
562
//        LayerList layers = getWwd().getModel().getLayers();
563
//        Layer layerByName = layers.getLayerByName(layerName);
564
//        if (layerByName != null) {
565
//            layerByName.setEnabled(false);
566
//        }
567
//    }
576 568

  
577 569
    public void hideMiniMap() {
578
        hideWWLayer(WorldMapLayer.class);
570
        setWWLayerVisibility(WorldMapLayer.class, false);
579 571
    }
580 572

  
581 573
    public void hideNorthIndicator() {
582
        hideWWLayer(CompassLayer.class);
574
        setWWLayerVisibility(CompassLayer.class, false);
583 575
    }
584 576

  
585 577
    public void hideScale() {
586
        hideWWLayer(ScalebarLayer.class);
578
        setWWLayerVisibility(ScalebarLayer.class, false);
587 579
    }
588 580

  
589 581
    public void hideStarBackground() {
590
        hideWWLayer(StarsLayer.class);
582
        setWWLayerVisibility(StarsLayer.class, false);
591 583
    }
592 584

  
593 585
    private void intializeWWPanel() {
......
661 653
    public void showAtmosphere() {
662 654
        Globe globe = getWwd().getModel().getGlobe();
663 655
        if (globe instanceof Earth) {
664
            showWWLayer(SkyGradientLayer.class);
656
            setWWLayerVisibility(SkyGradientLayer.class, true);
665 657
        } else if (globe instanceof EarthFlat) {
666
            showWWLayer(SkyColorLayer.class);
658
            setWWLayerVisibility(SkyColorLayer.class, true);
667 659
        }
668 660
    }
669 661

  
670 662
    public void showMiniMap() {
671
        showWWLayer(WorldMapLayer.class);
663
        setWWLayerVisibility(WorldMapLayer.class, true);
672 664
    }
673 665

  
674 666
    public void showNortIndicator() {
675
        showWWLayer(CompassLayer.class);
667
        setWWLayerVisibility(CompassLayer.class, true);
676 668
    }
677 669

  
678 670
    public void showScale() {
679
        showWWLayer(ScalebarLayer.class);
671
        setWWLayerVisibility(ScalebarLayer.class, true);
680 672
    }
681 673

  
682 674
    public void showStarBackgroundLayer() {
683
        showWWLayer(StarsLayer.class);
675
        setWWLayerVisibility(StarsLayer.class, true);
684 676
    }
685 677

  
686 678
    public void synchronizeLayers() {

Also available in: Unified diff