Add support for .gbrjob new file format (JSON format) in Gerbview

Add experimental code to generate .gbrjob files in the new JSON file format

common/plotters/GERBER_plotter.cpp

@@ -649,7 +649,6 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub
                                    EDA_DRAW_MODE_T trace_mode, void* aData )
 {
     wxASSERT( outputFile );
-    int x0, y0, x1, y1, delta;
     wxSize size( aSize );
     GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
 
@@ -684,18 +683,17 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub
         if( trace_mode == FILLED )
         {
             // TODO: use an aperture macro to declare the rotated pad
-            //
 
             // Flash a pad anchor, if a netlist attribute is set
             if( aData )
                 FlashPadCircle( pos, size.x, trace_mode, aData );
 
             // The pad is reduced to an segment with dy > dx
-            delta = size.y - size.x;
-            x0    = 0;
-            y0    = -delta / 2;
-            x1    = 0;
-            y1    = delta / 2;
+            int delta = size.y - size.x;
+            int x0    = 0;
+            int y0    = -delta / 2;
+            int x1    = 0;
+            int y1    = delta / 2;
             RotatePoint( &x0, &y0, orient );
             RotatePoint( &x1, &y1, orient );
             GBR_METADATA metadata;
@@ -740,8 +738,7 @@ void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
     case 900:
     case 2700:        // rotation of 90 degrees or 270 swaps sizes
         std::swap( size.x, size.y );
-
-	// Pass through
+        // Pass through
     case 0:
     case 1800:
         if( trace_mode == SKETCH )
@@ -755,7 +752,7 @@ void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
                            pos.y - (size.y - currentPenWidth) / 2 ),
                   wxPoint( pos.x + (size.x - currentPenWidth) / 2,
                            pos.y + (size.y - currentPenWidth) / 2 ),
-                  NO_FILL );
+                  NO_FILL, GetCurrentLineWidth() );
         }
         else
         {
@@ -800,24 +797,6 @@ void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
                                      EDA_DRAW_MODE_T aTraceMode, void* aData )
 
 {
-    // Currently, a Pad RoundRect is plotted as polygon.
-    // TODO: use Aperture macro and flash it
-    SHAPE_POLY_SET outline;
-    const int segmentToCircleCount = 64;
-    TransformRoundRectToPolygon( outline, aPadPos, aSize, aOrient,
-                                 aCornerRadius, segmentToCircleCount );
-
-    std::vector< wxPoint > cornerList;
-    cornerList.reserve( segmentToCircleCount + 5 );
-    // TransformRoundRectToPolygon creates only one convex polygon
-    SHAPE_LINE_CHAIN& poly = outline.Outline( 0 );
-
-    for( int ii = 0; ii < poly.PointCount(); ++ii )
-        cornerList.push_back( wxPoint( poly.Point( ii ).x, poly.Point( ii ).y ) );
-
-    // Close polygon
-    cornerList.push_back( cornerList[0] );
-
     GBR_METADATA gbr_metadata;
 
     if( aData )
@@ -832,7 +811,32 @@ void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
         gbr_metadata.m_NetlistMetadata.ClearAttribute( &attrname );   // not allowed on inner layers
     }
 
-    PlotPoly( cornerList, ( aTraceMode == FILLED ) ? FILLED_SHAPE : NO_FILL, USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
+    if( aTraceMode != FILLED )
+        SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
+
+    // Currently, a Pad RoundRect is plotted as polygon.
+    // TODO: use Aperture macro and flash it
+    SHAPE_POLY_SET outline;
+    const int segmentToCircleCount = 64;
+    TransformRoundRectToPolygon( outline, aPadPos, aSize, aOrient,
+                                 aCornerRadius, segmentToCircleCount );
+
+    if( aTraceMode != FILLED )
+        outline.Inflate( -GetCurrentLineWidth()/2, 16 );
+
+    std::vector< wxPoint > cornerList;
+    // TransformRoundRectToPolygon creates only one convex polygon
+    SHAPE_LINE_CHAIN& poly = outline.Outline( 0 );
+    cornerList.reserve( poly.PointCount() + 1 );
+
+    for( int ii = 0; ii < poly.PointCount(); ++ii )
+        cornerList.push_back( wxPoint( poly.Point( ii ).x, poly.Point( ii ).y ) );
+
+    // Close polygon
+    cornerList.push_back( cornerList[0] );
+
+    PlotPoly( cornerList, aTraceMode == FILLED ? FILLED_SHAPE : NO_FILL,
+              aTraceMode == FILLED ? 0 : GetCurrentLineWidth(), &gbr_metadata );
 
     // Now, flash a pad anchor, if a netlist attribute is set
     // (remove me when a Aperture macro will be used)
@@ -854,7 +858,9 @@ void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
     // However, because the anchor pad can be circle or rect, we use only
     // a circle not bigger than the rect.
     // the main purpose is to print a flashed DCode as pad anchor
-    FlashPadCircle( aPadPos, std::min( aSize.x, aSize.y ), aTraceMode, aData );
+    if( aTraceMode == FILLED )
+        FlashPadCircle( aPadPos, std::min( aSize.x, aSize.y ), aTraceMode, aData );
+
     GBR_METADATA gbr_metadata;
 
     if( aData )
@@ -869,11 +875,20 @@ void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
         gbr_metadata.m_NetlistMetadata.ClearAttribute( &attrname );   // not allowed on inner layers
     }
 
+    SHAPE_POLY_SET polyshape = *aPolygons;
+
+    if( aTraceMode != FILLED )
+    {
+        SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
+        polyshape.Inflate( -GetCurrentLineWidth()/2, 16 );
+    }
+
     std::vector< wxPoint > cornerList;
 
-    for( int cnt = 0; cnt < aPolygons->OutlineCount(); ++cnt )
+    for( int cnt = 0; cnt < polyshape.OutlineCount(); ++cnt )
     {
-        SHAPE_LINE_CHAIN& poly = aPolygons->Outline( cnt );
+        SHAPE_LINE_CHAIN& poly = polyshape.Outline( cnt );
+
         cornerList.clear();
 
         for( int ii = 0; ii < poly.PointCount(); ++ii )
@@ -882,7 +897,9 @@ void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
         // Close polygon
         cornerList.push_back( cornerList[0] );
 
-        PlotPoly( cornerList, ( aTraceMode == FILLED ) ? FILLED_SHAPE : NO_FILL, USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
+        PlotPoly( cornerList,
+                  aTraceMode == FILLED ? FILLED_SHAPE : NO_FILL,
+                  aTraceMode == FILLED ? 0 : GetCurrentLineWidth(), &gbr_metadata );
     }
 }
 
@@ -902,7 +919,7 @@ void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos,  const wxPoint* aCo
 
     // Now, flash a pad anchor, if a netlist attribute is set
     // (remove me when a Aperture macro will be used)
-    if( aData && (aTrace_Mode==FILLED) )
+    if( aData && ( aTrace_Mode == FILLED ) )
     {
         // Calculate the radius of the circle inside the shape
         // It is the smaller dist from shape pos to edges
@@ -945,7 +962,9 @@ void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos,  const wxPoint* aCo
     }
 
     SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &metadata );
-    PlotPoly( cornerList, aTrace_Mode==FILLED ? FILLED_SHAPE : NO_FILL, USE_DEFAULT_LINE_WIDTH, &metadata );
+    PlotPoly( cornerList, aTrace_Mode == FILLED ? FILLED_SHAPE : NO_FILL,
+              aTrace_Mode == FILLED ? 0 : GetCurrentLineWidth(),
+              &metadata );
 }