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

A bit of cleanup from last commit.

This commit is contained in:
Jeff Young 2022-08-20 11:01:31 +01:00
parent aa2ad3b44c
commit 8b0efa8ac4
3 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/ee_collectors.cpp
View File

@ -51,8 +51,7 @@ const std::initializer_list<KICAD_T> EE_COLLECTOR::EditableItems = {
SCH_BITMAP_T,
SCH_LINE_T,
SCH_BUS_WIRE_ENTRY_T,
SCH_JUNCTION_T,
EOT
SCH_JUNCTION_T
};
@ -75,8 +74,7 @@ const std::initializer_list<KICAD_T> EE_COLLECTOR::MovableItems =
SCH_FIELD_T,
SCH_SYMBOL_T,
SCH_SHEET_PIN_T,
SCH_SHEET_T,
EOT
SCH_SHEET_T
};

2
include/core/typeinfo.h
View File

@ -78,8 +78,6 @@ enum KICAD_T
{
NOT_USED = -1, ///< the 3d code uses this value
EOT = 0, ///< search types array terminator (End Of Types)
TYPE_NOT_INIT = 0,
PCB_T,
SCREEN_T, ///< not really an item, used to identify a screen

38
pcbnew/python/swig/typeinfo.i
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2022 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
@ -29,41 +29,5 @@
#include <core/typeinfo.h>
%}
// methods like CONNECTIVITY_DATA::GetNetItems take an array of KICAD_T values,
// terminated by EOT. for example, class_board.cpp calls the method with this argument:
// const KICAD_T types[] = { PCB_PAD_T, PCB_ZONE_AREA_T, EOT };
// this typemap allows any of the following:
// conn = board.GetConnectivity()
// conn.GetNetItems(net.GetNet(), (pcbnew.PCB_PAD_T, pcbnew.PCB_TRACE_T))
// conn.GetNetItems(net.GetNet(), [pcbnew.PCB_PAD_T, pcbnew.PCB_TRACE_T])
// conn.GetNetItems(net.GetNet(), pcbnew.PCB_PAD_T)
%typemap(in) KICAD_T [] ( KICAD_T retval[5] ){
retval[0] = EOT;
$1 = retval;
int type;
int ecode = SWIG_AsVal_int( $input, &type );
if ( SWIG_IsOK( ecode ) ) {
retval[0] = static_cast<KICAD_T>( type );
retval[1] = EOT;
} else if ( PySequence_Check( $input ) ) {
// compare less than because we still need space for the EOT terminator
assert( PySequence_Size( $input ) <=
static_cast<int>( sizeof( retval )/sizeof( KICAD_T ) ) );
for(int i=0; i<PySequence_Size( $input ); i++) {
int ecode = SWIG_AsVal_int( PySequence_GetItem( $input, i ), &type );
if ( !SWIG_IsOK( ecode ) ) {
SWIG_exception_fail( SWIG_ArgError( ecode ),
"expecting KICAD_T enum values" );
}
retval[i] = static_cast<KICAD_T>( type );
retval[i+1] = EOT;
}
} else {
SWIG_exception_fail( SWIG_ArgError( ecode ),
"expecting KICAD_T enum value" );
}
}