Fix bugs from 100.8 regressions testing (#578)

* Remove empty cell from listview

* Add css colours to labels

* Set viewshed colours

* Update screenshot

* Set the frustum visibility

* Update style.css

* Add checkbox css

* Rename boolean

Author: sclaridge

analysis/viewshed-location/ViewshedLocation.png

@@ -22,12 +22,10 @@
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Point2D;
-import javafx.scene.control.ColorPicker;
 import javafx.scene.control.Slider;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.paint.Color;
 
 import com.esri.arcgisruntime.geoanalysis.LocationViewshed;
 import com.esri.arcgisruntime.geoanalysis.Viewshed;
@@ -54,9 +52,6 @@ public class ViewshedLocationController {
   @FXML private Slider verticalAngleSlider;
   @FXML private Slider minDistanceSlider;
   @FXML private Slider maxDistanceSlider;
-  @FXML private ColorPicker visibleColorPicker;
-  @FXML private ColorPicker obstructedColorPicker;
-  @FXML private ColorPicker frustumColorPicker;
 
   public void initialize() {
     // create a scene and add a basemap to it
@@ -81,6 +76,12 @@ public void initialize() {
     LocationViewshed viewshed = new LocationViewshed(location, headingSlider.getValue(), pitchSlider.getValue(),
         horizontalAngleSlider.getValue(), verticalAngleSlider.getValue(), minDistanceSlider.getValue(),
         maxDistanceSlider.getValue());
+    // set the colors of the visible and obstructed areas
+    Viewshed.setVisibleColor(0xCC00FF00);
+    Viewshed.setObstructedColor(0xCCFF0000);
+    // set the color and show the frustum outline
+    Viewshed.setFrustumOutlineColor(0xCC0000FF);
+    viewshed.setFrustumOutlineVisible(true);
 
     // set the camera
     Camera camera = new Camera(location, 200.0, 20.0, 70.0, 0.0);
@@ -146,32 +147,6 @@ public void handle(MouseEvent event) {
     // distance sliders
     minDistanceSlider.valueProperty().addListener(e -> viewshed.setMinDistance(minDistanceSlider.getValue()));
     maxDistanceSlider.valueProperty().addListener(e -> viewshed.setMaxDistance(maxDistanceSlider.getValue()));
-    // colors
-    visibleColorPicker.setValue(Color.rgb(0, 255, 0, 0.8));
-    visibleColorPicker.valueProperty().addListener(e -> Viewshed.setVisibleColor(colorToInt(visibleColorPicker
-        .getValue())));
-    obstructedColorPicker.setValue(Color.rgb(255, 0, 0, 0.8));
-    obstructedColorPicker.valueProperty().addListener(e -> Viewshed.setObstructedColor(colorToInt(obstructedColorPicker
-        .getValue())));
-    frustumColorPicker.setValue(Color.rgb(0, 0, 255, 0.8));
-    frustumColorPicker.valueProperty().addListener(e -> Viewshed.setFrustumOutlineColor(colorToInt(frustumColorPicker
-        .getValue())));
-  }
-
-  /**
-   * Parses a Color into an ARGB integer.
-   *
-   * @param c color
-   * @return integer representation of the color
-   */
-  private int colorToInt(Color c) {
-    String hex = String.format("0x%02X%02X%02X%02X",
-        (int)(c.getOpacity() * 255),
-        (int)(c.getRed() * 255),
-        (int)(c.getGreen() * 255),
-        (int)(c.getBlue() * 255)
-    );
-    return Long.decode(hex).intValue();
   }
 
   /**
@@ -183,5 +158,4 @@ void terminate() {
       sceneView.dispose();
     }
   }
-
 }

analysis/viewshed-location/src/main/java/com/esri/samples/viewshed_location/ViewshedLocationController.java

@@ -15,7 +15,6 @@
   ~ the License.
   -->
 
-<?import javafx.scene.control.ColorPicker?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Slider?>
 <?import javafx.scene.control.ToggleButton?>
@@ -29,7 +28,7 @@
            prefHeight="450.0" prefWidth="600.0" stylesheets="/viewshed_location/style.css">
     <SceneView fx:id="sceneView"/>
     <GridPane StackPane.alignment="TOP_LEFT" pickOnBounds="false" styleClass="panel-region" maxWidth="300"
-              maxHeight="460" hgap="10" vgap="10">
+              maxHeight="300" hgap="10" vgap="10">
         <padding>
             <Insets topRightBottomLeft="10"/>
         </padding>
@@ -48,7 +47,7 @@
         <ToggleButton fx:id="visibilityToggle" selected="true" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
 
         <Label text="Frustum" GridPane.rowIndex="1" GridPane.columnIndex="0"/>
-        <ToggleButton fx:id="frustumToggle" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+        <ToggleButton fx:id="frustumToggle" selected="true" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
 
         <Label text="Heading" GridPane.rowIndex="2" GridPane.columnIndex="0"/>
         <Slider fx:id="headingSlider" value="10" max="360" GridPane.rowIndex="2" GridPane.columnIndex="1"
@@ -73,14 +72,5 @@
         <Label text="Max Distance" GridPane.rowIndex="7" GridPane.columnIndex="0"/>
         <Slider fx:id="maxDistanceSlider" min="1" max="2000" value="500" GridPane.rowIndex="7"
                  GridPane.columnIndex="1" showTickLabels="true" majorTickUnit="Infinity"/>
-
-        <Label text="Visible Color" GridPane.rowIndex="8" GridPane.columnIndex="0"/>
-        <ColorPicker fx:id="visibleColorPicker" GridPane.rowIndex="8" GridPane.columnIndex="1"/>
-
-        <Label text="Obstructed Color" GridPane.rowIndex="9" GridPane.columnIndex="0"/>
-        <ColorPicker fx:id="obstructedColorPicker" GridPane.rowIndex="9" GridPane.columnIndex="1"/>
-
-        <Label text="Frustum Outline Color" GridPane.rowIndex="10" GridPane.columnIndex="0"/>
-        <ColorPicker fx:id="frustumColorPicker" GridPane.rowIndex="10" GridPane.columnIndex="1"/>
     </GridPane>
 </StackPane>

analysis/viewshed-location/src/main/resources/viewshed_location/main.fxml

@@ -53,6 +53,7 @@ public void start(Stage stage) {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
+      scene.getStylesheets().add(getClass().getResource("/control_annotation_sublayer_visibility/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Control Annotation Sublayer Visibility");
@@ -67,10 +68,8 @@ public void start(Stage stage) {
       // create checkboxes for toggling the sublayer visibility manually
       CheckBox closedSublayerCheckbox = new CheckBox();
       closedSublayerCheckbox.setSelected(true);
-      closedSublayerCheckbox.setTextFill(Color.WHITE);
       CheckBox openSublayerCheckbox = new CheckBox();
       openSublayerCheckbox.setSelected(true);
-      openSublayerCheckbox.setTextFill(Color.DARKGRAY);
 
       // create a control panel and label for the checkboxes
       VBox controlsVBox = new VBox(6);
@@ -82,7 +81,6 @@ public void start(Stage stage) {
 
       // show current map scale in a label within the control panel
       Label currentMapScaleLabel = new Label();
-      currentMapScaleLabel.setTextFill(Color.WHITE);
       mapView.addMapScaleChangedListener(mapScaleChangedEvent ->
               currentMapScaleLabel.setText("Scale: 1:" + Math.round(mapView.getMapScale()))
       );
@@ -120,9 +118,9 @@ public void start(Stage stage) {
                   // gray out the open sublayer when the layer is out of scale
                   mapView.addMapScaleChangedListener(mapScaleChangedEvent -> {
                     if (openSublayer.isVisibleAtScale(mapView.getMapScale())) {
-                      openSublayerCheckbox.setTextFill(Color.WHITE);
+                      openSublayerCheckbox.setStyle("-fx-text-fill: white");
                     } else {
-                      openSublayerCheckbox.setTextFill(Color.DARKGRAY);
+                      openSublayerCheckbox.setStyle("-fx-text-fill: darkgrey");
                     }
                   });
 

display_information/control-annotation-sublayer-visibility/src/main/java/com/esri/samples/control_annotation_sublayer_visibility/ControlAnnotationSublayerVisibilitySample.java

@@ -0,0 +1,11 @@
+.panel-region .label {
+  -fx-text-fill: white;
+}
+
+#openSublayerCheckbox  {
+   -fx-text-fill: darkgrey;
+}
+
+#closedSublayerCheckbox  {
+   -fx-text-fill: white;
+}

display_information/control-annotation-sublayer-visibility/src/main/resources/control_annotation_sublayer_visibility/style.css

@@ -100,10 +100,13 @@ public void start(Stage stage) {
       transformationsListView.setCellFactory(list -> new ListCell<DatumTransformation>() {
 
         @Override
-        protected void updateItem(DatumTransformation transformation, boolean bln) {
+        protected void updateItem(DatumTransformation transformation, boolean isEmpty) {
 
-          super.updateItem(transformation, bln);
-          if (transformation != null) {
+          super.updateItem(transformation, isEmpty);
+          if (isEmpty) {
+            setText(null);
+          }
+          else if (transformation != null) {
             setText(transformation.getName());
           }
         }