Skip to content

Commit e434645

Browse files
tschietschie
committed
Merge branch 'dev' into 100.3.0
2 parents 33d47a0 + 9e593b7 commit e434645

17 files changed

+321
-7
lines changed

‎src/main/resources/fxml/animate_3d_graphic.fxml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<?import javafx.animation.Timeline?>
2929

3030
<?import javafx.geometry.Insets?>
31+
<?import javafx.scene.paint.Color?>
3132
<StackPane fx:controller="com.esri.samples.scene.animate_3d_graphic.Animate3dGraphicController"
3233
xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
3334
<!--Instantiate model instances to bind to-->
@@ -39,6 +40,20 @@
3940
<SceneView fx:id="sceneView"/>
4041
<!--Mission Selector Pane-->
4142
<VBox StackPane.alignment="TOP_LEFT" spacing="5" maxWidth="200" maxHeight="50" styleClass="panel-region">
43+
<padding>
44+
<Insets topRightBottomLeft="10"/>
45+
</padding>
46+
<background>
47+
<Background>
48+
<fills>
49+
<BackgroundFill>
50+
<fill>
51+
<Color opacity="0.3"/>
52+
</fill>
53+
</BackgroundFill>
54+
</fills>
55+
</Background>
56+
</background>
4257
<ComboBox fx:id="missionSelector" promptText="Select a Mission" onAction="#changeMission">
4358
<value>
4459
<String fx:value="GrandCanyon.csv"/>
@@ -61,12 +76,40 @@
6176
</VBox>
6277
<!--Camera Controls Pane-->
6378
<VBox StackPane.alignment="TOP_RIGHT" maxWidth="200" maxHeight="50" styleClass="panel-region">
79+
<padding>
80+
<Insets topRightBottomLeft="10"/>
81+
</padding>
82+
<background>
83+
<Background>
84+
<fills>
85+
<BackgroundFill>
86+
<fill>
87+
<Color opacity="0.3"/>
88+
</fill>
89+
</BackgroundFill>
90+
</fills>
91+
</Background>
92+
</background>
6493
<Label text="Speed"/>
6594
<Slider fx:id="speedSlider" min="0.25" max="5"/>
6695
</VBox>
6796
<!--Position Parameters Pane-->
6897
<GridPane StackPane.alignment="BOTTOM_RIGHT" maxWidth="200" prefWidth="150" maxHeight="50" hgap="10" vgap="5"
6998
styleClass="panel-region">
99+
<padding>
100+
<Insets topRightBottomLeft="10"/>
101+
</padding>
102+
<background>
103+
<Background>
104+
<fills>
105+
<BackgroundFill>
106+
<fill>
107+
<Color opacity="0.3"/>
108+
</fill>
109+
</BackgroundFill>
110+
</fills>
111+
</Background>
112+
</background>
70113
<StackPane.margin><Insets bottom="16"/></StackPane.margin>
71114
<Label text="Altitude" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
72115
<Label fx:id="altitudeLabel" GridPane.columnIndex="1" GridPane.rowIndex="0"/>

‎src/main/resources/fxml/blend_renderer.fxml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,28 @@
2222
<?import javafx.scene.control.Label?>
2323
<?import javafx.scene.control.Slider?>
2424
<?import javafx.scene.control.ComboBox?>
25+
<?import javafx.scene.layout.Background?>
26+
<?import javafx.scene.layout.BackgroundFill?>
27+
<?import javafx.scene.paint.Color?>
28+
<?import javafx.geometry.Insets?>
2529
<StackPane fx:controller="com.esri.samples.raster.blend_renderer.BlendRendererController" xmlns:fx="http://javafx.com/fxml"
2630
stylesheets="/css/style.css">
2731
<MapView fx:id="mapView"/>
2832
<VBox StackPane.alignment="TOP_LEFT" maxWidth="250" maxHeight="50" styleClass="panel-region">
33+
<padding>
34+
<Insets topRightBottomLeft="10"/>
35+
</padding>
36+
<background>
37+
<Background>
38+
<fills>
39+
<BackgroundFill>
40+
<fill>
41+
<Color opacity="0.3"/>
42+
</fill>
43+
</BackgroundFill>
44+
</fills>
45+
</Background>
46+
</background>
2947
<GridPane hgap="10" vgap="10">
3048
<Label text="Slope Type:" GridPane.rowIndex="0" GridPane.columnIndex="0"/>
3149
<ComboBox fx:id="slopeTypeComboBox" onAction="#updateRenderer" GridPane.rowIndex="0"

