haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no XORing on delete segment

This commit is contained in:
dickelbeck 2008-03-04 21:39:46 +00:00
parent 58b5543b9e
commit a4ffa8fa90
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/deltrack.cpp
View File

@ -31,12 +31,10 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* Track )
if( Track == NULL ) if( Track == NULL )
return NULL; return NULL;
if( Track->GetState(DELETED) ) if( Track->GetState(DELETED) )
{ {
#if defined(DEBUG) D(printf("WinEDA_PcbFrame::Delete_Segment(): bug deleted already deleted TRACK\n");)
printf("WinEDA_PcbFrame::Delete_Segment(): bug deleted already deleted TRACK\n");
#endif
return NULL; return NULL;
} }
@ -56,7 +54,7 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* Track )
g_TrackSegmentCount--; g_TrackSegmentCount--;
if( g_TwoSegmentTrackBuild ) if( g_TwoSegmentTrackBuild )
{ {
// g_CurrentTrackSegment->Pback must not be a via, or we want delete also the via // g_CurrentTrackSegment->Pback must not be a via, or we want delete also the via
if( (g_TrackSegmentCount >= 2) if( (g_TrackSegmentCount >= 2)
&& (g_CurrentTrackSegment->Type() != TYPEVIA) && (g_CurrentTrackSegment->Type() != TYPEVIA)
@ -120,7 +118,13 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* Track )
current_net_code = Track->GetNet(); current_net_code = Track->GetNet();
#if 0 && !defined(DEBUG)
Track->Draw( DrawPanel, DC, GR_XOR ); Track->Draw( DrawPanel, DC, GR_XOR );
#else
// just redraw the whole drawing so there are no XOR remnants at track intersections.
DrawPanel->Refresh( TRUE );
#endif
SaveItemEfface( Track, 1 ); SaveItemEfface( Track, 1 );
GetScreen()->SetModify(); GetScreen()->SetModify();
@ -204,7 +208,7 @@ void WinEDA_PcbFrame::Supprime_Une_Piste( wxDC* DC, TRACK* pt_segm )
if( nb_segm ) /* Il y a nb_segm segments de piste a effacer */ if( nb_segm ) /* Il y a nb_segm segments de piste a effacer */
{ {
Trace_Une_Piste( DrawPanel, DC, pt_track, nb_segm, GR_XOR | GR_SURBRILL ); Trace_Une_Piste( DrawPanel, DC, pt_track, nb_segm, GR_XOR | GR_SURBRILL );
/* Effacement flag BUSY */ /* Effacement flag BUSY */
Struct = pt_track;; Struct = pt_track;;
for( ii=0; ii<nb_segm; ii++, Struct = (TRACK*) Struct->Pnext ) for( ii=0; ii<nb_segm; ii++, Struct = (TRACK*) Struct->Pnext )

1
pcbnew/specctra_export.cpp
View File

@ -833,6 +833,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IOError )
case LT_SIGNAL: layerType = T_signal; break; case LT_SIGNAL: layerType = T_signal; break;
case LT_POWER: layerType = T_power; break; case LT_POWER: layerType = T_power; break;
case LT_MIXED: layerType = T_mixed; break; case LT_MIXED: layerType = T_mixed; break;
case LT_JUMPER: layerType = T_jumper; break;
} }
layer->layer_type = layerType; layer->layer_type = layerType;