Commit 7c6e134c authored by iSergio's avatar iSergio
Browse files

Merge branch '1.85' into 'develop' 

Example fix and additions

See merge request !10
parents 84bad959 6be17ae9

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/CloudParameters.java

+46 −6
Original line number Diff line number Diff line 
/*

 * Copyright 2021 iserge.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package org.cleanlogic.cesiumjs4gwt.showcase.examples;



import com.google.gwt.core.client.GWT;
@@ -40,6 +56,8 @@ public class CloudParameters extends AbstractExample { 
    CumulusCloud cloud = null;



    CheckBox maxScaleCBox;

    HorizontalPanel scaleXHPanel;

    HorizontalPanel scaleYHPanel;

    Slider scaleXSlider;

    TextBox scaleXTBox;

    Slider scaleYSlider;
@@ -56,6 +74,8 @@ public class CloudParameters extends AbstractExample { 
    Slider brightnessSlider;

    TextBox brightnessTBox;



    FlexTable flexTable;



    @Inject

    public CloudParameters(ShowcaseExampleStore store) {

        super("Cloud Parameters",
@@ -100,8 +120,15 @@ public class CloudParameters extends AbstractExample { 
        maxScaleCBox = new CheckBox();

        maxScaleCBox.setWidth("100px");

        maxScaleCBox.setValue(true);

        maxScaleCBox.addValueChangeHandler(value -> {

            if (value.getValue()) {

                cloudParameters.scaleX = cloudParameters.maximumSizeX;

                cloudParameters.scaleY = cloudParameters.maximumSizeY;

            }

            visibleScaleXY(!value.getValue());

        });



        HorizontalPanel scaleXHPanel = new HorizontalPanel();

        scaleXHPanel = new HorizontalPanel();

        scaleXHPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);

        scaleXHPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);

        scaleXHPanel.setSpacing(10);
@@ -116,7 +143,7 @@ public class CloudParameters extends AbstractExample { 
        scaleXHPanel.add(scaleXSlider);

        scaleXHPanel.add(scaleXTBox);



        HorizontalPanel scaleYHPanel = new HorizontalPanel();

        scaleYHPanel = new HorizontalPanel();

        scaleYHPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);

        scaleYHPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);

        scaleYHPanel.setSpacing(10);
@@ -179,6 +206,10 @@ public class CloudParameters extends AbstractExample { 
        renderSliceCBox = new CheckBox();

        renderSliceCBox.setWidth("100px");

        renderSliceCBox.setValue(true);

        renderSliceCBox.addValueChangeHandler(value -> {

            flexTable.getWidget(8, 0).setVisible(value.getValue());

            flexTable.getWidget(8, 1).setVisible(value.getValue());

        });



        HorizontalPanel sliceHPanel = new HorizontalPanel();

        sliceHPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
@@ -210,12 +241,12 @@ public class CloudParameters extends AbstractExample { 
        brightnessHPanel.add(brightnessSlider);

        brightnessHPanel.add(brightnessTBox);



        FlexTable flexTable = new FlexTable();

        flexTable = new FlexTable();

        flexTable.setHTML(1, 0, "<font color=\"white\">Scale with Max Size</font>");

        flexTable.setWidget(1, 1, maxScaleCBox);

        flexTable.setHTML(2, 0, "<font color=\"white\">Scale X</font>");

        flexTable.setWidget(2, 0, new HTML("<font color=\"white\">Scale X</font>"));

        flexTable.setWidget(2, 1, scaleXHPanel);

        flexTable.setHTML(3, 0, "<font color=\"white\">Scale Y</font>");

        flexTable.setWidget(3, 0, new HTML("<font color=\"white\">Scale Y</font>"));

        flexTable.setWidget(3, 1, scaleYHPanel);

        flexTable.setHTML(4, 0, "<font color=\"white\">Maximum Size X</font>");

        flexTable.setWidget(4, 1, maxSizeXHPanel);
@@ -225,11 +256,13 @@ public class CloudParameters extends AbstractExample { 
        flexTable.setWidget(6, 1, maxSizeZHPanel);

        flexTable.setHTML(7, 0, "<font color=\"white\">Render Slice</font>");

        flexTable.setWidget(7, 1, renderSliceCBox);

        flexTable.setHTML(8, 0, "<font color=\"white\">Slice</font>");

        flexTable.setWidget(8, 0, new HTML("<font color=\"white\">Slice</font>"));

        flexTable.setWidget(8, 1, sliceHPanel);

        flexTable.setHTML(9, 0, "<font color=\"white\">Brightness</font>");

        flexTable.setWidget(9, 1, brightnessHPanel);



        visibleScaleXY(false);



        AbsolutePanel aPanel = new AbsolutePanel();

        aPanel.add(csVPanel);

        aPanel.add(flexTable, 20, 20);
@@ -241,6 +274,13 @@ public class CloudParameters extends AbstractExample { 
        initWidget(contentPanel);

    }



    private void visibleScaleXY(boolean visible) {

        flexTable.getWidget(2, 0).setVisible(visible);

        flexTable.getWidget(2, 1).setVisible(visible);

        flexTable.getWidget(3, 0).setVisible(visible);

        flexTable.getWidget(3, 1).setVisible(visible);

    }



    private class MSliderListener implements SliderListener {



        @Override

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/Clouds.java

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import com.google.gwt.user.client.ui.HTML; 
import org.cesiumjs.cs.Cesium;

import org.cesiumjs.cs.collections.CloudCollection;

import org.cesiumjs.cs.collections.options.CumulusCloudAddOptions;

import org.cesiumjs.cs.core.*;

import org.cesiumjs.cs.core.HeadingPitchRoll;

import org.cesiumjs.cs.core.Math;

import org.cesiumjs.cs.core.*;

import org.cesiumjs.cs.core.enums.ClockRange;

import org.cesiumjs.cs.core.interpolation.HermitePolynomialApproximation;

import org.cesiumjs.cs.datasources.Entity;

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/ElevationBandMaterial.java

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import com.google.gwt.user.client.ui.CheckBox; 
import com.google.gwt.user.client.ui.FlexTable;

import com.google.gwt.user.client.ui.HTML;

import org.cesiumjs.cs.Cesium;

import org.cesiumjs.cs.core.*;

import org.cesiumjs.cs.core.HeadingPitchRoll;

import org.cesiumjs.cs.core.Math;

import org.cesiumjs.cs.core.*;

import org.cesiumjs.cs.scene.options.ViewOptions;

import org.cesiumjs.cs.widgets.ViewerPanel;

import org.cleanlogic.cesiumjs4gwt.showcase.basic.AbstractExample;

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/GeoJSONAndTopoJSON.java

+3 −4
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import com.google.gwt.event.dom.client.ClickHandler; 
import com.google.gwt.user.client.Window;

import com.google.gwt.user.client.ui.*;

import org.cesiumjs.cs.Cesium;

import org.cesiumjs.cs.core.*;

import org.cesiumjs.cs.core.Cartesian3;

import org.cesiumjs.cs.core.Color;

import org.cesiumjs.cs.core.Math;

import org.cesiumjs.cs.core.Matrix4;

import org.cesiumjs.cs.core.options.ColorRandomOptions;

import org.cesiumjs.cs.datasources.Entity;

import org.cesiumjs.cs.datasources.GeoJsonDataSource;
@@ -31,9 +33,6 @@ import org.cesiumjs.cs.datasources.options.GeoJsonDataSourceOptions; 
import org.cesiumjs.cs.datasources.properties.ColorMaterialProperty;

import org.cesiumjs.cs.datasources.properties.ConstantProperty;

import org.cesiumjs.cs.js.JsObject;

import org.cesiumjs.cs.promise.Fulfill;

import org.cesiumjs.cs.promise.Promise;

import org.cesiumjs.cs.promise.Reject;

import org.cesiumjs.cs.widgets.ViewerPanel;

import org.cleanlogic.cesiumjs4gwt.showcase.basic.AbstractExample;

import org.cleanlogic.cesiumjs4gwt.showcase.components.store.ShowcaseExampleStore;

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/ImageryLayersSplit.java

+2 −3
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 


package org.cleanlogic.cesiumjs4gwt.showcase.examples;



import javax.inject.Inject;



import com.google.gwt.core.client.GWT;

import com.google.gwt.user.client.ui.AbsolutePanel;

import com.google.gwt.user.client.ui.HTML;



import org.cesiumjs.cs.collections.ImageryLayerCollection;

import org.cesiumjs.cs.core.Credit;

import org.cesiumjs.cs.scene.ImageryLayer;
@@ -37,6 +34,8 @@ import org.cleanlogic.cesiumjs4gwt.showcase.examples.slider.Slider; 
import org.cleanlogic.cesiumjs4gwt.showcase.examples.slider.SliderEvent;

import org.cleanlogic.cesiumjs4gwt.showcase.examples.slider.SliderListener;



import javax.inject.Inject;



/**

 * @author Serge Silaev aka iSergio

 */