‎src/main/resources/fxml/calculate_distance_3d.fxml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,30 @@
1919
<?import javafx.scene.layout.HBox?>
2020
<?import javafx.scene.layout.StackPane?>
2121
<?import com.esri.arcgisruntime.mapping.view.SceneView?>
22+
<?import javafx.scene.layout.Background?>
23+
<?import javafx.scene.layout.BackgroundFill?>
24+
<?import javafx.scene.paint.Color?>
25+
<?import javafx.geometry.Insets?>
2226
<StackPane fx:controller="com.esri.samples.scene.calculate_distance_3d.CalculateDistance3dController"
2327
xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
2428
<!--SDK SceneView-->
2529
<SceneView fx:id="sceneView"/>
2630
<!--Position Parameters Pane-->
2731
<HBox StackPane.alignment="TOP_CENTER" maxWidth="200" maxHeight="50" spacing="5" styleClass="panel-region">
32+
<padding>
33+
<Insets topRightBottomLeft="10"/>
34+
</padding>
35+
<background>
36+
<Background>
37+
<fills>
38+
<BackgroundFill>
39+
<fill>
40+
<Color opacity="0.3"/>
41+
</fill>
42+
</BackgroundFill>
43+
</fills>
44+
</Background>
45+
</background>
2846
<Label text="Distance: " style="-fx-font-size: 1.4em"/>
2947
<Label fx:id="txtDistance" style="-fx-font-size: 1.4em"/>
3048
</HBox>

‎src/main/resources/fxml/create_and_save_map.fxml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,28 @@
2626
<?import javafx.scene.layout.HBox?>
2727
<?import javafx.scene.control.ComboBox?>
2828
<?import javafx.scene.control.ProgressIndicator?>
29+
<?import javafx.scene.layout.Background?>
30+
<?import javafx.scene.layout.BackgroundFill?>
31+
<?import javafx.scene.paint.Color?>
32+
<?import javafx.geometry.Insets?>
2933
<StackPane fx:controller="com.esri.samples.map.create_and_save_map.CreateAndSaveMapController" xmlns:fx="http://javafx.com/fxml"
3034
stylesheets="/css/style.css">
3135
<MapView fx:id="mapView"/>
3236
<VBox StackPane.alignment="TOP_LEFT" spacing="10" maxWidth="250" styleClass="panel-region">
37+
<padding>
38+
<Insets topRightBottomLeft="10"/>
39+
</padding>
40+
<background>
41+
<Background>
42+
<fills>
43+
<BackgroundFill>
44+
<fill>
45+
<Color opacity="0.3"/>
46+
</fill>
47+
</BackgroundFill>
48+
</fills>
49+
</Background>
50+
</background>
3351
<VBox>
3452
<Label text="Title"/>
3553
<TextField fx:id="title"/>

‎src/main/resources/fxml/densify_and_generalize.fxml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,28 @@
2121
<?import javafx.scene.layout.StackPane?>
2222
<?import javafx.scene.layout.VBox?>
2323
<?import com.esri.arcgisruntime.mapping.view.MapView?>
24+
<?import javafx.scene.layout.Background?>
25+
<?import javafx.scene.layout.BackgroundFill?>
26+
<?import javafx.scene.paint.Color?>
27+
<?import javafx.geometry.Insets?>
2428
<StackPane fx:controller="com.esri.samples.geometry.densify_and_generalize.DensifyAndGeneralizeController" xmlns:fx="http://javafx.com/fxml"
2529
stylesheets="/css/style.css">
2630
<MapView fx:id="mapView"/>
2731
<VBox StackPane.alignment="TOP_LEFT" maxWidth="250" maxHeight="50" styleClass="panel-region" spacing="10">
32+
<padding>
33+
<Insets topRightBottomLeft="10"/>
34+
</padding>
35+
<background>
36+
<Background>
37+
<fills>
38+
<BackgroundFill>
39+
<fill>
40+
<Color opacity="0.3"/>
41+
</fill>
42+
</BackgroundFill>
43+
</fills>
44+
</Background>
45+
</background>
2846
<CheckBox fx:id="densifyCheckBox" text="Densify" selected="true" onAction="#updateGeometry"/>
2947
<Label text="Max Segment Length:"/>
3048
<Slider fx:id="maxSegmentLengthSlider" min="100" max="500" majorTickUnit="100" showTickLabels="true"/>

