Commit a4ffa8fa authored by dickelbeck's avatar dickelbeck

no XORing on delete segment

parent 58b5543b
...@@ -31,12 +31,10 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* Track ) ...@@ -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 ) ...@@ -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 ) ...@@ -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 ) ...@@ -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 )
......
...@@ -833,6 +833,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IOError ) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment