Pcbnew: fix a python interface issue ( a not defined constant in some modules).

Was due to incorrect order of definitions in board.i interface.
This commit is contained in:
jean-pierre charras 2020-07-30 10:42:23 +02:00
parent 265f28afe1
commit 0c774aa163
2 changed files with 66 additions and 38 deletions

View File

@ -42,6 +42,7 @@ file near the top; only class BOARD functions go in board.i.
HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints) HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints)
%include layers_id_colors_and_visibility.i
%include board_item.i %include board_item.i
%include board_item_container.i %include board_item_container.i
%include board_connected_item.i %include board_connected_item.i
@ -62,44 +63,6 @@ HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints)
%include netclass.i %include netclass.i
%include pcb_plot_params.i %include pcb_plot_params.i
%ignore operator++(SCH_LAYER_ID&);
%ignore operator++(GAL_LAYER_ID&);
%ignore operator+(const GAL_LAYER_ID&, int);
%include layers_id_colors_and_visibility.h
// Extend LSET by 2 methods to add or remove layers from the layer list
// Mainly used to add or remove layers of a pad layer list
%extend LSET
{
LSET addLayer( PCB_LAYER_ID aLayer) { return self->set(aLayer); }
LSET removeLayer( PCB_LAYER_ID aLayer) { return self->reset(aLayer); }
LSET addLayerSet( LSET aLayerSet) { return *self |= aLayerSet; }
LSET removeLayerSet( LSET aLayerSet) { return *self &= ~aLayerSet; }
%pythoncode
%{
def AddLayer(self, layer):
return self.addLayer( layer )
def AddLayerSet(self, layers):
return self.addLayerSet( layers )
def RemoveLayer(self, layer):
return self.removeLayer( layer )
def RemoveLayerSet(self, layers):
return self.removeLayerSet( layers )
%}
}
%{
#include <layers_id_colors_and_visibility.h>
#include <pcbnew_scripting_helpers.h>
%}
// std::vector templates // std::vector templates
%template(VIA_DIMENSION_Vector) std::vector<VIA_DIMENSION>; %template(VIA_DIMENSION_Vector) std::vector<VIA_DIMENSION>;

View File

@ -0,0 +1,65 @@
%ignore operator++(SCH_LAYER_ID&);
%ignore operator++(GAL_LAYER_ID&);
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file layers_id_colors_and_visibility.i
* @brief layers IDs, draw layers IDs, layers set and templates
* these IDs are used as physical layers or draw layers (for colors, visibility...)
*/
%ignore operator+(const GAL_LAYER_ID&, int);
%include layers_id_colors_and_visibility.h
// Extend LSET by 2 methods to add or remove layers from the layer list
// Mainly used to add or remove layers of a pad layer list
%extend LSET
{
LSET addLayer( PCB_LAYER_ID aLayer) { return self->set(aLayer); }
LSET removeLayer( PCB_LAYER_ID aLayer) { return self->reset(aLayer); }
LSET addLayerSet( LSET aLayerSet) { return *self |= aLayerSet; }
LSET removeLayerSet( LSET aLayerSet) { return *self &= ~aLayerSet; }
%pythoncode
%{
def AddLayer(self, layer):
return self.addLayer( layer )
def AddLayerSet(self, layers):
return self.addLayerSet( layers )
def RemoveLayer(self, layer):
return self.removeLayer( layer )
def RemoveLayerSet(self, layers):
return self.removeLayerSet( layers )
%}
}
%{
#include <layers_id_colors_and_visibility.h>
#include <pcbnew_scripting_helpers.h>
%}