3d-viewer and polygon functions: remove duplicate code about conversion from...

3d-viewer and polygon functions: remove duplicate code about conversion from basic shapes to polygons.

common/CMakeLists.txt

@@ -87,6 +87,7 @@ set(PCB_COMMON_SRCS
     base_screen.cpp
     eda_text.cpp
     class_page_info.cpp
+    convert_basic_shapes_to_polygon.cpp
     pcbcommon.cpp
     footprint_info.cpp
     ../pcbnew/basepcbframe.cpp

common/convert_basic_shapes_to_polygon.cpp

+/**
+ * @file convert_basic_shapes_to_polygon.cpp
+ */
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2012 KiCad Developers, see change_log.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+#include <vector>
+
+#include <fctsys.h>
+#include <trigo.h>
+#include <macros.h>
+#include <convert_basic_shapes_to_polygon.h>
+
+/**
+ * Function TransformCircleToPolygon
+ * convert a circle to a polygon, using multiple straight lines
+ * @param aCornerBuffer = a buffer to store the polygon
+ * @param aCenter = the center of the circle
+ * @param aRadius = the radius of the circle
+ * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+ * Note: the polygon is inside the circle, so if you want to have the polygon
+ * outside the circle, you should give aRadius calculated with a corrrection factor
+ */
+void TransformCircleToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                                           wxPoint aCenter, int aRadius,
+                                           int aCircleToSegmentsCount )
+{
+    wxPoint corner_position;
+    int     delta = 3600 / aCircleToSegmentsCount;  // rot angle in 0.1 degree
+    int     halfstep = 1800 / aCircleToSegmentsCount;   // the starting value for rot angles
+
+    for( int ii = 0; ii < aCircleToSegmentsCount; ii++ )
+    {
+        corner_position.x = aRadius;
+        corner_position.y = 0;
+        int angle = (ii * delta) + halfstep;
+        RotatePoint( &corner_position.x, &corner_position.y, angle );
+        corner_position += aCenter;
+        CPolyPt polypoint( corner_position.x, corner_position.y );
+        aCornerBuffer.push_back( polypoint );
+    }
+
+    aCornerBuffer.back().end_contour = true;
+}
+
+
+/**
+ * Function TransformRoundedEndsSegmentToPolygon
+ * convert a segment with rounded ends to a polygon
+ * Convert arcs to multiple straight lines
+ * @param aCornerBuffer = a buffer to store the polygon
+ * @param aStart = the segment start point coordinate
+ * @param aEnd = the segment end point coordinate
+ * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+ * @param aWidth = the segment width
+ * Note: the polygon is inside the arc ends, so if you want to have the polygon
+ * outside the circle, you should give aStart and aEnd calculated with a correction factor
+ */
+void TransformRoundedEndsSegmentToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                                           wxPoint aStart, wxPoint aEnd,
+                                           int aCircleToSegmentsCount,
+                                           int aWidth )
+{
+    int     radius = aWidth / 2;
+    wxPoint endp   = aEnd - aStart; // end point coordinate for the same segment starting at (0,0)
+    wxPoint startp = aStart;
+    wxPoint corner;
+    int     seg_len;
+    CPolyPt polypoint;
+
+    // normalize the position in order to have endp.x >= 0;
+    if( endp.x < 0 )
+    {
+        endp   = aStart - aEnd;
+        startp = aEnd;
+    }
+
+    int delta_angle = ArcTangente( endp.y, endp.x );    // delta_angle is in 0.1 degrees
+    seg_len = (int) sqrt( ( (double) endp.y * endp.y ) + ( (double) endp.x * endp.x ) );
+
+    int delta = 3600 / aCircleToSegmentsCount; // rot angle in 0.1 degree
+
+    // Compute the outlines of the segment, and creates a polygon
+    // add right rounded end:
+    for( int ii = 0; ii < 1800; ii += delta )
+    {
+        corner = wxPoint( 0, radius );
+        RotatePoint( &corner, ii );
+        corner.x += seg_len;
+        RotatePoint( &corner, -delta_angle );
+        corner += startp;
+        polypoint.x = corner.x;
+        polypoint.y = corner.y;
+        aCornerBuffer.push_back( polypoint );
+    }
+
+    // Finish arc:
+    corner = wxPoint( seg_len, -radius );
+    RotatePoint( &corner, -delta_angle );
+    corner += startp;
+    polypoint.x = corner.x;
+    polypoint.y = corner.y;
+    aCornerBuffer.push_back( polypoint );
+
+    // add left rounded end:
+    for( int ii = 0; ii < 1800; ii += delta )
+    {
+        corner = wxPoint( 0, -radius );
+        RotatePoint( &corner, ii );
+        RotatePoint( &corner, -delta_angle );
+        corner += startp;
+        polypoint.x = corner.x;
+        polypoint.y = corner.y;
+        aCornerBuffer.push_back( polypoint );
+    }
+
+    // Finish arc:
+    corner = wxPoint( 0, radius );
+    RotatePoint( &corner, -delta_angle );
+    corner += startp;
+    polypoint.x = corner.x;
+    polypoint.y = corner.y;
+    aCornerBuffer.push_back( polypoint );
+
+    aCornerBuffer.back().end_contour = true;
+}
+
+
+/**
+ * Function TransformArcToPolygon
+ * Creates a polygon from an Arc
+ * Convert arcs to multiple straight segments
+ * @param aCornerBuffer = a buffer to store the polygon
+ * @param aCentre = centre of the arc or circle
+ * @param aStart = start point of the arc, or a point on the circle
+ * @param aArcAngle = arc angle in 0.1 degrees. For a circle, aArcAngle = 3600
+ * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+ * @param aWidth = width (thickness) of the line
+ */
+void TransformArcToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                            wxPoint aCentre, wxPoint aStart, int aArcAngle,
+                            int aCircleToSegmentsCount, int aWidth )
+{
+    wxPoint arc_start, arc_end;
+    int     delta = 3600 / aCircleToSegmentsCount;   // rotate angle in 0.1 degree
+
+    arc_end = arc_start = aStart;
+
+    if( aArcAngle != 3600 )
+    {
+        RotatePoint( &arc_end, aCentre, -aArcAngle );
+    }
+
+    if( aArcAngle < 0 )
+    {
+        EXCHG( arc_start, arc_end );
+        NEGATE( aArcAngle );
+    }
+
+    // Compute the ends of segments and creates poly
+    wxPoint curr_end   = arc_start;
+    wxPoint curr_start = arc_start;
+
+    for( int ii = delta; ii < aArcAngle; ii += delta )
+    {
+        curr_end = arc_start;
+        RotatePoint( &curr_end, aCentre, -ii );
+        TransformRoundedEndsSegmentToPolygon( aCornerBuffer, curr_start, curr_end,
+                                              aCircleToSegmentsCount, aWidth );
+        curr_start = curr_end;
+    }
+
+    if( curr_end != arc_end )
+        TransformRoundedEndsSegmentToPolygon( aCornerBuffer,
+                                              curr_end, arc_end, aCircleToSegmentsCount, aWidth );
+}

