Index: applications/editors/josm/plugins/pdfimport/.classpath
===================================================================
--- applications/editors/josm/plugins/pdfimport/.classpath (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/.classpath (revision 34541)
@@ -3,5 +3,9 @@
-
+
+
+
+
+
Index: applications/editors/josm/plugins/pdfimport/build.xml
===================================================================
--- applications/editors/josm/plugins/pdfimport/build.xml (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/build.xml (revision 34541)
@@ -4,5 +4,5 @@
-
+
ignore it
- } finally {
- LoadPdfDialog.this.placement.verify();
- }
- LoadPdfDialog.this.newLayer = null;
- LoadPdfDialog.this.loadFileButton.setEnabled(true);
- LoadPdfDialog.this.placementPanel.setEnabled(true);
- LoadPdfDialog.this.actionPanel.panel.setEnabled(true);
- LoadPdfDialog.this.actionPanel.showButton.setEnabled(true);
- LoadPdfDialog.this.actionPanel.saveButton.setEnabled(true);
- LoadPdfDialog.this.actionPanel.okButton.setEnabled(true);
- LoadPdfDialog.this.loadProgress.setVisible(false);
- }
- }
- });
- return true;
- }
-
- private void importAction() {
-
- if (!placement.isValid()) return;
- try {
- placement.save(pdfFile);
- } catch (IOException e) {
- e.toString();
- }
- removeLayer();
-
- runAsBackgroundTask(new Runnable() {
- @Override
- public void run() {
- // async part
- LoadPdfDialog.this.loadProgress.setVisible(true);
- SwingRenderingProgressMonitor monitor = new SwingRenderingProgressMonitor(progressRenderer);
- LoadPdfDialog.this.newLayer = LoadPdfDialog.this.makeLayer(tr("PDF: ") + pdfFile.getName(), placement,
- OsmBuilder.Mode.Final, monitor);
- progressRenderer.finish();
- }
- }, new ActionListener() {
-
- @Override
- public void actionPerformed(ActionEvent e) {
- // sync part
- // rebuild layer with latest projection
- MainApplication.getLayerManager().addLayer(newLayer);
- MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
- LoadPdfDialog.this.setVisible(false);
- }
- });
- }
-
- private void saveAction() {
- /*
- * perform save preview layer to file
- * TODO: is this action valueable? Can be easily performed from main menu
- */
-
- if (!placement.isValid()) return;
-
- final java.io.File file = this.chooseSaveFile();
-
- if (file == null) {
- return;
- }
-
- this.removeLayer();
-
- this.runAsBackgroundTask(new Runnable() {
- @Override
- public void run() {
- // async part
- SwingRenderingProgressMonitor monitor = new SwingRenderingProgressMonitor(progressRenderer);
- LoadPdfDialog.this.saveLayer(file, placement, monitor);
- progressRenderer.finish();
- }
- }, new ActionListener() {
-
- @Override
- public void actionPerformed(ActionEvent e) {
- // sync part
- LoadPdfDialog.this.setVisible(false);
- }
- });
- }
-
- private void showAction() {
- /*
- * perform show action
- * TODO: is this action valuable? User can do it easy from OSM Main Menu
- */
- if (!placement.isValid()) return;
-
- // zoom to new location
- MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
- MainApplication.getMap().repaint();
- }
-
- private void cancelAction() {
- /*
- * perform cancel action
- */
- removeLayer();
- setVisible(false);
- }
-
- // Implementation methods
-
- private static JFileChooser loadChooser = null;
-
- private java.io.File chooseFile() {
- // get PDF file to load
- if (loadChooser == null) {
- loadChooser = new JFileChooser(Preferences.getLoadDir());
- loadChooser.setAcceptAllFileFilterUsed(false);
- loadChooser.setMultiSelectionEnabled(false);
- loadChooser.setFileFilter(new FileFilter() {
- @Override
- public boolean accept(java.io.File pathname) {
- return pathname.isDirectory() || pathname.getName().endsWith(".pdf");
- }
-
- @Override
- public String getDescription() {
- return tr("PDF files");
- }
- });
- } else {
- loadChooser.rescanCurrentDirectory();
- }
- int result = loadChooser.showDialog(this, tr("Import PDF"));
- if (result != JFileChooser.APPROVE_OPTION) {
- return null;
- } else {
- Preferences.setLoadDir(loadChooser.getSelectedFile().getParentFile().getAbsolutePath());
- return loadChooser.getSelectedFile();
- }
- }
-
- private java.io.File chooseSaveFile() {
- // get file name
- JFileChooser fc = new JFileChooser();
- fc.setAcceptAllFileFilterUsed(true);
- fc.setMultiSelectionEnabled(false);
- fc.setFileFilter(new FileFilter() {
- @Override
- public boolean accept(java.io.File pathname) {
- return pathname.isDirectory() || pathname.getName().endsWith(".osm");
- }
-
- @Override
- public String getDescription() {
- return tr("OSM files");
- }
- });
- int result = fc.showOpenDialog(Main.parent);
-
- if (result != JFileChooser.APPROVE_OPTION) {
- return null;
- } else {
- return fc.getSelectedFile();
- }
- }
-
- private void runAsBackgroundTask(final Runnable task, final ActionListener after) {
- /*
- * run @task in background (asychronosly , run @after when @task has finished
- */
- this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- Thread t = new Thread(new Runnable() {
- @Override
- public void run() {
- task.run();
-
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
- after.actionPerformed(null);
- }
- });
- }
- });
- t.start();
- }
-
- private PathOptimizer loadPDF(File fileName, ProgressMonitor monitor) {
- /*
- * postprocess load PDF-file according to options
- */
-
- monitor.beginTask("", 100);
- monitor.setTicks(0);
- monitor.setCustomText(tr("Preparing"));
-
- double nodesTolerance = 0.0;
- Color color = null;
- int maxPaths = Integer.MAX_VALUE;
-
- if (configPanel.mergeCloseNodesCheck.getValue() && configPanel.mergeCloseNodesTolerance.isDataValid()) {
- nodesTolerance = configPanel.mergeCloseNodesTolerance.getValue();
- }
-
- if (configPanel.colorFilterCheck.getValue()) {
- try {
- String colString = this.configPanel.colorFilterColor.getText().replace("#", "");
- color = new Color(Integer.parseInt(colString, 16));
- } catch (Exception e) {
- JOptionPane.showMessageDialog(Main.parent, tr("Could not parse color"));
- return null;
- }
- }
-
- if (configPanel.limitPathCountCheck.getValue() && configPanel.limitPathCount.isDataValid()) {
- maxPaths = configPanel.limitPathCount.getValue();
- }
-
- monitor.setTicks(10);
- monitor.setCustomText(tr("Parsing file"));
-
- PathOptimizer data = new PathOptimizer(nodesTolerance, color, configPanel.splitOnColorChangeCheck.getValue());
-
- try {
- PdfBoxParser parser = new PdfBoxParser(data);
- parser.parse(fileName, maxPaths, monitor.createSubTaskMonitor(80, false));
-
- } catch (FileNotFoundException e1) {
- JOptionPane.showMessageDialog(Main.parent, tr("File not found."));
- return null;
- } catch (Exception e) {
- e.printStackTrace();
- JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing: {0}", e.getMessage()));
- return null;
- }
-
- monitor.setTicks(80);
-
- if (configPanel.removeParallelSegmentsCheck.getValue() && configPanel.removeParallelSegmentsTolerance.isDataValid()) {
- double tolerance = configPanel.removeParallelSegmentsTolerance.getValue();
- monitor.setCustomText(tr("Removing parallel segments"));
- }
-
- if (nodesTolerance > 0.0) {
- monitor.setTicks(83);
- monitor.setCustomText(tr("Joining nodes"));
- data.mergeNodes();
- }
-
- monitor.setTicks(85);
- monitor.setCustomText(tr("Joining adjacent segments"));
- data.mergeSegments();
-
- if (configPanel.removeSmallObjectsCheck.getValue() && configPanel.removeSmallObjectsSize.isDataValid()) {
- double tolerance = configPanel.removeSmallObjectsSize.getValue();
- monitor.setTicks(90);
- monitor.setCustomText(tr("Removing small objects"));
-
- data.removeSmallObjects(tolerance);
-
- }
-
- if (configPanel.removeLargeObjectsCheck.getValue() && configPanel.removeLargeObjectsSize.isDataValid()) {
- double tolerance = configPanel.removeLargeObjectsSize.getValue();
- monitor.setTicks(90);
- monitor.setCustomText(tr("Removing large objects"));
- data.removeLargeObjects(tolerance);
- }
-
- monitor.setTicks(95);
- monitor.setCustomText(tr("Finalizing layers"));
- data.splitLayersByPathKind(configPanel.splitOnShapeClosedCheck.getValue(),
- configPanel.splitOnSingleSegmentCheck.getValue(),
- configPanel.splitOnOrthogonalCheck.getValue());
- data.finish();
-
- monitor.finishTask();
- return data;
- }
-
- private OsmDataLayer makeLayer(String name, FilePlacement placement, OsmBuilder.Mode mode,
- ProgressMonitor monitor) {
- /*
- * create a layer from data
- */
- monitor.beginTask(tr("Building JOSM layer"), 100);
- OsmBuilder builder = new OsmBuilder(placement);
- DataSet data = builder.build(pdfData.getLayers(), mode, monitor.createSubTaskMonitor(50, false));
- data.setUploadPolicy(UploadPolicy.BLOCKED);
- monitor.setTicks(50);
- monitor.setCustomText(tr("Postprocessing layer"));
- OsmDataLayer result = new OsmDataLayer(data, name, null);
- result.setUploadDiscouraged(true);
- result.setBackgroundLayer(true);
- result.onPostLoadFromFile();
-
- monitor.finishTask();
- return result;
- }
-
- private void removeLayer() {
- /*
- * remove preview layer
- */
-// if (dataLayer != null) {
-// MainApplication.getLayerManager().removeLayer(dataLayer);
-// dataLayer.data.clear(); // saves memory
-// dataLayer = null;
-// }
- Preview.clear();
- // No layer ==> no actions
- actionPanel.showButton.setEnabled(false);
- actionPanel.saveButton.setEnabled(false);
- actionPanel.okButton.setEnabled(false);
- placementPanel.setEnabled(false);
-
- }
-
- private void saveLayer(java.io.File file, FilePlacement placement, ProgressMonitor monitor) {
- /*
- * save layer to file
- * TODO: is this methode valuable? Functionality can easily performed from Main-Menu
- */
- monitor.beginTask(tr("Saving to file."), 1000);
-
- OsmBuilder builder = new OsmBuilder(placement);
- DataSet data = builder.build(this.pdfData.getLayers(), OsmBuilder.Mode.Final,
- monitor.createSubTaskMonitor(500, false));
- OsmDataLayer layer = new OsmDataLayer(data, file.getName(), file);
-
- monitor.setCustomText(tr(" Writing to file"));
- monitor.setTicks(500);
-
- OsmExporter exporter = new OsmExporter();
-
- try {
- exporter.exportData(file, layer);
- } catch (IOException e) {
- Logging.error(e);
- }
-
- monitor.finishTask();
- }
+ private OsmDataLayer newLayer;
+
+ private LoadProgressRenderer progressRenderer;
+
+ public LoadPdfDialog() {
+ buildGUI();
+ removeLayer();
+ if (Preferences.getGuiMode() == Preferences.GuiMode.Simple) {
+ loadFileButton.setVisible(false);
+ configPanel.panel.setVisible(false);
+ actionPanel.saveButton.setVisible(false);
+ actionPanel.showButton.setVisible(false);
+ setSize(new Dimension(380, 350));
+ if (!loadAction()) {
+ cancelAction();
+ return;
+ }
+ } else {
+ setSize(new Dimension(450, 600));
+ }
+ setAlwaysOnTop(true);
+ setVisible(true);
+ }
+
+ Component placementPanel = placement.getGui();
+ MainButtons actionPanel = new MainButtons();
+ Config configPanel = new Config();
+
+ private void buildGUI() {
+ /*
+ * build the GUI from Components
+ */
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridheight = 1;
+ c.gridwidth = 1;
+ c.gridx = 0;
+ c.gridy = GridBagConstraints.RELATIVE;
+ c.fill = GridBagConstraints.BOTH;
+ c.insets = new java.awt.Insets(0, 0, 0, 0);
+
+ actionPanel.build(this);
+
+ loadFileButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ loadAction();
+ }
+ });
+
+ progressRenderer = new LoadProgressRenderer(loadProgress);
+
+ JPanel panel = new JPanel(new GridBagLayout());
+
+ panel.add(configPanel.getComponent(), c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ panel.add(loadFileButton, c);
+ c.fill = GridBagConstraints.BOTH;
+ panel.add(placementPanel, c);
+ panel.add(actionPanel.panel, c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ panel.add(this.loadProgress, c);
+
+ setContentPane(panel);
+ addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ cancelAction();
+ }
+ });
+ placement.setDependsOnValid(actionPanel.okButton);
+
+ /*
+ * TODO: Make okButton to default Button of Dialog, make cancelButton to react on ESC-Key
+ */
+// SwingUtilities.getRootPane(panel).setDefaultButton(actionPanel.okButton);
+ }
+
+ private boolean loadAction() {
+ /*
+ * perform load PDF file to preview
+ * TODO: load preview to previous placement, involves reverse transform
+ */
+ final File newFileName = this.chooseFile();
+
+ if (newFileName == null) {
+ return false;
+ }
+ Logging.debug("PdfImport: Load Preview");
+ this.removeLayer();
+
+ this.loadFileButton.setEnabled(false);
+
+ this.runAsBackgroundTask(new Runnable() {
+ @Override
+ public void run() {
+ // async part
+ LoadPdfDialog.this.loadProgress.setVisible(true);
+ SwingRenderingProgressMonitor monitor = new SwingRenderingProgressMonitor(progressRenderer);
+ monitor.beginTask("Loading file", 1000);
+ pdfData = loadPDF(newFileName, monitor.createSubTaskMonitor(500, false));
+ OsmBuilder.Mode mode = LoadPdfDialog.this.configPanel.debugModeCheck.getValue()
+ ? OsmBuilder.Mode.Debug
+ : OsmBuilder.Mode.Draft;
+
+ if (pdfData != null) {
+ LoadPdfDialog.this.newLayer = LoadPdfDialog.this.makeLayer(
+ tr("PDF preview: ") + newFileName.getName(), new FilePlacement(), mode,
+ monitor.createSubTaskMonitor(500, false));
+ }
+
+ monitor.finishTask();
+ progressRenderer.finish();
+ }
+ }, new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ // sync part
+ LoadPdfDialog.this.pdfFile = newFileName;
+ if (pdfData != null) {
+ Preview.set(newLayer, new FilePlacement());
+ MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
+ try {
+ LoadPdfDialog.this.placement.load(newFileName);
+ } catch (IOException e) {
+ // Saved placement does not exist, corrupt, ... ---> ignore it
+ } finally {
+ LoadPdfDialog.this.placement.verify();
+ }
+ LoadPdfDialog.this.newLayer = null;
+ LoadPdfDialog.this.loadFileButton.setEnabled(true);
+ LoadPdfDialog.this.placementPanel.setEnabled(true);
+ LoadPdfDialog.this.actionPanel.panel.setEnabled(true);
+ LoadPdfDialog.this.actionPanel.showButton.setEnabled(true);
+ LoadPdfDialog.this.actionPanel.saveButton.setEnabled(true);
+ LoadPdfDialog.this.actionPanel.okButton.setEnabled(true);
+ LoadPdfDialog.this.loadProgress.setVisible(false);
+ }
+ }
+ });
+ return true;
+ }
+
+ private void importAction() {
+
+ if (!placement.isValid()) return;
+ try {
+ placement.save(pdfFile);
+ } catch (IOException e) {
+ e.toString();
+ }
+ removeLayer();
+
+ runAsBackgroundTask(new Runnable() {
+ @Override
+ public void run() {
+ // async part
+ LoadPdfDialog.this.loadProgress.setVisible(true);
+ SwingRenderingProgressMonitor monitor = new SwingRenderingProgressMonitor(progressRenderer);
+ LoadPdfDialog.this.newLayer = LoadPdfDialog.this.makeLayer(tr("PDF: ") + pdfFile.getName(), placement,
+ OsmBuilder.Mode.Final, monitor);
+ progressRenderer.finish();
+ }
+ }, new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ // sync part
+ // rebuild layer with latest projection
+ MainApplication.getLayerManager().addLayer(newLayer);
+ MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
+ LoadPdfDialog.this.setVisible(false);
+ }
+ });
+ }
+
+ private void saveAction() {
+ /*
+ * perform save preview layer to file
+ * TODO: is this action valueable? Can be easily performed from main menu
+ */
+
+ if (!placement.isValid()) return;
+
+ final java.io.File file = this.chooseSaveFile();
+
+ if (file == null) {
+ return;
+ }
+
+ this.removeLayer();
+
+ this.runAsBackgroundTask(new Runnable() {
+ @Override
+ public void run() {
+ // async part
+ SwingRenderingProgressMonitor monitor = new SwingRenderingProgressMonitor(progressRenderer);
+ LoadPdfDialog.this.saveLayer(file, placement, monitor);
+ progressRenderer.finish();
+ }
+ }, new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ // sync part
+ LoadPdfDialog.this.setVisible(false);
+ }
+ });
+ }
+
+ private void showAction() {
+ /*
+ * perform show action
+ * TODO: is this action valuable? User can do it easy from OSM Main Menu
+ */
+ if (!placement.isValid()) return;
+
+ // zoom to new location
+ MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
+ MainApplication.getMap().repaint();
+ }
+
+ private void cancelAction() {
+ /*
+ * perform cancel action
+ */
+ removeLayer();
+ setVisible(false);
+ }
+
+ // Implementation methods
+
+ private static JFileChooser loadChooser = null;
+
+ private java.io.File chooseFile() {
+ // get PDF file to load
+ if (loadChooser == null) {
+ loadChooser = new JFileChooser(Preferences.getLoadDir());
+ loadChooser.setAcceptAllFileFilterUsed(false);
+ loadChooser.setMultiSelectionEnabled(false);
+ loadChooser.setFileFilter(new FileFilter() {
+ @Override
+ public boolean accept(java.io.File pathname) {
+ return pathname.isDirectory() || pathname.getName().endsWith(".pdf");
+ }
+
+ @Override
+ public String getDescription() {
+ return tr("PDF files");
+ }
+ });
+ } else {
+ loadChooser.rescanCurrentDirectory();
+ }
+ int result = loadChooser.showDialog(this, tr("Import PDF"));
+ if (result != JFileChooser.APPROVE_OPTION) {
+ return null;
+ } else {
+ Preferences.setLoadDir(loadChooser.getSelectedFile().getParentFile().getAbsolutePath());
+ return loadChooser.getSelectedFile();
+ }
+ }
+
+ private java.io.File chooseSaveFile() {
+ // get file name
+ JFileChooser fc = new JFileChooser();
+ fc.setAcceptAllFileFilterUsed(true);
+ fc.setMultiSelectionEnabled(false);
+ fc.setFileFilter(new FileFilter() {
+ @Override
+ public boolean accept(java.io.File pathname) {
+ return pathname.isDirectory() || pathname.getName().endsWith(".osm");
+ }
+
+ @Override
+ public String getDescription() {
+ return tr("OSM files");
+ }
+ });
+ int result = fc.showOpenDialog(MainApplication.getMainFrame());
+
+ if (result != JFileChooser.APPROVE_OPTION) {
+ return null;
+ } else {
+ return fc.getSelectedFile();
+ }
+ }
+
+ private void runAsBackgroundTask(final Runnable task, final ActionListener after) {
+ /*
+ * run @task in background (asychronosly , run @after when @task has finished
+ */
+ this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ task.run();
+
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ after.actionPerformed(null);
+ }
+ });
+ }
+ });
+ t.start();
+ }
+
+ private PathOptimizer loadPDF(File fileName, ProgressMonitor monitor) {
+ /*
+ * postprocess load PDF-file according to options
+ */
+
+ monitor.beginTask("", 100);
+ monitor.setTicks(0);
+ monitor.setCustomText(tr("Preparing"));
+
+ double nodesTolerance = 0.0;
+ Color color = null;
+ int maxPaths = Integer.MAX_VALUE;
+
+ if (configPanel.mergeCloseNodesCheck.getValue() && configPanel.mergeCloseNodesTolerance.isDataValid()) {
+ nodesTolerance = configPanel.mergeCloseNodesTolerance.getValue();
+ }
+
+ if (configPanel.colorFilterCheck.getValue()) {
+ try {
+ String colString = this.configPanel.colorFilterColor.getText().replace("#", "");
+ color = new Color(Integer.parseInt(colString, 16));
+ } catch (Exception e) {
+ JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Could not parse color"));
+ return null;
+ }
+ }
+
+ if (configPanel.limitPathCountCheck.getValue() && configPanel.limitPathCount.isDataValid()) {
+ maxPaths = configPanel.limitPathCount.getValue();
+ }
+
+ monitor.setTicks(10);
+ monitor.setCustomText(tr("Parsing file"));
+
+ PathOptimizer data = new PathOptimizer(nodesTolerance, color, configPanel.splitOnColorChangeCheck.getValue());
+
+ try {
+ PdfBoxParser parser = new PdfBoxParser(data);
+ parser.parse(fileName, maxPaths, monitor.createSubTaskMonitor(80, false));
+
+ } catch (FileNotFoundException e1) {
+ JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("File not found."));
+ return null;
+ } catch (Exception e) {
+ e.printStackTrace();
+ JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Error while parsing: {0}", e.getMessage()));
+ return null;
+ }
+
+ monitor.setTicks(80);
+
+ if (configPanel.removeParallelSegmentsCheck.getValue() && configPanel.removeParallelSegmentsTolerance.isDataValid()) {
+ double tolerance = configPanel.removeParallelSegmentsTolerance.getValue();
+ monitor.setCustomText(tr("Removing parallel segments"));
+ }
+
+ if (nodesTolerance > 0.0) {
+ monitor.setTicks(83);
+ monitor.setCustomText(tr("Joining nodes"));
+ data.mergeNodes();
+ }
+
+ monitor.setTicks(85);
+ monitor.setCustomText(tr("Joining adjacent segments"));
+ data.mergeSegments();
+
+ if (configPanel.removeSmallObjectsCheck.getValue() && configPanel.removeSmallObjectsSize.isDataValid()) {
+ double tolerance = configPanel.removeSmallObjectsSize.getValue();
+ monitor.setTicks(90);
+ monitor.setCustomText(tr("Removing small objects"));
+
+ data.removeSmallObjects(tolerance);
+
+ }
+
+ if (configPanel.removeLargeObjectsCheck.getValue() && configPanel.removeLargeObjectsSize.isDataValid()) {
+ double tolerance = configPanel.removeLargeObjectsSize.getValue();
+ monitor.setTicks(90);
+ monitor.setCustomText(tr("Removing large objects"));
+ data.removeLargeObjects(tolerance);
+ }
+
+ monitor.setTicks(95);
+ monitor.setCustomText(tr("Finalizing layers"));
+ data.splitLayersByPathKind(configPanel.splitOnShapeClosedCheck.getValue(),
+ configPanel.splitOnSingleSegmentCheck.getValue(),
+ configPanel.splitOnOrthogonalCheck.getValue());
+ data.finish();
+
+ monitor.finishTask();
+ return data;
+ }
+
+ private OsmDataLayer makeLayer(String name, FilePlacement placement, OsmBuilder.Mode mode,
+ ProgressMonitor monitor) {
+ /*
+ * create a layer from data
+ */
+ monitor.beginTask(tr("Building JOSM layer"), 100);
+ OsmBuilder builder = new OsmBuilder(placement);
+ DataSet data = builder.build(pdfData.getLayers(), mode, monitor.createSubTaskMonitor(50, false));
+ data.setUploadPolicy(UploadPolicy.BLOCKED);
+ monitor.setTicks(50);
+ monitor.setCustomText(tr("Postprocessing layer"));
+ OsmDataLayer result = new OsmDataLayer(data, name, null);
+ result.setUploadDiscouraged(true);
+ result.setBackgroundLayer(true);
+ result.onPostLoadFromFile();
+
+ monitor.finishTask();
+ return result;
+ }
+
+ private void removeLayer() {
+ /*
+ * remove preview layer
+ */
+// if (dataLayer != null) {
+// MainApplication.getLayerManager().removeLayer(dataLayer);
+// dataLayer.data.clear(); // saves memory
+// dataLayer = null;
+// }
+ Preview.clear();
+ // No layer ==> no actions
+ actionPanel.showButton.setEnabled(false);
+ actionPanel.saveButton.setEnabled(false);
+ actionPanel.okButton.setEnabled(false);
+ placementPanel.setEnabled(false);
+
+ }
+
+ private void saveLayer(java.io.File file, FilePlacement placement, ProgressMonitor monitor) {
+ /*
+ * save layer to file
+ * TODO: is this methode valuable? Functionality can easily performed from Main-Menu
+ */
+ monitor.beginTask(tr("Saving to file."), 1000);
+
+ OsmBuilder builder = new OsmBuilder(placement);
+ DataSet data = builder.build(this.pdfData.getLayers(), OsmBuilder.Mode.Final,
+ monitor.createSubTaskMonitor(500, false));
+ OsmDataLayer layer = new OsmDataLayer(data, file.getName(), file);
+
+ monitor.setCustomText(tr(" Writing to file"));
+ monitor.setTicks(500);
+
+ OsmExporter exporter = new OsmExporter();
+
+ try {
+ exporter.exportData(file, layer);
+ } catch (IOException e) {
+ Logging.error(e);
+ }
+
+ monitor.finishTask();
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java (revision 34541)
@@ -33,7 +33,7 @@
//show dialog asking to select coordinate axes and input coordinates and projection.
- /*
- * TODO: make dialog reusable
- */
+ /*
+ * TODO: make dialog reusable
+ */
LoadPdfDialog dialog = new LoadPdfDialog();
dialog.setTitle(tr("Import PDF"));
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java (revision 34541)
@@ -14,45 +14,41 @@
* A plugin to import a PDF file.
*/
-
public class PdfImportPlugin extends Plugin {
+ public PdfImportPlugin(PluginInformation info) {
+ super(info);
+ MainMenu.add(MainApplication.getMenu().imagerySubMenu, new PdfImportAction());
+ new Preferences(getPluginInformation().name);
+ }
- public PdfImportPlugin(PluginInformation info) {
- super(info);
- MainMenu.add(MainApplication.getMenu().imagerySubMenu, new PdfImportAction());
- new Preferences(getPluginInformation().name);
- }
+ public static class pdfimportPrefs implements SubPreferenceSetting {
+ @Override
+ public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
+ return null;
+ }
- public class pdfimportPrefs implements SubPreferenceSetting
- {
- @Override
- public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui)
- {
- return null;
- }
+ @Override
+ public void addGui(PreferenceTabbedPane gui) {
+ return;
+ }
- @Override
- public void addGui(PreferenceTabbedPane gui) {
- return;
- }
+ @Override
+ public boolean ok() {
+ return false;
+ }
- @Override
- public boolean ok() {
- return false;
- }
+ @Override
+ public boolean isExpert() {
+ return false;
+ }
+ }
- @Override
- public boolean isExpert() {
- return false;
- }
- }
-
- @Override
- public PreferenceSetting getPreferenceSetting() {
- /*
- * TODO: implement it
- */
- return new pdfimportPrefs();
- }
+ @Override
+ public PreferenceSetting getPreferenceSetting() {
+ /*
+ * TODO: implement it
+ */
+ return new pdfimportPrefs();
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/Preferences.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/Preferences.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/Preferences.java (revision 34541)
@@ -8,115 +8,115 @@
public class Preferences {
- public enum GuiMode {
- Auto, Expert, Simple
- };
+ public enum GuiMode {
+ Auto, Expert, Simple
+ };
- public static String getLoadDir() {
- return Config.getPref().get(Preferences.prefix + "loadDir");
- }
+ public static String getLoadDir() {
+ return Config.getPref().get(Preferences.prefix + "loadDir");
+ }
- public static void setLoadDir(String loadDir) {
- Config.getPref().put(Preferences.prefix + "loadDir", loadDir);
- }
+ public static void setLoadDir(String loadDir) {
+ Config.getPref().put(Preferences.prefix + "loadDir", loadDir);
+ }
- public static GuiMode getGuiMode() {
- int GuiCode = Config.getPref().getInt(Preferences.prefix + "guiCode", 0);
- switch (GuiCode) {
- case -1:
- case 1:
- return GuiMode.Expert;
- case 2:
- return GuiMode.Simple;
- default:
- if (Config.getPref().getBoolean("expert"))
- return GuiMode.Expert;
- else
- return GuiMode.Simple;
- }
- }
+ public static GuiMode getGuiMode() {
+ int GuiCode = Config.getPref().getInt(Preferences.prefix + "guiCode", 0);
+ switch (GuiCode) {
+ case -1:
+ case 1:
+ return GuiMode.Expert;
+ case 2:
+ return GuiMode.Simple;
+ default:
+ if (Config.getPref().getBoolean("expert"))
+ return GuiMode.Expert;
+ else
+ return GuiMode.Simple;
+ }
+ }
- public static boolean isLegacyActions() {
- return (Config.getPref().getInt(Preferences.prefix + "guiCode", 0) == -1);
- }
+ public static boolean isLegacyActions() {
+ return (Config.getPref().getInt(Preferences.prefix + "guiCode", 0) == -1);
+ }
- public static boolean isMergeNodes() {
- return Config.getPref().getBoolean(Preferences.prefix + "mergeNodes");
- }
+ public static boolean isMergeNodes() {
+ return Config.getPref().getBoolean(Preferences.prefix + "mergeNodes");
+ }
- public static double getMergeNodesValue() {
- return Config.getPref().getDouble(Preferences.prefix + "mergeNodes.value", 1e-3);
- }
+ public static double getMergeNodesValue() {
+ return Config.getPref().getDouble(Preferences.prefix + "mergeNodes.value", 1e-3);
+ }
- public static boolean isRemoveSmall() {
- return Config.getPref().getBoolean(Preferences.prefix + "removeSmall");
- }
+ public static boolean isRemoveSmall() {
+ return Config.getPref().getBoolean(Preferences.prefix + "removeSmall");
+ }
- public static double getRemoveSmallValue() {
- return Config.getPref().getDouble(Preferences.prefix + "removeSmall.value", 1);
- }
+ public static double getRemoveSmallValue() {
+ return Config.getPref().getDouble(Preferences.prefix + "removeSmall.value", 1);
+ }
- public static boolean isRemoveLarge() {
- return Config.getPref().getBoolean(Preferences.prefix + "removeLarge");
- }
+ public static boolean isRemoveLarge() {
+ return Config.getPref().getBoolean(Preferences.prefix + "removeLarge");
+ }
- public static double getRemoveLargeValue() {
- return Config.getPref().getDouble(Preferences.prefix + "removeLarge.value", 10);
- }
+ public static double getRemoveLargeValue() {
+ return Config.getPref().getDouble(Preferences.prefix + "removeLarge.value", 10);
+ }
- public static boolean isRemoveParallel() {
- return Config.getPref().getBoolean(Preferences.prefix + "removeParallel");
- }
+ public static boolean isRemoveParallel() {
+ return Config.getPref().getBoolean(Preferences.prefix + "removeParallel");
+ }
- public static double getRemoveParallelValue() {
- return Config.getPref().getDouble(Preferences.prefix + "removeParallel.value", 3);
- }
+ public static double getRemoveParallelValue() {
+ return Config.getPref().getDouble(Preferences.prefix + "removeParallel.value", 3);
+ }
- public static boolean isLimitPath() {
- return Config.getPref().getBoolean(Preferences.prefix + "limitPath");
- }
+ public static boolean isLimitPath() {
+ return Config.getPref().getBoolean(Preferences.prefix + "limitPath");
+ }
- public static int getLimitPathValue() {
- return Config.getPref().getInt(Preferences.prefix + "limitPath.value", Integer.MAX_VALUE);
- }
+ public static int getLimitPathValue() {
+ return Config.getPref().getInt(Preferences.prefix + "limitPath.value", Integer.MAX_VALUE);
+ }
- public static boolean isLimitColor() {
- return Config.getPref().getBoolean(Preferences.prefix + "limitColor");
- }
+ public static boolean isLimitColor() {
+ return Config.getPref().getBoolean(Preferences.prefix + "limitColor");
+ }
- public static String getLimitColorValue() {
- return Config.getPref().get(Preferences.prefix + "limitColor.value","#000000");
- }
+ public static String getLimitColorValue() {
+ return Config.getPref().get(Preferences.prefix + "limitColor.value","#000000");
+ }
- public static boolean isDebugTags() {
- return Config.getPref().getBoolean(Preferences.prefix + "debugTags");
- }
+ public static boolean isDebugTags() {
+ return Config.getPref().getBoolean(Preferences.prefix + "debugTags");
+ }
- public static boolean isLayerClosed() {
- return Config.getPref().getBoolean(Preferences.prefix + "layerClosed");
- }
+ public static boolean isLayerClosed() {
+ return Config.getPref().getBoolean(Preferences.prefix + "layerClosed");
+ }
- public static boolean isLayerSegment() {
- return Config.getPref().getBoolean(Preferences.prefix + "layerSegment");
- }
+ public static boolean isLayerSegment() {
+ return Config.getPref().getBoolean(Preferences.prefix + "layerSegment");
+ }
- public static boolean isLayerAttribChange() {
- return Config.getPref().getBoolean(Preferences.prefix + "layerAttribChanges");
- }
+ public static boolean isLayerAttribChange() {
+ return Config.getPref().getBoolean(Preferences.prefix + "layerAttribChanges");
+ }
- public static boolean isLayerOrtho() {
- return Config.getPref().getBoolean(Preferences.prefix + "layerOrtho");
- }
+ public static boolean isLayerOrtho() {
+ return Config.getPref().getBoolean(Preferences.prefix + "layerOrtho");
+ }
- protected static int GuiCode;
+ protected static int GuiCode;
- private static String prefix;
+ private static String prefix;
- private Preferences() {
- return;
- }
+ private Preferences() {
+ return;
+ }
- public Preferences (String p) {
- prefix = p + "." ;
- }
+ public Preferences (String p) {
+ prefix = p + "." ;
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/Preview.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/Preview.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/Preview.java (revision 34541)
@@ -3,6 +3,4 @@
*/
package pdfimport;
-
-import java.io.File;
import org.openstreetmap.josm.gui.MainApplication;
@@ -16,27 +14,27 @@
*/
public class Preview {
- public static OsmDataLayer dataLayer;
- public static FilePlacement placement;
-
- public static synchronized void set (@NotNull OsmDataLayer dataLayer, @NotNull FilePlacement placement) {
- clear();
- Preview.dataLayer = dataLayer;
- Preview.placement = placement;
- MainApplication.getLayerManager().addLayer(dataLayer);
+ public static OsmDataLayer dataLayer;
+ public static FilePlacement placement;
+
+ public static synchronized void set (@NotNull OsmDataLayer dataLayer, @NotNull FilePlacement placement) {
+ clear();
+ Preview.dataLayer = dataLayer;
+ Preview.placement = placement;
+ MainApplication.getLayerManager().addLayer(dataLayer);
- }
-
- public static void clear() {
- if (Preview.dataLayer != null) {
- MainApplication.getLayerManager().removeLayer(Preview.dataLayer);
- Preview.dataLayer.data.clear(); // saves memory
- }
- Preview.dataLayer = null;
- Preview.placement = null;
- }
-
- public void save() {
-// TODO: implement
- }
+ }
+
+ public static void clear() {
+ if (Preview.dataLayer != null) {
+ MainApplication.getLayerManager().removeLayer(Preview.dataLayer);
+ Preview.dataLayer.data.clear(); // saves memory
+ }
+ Preview.dataLayer = null;
+ Preview.placement = null;
+ }
+
+ public void save() {
+// TODO: implement
+ }
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/ProjectionInfo.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/ProjectionInfo.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/ProjectionInfo.java (revision 34541)
@@ -26,12 +26,12 @@
}
- public static Projection getProjectionByCode(String code) {
- try {
- ProjectionChoice pc = new SingleProjectionChoice(code.toString(), code.toString(), code);
- Projection p = pc.getProjection();
- return p;
- } catch (Exception e) {
- throw new IllegalArgumentException();
- }
+ public static Projection getProjectionByCode(String code) {
+ try {
+ ProjectionChoice pc = new SingleProjectionChoice(code.toString(), code.toString(), code);
+ Projection p = pc.getProjection();
+ return p;
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
+ }
// Projection p = allCodes.get(code);
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PageDrawer.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PageDrawer.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PageDrawer.java (revision 34541)
@@ -39,4 +39,5 @@
import org.apache.pdfbox.util.ResourceLoader;
import org.apache.pdfbox.util.TextPosition;
+import org.openstreetmap.josm.tools.Logging;
@@ -140,6 +141,6 @@
graphics.setClip(getGraphicsState().getCurrentClippingPath());
graphics.drawString(x, y, text.getCharacter(), color);
- } catch (IOException io) {
- io.printStackTrace();
+ } catch (IOException e) {
+ Logging.error(e);
}
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/AppendRectangleToPath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/AppendRectangleToPath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/AppendRectangleToPath.java (revision 34541)
@@ -38,42 +38,42 @@
- /**
- * process : re : append rectangle to path.
- * @param operator The operator that is being executed.
- * @param arguments List
- */
- @Override
- public void process(PDFOperator operator, List arguments)
- {
- PageDrawer drawer = (PageDrawer)context;
+ /**
+ * process : re : append rectangle to path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments)
+ {
+ PageDrawer drawer = (PageDrawer)context;
- COSNumber x = (COSNumber)arguments.get( 0 );
- COSNumber y = (COSNumber)arguments.get( 1 );
- COSNumber w = (COSNumber)arguments.get( 2 );
- COSNumber h = (COSNumber)arguments.get( 3 );
+ COSNumber x = (COSNumber)arguments.get( 0 );
+ COSNumber y = (COSNumber)arguments.get( 1 );
+ COSNumber w = (COSNumber)arguments.get( 2 );
+ COSNumber h = (COSNumber)arguments.get( 3 );
- double x1 = x.doubleValue();
- double y1 = y.doubleValue();
- // create a pair of coordinates for the transformation
- double x2 = w.doubleValue()+x1;
- double y2 = h.doubleValue()+y1;
+ double x1 = x.doubleValue();
+ double y1 = y.doubleValue();
+ // create a pair of coordinates for the transformation
+ double x2 = w.doubleValue()+x1;
+ double y2 = h.doubleValue()+y1;
- Point2D startCoords = drawer.transformedPoint(x1,y1);
- Point2D endCoords = drawer.transformedPoint(x2,y2);
+ Point2D startCoords = drawer.transformedPoint(x1,y1);
+ Point2D endCoords = drawer.transformedPoint(x2,y2);
- float width = (float)(endCoords.getX()-startCoords.getX());
- float height = (float)(endCoords.getY()-startCoords.getY());
- float xStart = (float)startCoords.getX();
- float yStart = (float)startCoords.getY();
+ float width = (float)(endCoords.getX()-startCoords.getX());
+ float height = (float)(endCoords.getY()-startCoords.getY());
+ float xStart = (float)startCoords.getX();
+ float yStart = (float)startCoords.getY();
- // To ensure that the path is created in the right direction,
- // we have to create it by combining single lines instead of
- // creating a simple rectangle
- GeneralPath path = drawer.getLinePath();
- path.moveTo(xStart, yStart);
- path.lineTo(xStart+width, yStart);
- path.lineTo(xStart+width, yStart+height);
- path.lineTo(xStart, yStart+height);
- path.lineTo(xStart, yStart);
- }
+ // To ensure that the path is created in the right direction,
+ // we have to create it by combining single lines instead of
+ // creating a simple rectangle
+ GeneralPath path = drawer.getLinePath();
+ path.moveTo(xStart, yStart);
+ path.lineTo(xStart+width, yStart);
+ path.lineTo(xStart+width, yStart+height);
+ path.lineTo(xStart, yStart+height);
+ path.lineTo(xStart, yStart);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/BeginInlineImage.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/BeginInlineImage.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/BeginInlineImage.java (revision 34541)
@@ -35,15 +35,15 @@
{
- /**
- * process : BI : begin inline image.
- * @param operator The operator that is being executed.
- * @param arguments List
- * @throws IOException If there is an error displaying the inline image.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawImage();
- }
+ /**
+ * process : BI : begin inline image.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ * @throws IOException If there is an error displaying the inline image.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawImage();
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClipEvenOddRule.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClipEvenOddRule.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClipEvenOddRule.java (revision 34541)
@@ -38,29 +38,29 @@
{
- /**
- * Log instance.
- */
- private static final Log log = LogFactory.getLog(ClipEvenOddRule.class);
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(ClipEvenOddRule.class);
- /**
- * process : W* : set clipping path using even odd rule.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException if there is an error during execution.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
+ /**
+ * process : W* : set clipping path using even odd rule.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException if there is an error during execution.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
- try
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.setClippingPath(GeneralPath.WIND_EVEN_ODD);
- }
- catch (Exception e)
- {
- log.warn(e, e);
- }
- }
+ try
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.setClippingPath(GeneralPath.WIND_EVEN_ODD);
+ }
+ catch (Exception e)
+ {
+ log.warn(e, e);
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClipNonZeroRule.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClipNonZeroRule.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClipNonZeroRule.java (revision 34541)
@@ -38,29 +38,29 @@
{
- /**
- * Log instance.
- */
- private static final Log log = LogFactory.getLog(ClipNonZeroRule.class);
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(ClipNonZeroRule.class);
- /**
- * process : W : Set the clipping path using non zero winding rule.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If there is an error during the processing.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
+ /**
+ * process : W : Set the clipping path using non zero winding rule.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If there is an error during the processing.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
- try
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.setClippingPath(GeneralPath.WIND_NON_ZERO);
- }
- catch (Exception e)
- {
- log.warn(e, e);
- }
- }
+ try
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.setClippingPath(GeneralPath.WIND_NON_ZERO);
+ }
+ catch (Exception e)
+ {
+ log.warn(e, e);
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CloseFillEvenOddAndStrokePath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CloseFillEvenOddAndStrokePath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CloseFillEvenOddAndStrokePath.java (revision 34541)
@@ -36,17 +36,17 @@
{
- /**
- * fill and stroke the path.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.getLinePath().closePath();
- drawer.drawPath(true, true, Path2D.WIND_EVEN_ODD);
- }
+ /**
+ * fill and stroke the path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.getLinePath().closePath();
+ drawer.drawPath(true, true, Path2D.WIND_EVEN_ODD);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CloseFillNonZeroAndStrokePath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CloseFillNonZeroAndStrokePath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CloseFillNonZeroAndStrokePath.java (revision 34541)
@@ -36,17 +36,17 @@
{
- /**
- * fill and stroke the path.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.getLinePath().closePath();
- drawer.drawPath(true, true, Path2D.WIND_NON_ZERO);
- }
+ /**
+ * fill and stroke the path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.getLinePath().closePath();
+ drawer.drawPath(true, true, Path2D.WIND_NON_ZERO);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClosePath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClosePath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/ClosePath.java (revision 34541)
@@ -34,16 +34,16 @@
{
- /**
- * process : h : Close path.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException if something went wrong during logging
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.getLinePath().closePath();
- }
+ /**
+ * process : h : Close path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException if something went wrong during logging
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.getLinePath().closePath();
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveTo.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveTo.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveTo.java (revision 34541)
@@ -37,27 +37,27 @@
- /**
- * process : c : Append curved segment to path.
- * @param operator The operator that is being executed.
- * @param arguments List
- */
- @Override
- public void process(PDFOperator operator, List arguments)
- {
- PageDrawer drawer = (PageDrawer)context;
+ /**
+ * process : c : Append curved segment to path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments)
+ {
+ PageDrawer drawer = (PageDrawer)context;
- COSNumber x1 = (COSNumber)arguments.get( 0 );
- COSNumber y1 = (COSNumber)arguments.get( 1 );
- COSNumber x2 = (COSNumber)arguments.get( 2 );
- COSNumber y2 = (COSNumber)arguments.get( 3 );
- COSNumber x3 = (COSNumber)arguments.get( 4 );
- COSNumber y3 = (COSNumber)arguments.get( 5 );
+ COSNumber x1 = (COSNumber)arguments.get( 0 );
+ COSNumber y1 = (COSNumber)arguments.get( 1 );
+ COSNumber x2 = (COSNumber)arguments.get( 2 );
+ COSNumber y2 = (COSNumber)arguments.get( 3 );
+ COSNumber x3 = (COSNumber)arguments.get( 4 );
+ COSNumber y3 = (COSNumber)arguments.get( 5 );
- Point2D point1 = drawer.transformedPoint(x1.doubleValue(), y1.doubleValue());
- Point2D point2 = drawer.transformedPoint(x2.doubleValue(), y2.doubleValue());
- Point2D point3 = drawer.transformedPoint(x3.doubleValue(), y3.doubleValue());
+ Point2D point1 = drawer.transformedPoint(x1.doubleValue(), y1.doubleValue());
+ Point2D point2 = drawer.transformedPoint(x2.doubleValue(), y2.doubleValue());
+ Point2D point3 = drawer.transformedPoint(x3.doubleValue(), y3.doubleValue());
- drawer.getLinePath().curveTo((float)point1.getX(), (float)point1.getY(),
- (float)point2.getX(), (float)point2.getY(), (float)point3.getX(), (float)point3.getY());
- }
+ drawer.getLinePath().curveTo((float)point1.getX(), (float)point1.getY(),
+ (float)point2.getX(), (float)point2.getY(), (float)point3.getX(), (float)point3.getY());
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveToReplicateFinalPoint.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveToReplicateFinalPoint.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveToReplicateFinalPoint.java (revision 34541)
@@ -37,24 +37,24 @@
- /**
- * process : y : Append curved segment to path (final point replicated).
- * @param operator The operator that is being executed.
- * @param arguments List
- */
- @Override
- public void process(PDFOperator operator, List arguments)
- {
- PageDrawer drawer = (PageDrawer)context;
+ /**
+ * process : y : Append curved segment to path (final point replicated).
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments)
+ {
+ PageDrawer drawer = (PageDrawer)context;
- COSNumber x1 = (COSNumber)arguments.get( 0 );
- COSNumber y1 = (COSNumber)arguments.get( 1 );
- COSNumber x3 = (COSNumber)arguments.get( 2 );
- COSNumber y3 = (COSNumber)arguments.get( 3 );
+ COSNumber x1 = (COSNumber)arguments.get( 0 );
+ COSNumber y1 = (COSNumber)arguments.get( 1 );
+ COSNumber x3 = (COSNumber)arguments.get( 2 );
+ COSNumber y3 = (COSNumber)arguments.get( 3 );
- Point2D point1 = drawer.transformedPoint(x1.doubleValue(), y1.doubleValue());
- Point2D point3 = drawer.transformedPoint(x3.doubleValue(), y3.doubleValue());
+ Point2D point1 = drawer.transformedPoint(x1.doubleValue(), y1.doubleValue());
+ Point2D point3 = drawer.transformedPoint(x3.doubleValue(), y3.doubleValue());
- drawer.getLinePath().curveTo((float)point1.getX(), (float)point1.getY(),
- (float)point3.getX(), (float)point3.getY(), (float)point3.getX(), (float)point3.getY());
- }
+ drawer.getLinePath().curveTo((float)point1.getX(), (float)point1.getY(),
+ (float)point3.getX(), (float)point3.getY(), (float)point3.getX(), (float)point3.getY());
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveToReplicateInitialPoint.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveToReplicateInitialPoint.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/CurveToReplicateInitialPoint.java (revision 34541)
@@ -38,26 +38,26 @@
- /**
- * process : v : Append curved segment to path (initial point replicated).
- * @param operator The operator that is being executed.
- * @param arguments List
- */
- @Override
- public void process(PDFOperator operator, List arguments)
- {
- PageDrawer drawer = (PageDrawer)context;
+ /**
+ * process : v : Append curved segment to path (initial point replicated).
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments)
+ {
+ PageDrawer drawer = (PageDrawer)context;
- COSNumber x2 = (COSNumber)arguments.get( 0 );
- COSNumber y2 = (COSNumber)arguments.get( 1 );
- COSNumber x3 = (COSNumber)arguments.get( 2 );
- COSNumber y3 = (COSNumber)arguments.get( 3 );
- GeneralPath path = drawer.getLinePath();
- Point2D currentPoint = path.getCurrentPoint();
+ COSNumber x2 = (COSNumber)arguments.get( 0 );
+ COSNumber y2 = (COSNumber)arguments.get( 1 );
+ COSNumber x3 = (COSNumber)arguments.get( 2 );
+ COSNumber y3 = (COSNumber)arguments.get( 3 );
+ GeneralPath path = drawer.getLinePath();
+ Point2D currentPoint = path.getCurrentPoint();
- Point2D point2 = drawer.transformedPoint(x2.doubleValue(), y2.doubleValue());
- Point2D point3 = drawer.transformedPoint(x3.doubleValue(), y3.doubleValue());
+ Point2D point2 = drawer.transformedPoint(x2.doubleValue(), y2.doubleValue());
+ Point2D point3 = drawer.transformedPoint(x3.doubleValue(), y3.doubleValue());
- drawer.getLinePath().curveTo((float)currentPoint.getX(), (float)currentPoint.getY(),
- (float)point2.getX(), (float)point2.getY(), (float)point3.getX(), (float)point3.getY());
- }
+ drawer.getLinePath().curveTo((float)currentPoint.getX(), (float)currentPoint.getY(),
+ (float)point2.getX(), (float)point2.getY(), (float)point3.getX(), (float)point3.getY());
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/EndPath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/EndPath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/EndPath.java (revision 34541)
@@ -35,14 +35,14 @@
- /**
- * process : n : End path.
- * @param operator The operator that is being executed.
- * @param arguments List
- */
- @Override
- public void process(PDFOperator operator, List arguments)
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.getLinePath().reset();
- }
+ /**
+ * process : n : End path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments)
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.getLinePath().reset();
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillEvenOddAndStrokePath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillEvenOddAndStrokePath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillEvenOddAndStrokePath.java (revision 34541)
@@ -36,16 +36,16 @@
{
- /**
- * fill and stroke the path.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawPath(true, true, Path2D.WIND_EVEN_ODD);
- }
+ /**
+ * fill and stroke the path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawPath(true, true, Path2D.WIND_EVEN_ODD);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillEvenOddRule.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillEvenOddRule.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillEvenOddRule.java (revision 34541)
@@ -38,29 +38,29 @@
{
- /**
- * Log instance.
- */
- private static final Log log = LogFactory.getLog(FillEvenOddRule.class);
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(FillEvenOddRule.class);
- /**
- * process : f* : fill path using even odd rule.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException if there is an error during execution.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- try
- {
- ///dwilson refactoring
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawPath(false, true, GeneralPath.WIND_EVEN_ODD);
- }
- catch (Exception e)
- {
- log.warn(e, e);
- }
- }
+ /**
+ * process : f* : fill path using even odd rule.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException if there is an error during execution.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ try
+ {
+ ///dwilson refactoring
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawPath(false, true, GeneralPath.WIND_EVEN_ODD);
+ }
+ catch (Exception e)
+ {
+ log.warn(e, e);
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillNonZeroAndStrokePath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillNonZeroAndStrokePath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillNonZeroAndStrokePath.java (revision 34541)
@@ -36,16 +36,16 @@
{
- /**
- * fill and stroke the path.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawPath(true, true, Path2D.WIND_NON_ZERO);
- }
+ /**
+ * fill and stroke the path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawPath(true, true, Path2D.WIND_NON_ZERO);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillNonZeroRule.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillNonZeroRule.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/FillNonZeroRule.java (revision 34541)
@@ -36,16 +36,16 @@
{
- /**
- * process : F/f : fill path using non zero winding rule.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If there is an error during the processing.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawPath(false, true, GeneralPath.WIND_NON_ZERO);
- }
+ /**
+ * process : F/f : fill path using non zero winding rule.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If there is an error during the processing.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawPath(false, true, GeneralPath.WIND_NON_ZERO);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/Invoke.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/Invoke.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/Invoke.java (revision 34541)
@@ -45,48 +45,48 @@
- /**
- * process : Do : Paint the specified XObject (section 4.7).
- * @param operator The operator that is being executed.
- * @param arguments List
- * @throws IOException If there is an error invoking the sub object.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- PDPage page = drawer.getPage();
- COSName objectName = (COSName)arguments.get( 0 );
- Map xobjects = drawer.getResources().getXObjects();
- PDXObject xobject = (PDXObject)xobjects.get( objectName.getName() );
- if( xobject instanceof PDXObjectImage )
- {
- drawer.drawImage();
- }
- else if(xobject instanceof PDXObjectForm)
- {
- PDXObjectForm form = (PDXObjectForm)xobject;
- COSStream invoke = (COSStream)form.getCOSObject();
- PDResources pdResources = form.getResources();
- if(pdResources == null)
- {
- pdResources = page.findResources();
- }
- // if there is an optional form matrix, we have to
- // map the form space to the user space
- Matrix matrix = form.getMatrix();
- if (matrix != null)
- {
- Matrix xobjectCTM = matrix.multiply( context.getGraphicsState().getCurrentTransformationMatrix());
- context.getGraphicsState().setCurrentTransformationMatrix(xobjectCTM);
- }
- getContext().processSubStream( page, pdResources, invoke );
- }
- else
- {
- //unknown xobject type
- }
+ /**
+ * process : Do : Paint the specified XObject (section 4.7).
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ * @throws IOException If there is an error invoking the sub object.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ PDPage page = drawer.getPage();
+ COSName objectName = (COSName)arguments.get( 0 );
+ Map xobjects = drawer.getResources().getXObjects();
+ PDXObject xobject = (PDXObject)xobjects.get( objectName.getName() );
+ if( xobject instanceof PDXObjectImage )
+ {
+ drawer.drawImage();
+ }
+ else if(xobject instanceof PDXObjectForm)
+ {
+ PDXObjectForm form = (PDXObjectForm)xobject;
+ COSStream invoke = (COSStream)form.getCOSObject();
+ PDResources pdResources = form.getResources();
+ if(pdResources == null)
+ {
+ pdResources = page.findResources();
+ }
+ // if there is an optional form matrix, we have to
+ // map the form space to the user space
+ Matrix matrix = form.getMatrix();
+ if (matrix != null)
+ {
+ Matrix xobjectCTM = matrix.multiply( context.getGraphicsState().getCurrentTransformationMatrix());
+ context.getGraphicsState().setCurrentTransformationMatrix(xobjectCTM);
+ }
+ getContext().processSubStream( page, pdResources, invoke );
+ }
+ else
+ {
+ //unknown xobject type
+ }
- //invoke named object.
- }
+ //invoke named object.
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/LineTo.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/LineTo.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/LineTo.java (revision 34541)
@@ -37,20 +37,20 @@
- /**
- * process : l : Append straight line segment to path.
- * @param operator The operator that is being executed.
- * @param arguments List
- */
- @Override
- public void process(PDFOperator operator, List arguments)
- {
- PageDrawer drawer = (PageDrawer)context;
+ /**
+ * process : l : Append straight line segment to path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments)
+ {
+ PageDrawer drawer = (PageDrawer)context;
- //append straight line segment from the current point to the point.
- COSNumber x = (COSNumber)arguments.get( 0 );
- COSNumber y = (COSNumber)arguments.get( 1 );
+ //append straight line segment from the current point to the point.
+ COSNumber x = (COSNumber)arguments.get( 0 );
+ COSNumber y = (COSNumber)arguments.get( 1 );
- Point2D pos = drawer.transformedPoint(x.doubleValue(), y.doubleValue());
- drawer.getLinePath().lineTo((float)pos.getX(), (float)pos.getY());
- }
+ Point2D pos = drawer.transformedPoint(x.doubleValue(), y.doubleValue());
+ drawer.getLinePath().lineTo((float)pos.getX(), (float)pos.getY());
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/MoveTo.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/MoveTo.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/MoveTo.java (revision 34541)
@@ -39,30 +39,30 @@
{
- /**
- * Log instance.
- */
- private static final Log log = LogFactory.getLog(MoveTo.class);
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(MoveTo.class);
- /**
- * process : m : Begin new subpath.
- * @param operator The operator that is being executed.
- * @param arguments List
- * @throws IOException If there is an error processing the operator.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- try
- {
- PageDrawer drawer = (PageDrawer)context;
- COSNumber x = (COSNumber)arguments.get( 0 );
- COSNumber y = (COSNumber)arguments.get( 1 );
- Point2D pos = drawer.transformedPoint(x.doubleValue(), y.doubleValue());
- drawer.getLinePath().moveTo((float)pos.getX(), (float)pos.getY());
- }
- catch (Exception exception)
- {
- log.warn( exception, exception);
- }
- }
+ /**
+ * process : m : Begin new subpath.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ * @throws IOException If there is an error processing the operator.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ try
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ COSNumber x = (COSNumber)arguments.get( 0 );
+ COSNumber y = (COSNumber)arguments.get( 1 );
+ Point2D pos = drawer.transformedPoint(x.doubleValue(), y.doubleValue());
+ drawer.getLinePath().moveTo((float)pos.getX(), (float)pos.getY());
+ }
+ catch (Exception exception)
+ {
+ log.warn( exception, exception);
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SHFill.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SHFill.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SHFill.java (revision 34541)
@@ -37,16 +37,16 @@
{
- /**
- * process : sh : shade fill the path or clipping area.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException if there is an error during execution.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawPath(false, true, Path2D.WIND_NON_ZERO);
- }
+ /**
+ * process : sh : shade fill the path or clipping area.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException if there is an error during execution.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawPath(false, true, Path2D.WIND_NON_ZERO);
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineCapStyle.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineCapStyle.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineCapStyle.java (revision 34541)
@@ -35,27 +35,27 @@
{
- /**
- * Set the line cap style.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- super.process( operator, arguments );
- int lineCapStyle = context.getGraphicsState().getLineCap();
- PageDrawer drawer = (PageDrawer)context;
- BasicStroke stroke = drawer.getStroke();
- if (stroke == null)
- {
- drawer.setStroke( new BasicStroke(1,lineCapStyle,BasicStroke.JOIN_MITER) );
- }
- else
- {
- drawer.setStroke( new BasicStroke(stroke.getLineWidth(), lineCapStyle, stroke.getLineJoin(),
- stroke.getMiterLimit(), stroke.getDashArray(), stroke.getDashPhase()));
- }
- }
+ /**
+ * Set the line cap style.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ super.process( operator, arguments );
+ int lineCapStyle = context.getGraphicsState().getLineCap();
+ PageDrawer drawer = (PageDrawer)context;
+ BasicStroke stroke = drawer.getStroke();
+ if (stroke == null)
+ {
+ drawer.setStroke( new BasicStroke(1,lineCapStyle,BasicStroke.JOIN_MITER) );
+ }
+ else
+ {
+ drawer.setStroke( new BasicStroke(stroke.getLineWidth(), lineCapStyle, stroke.getLineJoin(),
+ stroke.getMiterLimit(), stroke.getDashArray(), stroke.getDashPhase()));
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineDashPattern.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineDashPattern.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineDashPattern.java (revision 34541)
@@ -36,45 +36,45 @@
{
- /**
- * Set the line dash pattern.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- super.process( operator, arguments );
- PDLineDashPattern lineDashPattern = context.getGraphicsState().getLineDashPattern();
- PageDrawer drawer = (PageDrawer)context;
- BasicStroke stroke = drawer.getStroke();
- if (stroke == null)
- {
- if (lineDashPattern.isDashPatternEmpty())
- {
- drawer.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f) );
- }
- else
- {
- drawer.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f,
- lineDashPattern.getCOSDashPattern().toFloatArray(), lineDashPattern.getPhaseStart()) );
- }
- }
- else
- {
- if (lineDashPattern.isDashPatternEmpty())
- {
- drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(),
- stroke.getLineJoin(), stroke.getMiterLimit()) );
- }
- else
- {
- drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(), stroke.getLineJoin(),
- stroke.getMiterLimit(), lineDashPattern.getCOSDashPattern().toFloatArray(),
- lineDashPattern.getPhaseStart()) );
- }
- }
- }
+ /**
+ * Set the line dash pattern.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ super.process( operator, arguments );
+ PDLineDashPattern lineDashPattern = context.getGraphicsState().getLineDashPattern();
+ PageDrawer drawer = (PageDrawer)context;
+ BasicStroke stroke = drawer.getStroke();
+ if (stroke == null)
+ {
+ if (lineDashPattern.isDashPatternEmpty())
+ {
+ drawer.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f) );
+ }
+ else
+ {
+ drawer.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f,
+ lineDashPattern.getCOSDashPattern().toFloatArray(), lineDashPattern.getPhaseStart()) );
+ }
+ }
+ else
+ {
+ if (lineDashPattern.isDashPatternEmpty())
+ {
+ drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(),
+ stroke.getLineJoin(), stroke.getMiterLimit()) );
+ }
+ else
+ {
+ drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(), stroke.getLineJoin(),
+ stroke.getMiterLimit(), lineDashPattern.getCOSDashPattern().toFloatArray(),
+ lineDashPattern.getPhaseStart()) );
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineJoinStyle.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineJoinStyle.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineJoinStyle.java (revision 34541)
@@ -35,27 +35,27 @@
{
- /**
- * Set the line cap style.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- super.process( operator, arguments );
- int lineJoinStyle = context.getGraphicsState().getLineJoin();
- PageDrawer drawer = (PageDrawer)context;
- BasicStroke stroke = drawer.getStroke();
- if (stroke == null)
- {
- drawer.setStroke( new BasicStroke(1,BasicStroke.CAP_SQUARE,lineJoinStyle) );
- }
- else
- {
- drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(), lineJoinStyle,
- stroke.getMiterLimit(), stroke.getDashArray(), stroke.getDashPhase()) );
- }
- }
+ /**
+ * Set the line cap style.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ super.process( operator, arguments );
+ int lineJoinStyle = context.getGraphicsState().getLineJoin();
+ PageDrawer drawer = (PageDrawer)context;
+ BasicStroke stroke = drawer.getStroke();
+ if (stroke == null)
+ {
+ drawer.setStroke( new BasicStroke(1,BasicStroke.CAP_SQUARE,lineJoinStyle) );
+ }
+ else
+ {
+ drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(), lineJoinStyle,
+ stroke.getMiterLimit(), stroke.getDashArray(), stroke.getDashPhase()) );
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineMiterLimit.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineMiterLimit.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineMiterLimit.java (revision 34541)
@@ -35,28 +35,28 @@
{
- /**
- * Set the line dash pattern.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- super.process(operator, arguments);
- float miterLimit = (float)context.getGraphicsState().getMiterLimit();
- PageDrawer drawer = (PageDrawer)context;
- BasicStroke stroke = drawer.getStroke();
- if (stroke == null)
- {
- drawer.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER,
- miterLimit, null, 0.0f));
- }
- else
- {
- drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(), stroke.getLineJoin(),
- miterLimit, null, 0.0f));
- }
- }
+ /**
+ * Set the line dash pattern.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ super.process(operator, arguments);
+ float miterLimit = (float)context.getGraphicsState().getMiterLimit();
+ PageDrawer drawer = (PageDrawer)context;
+ BasicStroke stroke = drawer.getStroke();
+ if (stroke == null)
+ {
+ drawer.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER,
+ miterLimit, null, 0.0f));
+ }
+ else
+ {
+ drawer.setStroke( new BasicStroke(stroke.getLineWidth(), stroke.getEndCap(), stroke.getLineJoin(),
+ miterLimit, null, 0.0f));
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineWidth.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineWidth.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/SetLineWidth.java (revision 34541)
@@ -35,30 +35,30 @@
{
- /**
- * w Set line width.
- * @param operator The operator that is being executed.
- * @param arguments List
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- super.process( operator, arguments );
- float lineWidth = (float)context.getGraphicsState().getLineWidth();
- if (lineWidth == 0)
- {
- lineWidth = 1;
- }
- PageDrawer drawer = (PageDrawer)context;
- BasicStroke stroke = drawer.getStroke();
- if (stroke == null)
- {
- drawer.setStroke( new BasicStroke( lineWidth ) );
- }
- else
- {
- drawer.setStroke( new BasicStroke(lineWidth, stroke.getEndCap(), stroke.getLineJoin(),
- stroke.getMiterLimit(), stroke.getDashArray(), stroke.getDashPhase()) );
- }
- }
+ /**
+ * w Set line width.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ super.process( operator, arguments );
+ float lineWidth = (float)context.getGraphicsState().getLineWidth();
+ if (lineWidth == 0)
+ {
+ lineWidth = 1;
+ }
+ PageDrawer drawer = (PageDrawer)context;
+ BasicStroke stroke = drawer.getStroke();
+ if (stroke == null)
+ {
+ drawer.setStroke( new BasicStroke( lineWidth ) );
+ }
+ else
+ {
+ drawer.setStroke( new BasicStroke(lineWidth, stroke.getEndCap(), stroke.getLineJoin(),
+ stroke.getMiterLimit(), stroke.getDashArray(), stroke.getDashPhase()) );
+ }
+ }
}
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/StrokePath.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/StrokePath.java (revision 34540)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/StrokePath.java (revision 34541)
@@ -35,16 +35,16 @@
{
- /**
- * S stroke the path.
- * @param operator The operator that is being executed.
- * @param arguments List
- *
- * @throws IOException If an error occurs while processing the font.
- */
- @Override
- public void process(PDFOperator operator, List arguments) throws IOException
- {
- PageDrawer drawer = (PageDrawer)context;
- drawer.drawPath(true, false, 0);
- }
+ /**
+ * S stroke the path.
+ * @param operator The operator that is being executed.
+ * @param arguments List
+ *
+ * @throws IOException If an error occurs while processing the font.
+ */
+ @Override
+ public void process(PDFOperator operator, List arguments) throws IOException
+ {
+ PageDrawer drawer = (PageDrawer)context;
+ drawer.drawPath(true, false, 0);
+ }
}