- Added globe imagery to WorldWindPanel for high altitude navigation

- WorldWindPanel now allows a custom list of layers to be passed in - EnvironmentManagerF map now shows place names
nbbrooks · May 27, 2014 · 4037f8c · 4037f8c
1 parent 624ab4f
commit 4037f8c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/src/crw/EnvironmentManagerF.java b/src/crw/EnvironmentManagerF.java
@@ -36,6 +36,7 @@
 import javax.swing.filechooser.FileNameExtensionFilter;
 import sami.environment.EnvironmentProperties;
 import sami.path.Location;
+import sami.ui.MissionMonitor;
 import static sami.ui.MissionMonitor.LAST_EPF_FILE;
 import static sami.ui.MissionMonitor.LAST_EPF_FOLDER;
 
@@ -51,13 +52,18 @@ public class EnvironmentManagerF extends JFrame {
     WorldWindPanel wwPanel;
 
     public EnvironmentManagerF() {
-        super("ObstacleManagerF");
-        setTitle("EnvironmentManagerF");
+        super("EnvironmentManagerF");
+        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
         getContentPane().setLayout(new BorderLayout());
 
         // Add map
+        ArrayList<String> layerNames = new ArrayList<String>();
+        layerNames.add("Bing Imagery");
+        layerNames.add("Blue Marble (WMS) 2004");
+        layerNames.add("Scale bar");
+        layerNames.add("Place Names");
         wwPanel = new WorldWindPanel();
-        wwPanel.createMap();
+        wwPanel.createMap(layerNames);
         getContentPane().add(wwPanel.component, BorderLayout.CENTER);
         // Add widgets
         List<SelectGeometryWidget.SelectMode> modes = Arrays.asList(SelectGeometryWidget.SelectMode.AREA, SelectGeometryWidget.SelectMode.NONE, SelectGeometryWidget.SelectMode.CLEAR);
@@ -115,7 +121,6 @@ public void actionPerformed(ActionEvent ae) {
         }
 
         pack();
-        setVisible(true);
     }
 
     public void applyObstacleList(ArrayList<ArrayList<Location>> obstacleList) {
@@ -270,6 +275,10 @@ public boolean loadEpf(File epfFile) {
     }
 
     public static void main(String[] args) {
-        EnvironmentManagerF mf = new EnvironmentManagerF();
+        java.awt.EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                new EnvironmentManagerF().setVisible(true);
+            }
+        });
     }
 }
diff --git a/src/crw/ui/component/WorldWindPanel.java b/src/crw/ui/component/WorldWindPanel.java
@@ -96,10 +96,14 @@ public WorldWindPanel() {
     }
 
     public void createMap() {
-        createMap(400, 300);
+        createMap(400, 300, null);
     }
 
-    public void createMap(int width, int height) {
+    public void createMap(ArrayList<String> layerNames) {
+        createMap(400, 300, layerNames);
+    }
+
+    public void createMap(int width, int height, ArrayList<String> layerNames) {
         widgetList = new Vector<WorldWindWidgetInt>();
         // Use flat Earth
         Configuration.setValue(AVKey.GLOBE_CLASS_NAME, EarthFlat.class.getName());
@@ -114,9 +118,14 @@ public void createMap(int width, int height) {
         wwCanvas.setModel(new BasicModel());
 
         // Virtual Earth
+        if(layerNames == null) {
+            layerNames = new ArrayList<String>();
+            layerNames.add("Bing Imagery");
+            layerNames.add("Blue Marble (WMS) 2004");
+            layerNames.add("Scale bar");
+        }
         for (Layer layer : wwCanvas.getModel().getLayers()) {
-            if (layer.getName().equals("Bing Imagery")
-                    || layer.getName().equals("Scale bar")) {
+            if(layerNames.contains(layer.getName())) {
                 layer.setEnabled(true);
             } else {
                 layer.setEnabled(false);