‎src/main/resources/fxml/display_grid.fxml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,30 @@
1515
~ the License.
1616
-->
1717

18-
<?import javafx.scene.control.Button?>
19-
<?import javafx.scene.control.CheckBox?>
20-
<?import javafx.scene.control.ColorPicker?>
21-
<?import javafx.scene.control.ComboBox?>
22-
<?import javafx.scene.control.Label?>
23-
<?import javafx.scene.layout.*?>
2418
<?import com.esri.arcgisruntime.mapping.view.MapView?>
19+
<?import javafx.scene.control.*?>
20+
<?import javafx.scene.layout.*?>
21+
<?import javafx.scene.paint.Color?>
22+
<?import javafx.geometry.Insets?>
2523
<StackPane fx:controller="com.esri.samples.displayinformation.display_grid.DisplayGridController" xmlns:fx="http://javafx.com/fxml"
2624
stylesheets="/css/style.css">
2725
<MapView fx:id="mapView"/>
2826
<VBox StackPane.alignment="TOP_LEFT" maxWidth="300" maxHeight="300" styleClass="panel-region" spacing="10"
2927
alignment="CENTER">
28+
<padding>
29+
<Insets topRightBottomLeft="10"/>
30+
</padding>
31+
<background>
32+
<Background>
33+
<fills>
34+
<BackgroundFill>
35+
<fill>
36+
<Color opacity="0.3"/>
37+
</fill>
38+
</BackgroundFill>
39+
</fills>
40+
</Background>
41+
</background>
3042
<GridPane hgap="10" vgap="10">
3143
<columnConstraints>
3244
<ColumnConstraints percentWidth="50"/>

‎src/main/resources/fxml/distance_measurement_analysis.fxml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,26 @@
1919
<?import javafx.scene.control.Label?>
2020
<?import javafx.scene.layout.*?>
2121
<?import com.esri.arcgisruntime.mapping.view.SceneView?>
22+
<?import javafx.scene.paint.Color?>
23+
<?import javafx.geometry.Insets?>
2224
<StackPane fx:controller="com.esri.samples.analysis.distance_measurement_analysis.DistanceMeasurementAnalysisController" xmlns:fx="http://javafx.com/fxml"
2325
stylesheets="/css/style.css">
2426
<SceneView fx:id="sceneView"/>
2527
<VBox StackPane.alignment="TOP_LEFT" maxWidth="250" maxHeight="50" styleClass="panel-region">
28+
<padding>
29+
<Insets topRightBottomLeft="10"/>
30+
</padding>
31+
<background>
32+
<Background>
33+
<fills>
34+
<BackgroundFill>
35+
<fill>
36+
<Color opacity="0.3"/>
37+
</fill>
38+
</BackgroundFill>
39+
</fills>
40+
</Background>
41+
</background>
2642
<GridPane hgap="10" vgap="10">
2743
<Label text="Direct Distance:" GridPane.rowIndex="0" GridPane.columnIndex="0"/>
2844
<Label fx:id="directDistanceLabel" GridPane.rowIndex="0" GridPane.columnIndex="1"/>

