added thining iterations parameters

Author: r00tat

src/org/openstreetmap/josm/plugins/areaselector/AreaSelectorAction.java

@@ -47,7 +47,7 @@
  */
 public class AreaSelectorAction extends MapMode implements MouseListener {
 
-    protected int colorThreshold=ImageAnalyzer.DEFAULT_COLORTHRESHOLD;
+    protected int colorThreshold=ImageAnalyzer.DEFAULT_COLORTHRESHOLD, thinningIterations=ImageAnalyzer.DEFAULT_THINNING_ITERATIONS;
     protected double toleranceDist=ImageAnalyzer.DEFAULT_TOLERANCEDIST,toleranceAngle=ImageAnalyzer.DEFAULT_TOLERANCEANGLE;
 
     protected boolean showAddressDialog=true,mergeNodes=true;
@@ -58,7 +58,8 @@ public class AreaSelectorAction extends MapMode implements MouseListener {
             PREF_TOLERANCEDIST=PLUGIN_NAME+".tolerancedist",
             PREF_TOLERANCEANGLE=PLUGIN_NAME+".toleranceangle",
             PREF_SHOWADDRESSDIALOG=PLUGIN_NAME+".showaddressdialog",
-            PREF_MERGENODES=PLUGIN_NAME+".mergenodes";
+            PREF_MERGENODES=PLUGIN_NAME+".mergenodes",
+            PREF_THINNING_ITERATIONS=PLUGIN_NAME+".thinning_iterations";
 
 
     protected Logger log = Logger.getLogger(AreaSelectorAction.class.getCanonicalName());
@@ -316,6 +317,25 @@ public void setColorThreshold(int colorThreshold) {
         Main.pref.put(PREF_COLORTHRESHOLD, Integer.toString(colorThreshold));
         this.colorThreshold = colorThreshold;
     }
+    
+    
+    public int getThinningIterations() {
+        // refresh from prefs
+        try{
+        this.thinningIterations=Integer.parseInt(Main.pref.get(PREF_THINNING_ITERATIONS, Integer.toString(ImageAnalyzer.DEFAULT_THINNING_ITERATIONS)));
+        }catch(NumberFormatException th){
+            log.warn("Could not load thinning iterations",th);
+        }
+        return thinningIterations;
+    }
+
+    /**
+     * @param thinningIterations the thinningIterations to set
+     */
+    public void setThinningIterations(int thinningIterations) {
+        Main.pref.put(PREF_THINNING_ITERATIONS, Integer.toString(thinningIterations));
+        this.thinningIterations = thinningIterations;
+    }
 
     /**
      * @return the toleranceDist

src/org/openstreetmap/josm/plugins/areaselector/ImageAnalyzer.java

@@ -102,7 +102,10 @@ public class ImageAnalyzer {
     // gaussian blur radius
     public static final int DEFAULT_BLURRADIUS = 10;
     protected int blurRadius = DEFAULT_BLURRADIUS;
-
+    
+    // default thinning iterations = 3
+    public static final int DEFAULT_THINNING_ITERATIONS = 2;
+    protected int thinningIterations = DEFAULT_THINNING_ITERATIONS;
 
 
 
@@ -160,6 +163,14 @@ public void initUI() {
         final JLabel toleranceAngleLabel = new JLabel("Tolerance Angle: ");
         textAreaPanel.add(toleranceAngleLabel);
         textAreaPanel.add(toleranceAngleTextArea);
+        
+        final JTextArea thinningIterationsTextArea=new JTextArea(1,5);
+        thinningIterationsTextArea.setText(""+(thinningIterations));
+        final JLabel thinningIterationsLabel = new JLabel("Thinning Iterations: ");
+        textAreaPanel.add(thinningIterationsLabel);
+        textAreaPanel.add(thinningIterationsTextArea);
+        
+        
 
 
         JButton refreshButton=new JButton("Refresh");
@@ -173,6 +184,8 @@ public void actionPerformed(ActionEvent e) {
                 toleranceDist=Double.parseDouble(toleranceDistTextArea.getText());
 
                 toleranceAngle=Double.parseDouble(toleranceAngleTextArea.getText());
+                
+                thinningIterations=Integer.parseInt(thinningIterationsTextArea.getText());
 
 
                 getArea();
@@ -522,7 +535,7 @@ public BufferedImage skeletonize(BufferedImage image){
             }
         }
 
-        for(int j=0;j<3;j++){
+        for(int j=0;j<thinningIterations;j++){
 
             int [] thinningKernel1= {
                     0, 0, 0,
@@ -1078,6 +1091,21 @@ public int getBlurRadius() {
     public void setBlurRadius(int blurRadius) {
         this.blurRadius = blurRadius;
     }
+    
+	/**
+	 * @return the thinningIterations
+	 */
+	public int getThinningIterations() {
+		return thinningIterations;
+	}
+
+	/**
+	 * @param thinningIterations the thinningIterations to set
+	 */
+	public void setThinningIterations(int thinningIterations) {
+		this.thinningIterations = thinningIterations;
+	}
+
 
     /**
      * @param args

src/org/openstreetmap/josm/plugins/areaselector/preferences/AreaSelectorPreference.java

@@ -37,6 +37,7 @@ public void addGui(PreferenceTabbedPane gui) {
         prefPanel.setColorThreshold(areaSelectorAction.getColorThreshold());
         prefPanel.setToleranceDist(areaSelectorAction.getToleranceDist());
         prefPanel.setToleranceAngle(areaSelectorAction.getToleranceAngle());
+        prefPanel.setThinningIterations(areaSelectorAction.getThinningIterations());
         prefPanel.setShowAddressDialog(areaSelectorAction.getShowAddressDialog());
         prefPanel.setMergeNodes(areaSelectorAction.getMergeNodes());
 
@@ -59,6 +60,7 @@ public boolean ok() {
         areaSelectorAction.setColorThreshold(prefPanel.getColorThreshold());
         areaSelectorAction.setToleranceDist(prefPanel.getToleranceDist());
         areaSelectorAction.setToleranceAngle(prefPanel.getToleranceAngle());
+        areaSelectorAction.setThinningIterations(prefPanel.getThinningIterations());
         areaSelectorAction.setShowAddressDialog(prefPanel.getShowAddressDialog());
         areaSelectorAction.setMergeNodes(prefPanel.getMergeNodes());
         return false;

src/org/openstreetmap/josm/plugins/areaselector/preferences/PreferencesPanel.java

@@ -24,10 +24,11 @@ public class PreferencesPanel extends JPanel {
     private JTextField txtColorThreshold;
     private JTextField txtToleranceDist;
     private JTextField txtToleranceAngle;
+    private JTextField txtThinningIterations;
 
     private JCheckBox ckbxShowAddressDialog;
     private JCheckBox ckbxMergeNodes;
-
+    
     /**
      * Constructs a new {@code PreferencesPanel}.
      */
@@ -115,7 +116,6 @@ private void initialize() {
         txtToleranceAngle.setColumns(10);
 
         JLabel lbluserInterfaceSettings = new JLabel("<html><p><b>"+tr("Plugin Settings")+"</b></p></html>");
-        sl_panel.putConstraint(SpringLayout.NORTH, lbluserInterfaceSettings, 40, SpringLayout.SOUTH, lblToleranceAngle);
         sl_panel.putConstraint(SpringLayout.WEST, lbluserInterfaceSettings, 0, SpringLayout.WEST, lblAlgorithmSettings);
         add(lbluserInterfaceSettings);
 
@@ -138,6 +138,24 @@ private void initialize() {
         sl_panel.putConstraint(SpringLayout.WEST, ckbxMergeNodes, 0, SpringLayout.WEST, ckbxShowAddressDialog);
         sl_panel.putConstraint(SpringLayout.SOUTH, ckbxMergeNodes, 0, SpringLayout.SOUTH, lblMergeNodesWithNeighbor);
         add(ckbxMergeNodes);
+        
+        JLabel lblThinningIterationsExplanation = new JLabel("<html><p>"+tr("How often thinning operation should be applied (Default {0}).",ImageAnalyzer.DEFAULT_THINNING_ITERATIONS)+"</p></html>");
+        sl_panel.putConstraint(SpringLayout.NORTH, lblThinningIterationsExplanation, 40, SpringLayout.NORTH, lblToleranceAngle);
+        sl_panel.putConstraint(SpringLayout.WEST, lblThinningIterationsExplanation, 0, SpringLayout.WEST, lblAlgorithmSettings);
+        add(lblThinningIterationsExplanation);
+        
+        JLabel lblThinningIterations = new JLabel(tr("Thinning Iterations"));
+        sl_panel.putConstraint(SpringLayout.NORTH, lbluserInterfaceSettings, 40, SpringLayout.SOUTH, lblThinningIterations);
+        sl_panel.putConstraint(SpringLayout.NORTH, lblThinningIterations, 10, SpringLayout.SOUTH, lblThinningIterationsExplanation);
+        sl_panel.putConstraint(SpringLayout.WEST, lblThinningIterations, 0, SpringLayout.WEST, lblAlgorithmSettings);
+        add(lblThinningIterations);
+        
+        txtThinningIterations = new JTextField();
+        sl_panel.putConstraint(SpringLayout.NORTH, txtThinningIterations, 10, SpringLayout.SOUTH, lblThinningIterationsExplanation);
+        sl_panel.putConstraint(SpringLayout.EAST, txtThinningIterations, 0, SpringLayout.EAST, txtColorThreshold);
+        txtThinningIterations.setText("0.4");
+        txtThinningIterations.setColumns(10);
+        add(txtThinningIterations);
     }
 
     /**
@@ -232,4 +250,24 @@ public boolean getMergeNodes() {
     public void setMergeNodes(boolean merge){
         ckbxMergeNodes.setSelected(merge);
     }
+    
+	/**
+	 * get Thinning Iterations
+	 * @return
+	 */
+	public int getThinningIterations() {
+		try{
+			return Integer.parseInt(txtThinningIterations.getText());
+		}catch(NumberFormatException e){
+			return ImageAnalyzer.DEFAULT_THINNING_ITERATIONS;
+		}
+	}
+	
+	/**
+	 * set text field to value of thinning Iterations
+	 * @param thinningIterations
+	 */
+	public void setThinningIterations(int thinningIterations) {
+		txtThinningIterations.setText(Integer.toString(thinningIterations));
+	}
 }