Changeset 23861 in osm for applications/editors

Timestamp:

2010-10-27T12:53:40+02:00 (14 years ago)

Author:

extropy

Message:

Work on integrating pdfbox.

Location:

applications/editors/josm/plugins/pdfimport

Files:

• .classpath (modified) (1 diff)
• src/pdfimport/GraphicsProcessor.java (added)
• src/pdfimport/LoadPdfDialog.java (modified) (6 diffs)
• src/pdfimport/OsmBuilder.java (modified) (2 diffs)
• src/pdfimport/PDFStreamProcessor.java (modified) (8 diffs)
• src/pdfimport/PathOptimizer.java (modified) (3 diffs)
• src/pdfimport/pdfbox (added)
• src/pdfimport/pdfbox/PdfBoxParser.java (added)

applications/editors/josm/plugins/pdfimport/.classpath

@@ -5 +5 @@
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="lib" path="lib/PDFClown.jar"/>
+        <classpathentry kind="lib" path="lib/pdfbox.jar" sourcepath="D:/Projects/Community/OSM/josm/pdfimport/pdfbox-1.3.1/pdfbox/src/main/java"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -47 +47 @@
 
         private String fileName;
-        private PDFStreamProcessor data;
+        private PathOptimizer data;
         private final OsmBuilder builder;
         private OsmDataLayer layer;
@@ -411 +411 @@
         }
 
-        private PDFStreamProcessor loadPDF(String fileName) {
+        private PathOptimizer loadPDF(String fileName) {
                 File file;
 
@@ -433 +433 @@
                 Page page = document.getPages().get(0);
 
-
-                PDFStreamProcessor processor = new PDFStreamProcessor(document);
-                processor.bounds = page.getBox();
+                PathOptimizer data = new PathOptimizer();
+                data.bounds = page.getBox();
+
+                PDFStreamProcessor processor = new PDFStreamProcessor(data, document);
                 Contents c = page.getContents();
                 processor.process(new ContentScanner(c));
@@ -441 +442 @@
                 document.delete();
 
-                return processor;
+                data.optimize();
+
+                return data;
         }
 
@@ -483 +486 @@
                 }
 
-                DataSet data = builder.build(this.data, isFinal);
+                DataSet data = builder.build(this.data.getLayers(), isFinal);
                 this.layer = new OsmDataLayer(data, name, null);
 
@@ -506 +509 @@
 
         private void saveLayer(java.io.File file) {
-                DataSet data = builder.build(this.data, true);
+                DataSet data = builder.build(this.data.getLayers(), true);
                 OsmDataLayer layer = new OsmDataLayer(data, file.getName(), file);
 

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

@@ -50 +50 @@
 
 
-        public Bounds getWorldBounds(PDFStreamProcessor data) {
+        public Bounds getWorldBounds(PathOptimizer data) {
                 LatLon min = tranformCoords(data.bounds.getMinX(), data.bounds.getMinY());
                 LatLon max = tranformCoords(data.bounds.getMaxX(), data.bounds.getMaxY());
@@ -56 +56 @@
         }
 
-        public DataSet build(PDFStreamProcessor data, boolean full) {
+        public DataSet build(List<LayerContents> data, boolean full) {
 
                 DataSet result = new DataSet();
 
-                for (LayerContents layer: data.getResult()) {
+                for (LayerContents layer: data) {
                         this.addLayer(result, layer, full);
                 }

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

@@ -15 +15 @@
 import it.stefanochizzolini.clown.documents.contents.objects.DrawRectangle;
 import it.stefanochizzolini.clown.documents.contents.objects.EndPathNoOp;
+import it.stefanochizzolini.clown.documents.contents.objects.Fill;
 import it.stefanochizzolini.clown.documents.contents.objects.FillEvenOdd;
+import it.stefanochizzolini.clown.documents.contents.objects.FillStroke;
 import it.stefanochizzolini.clown.documents.contents.objects.FillStrokeEvenOdd;
 import it.stefanochizzolini.clown.documents.contents.objects.GenericOperation;
+import it.stefanochizzolini.clown.documents.contents.objects.ModifyClipPath;
 import it.stefanochizzolini.clown.documents.contents.objects.Path;
 import it.stefanochizzolini.clown.documents.contents.objects.Stroke;
@@ -27 +30 @@
 import java.awt.Color;
 import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36 +38 @@
 
         private final LayerInfo info;
-        public Rectangle2D bounds;
         int pathNo = 0;
 
-        PathOptimizer optimizer = new PathOptimizer();
+        PathOptimizer optimizer;
         Map<LayerInfo, LayerInfo> multipathLayers = new HashMap<LayerInfo, LayerInfo>();
         private GraphicsState state;
@@ -45 +46 @@
         private DeviceGrayColorSpace graySpace;
 
-        public PDFStreamProcessor(Document doc) {
-
+        public PDFStreamProcessor(PathOptimizer target, Document doc) {
+
+                this.optimizer = target;
                 this.rgbSpace = new DeviceRGBColorSpace(doc);
                 this.graySpace = new DeviceGrayColorSpace(doc);
-
                 this.info = new LayerInfo();
         }
@@ -57 +58 @@
                 this.graySpace = null;
                 this.state = null;
-                this.optimizer.optimize();
-        }
-
-        public List<LayerContents> getResult() {
-                return this.optimizer.getLayers();
         }
 
@@ -201 +197 @@
                                 }
                         }
-                        else if (obj instanceof FillEvenOdd) {
+                        else if (obj instanceof FillEvenOdd || obj instanceof Fill) {
                                 this.info.fill = true;
                                 this.info.stroke = false;
                         }
-                        else if (obj instanceof FillStrokeEvenOdd){
+                        else if (obj instanceof FillStrokeEvenOdd || obj instanceof FillStroke){
                                 this.info.fill = true;
                                 this.info.stroke = true;
@@ -229 +225 @@
                                 points = new ArrayList<Point2D>(2);
                         }
+                        else if (obj instanceof ModifyClipPath) {
+                                //nothign here
+                        }
                         else {
                                 int a = 10;
@@ -273 +272 @@
                 ColorSpace space = col.getColorSpace();
 
-                if (space instanceof DeviceRGBColorSpace) {
+                if (space == null){
+                        return new Color(
+                                        (float)col.getComponents()[0],
+                                        (float)col.getComponents()[1],
+                                        (float)col.getComponents()[2]);
+                }
+                else if (space instanceof DeviceRGBColorSpace) {
                         return new Color(
                                         (float)col.getComponents()[0],

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

@@ -2 +2 @@
 
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14 +15 @@
         private final Map<LayerInfo, LayerContents> layerMap;
         private List<LayerContents> layers;
+        public Rectangle2D bounds;
 
         public PathOptimizer()
@@ -70 +72 @@
                 }
 
+
                 List<LayerContents> newLayers = new ArrayList<LayerContents>();
                 int nr = 0;