Fixed some issues with arcs (Arcs are a nightmare in graphic applications).

gerbview/class_GERBER.cpp

@@ -57,7 +57,7 @@
 GERBER::GERBER( WinEDA_GerberFrame* aParent, int aLayer )
 {
     m_Parent = aParent;
-    m_Layer  = aLayer;           // Layer Number
+    m_GraphicLayer  = aLayer;           // Graphic layer Number
 
     m_Selected_Tool = FIRST_DCODE;
 
@@ -157,6 +157,7 @@ void GERBER::ResetDefaultValues()
     m_FilesPtr        = 0;
     m_PolygonFillMode = false;
     m_PolygonFillModeState = 0;
+    m_Selected_Tool = FIRST_DCODE;
 }
 
 

gerbview/class_GERBER.h

@@ -33,7 +33,7 @@ public:
     wxString           m_FileName;                                      // Full File Name for this layer
     wxString           m_ImageName;                                     // Image name, from IN <name>* command
     wxString           m_LayerName;                                     // Layer name, from LN <name>* command
-    int                m_Layer;                                         // Layer Number
+    int                m_GraphicLayer;                                  // Graphic layer Number
     bool               m_LayerNegative;                                 // true = Negative Layer
     bool               m_GerbMetric;                                    // false = Inches, true = metric
     bool               m_Relative;                                      // false = absolute Coord, true = relative Coord

gerbview/class_gerber_draw_item.cpp

@@ -352,6 +352,12 @@ void GERBER_DRAW_ITEM::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, int aDrawMode,
         break;
 
     case GBR_ARC:
+#if 0     // for arc debug only
+        GRLine( &aPanel->m_ClipBox, aDC, GetABPosition( m_Start ),
+                    GetABPosition( m_ArcCentre ), 0, color );
+        GRLine( &aPanel->m_ClipBox, aDC, GetABPosition( m_End ),
+                    GetABPosition( m_ArcCentre ), 0, color );
+#endif
         if( !isFilled )
         {
             GRArc1( &aPanel->m_ClipBox, aDC, GetABPosition( m_Start ),

gerbview/gerber_test_files/test-polygon_with_arc-fill.gbr

+G04 Draw a rectangle with a rounded right side
+G04 Hand coded by Julian Lamb *
+%MOIN*%
+%FSLAX23Y23*%
+%ADD10C,0.050*%
+
+G04 Draw a rectangle with a rounded right side*
+G36*
+G01X0Y0D02*
+X00200Y0D01*
+G75*
+G03X00200Y00200I0J00100D01*
+G01X0Y00200D01*
+G04 Do not close with a final line, so let gerbv automatically close*
+G37*
+
+
+M02*

gerbview/tracepcb.cpp

@@ -159,7 +159,7 @@ void Show_Items_DCode_Value( WinEDA_DrawPanel* aPanel, wxDC* aDC, BOARD* aPcb, i
         if( gerb_item->m_DCode <= 0 )
             continue;
 
-        if( gerb_item->m_Flashed )
+        if( gerb_item->m_Flashed || gerb_item->m_Shape == GBR_ARC )
             pos = gerb_item->m_Start;
         else
         {