← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pcbnew/deltrack.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/deltrack.cpp
34
34
#include <wxPcbStruct.h>
35
35
#include <macros.h>
36
36
#include <pcbcommon.h>
 
37
#include <ratsnest_data.h>
37
38
 
38
39
#include <class_board.h>
39
40
#include <class_track.h>
53
54
    {
54
55
        if( g_CurrentTrackList.GetCount() > 0 )
55
56
        {
56
 
            LAYER_NUM previous_layer = getActiveLayer();
 
57
            LAYER_ID previous_layer = GetActiveLayer();
57
58
 
58
59
            DBG( g_CurrentTrackList.VerifyListIntegrity(); )
59
60
 
86
87
 
87
88
            // Correct active layer which could change if a via
88
89
            // has been erased
89
 
            setActiveLayer( previous_layer );
 
90
            SetActiveLayer( previous_layer );
90
91
 
91
92
            UpdateStatusBar();
92
93
 
124
125
 
125
126
    DLIST<TRACK>* container = (DLIST<TRACK>*)aTrack->GetList();
126
127
    wxASSERT( container );
 
128
    GetBoard()->GetRatsnest()->Remove( aTrack );
 
129
    aTrack->ViewRelease();
127
130
    container->Remove( aTrack );
128
131
 
129
132
    // redraw the area where the track was
174
177
        if( segm->GetNetCode() != net_code_delete )
175
178
            break;
176
179
 
 
180
        GetBoard()->GetRatsnest()->Remove( segm );
 
181
        segm->ViewRelease();
177
182
        GetBoard()->m_Track.Remove( segm );
178
183
 
179
184
        // redraw the area where the track was
219
224
                     << TO_UTF8( TRACK::ShowState( tracksegment->GetStatus() ) ) \
220
225
                     << std::endl; )
221
226
 
 
227
        GetBoard()->GetRatsnest()->Remove( tracksegment );
 
228
        tracksegment->ViewRelease();
222
229
        GetBoard()->m_Track.Remove( tracksegment );
223
230
 
224
231
        // redraw the area where the track was