include/convert_basic_shapes_to_polygon.h

+/**
+ * @file convert_basic_shapes_to_polygon.h
+ */
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2012 KiCad Developers, see change_log.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef CONVERT_BASIC_SHAPES_TO_POLYGON_H
+#define CONVERT_BASIC_SHAPES_TO_POLYGON_H
+
+#include <vector>
+
+#include <fctsys.h>
+#include <trigo.h>
+#include <macros.h>
+#include <PolyLine.h>
+
+/**
+ * Function TransformCircleToPolygon
+ * convert a circle to a polygon, using multiple straight lines
+ * @param aCornerBuffer = a buffer to store the polygon
+ * @param aCenter = the center of the circle
+ * @param aRadius = the radius of the circle
+ * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+ * Note: the polygon is inside the circle, so if you want to have the polygon
+ * outside the circle, you should give aRadius calculated with a correction factor
+ */
+void TransformCircleToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                                           wxPoint aCenter, int aRadius,
+                                           int aCircleToSegmentsCount );
+
+/**
+ * Function TransformRoundedEndsSegmentToPolygon
+ * convert a segment with rounded ends to a polygon
+ * Convert arcs to multiple straight lines
+ * @param aCornerBuffer = a buffer to store the polygon
+ * @param aStart = the segment start point coordinate
+ * @param aEnd = the segment end point coordinate
+ * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+ * @param aWidth = the segment width
+ * Note: the polygon is inside the arc ends, so if you want to have the polygon
+ * outside the circle, you should give aStart and aEnd calculated with a correction factor
+ */
+void TransformRoundedEndsSegmentToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                                           wxPoint aStart, wxPoint aEnd,
+                                           int aCircleToSegmentsCount,
+                                           int aWidth );
+
+
+/**
+ * Function TransformArcToPolygon
+ * Creates a polygon from an Arc
+ * Convert arcs to multiple straight segments
+ * @param aCornerBuffer = a buffer to store the polygon
+ * @param aCentre = centre of the arc or circle
+ * @param aStart = start point of the arc, or a point on the circle
+ * @param aArcAngle = arc angle in 0.1 degrees. For a circle, aArcAngle = 3600
+ * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+ * @param aWidth = width (thickness) of the line
+ */
+void TransformArcToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                            wxPoint aCentre, wxPoint aStart, int aArcAngle,
+                            int aCircleToSegmentsCount, int aWidth );
+
+#endif     // CONVERT_BASIC_SHAPES_TO_POLYGON_H