Add TestBuilder Selection layer

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppColors.java

@@ -41,6 +41,9 @@ public class AppColors {
   public static final Color BACKGROUND_ERROR = Color.PINK;
   public static final Color TAB_FOCUS = UIManager.getColor ("TabbedPane.highlight" );
 
+  public static final Color GEOM_SELECT_LINE_CLR = new Color(0, 204, 204, 200);
+  public static final Color GEOM_SELECT_FILL_CLR = new Color(150, 255, 255, 100);
+  
 
 
 }

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppStrings.java

@@ -95,6 +95,10 @@ public class AppStrings {
 
   public static final String LYR_INDICATORS = "Indicators";
 
+  public static final String LYR_LABEL_SELECTION = "Selection";
+
+  public static final String TIP_SELECT_ELEMENTS = "Select Elements";
+
 
 
 

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderToolBar.java

@@ -257,6 +257,16 @@ public void actionPerformed(ActionEvent e)
             }
           });
 
+      JToggleButton selectComponentButton = createToggleButton(
+          AppStrings.TIP_SELECT_ELEMENTS,
+          new ImageIcon(this.getClass().getResource("Select.png")), 
+          new java.awt.event.ActionListener() {
+            public void actionPerformed(ActionEvent e)
+            {
+              controller().modeSelectComponent();
+            }
+          });
+      
       deleteVertexButton = createToggleButton(
           AppStrings.TIP_DELETE_VERTEX_COMPONENT,
           new ImageIcon(this.getClass().getResource("DeleteVertex.png")), 
@@ -276,6 +286,7 @@ public void actionPerformed(ActionEvent e) {
           ,btnMove
           ,deleteVertexButton
           ,infoButton
+          ,selectComponentButton
           ,extractComponentButton
       );
 
@@ -290,6 +301,7 @@ public void actionPerformed(ActionEvent e) {
         strut(20),
         zoomButton,
         infoButton,
+        selectComponentButton,
         extractComponentButton,
 
         strut(20),

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java

@@ -210,15 +210,14 @@ public void setLayerFocus(LayerItemPanel layerItem) {
     }
     layerItem.setFocusLayer(true);
     Layer layer = layerItem.getLayer();
-    boolean isModifiable = ! JTSTestBuilder.model().isLayerFixed(layer);
     showTabLayerStyle(layer.getName());
-    lyrStylePanel.setLayer(layer, isModifiable);
+    lyrStylePanel.setLayer(layer, layer.isModifiable());
     focusLayer = layer;
     updateButtons(focusLayer);
   }
 
   private void updateButtons(Layer lyr) {
-    boolean isModifiable = ! JTSTestBuilder.model().isLayerFixed(lyr);
+    boolean isModifiable = lyr.isModifiable();
 
     // every layer is copyable
     btnCopy.setEnabled(true);
@@ -338,6 +337,7 @@ public boolean isFocusLayer() {
   public void update() {
     LayerStyleSwatchControl.update(swatch, layer);
     lblName.setText( layer.getName());
+    lblName.setForeground(layer.hasGeometry() ? Color.BLACK : Color.GRAY);
   }
 
   private void uiInit() throws Exception {
@@ -392,6 +392,8 @@ public void mouseClicked(MouseEvent e)
     namePanel.addMouseListener(new HighlightMouseListener(this));
 
     namePanel.add(lblName);
+    
+    update();
   }
 
   private void layerVisAction() {

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/JTSTestBuilderController.java

@@ -44,6 +44,7 @@
 import org.locationtech.jtstest.testbuilder.ui.tools.PanTool;
 import org.locationtech.jtstest.testbuilder.ui.tools.PointTool;
 import org.locationtech.jtstest.testbuilder.ui.tools.RectangleTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.SelectComponentTool;
 import org.locationtech.jtstest.testbuilder.ui.tools.StreamPolygonTool;
 import org.locationtech.jtstest.testbuilder.ui.tools.Tool;
 import org.locationtech.jtstest.testbuilder.ui.tools.ZoomTool;
@@ -147,6 +148,7 @@ public void extractComponentsToTestCase(Geometry aoi, boolean isSegments)
     if (comp == null) 
       return;
     model().addCase(comp);
+    model().setSelection(comp[0]);
     JTSTestBuilderFrame.instance().updateTestCases();
     toolbar().selectZoomButton();
     modeZoomIn();
@@ -162,6 +164,27 @@ public void copyComponentToClipboard(Coordinate pt)
     SwingUtil.copyToClipboard(comp, false);
   }
 
+  public void selectComponents(Geometry aoi)
+  {
+    LayerList lyrList = model().getLayers();
+    Geometry[] comp;
+    comp = lyrList.getComponents(aoi);
+    if (comp == null) {
+      model().clearSelection();
+    } 
+    else {
+      //TODO: allow selecting from A or B when enabled
+      if (comp[0] != null) {
+        model().setSelection(comp[0]);
+      }
+      else {
+        model().setSelection(comp[1]);
+      }
+    }
+    geometryViewChanged();
+  }
+
+
   public void setFocusGeometry(int index) {
     model().getGeometryEditModel().setEditGeomIndex(index);
     toolbar().setFocusGeometry(index);    
@@ -274,6 +297,10 @@ public void modeExtractComponent() {
     setTool(ExtractComponentTool.getInstance());
   }
 
+  public void modeSelectComponent() {
+    setTool(SelectComponentTool.getInstance());
+  }
+
   public void modeDeleteVertex() {
     setTool(DeleteByBoxTool.getInstance());
   }

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/Layer.java

@@ -23,6 +23,7 @@ public class Layer
   private String name = "";
   private GeometryContainer geomCont;
   private boolean isEnabled = true;
+  private boolean isModifiable = true;
 
   private LayerStyle layerStyle;
   private BasicStyle initStyle = null;
@@ -31,6 +32,11 @@ public Layer(String name) {
     this.name = name;
   }
 
+  public Layer(String name, boolean isModifiable) {
+    this.name = name;
+    this.isModifiable = isModifiable;
+  }
+
   public Layer(String name, GeometryContainer source, BasicStyle style) {
     this.name = name;
     setSource(source);
@@ -50,6 +56,10 @@ public void setName(String name) {
     this.name = name; 
   }
 
+  public boolean isModifiable() {
+    return isModifiable;
+  }
+  
   public String getNameInfo() {
     if (geomCont.getGeometry() == null) return getName();
     return getName()

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/LayerList.java

@@ -44,6 +44,7 @@ public static LayerList create(LayerList l1, LayerList l2, LayerList l3) {
   public static final int LYR_A = 0;
   public static final int LYR_B = 1;
   public static final int LYR_RESULT = 2;
+  public static final int LYR_SELECT = 3;
 
   private List<Layer> layers = new ArrayList<Layer>();
 
@@ -52,9 +53,10 @@ public LayerList()
   }
 
   void initFixed() {
-    layers.add(new Layer(AppStrings.GEOM_LABEL_A));
-    layers.add(new Layer(AppStrings.GEOM_LABEL_B));
-    layers.add(new Layer(AppStrings.GEOM_LABEL_RESULT));
+    layers.add(new Layer(AppStrings.GEOM_LABEL_A, false));
+    layers.add(new Layer(AppStrings.GEOM_LABEL_B, false));
+    layers.add(new Layer(AppStrings.GEOM_LABEL_RESULT, false));
+    layers.add(new Layer(AppStrings.LYR_LABEL_SELECTION, false));
   }
 
   public int size() { return layers.size(); }
@@ -87,6 +89,11 @@ public Geometry getComponent(Coordinate pt, double tolerance)
     return null;
   }
 
+  public Geometry[] getComponents(Geometry aoi)
+  {
+    return getComponents(aoi, false);
+  }
+  
   public Geometry[] getComponents(Geometry aoi, boolean isSegments)
   {
     Geometry comp[] = new Geometry[2];

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestBuilderModel.java

@@ -159,6 +159,7 @@ private void initLayers()
 
     layerList.getLayer(LayerList.LYR_A).setSource(geomCont0);
     layerList.getLayer(LayerList.LYR_B).setSource(geomCont1);
+    //layerList.getLayer(LayerList.LYR_SELECT).setSource(new ListGeometryContainer());
 
     if (geomEditModel != null)
       layerList.getLayer(LayerList.LYR_RESULT).setSource(
@@ -175,6 +176,10 @@ private void initLayers()
     Layer lyrR = layerList.getLayer(LayerList.LYR_RESULT);
     lyrR.setGeometryStyle(new BasicStyle(AppColors.GEOM_RESULT_LINE_CLR,
         AppColors.GEOM_RESULT_FILL_CLR));
+    
+    Layer lyrSel = layerList.getLayer(LayerList.LYR_SELECT);
+    lyrSel.setGeometryStyle(new BasicStyle(AppColors.GEOM_SELECT_LINE_CLR,
+        AppColors.GEOM_SELECT_FILL_CLR));
   }
 
   public void pasteGeometry(int geomIndex) throws Exception {
@@ -600,11 +605,22 @@ else if (layerListTop.contains(lyr)) {
       }
       layerListTop.moveDown(lyr);
     } 
-    
   }
 
-  public boolean isLayerFixed(Layer lyr) {
-    return layerList.contains(lyr);
+  public void setSelection(Geometry geometry) {
+    Layer lyr = layerList.getLayer(LayerList.LYR_SELECT);
+    lyr.setGeometry(geometry);
+  }
+
+  public void addSelection(Geometry geometry) {
+    Layer lyr = layerList.getLayer(LayerList.LYR_SELECT);
+    ListGeometryContainer src = (ListGeometryContainer) lyr.getSource();
+    src.add(geometry);
+  }
+
+  public void clearSelection() {
+    Layer lyr = layerList.getLayer(LayerList.LYR_SELECT);
+    lyr.getSource().clear();
   }
 
 

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/SelectComponentTool.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v20.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.Cursor;
+import java.awt.event.MouseEvent;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+
+/**
+ * Selects components of a geometry
+ * @version 1.7
+ */
+public class SelectComponentTool extends BoxBandTool {
+  private static SelectComponentTool singleton = null;
+
+  public static SelectComponentTool getInstance() {
+    if (singleton == null)
+      singleton = new SelectComponentTool();
+    return singleton;
+  }
+
+  private SelectComponentTool() {
+    super(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+  }
+
+  protected void gestureFinished() 
+  {  
+    JTSTestBuilder.controller().selectComponents(getBox());
+  }
+  
+  public void mouseClicked(MouseEvent e) {
+    Geometry box = getBox(e);
+    JTSTestBuilder.controller().selectComponents(box);
+  }
+
+  private Geometry getBox(MouseEvent e) {
+    Coordinate pt = toModelSnapped(e.getPoint());
+    Envelope env = new Envelope(pt);
+    Geometry box = JTSTestBuilder.getGeometryFactory().toGeometry(env);
+    return box;
+  }
+
+}