‎src/main/resources/fxml/find_place.fxml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,28 @@
2323
<?import com.esri.arcgisruntime.mapping.view.MapView?>
2424
<?import javafx.collections.FXCollections?>
2525
<?import java.lang.String?>
26+
<?import javafx.scene.layout.Background?>
27+
<?import javafx.scene.layout.BackgroundFill?>
28+
<?import javafx.scene.paint.Color?>
2629
<StackPane fx:controller="com.esri.samples.search.find_place.FindPlaceController"
2730
xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
2831
<MapView fx:id="mapView"/>
2932
<VBox StackPane.alignment="TOP_LEFT" spacing="5" maxWidth="250" maxHeight="50" styleClass="panel-region">
33+
<padding>
34+
<Insets topRightBottomLeft="10"/>
35+
</padding>
36+
<background>
37+
<Background>
38+
<fills>
39+
<BackgroundFill>
40+
<fill>
41+
<Color opacity="0.3"/>
42+
</fill>
43+
</BackgroundFill>
44+
</fills>
45+
</Background>
46+
</background>
3047
<StackPane.margin><Insets left="10" top="10"/></StackPane.margin>
31-
<padding><Insets top="6" left="6" right="6" bottom="6"/></padding>
3248
<ComboBox fx:id="placeBox" promptText="Find a place" editable="true" maxWidth="Infinity">
3349
<items>
3450
<FXCollections fx:factory="observableArrayList">

‎src/main/resources/fxml/geodesic_sector_and_ellipse.fxml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,27 @@
2121
<?import javafx.scene.control.Spinner?>
2222
<?import javafx.scene.layout.*?>
2323
<?import com.esri.arcgisruntime.mapping.view.MapView?>
24+
<?import javafx.scene.paint.Color?>
25+
<?import javafx.geometry.Insets?>
2426
<StackPane fx:controller="com.esri.samples.geometry.geodesic_sector_and_ellipse.GeodesicSectorAndEllipseController" xmlns:fx="http://javafx.com/fxml"
2527
stylesheets="/css/style.css">
2628
<MapView fx:id="mapView"/>
2729
<VBox StackPane.alignment="TOP_LEFT" maxWidth="350" maxHeight="300" styleClass="panel-region" spacing="10"
2830
alignment="CENTER">
31+
<padding>
32+
<Insets topRightBottomLeft="10"/>
33+
</padding>
34+
<background>
35+
<Background>
36+
<fills>
37+
<BackgroundFill>
38+
<fill>
39+
<Color opacity="0.3"/>
40+
</fill>
41+
</BackgroundFill>
42+
</fills>
43+
</Background>
44+
</background>
2945
<GridPane hgap="10" vgap="10">
3046
<columnConstraints>
3147
<ColumnConstraints percentWidth="50"/>

‎src/main/resources/fxml/hillshade_renderer.fxml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,28 @@
2222
<?import javafx.scene.control.Label?>
2323
<?import javafx.scene.control.Slider?>
2424
<?import javafx.scene.control.ComboBox?>
25+
<?import javafx.scene.layout.Background?>
26+
<?import javafx.scene.layout.BackgroundFill?>
27+
<?import javafx.scene.paint.Color?>
28+
<?import javafx.geometry.Insets?>
2529
<StackPane fx:controller="com.esri.samples.raster.hillshade_renderer.HillshadeRendererController"
2630
xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
2731
<MapView fx:id="mapView"/>
2832
<VBox StackPane.alignment="TOP_LEFT" maxWidth="250" maxHeight="50" styleClass="panel-region">
33+
<padding>
34+
<Insets topRightBottomLeft="10"/>
35+
</padding>
36+
<background>
37+
<Background>
38+
<fills>
39+
<BackgroundFill>
40+
<fill>
41+
<Color opacity="0.3"/>
42+
</fill>
43+
</BackgroundFill>
44+
</fills>
45+
</Background>
46+
</background>
2947
<GridPane hgap="10" vgap="10">
3048
<Label text="Slope Type:" GridPane.rowIndex="0" GridPane.columnIndex="0"/>
3149
<ComboBox fx:id="slopeTypeComboBox" onAction="#updateRenderer" GridPane.rowIndex="0"

0 commit comments

Comments
 (0)