← Back to branch summary

~pierre-parent-k/kicad/length-tunning

« back to all changes in this revision

Viewing changes to pcbnew/class_drawsegment.cpp

  • Committer: Pierre Parent
  • Date: 2014-07-06 10:32:13 UTC
  • mfrom: (4798.1.179 kicad)
  • Revision ID: pierre.parent@insa-rouen.fr-20140706103213-wjsdy0hc9q6wbz5v
Merge with lp:kicad 4977

Show diffs side-by-side

added added

removed removed

Lines of Context:
pcbnew/class_drawsegment.cpp
173
173
    int l_trace;
174
174
    int mode;
175
175
    int radius;
176
 
    LAYER_NUM curr_layer = ( (PCB_SCREEN*) panel->GetScreen() )->m_Active_Layer;
 
176
 
 
177
    LAYER_ID    curr_layer = ( (PCB_SCREEN*) panel->GetScreen() )->m_Active_Layer;
177
178
    EDA_COLOR_T color;
178
179
 
179
180
    BOARD * brd =  GetBoard( );
185
186
 
186
187
    if( ( draw_mode & GR_ALLOW_HIGHCONTRAST ) &&  DisplayOpt.ContrastModeDisplay )
187
188
    {
188
 
        if( !IsOnLayer( curr_layer ) && !IsOnLayer( EDGE_N ) )
 
189
        if( !IsOnLayer( curr_layer ) && !IsOnLayer( Edge_Cuts ) )
189
190
            ColorTurnToDarkDarkGray( &color );
190
191
    }
191
192
 
192
 
 
193
193
    GRSetDrawMode( DC, draw_mode );
194
 
    l_trace = m_Width >> 1;  /* half trace width */
 
194
    l_trace = m_Width >> 1;         // half trace width
195
195
 
196
196
    // Line start point or Circle and Arc center
197
197
    ux0 = m_Start.x + aOffset.x;
247
247
                EXCHG( StAngle, EndAngle );
248
248
        }
249
249
 
250
 
 
251
250
        if( mode == LINE )
252
251
            GRArc( panel->GetClipBox(), DC, ux0, uy0, StAngle, EndAngle, radius, color );
253
252
 
475
474
}
476
475
 
477
476
 
478
 
bool DRAWSEGMENT::HitTest( const wxPoint& aPosition )
 
477
bool DRAWSEGMENT::HitTest( const wxPoint& aPosition ) const
479
478
{
480
479
    switch( m_Shape )
481
480
    {
612
611
{
613
612
    return new DRAWSEGMENT( *this );
614
613
}
615