Changeset 24054 in osm

Timestamp:

2010-11-04T10:44:32+01:00 (14 years ago)

Author:

extropy

Message:

'Initial pdfimport version'

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• DuplicateNodesFinder.java (modified) (2 diffs)
• LoadPdfDialog.java (modified) (6 diffs)
• PathOptimizer.java (modified) (3 diffs)

applications/editors/josm/plugins/pdfimport/src/pdfimport/DuplicateNodesFinder.java

@@ -41 +41 @@
                 });
 
+                //sweep from top to bottom.
                 double prevY = Double.NEGATIVE_INFINITY;
 
                 for(Point2D point: points) {
+                        boolean mappedToOtherPoint = false;
+
                         if (point.getY() - prevY > tolerance){
                                 sweepLine.clear();
@@ -49 +52 @@
                         } else {
                                 //small offset, test against existing points (there may be more than one)
-                                while (sweepLine.containsKey(point)){
+
+                                while (!mappedToOtherPoint && sweepLine.containsKey(point)) {
                                         //a close point found
                                         Point2D closePoint = sweepLine.get(point);
                                         double dy = point.getY() - closePoint.getY();
-                                        if (dy <= tolerance){
+                                        if (dy <= tolerance) {
                                                 //mark them as close
-                                                result.put(closePoint, point);
+                                                result.put(point, closePoint);
+                                                mappedToOtherPoint = true;
                                         }
+                                        else
+                                        {
+                                                sweepLine.remove(point);
 
-                                        sweepLine.remove(closePoint);
+                                        }
                                 }
                         }
 
-                        prevY = point.getY();
-                        sweepLine.put(point, point);
-                }
-
-                //remove cascading relations
-                for(Point2D pt: points) {
-                        if (!result.containsKey(pt)){
-                                continue;
+                        if (!mappedToOtherPoint) {
+                                sweepLine.put(point, point);
                         }
 
-                        Point2D rep = result.get(pt);
-                        while (result.containsKey(rep)){
-                                rep = result.get(rep);
-                        }
-
-                        result.put(pt, rep);
+                        prevY = point.getY();
                 }
 

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Cursor;
 import java.awt.GridBagConstraints;
@@ -69 +68 @@
         private JButton saveButton;
         private JCheckBox debugModeCheck;
+        private JCheckBox mergeCloseNodesCheck;
+        private JTextField mergeCloseNodesTolerance;
 
         public LoadPdfDialog() {
@@ -162 +163 @@
 
                 this.debugModeCheck = new JCheckBox(tr("Debug info"));
+                this.mergeCloseNodesCheck = new JCheckBox(tr("Merge close nodes"));
+                this.mergeCloseNodesTolerance = new JTextField();
+
+                JPanel configPanel = new JPanel(new GridBagLayout());
+                c.gridx = 0; c.gridy = 0; c.gridwidth = 1;
+                configPanel.add(this.mergeCloseNodesCheck, c);
+                c.gridx = 1; c.gridy = 0; c.gridwidth = 1;
+                configPanel.add(this.mergeCloseNodesTolerance, c);
+
+                c.gridx = 0; c.gridy = 1; c.gridwidth = 2;
+                configPanel.add(this.debugModeCheck, c);
 
 
@@ -169 +181 @@
                 selectFilePanel.add(this.loadFileButton, c);
 
-                c.gridx = 0; c.gridy = 1; c.gridwidth = 1;
-                selectFilePanel.add(this.debugModeCheck, c);
 
                 JPanel projectionPanel = new JPanel(new GridBagLayout());
@@ -221 +231 @@
                 okCancelPanel.add(this.saveButton);
 
-                JPanel panel = new JPanel(new BorderLayout());
-                panel.add(okCancelPanel, BorderLayout.SOUTH);
-                panel.add(projectionPanel, BorderLayout.CENTER);
-                panel.add(selectFilePanel, BorderLayout.NORTH);
+                JPanel panel = new JPanel(new GridBagLayout());
+                c.gridx = 0; c.gridy = 0; c.gridwidth = 1;
+                panel.add(configPanel, c);
+                c.gridx = 0; c.gridy = 1; c.gridwidth = 1;
+                panel.add(selectFilePanel, c);
+                c.gridx = 0; c.gridy = 2; c.gridwidth = 1;
+                panel.add(projectionPanel, c);
+                c.gridx = 0; c.gridy = 3; c.gridwidth = 1;
+                panel.add(okCancelPanel, c);
 
                 this.setSize(400, 400);
@@ -438 +453 @@
                 }
 
-                /*
-                File file = new File(fileName);
-
-                Document document = file.getDocument();
-                Page page = document.getPages().get(0);
-                data.bounds = page.getBox();
-
-                PDFStreamProcessor processor = new PDFStreamProcessor(data, document);
-                Contents c = page.getContents();
-                processor.process(new ContentScanner(c));
-                processor.finish();
-                document.delete();*/
+                if (this.mergeCloseNodesCheck.isSelected()) {
+                        try {
+                                double tolerance = Double.parseDouble(this.mergeCloseNodesTolerance.getText());
+                                data.mergeNodes(tolerance);
+                        }
+                        catch (Exception e) {
+                                JOptionPane
+                                .showMessageDialog(
+                                                Main.parent,
+                                                tr("Tolerance is not a number"));
+                                return null;
+                        }
+                }
 
                 data.optimize();

applications/editors/josm/plugins/pdfimport/src/pdfimport/PathOptimizer.java

@@ -71 +71 @@
         }
 
-        public void optimize()
-        {
-                //fix points
+
+        public void mergeNodes(double tolerance) {
                 Map<Point2D, Point2D> pointMap = DuplicateNodesFinder.findDuplicateNodes(uniquePoints, POINT_TOLERANCE);
-
 
                 for(LayerContents layer: this.layers) {
@@ -81 +79 @@
                         this.concatenatePaths(layer);
                 }
-
-
+        }
+
+        public void optimize()
+        {
                 List<LayerContents> newLayers = new ArrayList<LayerContents>();
                 /*
@@ -467 +467 @@
         }
 
+
 }