← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pcbnew/specctra.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/specctra.cpp
75
75
{
76
76
    // specctra wants top physical layer first, then going down to the
77
77
    // bottom most physical layer in physical sequence.
78
 
    // @question : why does KiCad not display layers in that order?
79
 
    int layerCount = aBoard->GetCopperLayerCount();
 
78
    // Same as KiCad now except for B_Cu
 
79
    unsigned layerCount = aBoard->GetCopperLayerCount();
80
80
 
81
81
    layerIds.clear();
82
82
    pcbLayer2kicad.resize( layerCount );
83
 
    kicadLayer2pcb.resize( LAYER_N_FRONT + 1 );
 
83
    kicadLayer2pcb.resize( B_Cu + 1 );
84
84
 
 
85
#if 0 // was:
85
86
    for( LAYER_NUM kiNdx = layerCount - 1, pcbNdx=FIRST_LAYER;
86
87
         kiNdx >= 0; --kiNdx, ++pcbNdx )
87
88
    {
88
 
        LAYER_NUM kilayer = (kiNdx>0 && kiNdx==layerCount-1) ? LAYER_N_FRONT : kiNdx;
 
89
        LAYER_NUM kilayer = (kiNdx>0 && kiNdx==layerCount-1) ? F_Cu : kiNdx;
89
90
 
90
91
        // establish bi-directional mapping between KiCad's BOARD layer and PCB layer
91
92
        pcbLayer2kicad[pcbNdx]  = kilayer;
92
93
        kicadLayer2pcb[kilayer] = pcbNdx;
93
94
 
94
95
        // save the specctra layer name in SPECCTRA_DB::layerIds for later.
95
 
        layerIds.push_back( TO_UTF8( aBoard->GetLayerName( kilayer ) ) );
96
 
    }
 
96
        layerIds.push_back( TO_UTF8( aBoard->GetLayerName( ToLAYER_ID( kilayer ) ) ) );
 
97
    }
 
98
#else
 
99
 
 
100
    // establish bi-directional mapping between KiCad's BOARD layer and PCB layer
 
101
 
 
102
    for( unsigned i = 0;  i < kicadLayer2pcb.size();  ++i )
 
103
    {
 
104
        if( i < layerCount-1 )
 
105
            kicadLayer2pcb[i] = i;
 
106
        else
 
107
            kicadLayer2pcb[i] = layerCount - 1;
 
108
    }
 
109
 
 
110
    for( unsigned i = 0;  i < pcbLayer2kicad.size();  ++i )
 
111
    {
 
112
        if( i < layerCount-1 )
 
113
            pcbLayer2kicad[i] = ToLAYER_ID( i );
 
114
        else
 
115
            pcbLayer2kicad[i] = B_Cu;
 
116
 
 
117
        // save the specctra layer name in SPECCTRA_DB::layerIds for later.
 
118
        layerIds.push_back( TO_UTF8( aBoard->GetLayerName( ToLAYER_ID( i ) ) ) );
 
119
    }
 
120
 
 
121
#endif
97
122
}
98
123
 
99
124