Improve rendering of arrows, fix #172.

DarwinNE · Apr 19, 2020 · 5b6b0ce · 5b6b0ce
1 parent 4e0f425
commit 5b6b0ce
Show file tree

Hide file tree

Showing 15 changed files with 408 additions and 360 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+bin/net/sourceforge/fidocadj/export/PointPr.class
 OSes/android/fidocadj/bin/
 OSes/android/fidocadj/gen/
 bin/.DS_Store

diff --git a/dev_tools/fidocadj_cpd.txt b/dev_tools/fidocadj_cpd.txt
diff --git a/dev_tools/fidocadj_pmd.html b/dev_tools/fidocadj_pmd.html
diff --git a/src/net/sourceforge/fidocadj/export/ExportEPS.java b/src/net/sourceforge/fidocadj/export/ExportEPS.java
@@ -29,7 +29,7 @@
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2008-2019 by Davide Bucci
+    Copyright 2008-2020 by Davide Bucci
     </pre>
     @author Davide Bucci
 */
@@ -341,15 +341,25 @@ public void exportLine (double x1, double y1,
         ColorInterface c=l.getColor();
         checkColorAndWidth(c, strokeWidth);
         registerDash(dashStyle);
-
-
-
-        out.write(""+x1+" "+y1+" moveto "+
-            x2+" "+y2+" lineto stroke\n");
-        if (arrowStart) exportArrow(x1, y1, x2, y2, arrowLength,
-            arrowHalfWidth, arrowStyle);
-        if (arrowEnd) exportArrow(x2, y2, x1, y1, arrowLength,
-            arrowHalfWidth, arrowStyle);
+        double xstart=x1, ystart=y1;
+        double xend=x2, yend=y2;
+
+        if (arrowStart) {
+            PointPr p=exportArrow(x1, y1, x2, y2, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xstart=p.x;
+            ystart=p.y;
+        }
+        if (arrowEnd) {
+            PointPr p=exportArrow(x2, y2, x1, y1, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xend=p.x;
+            yend=p.y;
+        }
+        out.write(""+xstart+" "+ystart+" moveto "+
+            xend+" "+yend+" lineto stroke\n");
     }
 
     /** Called when exporting an arrow.
@@ -360,10 +370,11 @@ public void exportLine (double x1, double y1,
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return the coordinates of the base of the arrow.
         @throws IOException when things goes horribly wrong, for example if
             the file in which the output is being done is not accessible.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
@@ -428,6 +439,7 @@ public void exportArrow(double x, double y, double xc, double yc,
                 " moveto\n"+Globals.roundTo(x4)+" "+Globals.roundTo(y4)+
                 " lineto\nstroke\n");
         }
+        return new PointPr(x0,y0);
     }
 
     /** Called when exporting a Macro call.

diff --git a/src/net/sourceforge/fidocadj/export/ExportEagle.java b/src/net/sourceforge/fidocadj/export/ExportEagle.java
@@ -29,7 +29,7 @@
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2008-2019 by Davide Bucci
+    Copyright 2008-2020 by Davide Bucci
    </pre>
 
 
@@ -457,15 +457,17 @@ public boolean exportCurve(PointDouble[] vertices, int nVertices,
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return always (0,0).
         @throws IOException when things goes horribly wrong, for example if
             the file in which the output is being done is not accessible.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
     {
         // Does nothing, since it will not be useful here.
+        return new PointPr();
     }
 
     /** Export a number: truncate it to four decimals

diff --git a/src/net/sourceforge/fidocadj/export/ExportFidoCad.java b/src/net/sourceforge/fidocadj/export/ExportFidoCad.java
@@ -33,7 +33,7 @@ Export towards FidoCAD (!)
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2008-2019 by Davide Bucci
+    Copyright 2008-2020 by Davide Bucci
     </pre>
 
     @author Davide Bucci
@@ -546,14 +546,16 @@ public void exportRectangle(int x1, int y1, int x2, int y2,
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return always (0,0).
         @throws IOException if a disaster happens, i.e. a file can not be
             accessed.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
     {
         // Does nothing, since it will not be useful here.
+        return new PointPr();
     }
 }
diff --git a/src/net/sourceforge/fidocadj/export/ExportGraphic.java b/src/net/sourceforge/fidocadj/export/ExportGraphic.java
@@ -46,7 +46,7 @@
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2007-2019 by Davide Bucci
+    Copyright 2007-2020 by Davide Bucci
     </pre>
 
     @author Davide Bucci

diff --git a/src/net/sourceforge/fidocadj/export/ExportInterface.java b/src/net/sourceforge/fidocadj/export/ExportInterface.java
@@ -315,9 +315,10 @@ public void exportRectangle(int x1, int y1, int x2, int y2,
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return the coordinates of the base of the arrow.
         @throws IOException if an error occurs.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException;

diff --git a/src/net/sourceforge/fidocadj/export/ExportPCBRND.java b/src/net/sourceforge/fidocadj/export/ExportPCBRND.java
@@ -29,7 +29,7 @@
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2008-2019 by Davide Bucci
+    Copyright 2008-2020 by Davide Bucci
     Copyright 2017 Erich Heinzle
    </pre>
 
@@ -608,19 +608,20 @@ public boolean exportCurve(PointDouble[] vertices, int nVertices,
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return always (0,0).
         @throws IOException when things goes horribly wrong, for example if
             the file in which the output is being done is not accessible.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
     {
         // Does nothing, since it will not be useful here.
+        return new PointPr();
     }
 
     /** Export a number: truncate it to four decimals
-
     */
     private String een(double n)
     {

diff --git a/src/net/sourceforge/fidocadj/export/ExportPDF.java b/src/net/sourceforge/fidocadj/export/ExportPDF.java
@@ -33,7 +33,7 @@
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2008-2019 by Davide Bucci
+    Copyright 2008-2020 by Davide Bucci
 </pre>
 
     @author Davide Bucci
@@ -939,19 +939,31 @@ public void exportLine (double x1, double y1,
         double strokeWidth)
         throws IOException
     {
+        double xstart=x1, ystart=y1;
+        double xend=x2, yend=y2;
+
         LayerDesc l=(LayerDesc)layerV.get(layer);
         ColorInterface c=l.getColor();
 
         checkColorAndWidth(c, strokeWidth);
         registerDash(dashStyle);
 
-        outt.write("  "+x1+" "+y1+" m "+
-            x2+" "+y2+" l S\n");
+        if (arrowStart) {
+            PointPr p=exportArrow(x1, y1, x2, y2, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xstart=p.x;
+            ystart=p.y;
+        }
+        if (arrowEnd) {
+            PointPr p=exportArrow(x2, y2, x1, y1, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xend=p.x;
+            yend=p.y;
+        }
 
-        if (arrowStart) exportArrow(x1, y1, x2, y2, arrowLength,
-            arrowHalfWidth, arrowStyle);
-        if (arrowEnd) exportArrow(x2, y2, x1, y1, arrowLength,
-            arrowHalfWidth, arrowStyle);
+        outt.write("  "+xstart+" "+ystart+" m "+ xend+" "+yend+" l S\n");
     }
 
     /** Called when exporting a Macro call.
@@ -1341,10 +1353,11 @@ private void registerDash(int dashStyle)
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return the coordinates of the base of the arrow.
         @throws IOException if a disaster happens, i.e. a file can not be
             accessed.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
@@ -1403,5 +1416,6 @@ public void exportArrow(double x, double y, double xc, double yc,
             outt.write(""+Globals.roundTo(x3)+" "+Globals.roundTo(y3)+" m\n"+
                 Globals.roundTo(x4)+" "+Globals.roundTo(y4)+" l s\n");
         }
+        return new PointPr(x0,y0);
     }
 }
diff --git a/src/net/sourceforge/fidocadj/export/ExportPGF.java b/src/net/sourceforge/fidocadj/export/ExportPGF.java
@@ -300,15 +300,25 @@ public void exportLine (double x1, double y1,
     {
         registerColorSize(layer, strokeWidth);
         registerDash(dashStyle);
-
-        out.write("\\pgfline{\\pgfxy("+x1+","+y1+")}{\\pgfxy("+
-            x2+","+y2+")}\n");
-
-
-        if (arrowStart) exportArrow(x1, y1, x2, y2, arrowLength,
-            arrowHalfWidth, arrowStyle);
-        if (arrowEnd) exportArrow(x2, y2, x1, y1, arrowLength,
-            arrowHalfWidth, arrowStyle);
+        double xstart=x1, ystart=y1;
+        double xend=x2, yend=y2;
+
+        if (arrowStart) {
+            PointPr p=exportArrow(x1, y1, x2, y2, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xstart=p.x;
+            ystart=p.y;
+        }
+        if (arrowEnd) {
+            PointPr p=exportArrow(x2, y2, x1, y1, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xend=p.x;
+            yend=p.y;
+        }
+        out.write("\\pgfline{\\pgfxy("+xstart+","+ystart+")}{\\pgfxy("+
+            xend+","+yend+")}\n");
     }
 
     /** Called when exporting an arrow.
@@ -319,10 +329,11 @@ public void exportLine (double x1, double y1,
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return the coordinates of the base of the arrow.
         @throws IOException if a disaster happens, i.e. a file can not be
             accessed.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
@@ -384,7 +395,7 @@ public void exportArrow(double x, double y, double xc, double yc,
             out.write("\\pgfline{\\pgfxy("+x3+","+y3+")}{\\pgfxy("+
                 x4+","+y4+")}\n");
         }
-
+        return new PointPr(x0,y0);
     }
 
     /** Called when exporting a Macro call.

diff --git a/src/net/sourceforge/fidocadj/export/ExportSVG.java b/src/net/sourceforge/fidocadj/export/ExportSVG.java
@@ -28,7 +28,7 @@
     along with FidoCadJ. If not,
     @see <a href=http://www.gnu.org/licenses/>http://www.gnu.org/licenses/</a>.
 
-    Copyright 2008-2015 by Davide Bucci
+    Copyright 2008-2020 by Davide Bucci
 </pre>
 
 
@@ -303,14 +303,27 @@ public void exportLine (double x1, double y1,
         LayerDesc l=(LayerDesc)layerV.get(layer);
         c=l.getColor();
         strokeWidth=sW;
-        out.write("<line x1=\""+cLe(x1)+"\" y1=\""+cLe(y1)+"\" x2=\""+
-            cLe(x2)+"\" y2=\""+cLe(y2)+"\" ");
-        checkColorAndWidth("fill=\"none\"", dashStyle);
 
-        if (arrowStart) exportArrow(x1, y1, x2, y2, arrowLength,
-            arrowHalfWidth, arrowStyle);
-        if (arrowEnd) exportArrow(x2, y2, x1, y1, arrowLength,
-            arrowHalfWidth, arrowStyle);
+        double xstart=x1, ystart=y1;
+        double xend=x2, yend=y2;
+
+        if (arrowStart) {
+            PointPr p=exportArrow(x1, y1, x2, y2, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xstart=p.x;
+            ystart=p.y;
+        }
+        if (arrowEnd) {
+            PointPr p=exportArrow(x2, y2, x1, y1, arrowLength,
+                arrowHalfWidth, arrowStyle);
+            // Fix #172
+            xend=p.x;
+            yend=p.y;
+        }
+        out.write("<line x1=\""+cLe(xstart)+"\" y1=\""+cLe(ystart)+"\" x2=\""+
+            cLe(xend)+"\" y2=\""+cLe(yend)+"\" ");
+        checkColorAndWidth("fill=\"none\"", dashStyle);
     }
 
     /** Called when exporting a Macro call.
@@ -683,10 +696,11 @@ private void checkColorAndWidth(String fill_pattern, int dashStyle)
         @param l length of the arrow.
         @param h width of the arrow.
         @param style style of the arrow.
+        @return the coordinates of the base of the arrow.
         @throws IOException if a disaster happens, i.e. a file can not be
             accessed.
     */
-    public void exportArrow(double x, double y, double xc, double yc,
+    public PointPr exportArrow(double x, double y, double xc, double yc,
         double l, double h,
         int style)
         throws IOException
@@ -755,5 +769,6 @@ public void exportArrow(double x, double y, double xc, double yc,
                 cLe(x4)+"\" y2=\""+cLe(y4)+"\" ");
             checkColorAndWidth("fill=\"none\"", 0);
         }
+        return new PointPr(x0,y0);
     }
 }
diff --git a/src/net/sourceforge/fidocadj/export/PointPr.java b/src/net/sourceforge/fidocadj/export/PointPr.java
@@ -0,0 +1,23 @@
+package net.sourceforge.fidocadj.export;
+
+/** A simple point featuring double-precision coordinates
+*/
+public class PointPr
+{
+    public double x;
+    public double y;
+    /** Standard constructor, yielding a (0,0) coordinate.
+    */
+    public PointPr()
+    {
+        x=0;y=0;
+    }
+    /** Constructor, yielding a generic coordinate.
+        @param xx the x coordinate.
+        @param yy the y coordinate.
+    */
+    public PointPr(double xx, double yy)
+    {
+        x=xx;y=yy;
+    }
+}