KiCad

Merge lp:~cern-kicad/kicad/zones_fix into lp:kicad/product

  1. zones_fix
  2. Merge into product
Proposed by Maciej Suminski
Status: Merged
Merged at revision: 4564
Proposed branch: lp:~cern-kicad/kicad/zones_fix
Merge into: lp:kicad/product
Diff against target: 32 lines (+9/-5)
1 file modified
pcbnew/pcb_painter.cpp (+9/-5)
To merge this branch: bzr merge lp:~cern-kicad/kicad/zones_fix
Reviewer Review Type Date Requested Status
KiCad Lead Developers Pending
Review via email: mp+199776@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pcbnew/pcb_painter.cpp'
2--- pcbnew/pcb_painter.cpp 2013-12-05 15:00:24 +0000
3+++ pcbnew/pcb_painter.cpp 2013-12-20 10:14:38 +0000
4@@ -755,11 +755,15 @@
5 for( int i = 0; i < outline->GetCornersCount(); ++i )
6 {
7 corners.push_back( VECTOR2D( outline->GetPos( i ) ) );
8+
9+ if( outline->IsEndContour( i ) )
10+ {
11+ // The last point for closing the polyline
12+ corners.push_back( corners[0] );
13+ m_gal->DrawPolyline( corners );
14+ corners.clear();
15+ }
16 }
17- // The last point for closing the polyline
18- corners.push_back( VECTOR2D( outline->GetPos( 0 ) ) );
19- m_gal->DrawPolyline( corners );
20- corners.clear();
21
22 // Draw the filling
23 if( displayMode != PCB_RENDER_SETTINGS::DZ_HIDE_FILLED )
24@@ -770,7 +774,7 @@
25
26 // Set up drawing options
27 m_gal->SetFillColor( color );
28- m_gal->SetLineWidth( aZone->GetThermalReliefCopperBridge() / 2.0 );
29+ m_gal->SetLineWidth( aZone->GetMinThickness() );
30
31 if( displayMode == PCB_RENDER_SETTINGS::DZ_SHOW_FILLED )
32 {