Skip to content

K
kicad-source-mirror
Commit f2446132 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files
Options

Merge branch 'master' into teardrops 

Master branch has many modifications wich need to be merged
parents 86923ed6 d38c9b20
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1029 additions and 476 deletions
3d-viewer/vrml_aux.cpp
View file @ f2446132
......@@ -233,7 +233,7 @@ int ParseVertexList( FILE* File, std::vector<glm::vec3>& dst_vector )
}
int ParseVertex( FILE* File, glm::vec3& dst_vertex )
bool ParseVertex( FILE* File, glm::vec3& dst_vertex )
{
float a, b, c;
int ret = fscanf( File, "%e %e %e", &a, &b, &c );
......@@ -252,7 +252,7 @@ int ParseVertex( FILE* File, glm::vec3& dst_vertex )
// DBG( printf( "ret%d(%.9f,%.9f,%.9f)", ret, a,b,c) );
return ret;
return ret == 3;
}
......
3d-viewer/vrml_aux.h
View file @ f2446132
......@@ -75,9 +75,9 @@ int ParseVertexList( FILE* File, std::vector< glm::vec3 > &dst_vector);
* parse a vertex
* @param File file to read from
* @param dst_vertex destination vector
* @return int - return the number of elements readed
* @return bool - return true if the 3 elements are read
*/
int ParseVertex( FILE* File, glm::vec3 &dst_vertex );
bool ParseVertex( FILE* File, glm::vec3 &dst_vertex );
/**
......
bitmaps_png/CMakeLists.txt
View file @ f2446132
......@@ -430,6 +430,7 @@ set( BMAPS_MID
pad_sketch
pad
pad_dimensions
pad_enumerate
pads_mask_layers
pagelayout_load
pagelayout_load_default
......
bitmaps_png/cpp_26/lang_pt.cpp
View file @ f2446132
......@@ -8,44 +8,30 @@
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x02, 0x46, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x3d, 0x30, 0xc3, 0xa8, 0x45, 0x64, 0x5b, 0xc4, 0xd0, 0xef, 0x20, 0xc0, 0x30, 0xd1, 0x21,
0x82, 0xa6, 0x78, 0xb2, 0x83, 0x09, 0xc8, 0x22, 0x03, 0x86, 0x49, 0xf6, 0xff, 0x69, 0x8b, 0x1d,
0x66, 0x90, 0x6c, 0x11, 0x23, 0x10, 0x0b, 0x4d, 0xb5, 0xa6, 0xad, 0x45, 0x6a, 0x33, 0x4d, 0xff,
0xef, 0xd9, 0xce, 0xff, 0xff, 0xe5, 0x01, 0x96, 0xff, 0x29, 0xcb, 0xd4, 0xc0, 0x96, 0x52, 0xd5,
0x22, 0xb6, 0xc9, 0x76, 0xff, 0xab, 0x56, 0x29, 0xfc, 0xff, 0x78, 0x88, 0xe9, 0xff, 0x8f, 0xc3,
0x0c, 0x70, 0xbc, 0x0f, 0x68, 0xa9, 0xc6, 0x2c, 0x53, 0xea, 0x58, 0x64, 0x31, 0xd7, 0xf0, 0xff,
0xf9, 0xdd, 0x5c, 0xff, 0x5f, 0x6e, 0xe3, 0xf8, 0x5f, 0x19, 0xe9, 0xf2, 0xdf, 0x45, 0x37, 0xe1,
0xbf, 0x89, 0x42, 0xc6, 0xff, 0x28, 0xfb, 0x90, 0xff, 0x7b, 0x26, 0x2a, 0xfc, 0xff, 0x74, 0x88,
0xf1, 0x7f, 0x0d, 0xd0, 0x11, 0x20, 0xc7, 0x90, 0x65, 0x11, 0xdf, 0x54, 0x9b, 0xff, 0x13, 0xd7,
0x4b, 0xfd, 0xff, 0x0e, 0x74, 0xf9, 0xd3, 0xcd, 0x5c, 0xff, 0x6d, 0x35, 0x52, 0xfe, 0x6b, 0x88,
0xe5, 0x63, 0xe0, 0x05, 0x55, 0xfa, 0x60, 0xdf, 0x5d, 0x00, 0x3a, 0xc6, 0x6a, 0x9e, 0x01, 0x69,
0x16, 0xf9, 0x2d, 0xd4, 0xfe, 0x7f, 0x6f, 0x1f, 0x3b, 0x3c, 0x88, 0xda, 0x9b, 0xcb, 0xfe, 0x37,
0xf4, 0x2c, 0xfb, 0x5f, 0xd6, 0xb2, 0xe0, 0x7f, 0x61, 0xee, 0x82, 0xff, 0x8e, 0x66, 0xf5, 0xff,
0x4d, 0x95, 0xcb, 0xc0, 0x16, 0xe9, 0xcb, 0x64, 0xff, 0x7f, 0xb8, 0x81, 0x07, 0xac, 0x0e, 0xe4,
0xa8, 0xc9, 0x40, 0xc7, 0xf1, 0x63, 0x24, 0x16, 0x34, 0x8b, 0x24, 0xa7, 0x5b, 0xfe, 0x5f, 0xb9,
0x59, 0x04, 0x25, 0x1e, 0xbe, 0x01, 0xe3, 0x25, 0xde, 0xbf, 0xf7, 0xbf, 0xb5, 0x76, 0xcd, 0x7f,
0x37, 0xb3, 0xe6, 0xff, 0xd1, 0x81, 0x13, 0x81, 0x96, 0x2e, 0xff, 0xbf, 0x78, 0xf5, 0xfe, 0xff,
0xa1, 0x11, 0xdd, 0x60, 0xcb, 0xd6, 0xb4, 0x68, 0xa0, 0xe8, 0xb9, 0xbf, 0x8f, 0xed, 0x7f, 0xc0,
0x22, 0x6d, 0xdc, 0x16, 0xcd, 0xd8, 0x20, 0x81, 0xa2, 0x01, 0x84, 0x5f, 0x6d, 0x67, 0x87, 0x07,
0x93, 0xb1, 0x62, 0x25, 0x98, 0xd6, 0x93, 0x29, 0xfd, 0x6f, 0x28, 0x5f, 0xfe, 0xbf, 0xb1, 0x71,
0xf5, 0xff, 0xfe, 0x19, 0x9b, 0xfe, 0x4f, 0x2e, 0xb5, 0xc2, 0xd0, 0x07, 0x0a, 0x11, 0x75, 0x78,
0x42, 0xc1, 0x12, 0x74, 0x3e, 0x0b, 0x75, 0xfe, 0xdf, 0x45, 0x0a, 0x36, 0x10, 0xf6, 0x36, 0xcd,
0xfd, 0xef, 0xa0, 0xd7, 0x08, 0xb7, 0xc4, 0x5c, 0xb5, 0x16, 0x6e, 0x79, 0xb4, 0x6f, 0xdf, 0xff,
0xa3, 0xcb, 0xbc, 0xe1, 0x6a, 0x41, 0xc1, 0x07, 0x8a, 0x5b, 0x50, 0x1c, 0x13, 0x8c, 0x23, 0xde,
0x29, 0x36, 0xff, 0xfb, 0xd7, 0x49, 0xff, 0xff, 0x06, 0xd5, 0x3c, 0xaf, 0xc2, 0xe0, 0xbf, 0x91,
0x42, 0xe5, 0x7f, 0x2b, 0x0d, 0x88, 0x8f, 0x40, 0x34, 0x88, 0x6f, 0xae, 0x5a, 0xf7, 0x3f, 0xc1,
0xa3, 0xe0, 0xff, 0xe7, 0xfd, 0xcc, 0x60, 0x75, 0xe7, 0x76, 0x73, 0xff, 0x37, 0x07, 0xa6, 0x52,
0x92, 0x93, 0xb7, 0x19, 0x50, 0xd3, 0x59, 0xa0, 0xe6, 0xef, 0x87, 0x18, 0xfe, 0x37, 0x25, 0xda,
0xff, 0xd7, 0x14, 0xcf, 0x47, 0x09, 0xc6, 0x70, 0xfb, 0x9c, 0xff, 0xd7, 0x97, 0x0b, 0x81, 0xf3,
0x17, 0x28, 0x9f, 0xb1, 0xe2, 0x4c, 0xe2, 0x44, 0xe4, 0x23, 0x90, 0xe6, 0x8a, 0x55, 0x8a, 0xff,
0x3f, 0x1c, 0x64, 0xfa, 0x7f, 0x66, 0x9e, 0xc4, 0xff, 0x29, 0x05, 0xa6, 0xff, 0x5b, 0x92, 0xed,
0xfe, 0xaf, 0x6d, 0xd5, 0xf8, 0xff, 0x71, 0x1f, 0x33, 0xb8, 0xa4, 0x00, 0x95, 0x18, 0x54, 0x2b,
0x82, 0x54, 0x66, 0x9a, 0xfd, 0xdf, 0xb5, 0x5d, 0x00, 0x1e, 0x17, 0x2f, 0x80, 0xc5, 0x50, 0xd2,
0x52, 0x62, 0x8b, 0x21, 0x32, 0x0a, 0xd5, 0x84, 0xa5, 0xea, 0xff, 0xe7, 0x6d, 0x14, 0xff, 0x2f,
0x0e, 0xcc, 0x0a, 0x34, 0x2d, 0xbd, 0xc9, 0xaf, 0x26, 0x26, 0xdb, 0xe9, 0x02, 0x39, 0x1f, 0x68,
0x8a, 0x27, 0xda, 0xf7, 0x8d, 0x36, 0x4e, 0x06, 0xbf, 0x45, 0x00, 0x67, 0x25, 0xe2, 0x78, 0xf3,
0x1b, 0xc4, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x01, 0x66, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0x4b, 0x2b, 0x84,
0x61, 0x18, 0x87, 0xf1, 0x3f, 0x1b, 0x9b, 0x49, 0xd2, 0x2b, 0x1b, 0x87, 0x66, 0x33, 0x28, 0x0b,
0x51, 0xc3, 0xc4, 0xa4, 0x71, 0xa6, 0x5e, 0xa7, 0x34, 0x23, 0x8d, 0xe3, 0x8c, 0x69, 0x9a, 0x42,
0x39, 0xc4, 0x1b, 0x52, 0x16, 0x16, 0x28, 0xcd, 0xc6, 0x82, 0x08, 0x89, 0xec, 0x84, 0x24, 0x1b,
0x7b, 0xca, 0xd2, 0x21, 0x1b, 0x3b, 0x7c, 0x04, 0xab, 0xcb, 0xc2, 0x17, 0x98, 0xa6, 0x97, 0x94,
0x59, 0x5c, 0xeb, 0x5f, 0xcf, 0xd3, 0x73, 0xdf, 0x3d, 0x02, 0xf4, 0x1b, 0x29, 0x05, 0x25, 0x0d,
0x4d, 0x56, 0x29, 0x90, 0x48, 0x87, 0x2e, 0xd5, 0x23, 0x95, 0x25, 0x9b, 0x14, 0x11, 0x89, 0xb4,
0x54, 0xa1, 0xef, 0x0b, 0x48, 0xb2, 0x7f, 0x0c, 0x2d, 0x96, 0xff, 0x20, 0x94, 0x16, 0x16, 0x2d,
0x51, 0xd1, 0x14, 0x14, 0x66, 0xab, 0xb0, 0x1a, 0x45, 0xbc, 0x4e, 0x7c, 0xa6, 0xd9, 0x08, 0x39,
0x06, 0x44, 0x77, 0x20, 0x93, 0x50, 0xb5, 0xc1, 0x55, 0x83, 0x87, 0x48, 0x75, 0x0e, 0x37, 0x3e,
0x0f, 0x51, 0x4f, 0x0e, 0x43, 0x5d, 0x99, 0x7c, 0x64, 0xd8, 0x04, 0x45, 0x62, 0x62, 0x6e, 0xce,
0x60, 0xb9, 0x48, 0x3c, 0x5a, 0x16, 0x13, 0xfe, 0x7a, 0x1e, 0x2d, 0x8b, 0x65, 0x97, 0x88, 0xf4,
0x19, 0xcc, 0xfa, 0x6d, 0x82, 0x02, 0x21, 0xd1, 0xd1, 0x63, 0x30, 0xee, 0x14, 0x2f, 0xaf, 0xef,
0xec, 0x5f, 0x3c, 0xf1, 0xf2, 0xfa, 0xce, 0x84, 0x53, 0x4c, 0xfb, 0x0c, 0x66, 0x7a, 0x6d, 0x82,
0x7a, 0xfc, 0xc2, 0x6b, 0x66, 0xb1, 0x5e, 0x9c, 0xce, 0xe6, 0xf1, 0x2d, 0xbb, 0x67, 0x0f, 0x6c,
0x9e, 0xdc, 0xb1, 0xea, 0x4a, 0x27, 0xec, 0xcb, 0x22, 0x68, 0xd7, 0x89, 0xba, 0x46, 0x45, 0x49,
0xbf, 0xd8, 0xf0, 0x14, 0xb0, 0x15, 0x6a, 0x23, 0x7e, 0x74, 0xcf, 0x4e, 0xb4, 0x93, 0x95, 0xca,
0x3c, 0x76, 0xe6, 0xc5, 0xf6, 0xb0, 0x4d, 0x50, 0x6d, 0xbf, 0xe8, 0x0b, 0x8a, 0x11, 0xb3, 0x80,
0x3d, 0x6f, 0x21, 0xcf, 0xd9, 0xd9, 0x1c, 0x78, 0x0b, 0x89, 0x35, 0xe7, 0x33, 0x33, 0x25, 0xd6,
0xda, 0x6d, 0x7c, 0xde, 0xee, 0x98, 0x30, 0x07, 0x45, 0xfb, 0x82, 0xf0, 0x9b, 0xb9, 0x5c, 0x76,
0x88, 0x93, 0x31, 0x71, 0xed, 0xfe, 0x81, 0x81, 0x75, 0x84, 0x45, 0x65, 0x54, 0xc4, 0x82, 0xe2,
0xdc, 0x2d, 0xde, 0x1c, 0xa9, 0x5d, 0xf7, 0xdb, 0x50, 0x8d, 0xa9, 0xb7, 0x44, 0x8a, 0x97, 0xea,
0x0e, 0xe9, 0x34, 0xd9, 0x52, 0x9f, 0x93, 0xbf, 0x0f, 0x7d, 0x01, 0x56, 0x7c, 0x9f, 0xa0, 0xa8,
0x66, 0x35, 0xc2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE lang_pt_xpm[1] = {{ png, sizeof( png ), "lang_pt_xpm" }};
......
bitmaps_png/cpp_26/pad_enumerate.cpp 0 → 100644
View file @ f2446132
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x03, 0x00, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x95, 0x94, 0x4b, 0x48, 0x94,
0x51, 0x18, 0x86, 0x3f, 0x33, 0x28, 0x2c, 0x72, 0x91, 0x45, 0x12, 0x45, 0x05, 0x2e, 0x14, 0x37,
0x51, 0x6e, 0xba, 0xe0, 0x94, 0x48, 0x51, 0x49, 0x10, 0x49, 0x17, 0x17, 0x05, 0x2d, 0x92, 0xa8,
0x88, 0xb0, 0x45, 0x0b, 0x9b, 0x19, 0x87, 0xdc, 0x08, 0x6d, 0x02, 0x09, 0xa4, 0x36, 0x81, 0x49,
0xbb, 0xac, 0x29, 0x9d, 0x8a, 0x82, 0x4c, 0xb1, 0xc2, 0x34, 0x4d, 0x33, 0x8b, 0x8c, 0x4c, 0x9b,
0x8d, 0x4a, 0x82, 0xb7, 0x6c, 0xa6, 0xf7, 0x9c, 0x79, 0xad, 0x33, 0xbf, 0xf3, 0x5f, 0x5a, 0x3c,
0xfc, 0xe7, 0xf2, 0x7e, 0xe7, 0x3d, 0xe7, 0x3b, 0xdf, 0x7f, 0x24, 0x1e, 0x8f, 0x8b, 0x22, 0x20,
0xe2, 0x07, 0x55, 0xf3, 0x7d, 0x2b, 0x98, 0x5b, 0x0a, 0xf6, 0x81, 0x1a, 0x70, 0x48, 0xf5, 0x1d,
0xb4, 0xa5, 0xe0, 0x1a, 0x28, 0x01, 0xe9, 0x6a, 0x6c, 0x7e, 0xe2, 0x02, 0x88, 0x83, 0x4e, 0x87,
0xe0, 0x5b, 0xd4, 0xf4, 0x81, 0x39, 0xd0, 0x65, 0xa3, 0xab, 0xa6, 0xae, 0x07, 0xcc, 0x82, 0xd7,
0xda, 0x08, 0x8d, 0x27, 0xe0, 0x17, 0x07, 0x3b, 0x6d, 0x82, 0xb3, 0xc1, 0x24, 0xa8, 0x65, 0xff,
0x22, 0x17, 0x2b, 0x4c, 0xa1, 0xbd, 0x0d, 0xea, 0xd8, 0xbe, 0x4a, 0x5d, 0xbe, 0xea, 0x34, 0x83,
0x5c, 0x30, 0xe8, 0x72, 0xa2, 0x45, 0x60, 0x09, 0xdb, 0x21, 0x2e, 0xb0, 0xd3, 0x41, 0xbf, 0x5b,
0x9d, 0x1a, 0x7c, 0x55, 0x69, 0x36, 0x27, 0x1c, 0x8d, 0x0c, 0x5d, 0x31, 0x98, 0x02, 0xed, 0x20,
0xcd, 0x41, 0xf7, 0x8d, 0x9b, 0x39, 0xf7, 0xf7, 0x8e, 0xbc, 0x1a, 0x61, 0x7e, 0x17, 0x4d, 0x3e,
0x83, 0x75, 0x2e, 0xda, 0x15, 0xe0, 0x12, 0xcd, 0x8e, 0x7a, 0x36, 0xc2, 0xdc, 0x16, 0xf0, 0x93,
0x97, 0xbc, 0xd6, 0x46, 0xb3, 0x18, 0x1c, 0x07, 0x45, 0xec, 0x6f, 0xa2, 0xd1, 0x75, 0x5b, 0x23,
0xb4, 0xb7, 0x81, 0x06, 0x65, 0x50, 0x5c, 0x24, 0x99, 0x95, 0xe9, 0x32, 0xaa, 0x82, 0x4e, 0x6c,
0x94, 0xfe, 0xb2, 0x1c, 0x79, 0x5e, 0xbe, 0x46, 0xee, 0x94, 0x67, 0x8b, 0x8f, 0x85, 0xa2, 0x74,
0xa5, 0x8c, 0x8b, 0x80, 0x11, 0x96, 0x78, 0x03, 0x8d, 0x0a, 0x9c, 0x8c, 0x8e, 0x29, 0x51, 0xc1,
0x7e, 0x09, 0xe7, 0x1e, 0xd1, 0xe5, 0x1c, 0xb7, 0xb2, 0xf9, 0xa0, 0xc4, 0xb2, 0x4f, 0xcb, 0x0b,
0xf6, 0xaf, 0x30, 0x2e, 0x1f, 0x34, 0xf1, 0x17, 0x18, 0x50, 0x15, 0x9a, 0x74, 0x47, 0x56, 0x50,
0x62, 0xbe, 0x93, 0x1b, 0x64, 0x72, 0xf5, 0x19, 0x89, 0x21, 0xfa, 0x0b, 0x78, 0x05, 0x22, 0xa0,
0x51, 0xfc, 0xf2, 0x08, 0xdf, 0x56, 0xf0, 0x01, 0xcc, 0x16, 0x6f, 0x97, 0x99, 0x92, 0xad, 0x72,
0xd3, 0x92, 0xc6, 0x4c, 0xb3, 0x58, 0x52, 0x9a, 0x48, 0x95, 0x14, 0xe6, 0x94, 0x49, 0xcc, 0xe7,
0x93, 0x19, 0x44, 0xb4, 0xe8, 0xc5, 0x6d, 0xc8, 0x3a, 0x2b, 0x2d, 0x87, 0xf3, 0x65, 0x3a, 0xbd,
0x52, 0xd4, 0xea, 0x15, 0x76, 0x1b, 0x5f, 0x38, 0x10, 0x90, 0xe5, 0x60, 0x10, 0x4c, 0x70, 0xe7,
0x8d, 0xae, 0xf8, 0xe5, 0x3e, 0xbe, 0x3f, 0x80, 0xda, 0x58, 0x9e, 0x57, 0xa3, 0x5a, 0x10, 0x43,
0xf0, 0x4b, 0xcb, 0x82, 0x4d, 0xa0, 0x9b, 0x9b, 0xe8, 0x05, 0x4f, 0x2d, 0xf3, 0xcd, 0x60, 0x4a,
0x82, 0xf2, 0x46, 0xee, 0x26, 0xde, 0x37, 0x5b, 0x23, 0xa9, 0x91, 0x65, 0x10, 0xce, 0xf1, 0x4e,
0xcc, 0x1d, 0xb7, 0x61, 0x7c, 0x12, 0x6d, 0x95, 0x9e, 0x31, 0xb4, 0xd5, 0xbd, 0xcd, 0xd1, 0xd8,
0x34, 0xeb, 0xa0, 0xc6, 0xe7, 0x6c, 0x14, 0x90, 0x1d, 0x5a, 0xe8, 0x97, 0x76, 0xcb, 0x4e, 0xa7,
0xc1, 0x7b, 0x09, 0x49, 0xae, 0xd6, 0x55, 0xcb, 0x4a, 0xf4, 0xef, 0x69, 0xc3, 0xe4, 0x93, 0x37,
0xd1, 0xa8, 0xc2, 0xcd, 0xe8, 0x3c, 0x85, 0x11, 0x23, 0xb8, 0x5b, 0x8f, 0xd1, 0xc4, 0xd0, 0x66,
0x80, 0x28, 0x18, 0xb2, 0x9c, 0x6a, 0x02, 0xd4, 0xbb, 0x19, 0xdd, 0xe0, 0xee, 0xcd, 0x40, 0x75,
0x27, 0x63, 0x29, 0x2f, 0x38, 0x20, 0x61, 0x9d, 0xca, 0x64, 0xbd, 0x32, 0xef, 0x72, 0x36, 0x0a,
0xca, 0x65, 0x9e, 0xe8, 0xa1, 0x11, 0xd8, 0xab, 0x53, 0x54, 0x2d, 0xab, 0x92, 0x03, 0x25, 0x0d,
0x73, 0x9f, 0xc0, 0x88, 0xc5, 0x68, 0x5c, 0xa5, 0xd5, 0xcd, 0x68, 0x0f, 0x8d, 0xcc, 0xbc, 0x3f,
0x03, 0xbf, 0xd9, 0xce, 0x30, 0x4c, 0x42, 0xd4, 0xbe, 0x35, 0xb4, 0x61, 0x5d, 0xb1, 0x41, 0xf1,
0xbb, 0xa5, 0x2e, 0x8b, 0xc1, 0x7d, 0x96, 0x5d, 0xf6, 0xb0, 0xd2, 0xa2, 0x5c, 0x6c, 0x80, 0xba,
0xa1, 0x05, 0xd5, 0x99, 0x18, 0x3f, 0xe0, 0xe5, 0x3f, 0x8a, 0xf0, 0xc7, 0x7b, 0x6c, 0x31, 0x6b,
0xd5, 0x0b, 0x07, 0x65, 0x94, 0xe9, 0xea, 0xb0, 0xcc, 0x3f, 0xd0, 0x69, 0x0b, 0xca, 0xb0, 0xfa,
0xe9, 0xbd, 0x18, 0xad, 0x67, 0xe5, 0x44, 0x3d, 0xbd, 0x0a, 0xff, 0xe8, 0xe7, 0x69, 0xf6, 0x7a,
0x7a, 0x19, 0x78, 0x57, 0xa7, 0x18, 0xf4, 0x9d, 0xff, 0x86, 0x93, 0x81, 0x3a, 0xc9, 0x47, 0xde,
0x63, 0x9d, 0xe7, 0xb7, 0xce, 0x38, 0x59, 0x05, 0x53, 0x38, 0xc5, 0x34, 0x59, 0x0d, 0xd5, 0x5d,
0xb5, 0xb1, 0xca, 0xd4, 0xa6, 0xea, 0xe6, 0x8b, 0xe5, 0xbf, 0x8c, 0x68, 0x96, 0xa7, 0xdf, 0xae,
0xc4, 0x42, 0x71, 0x23, 0xa5, 0xe3, 0xba, 0xba, 0x12, 0x63, 0xc3, 0x76, 0xe9, 0xf2, 0x6c, 0xa4,
0x05, 0x78, 0x20, 0xd5, 0xdb, 0xc5, 0x13, 0xd6, 0xc3, 0xf8, 0x1d, 0x9f, 0x1f, 0xbf, 0xaa, 0xae,
0x54, 0x17, 0x9f, 0x8a, 0x3f, 0x4e, 0xf9, 0x1e, 0xe8, 0xdb, 0x0e, 0x2c, 0xf3, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE pad_enumerate_xpm[1] = {{ png, sizeof( png ), "pad_enumerate_xpm" }};
//EOF
bitmaps_png/sources/lang_pt.svg
View file @ f2446132
This diff is collapsed.
bitmaps_png/sources/pad_enumerate.svg 0 → 100644
View file @ f2446132
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="26"
width="26"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="pad_enumerate.svg">
<metadata
id="metadata40">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1033"
id="namedview38"
showgrid="true"
inkscape:snap-to-guides="false"
inkscape:snap-grids="true"
inkscape:zoom="22.961538"
inkscape:cx="12.956449"
inkscape:cy="14.77885"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:snap-nodes="true">
<inkscape:grid
type="xygrid"
id="grid3017"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
spacingx="0.5px"
spacingy="0.5px" />
</sodipodi:namedview>
<defs
id="defs4" />
<g
transform="matrix(1.6382539,0,0,1.5572263,1.2572207,0.36314149)"
id="g16">
<rect
height="16"
width="16"
y="0"
x="0"
id="rect18"
style="fill-opacity:0" />
</g>
<path
style="fill:#008000;fill-opacity:0.69803922;stroke:#008000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 12.60804,8.1147404 c -4.6944198,0 -8.4999998,3.8055796 -8.4999998,8.4999996 0,4.69442 3.80558,8.5 8.4999998,8.5 4.69442,0 8.5,-3.80558 8.5,-8.5 0,-4.69442 -3.80558,-8.4999996 -8.5,-8.4999996 z m 0,4.9999996 c 1.932997,0 3.5,1.567003 3.5,3.5 0,1.932997 -1.567003,3.5 -3.5,3.5 -1.932997,0 -3.4999998,-1.567003 -3.4999998,-3.5 0,-1.932997 1.5670028,-3.5 3.4999998,-3.5 z"
id="path3763"
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
style="font-size:12.11407566px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
x="-0.99058318"
y="9.085557"
id="text2985"
sodipodi:linespacing="125%"
transform="scale(1.0095063,0.99058318)"><tspan
sodipodi:role="line"
id="tspan2987"
x="-0.99058318"
y="9.085557">1,2,3</tspan></text>
</svg>
common/dialog_about/AboutDialog_main.cpp
View file @ f2446132
......@@ -75,7 +75,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
info.SetAppName( wxT( ".: " ) + Pgm().App().GetAppName() + wxT( " :." ) );
/* Copyright information */
info.SetCopyright( wxT( "(C) 1992-2014 KiCad Developers Team" ) );
info.SetCopyright( wxT( "(C) 1992-2015 KiCad Developers Team" ) );
/* KiCad build version */
wxString version;
......@@ -238,8 +238,12 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
new Contributor( wxT( "Tim Hanson" ), wxT( "sideskate@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Hauptmech" ), wxT( "hauptmech@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Torsten Hüter" ), wxT( "torstenhtr@gmx.de" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Jerry Jacobs" ), wxT( "xor.gate.engineering@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Daniel Majewski" ), wxT( "lordblick@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Lorenzo Marcantonio" ), wxT( "lomarcan@tin.it" ) ) );
info.AddDeveloper(
......@@ -247,19 +251,31 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
info.AddDeveloper(
new Contributor( wxT( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Miguel Angel Ajo Pelayo" ),wxT( "miguelangel@nbee.es" ) ) );
new Contributor( wxT( "Miguel Angel Ajo Pelayo" ), wxT( "miguelangel@nbee.es" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Jacobo Aragunde Perez" ), wxT( "jaragunde@igalia.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Mark Roszko" ), wxT( "mark.roszko@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Brian Sidebotham" ), wxT( "brian.sidebotham@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Orson (Maciej Suminski)" ), wxT( "maciej.suminski@cern.ch" ) ) );
new Contributor( wxT( "Orson (Maciej Sumiński)" ), wxT( "maciej.suminski@cern.ch" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Tomasz Wlostowski" ), wxT( "tomasz.wlostowski@cern.ch" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Alexander Zakamaldin" ), wxT( "zaka62@mail.ru" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Henner Zeller" ), wxT( "h.zeller@acm.org" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Andrew Zonenberg" ), wxT( "azonenberg@drawersteak.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Nick Østergaard" ), wxT( "oe.nick@gmail.com" ) ) );
// The document writers
info.AddDocWriter(
......@@ -283,6 +299,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ), wxT( "French (FR)" ), KiBitmapNew( lang_fr_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ), wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Kerusey Karyu" ), wxT( "keruseykaryu@o2.pl" ), wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), wxT( "Portuguese (PT)" ), KiBitmapNew( lang_pt_xpm ) ) );
info.AddTranslator(
......@@ -302,6 +320,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Massimo Cioce" ), wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Marco Ciampa" ), wxT( "ciampix@libero.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Evgeniy Ivanov" ), wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ),KiBitmapNew( lang_bg_xpm ) ) );
......
common/ptree.cpp
View file @ f2446132
......@@ -152,14 +152,6 @@ static void formatList( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE&
int ctl = 0;
#if defined(DEBUG)
if( it->first == "field" )
{
int breakhere = 1;
(void) breakhere;
}
#endif
if( isLast( aTree, it ) ) // is "it" the last one?
{
//if( !( aCtl & CTL_IN_ATTRS ) )
......@@ -205,8 +197,7 @@ static void formatNode( OUTPUTFORMATTER* out, int aNestLevel, int aCtl,
else // is an atom, not a list
{
const char* atom = out->Quotes( aKey ).c_str();
out->Print( 0, " %s", atom );
out->Print( 0, " %s", out->Quotes( aKey ).c_str() );
}
}
......
eeschema/class_libentry.cpp
View file @ f2446132
......@@ -279,7 +279,23 @@ wxString LIB_PART::SubReference( int aUnit, bool aAddSeparator )
if( m_subpartFirstId >= '0' && m_subpartFirstId <= '9' )
subRef << aUnit;
else
subRef << wxChar( m_subpartFirstId + aUnit - 1);
{
// use letters as notation. To allow more than 26 units, the sub ref
// use one letter if letter = A .. Z or a ... z, and 2 letters otherwise
// first letter is expected to be 'A' or 'a' (i.e. 26 letters are available)
int u;
aUnit -= 1; // Unit number starts to 1. now to 0.
while( aUnit >= 26 ) // more than one letter are needed
{
u = aUnit / 26;
subRef << wxChar( m_subpartFirstId + u -1 );
aUnit %= 26;
}
u = m_subpartFirstId + aUnit;
subRef << wxChar( u );
}
return subRef;
}
......
eeschema/dialogs/dialog_edit_component_in_lib.cpp
View file @ f2446132
......@@ -35,6 +35,7 @@
#include <general.h>
#include <libeditframe.h>
#include <class_library.h>
#include <eeschema_id.h> // for ID_POPUP_SCH_SELECT_UNIT_CMP_MAX and ID_POPUP_SCH_SELECT_UNIT1
#include <dialog_edit_component_in_lib.h>
......@@ -157,6 +158,13 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::InitBasicPanel()
if( m_Parent->GetShowDeMorgan() )
m_AsConvertButt->SetValue( true );
int maxUnits = ID_POPUP_SCH_SELECT_UNIT_CMP_MAX - ID_POPUP_SCH_SELECT_UNIT1;
m_SelNumberOfUnits->SetRange (1, maxUnits );
m_staticTextNbUnits->SetLabel( wxString::Format(
_( "Number of Units (max allowed %d)" ), maxUnits ) );
/* Default values for a new component. */
if( component == NULL )
{
......
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
View file @ f2446132
......@@ -56,7 +56,7 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC : public DIALOG_EDIT_COMPONENT_IN_SCHEM
{
public:
/** Constructor */
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow* parent );
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow* aParent );
/**
* Function InitBuffers
......@@ -69,7 +69,7 @@ private:
friend class SCH_EDIT_FRAME;
SCH_EDIT_FRAME* m_Parent;
SCH_EDIT_FRAME* m_parent;
SCH_COMPONENT* m_cmp;
LIB_PART* m_part;
bool m_skipCopyFromPanel;
......@@ -165,10 +165,10 @@ void SCH_EDIT_FRAME::EditComponent( SCH_COMPONENT* aComponent )
}
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow* parent ) :
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( parent )
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow* aParent ) :
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( aParent )
{
m_Parent = (SCH_EDIT_FRAME*) parent;
m_parent = (SCH_EDIT_FRAME*) aParent;
m_cmp = NULL;
m_part = NULL;
......@@ -258,7 +258,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnSelectChipName( wxCommandEvent& event
{
wxArrayString dummy;
int dummyunit = 1;
wxString chipname = m_Parent->SelectComponentFromLibrary( wxEmptyString, dummy, dummyunit,
wxString chipname = m_parent->SelectComponentFromLibrary( wxEmptyString, dummy, dummyunit,
true, NULL, NULL );
if( chipname.IsEmpty() )
return;
......@@ -336,7 +336,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyPanelToOptions()
{
int unit_selection = unitChoice->GetCurrentSelection() + 1;
m_cmp->SetUnitSelection( &m_Parent->GetCurrentSheet(), unit_selection );
m_cmp->SetUnitSelection( &m_parent->GetCurrentSheet(), unit_selection );
m_cmp->SetUnit( unit_selection );
}
......@@ -397,8 +397,8 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnOKButtonClick( wxCommandEvent& event
// save old cmp in undo list if not already in edit, or moving ...
// or the component to be edited is part of a block
if( m_cmp->m_Flags == 0
|| m_Parent->GetScreen()->m_BlockLocate.GetState() != STATE_NO_BLOCK )
m_Parent->SaveCopyInUndoList( m_cmp, UR_CHANGED );
|| m_parent->GetScreen()->m_BlockLocate.GetState() != STATE_NO_BLOCK )
m_parent->SaveCopyInUndoList( m_cmp, UR_CHANGED );
copyPanelToOptions();
......@@ -412,7 +412,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnOKButtonClick( wxCommandEvent& event
// correct the problem before removing the undefined fields. It should also
// resolve most of the bug reports and questions regarding missing fields.
if( !m_FieldsBuf[i].GetName( false ).IsEmpty() && m_FieldsBuf[i].GetText().IsEmpty()
&& !m_Parent->GetTemplates().HasFieldName( m_FieldsBuf[i].GetName( false ) )
&& !m_parent->GetTemplates().HasFieldName( m_FieldsBuf[i].GetName( false ) )
&& !removeRemainingFields )
{
wxString msg = wxString::Format(
......@@ -455,11 +455,11 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnOKButtonClick( wxCommandEvent& event
// Reference has a specific initialization, depending on the current active sheet
// because for a given component, in a complex hierarchy, there are more than one
// reference.
m_cmp->SetRef( &m_Parent->GetCurrentSheet(), m_FieldsBuf[REFERENCE].GetText() );
m_cmp->SetRef( &m_parent->GetCurrentSheet(), m_FieldsBuf[REFERENCE].GetText() );
m_Parent->OnModify();
m_Parent->GetScreen()->TestDanglingEnds();
m_Parent->GetCanvas()->Refresh( true );
m_parent->OnModify();
m_parent->GetScreen()->TestDanglingEnds();
m_parent->GetCanvas()->Refresh( true );
EndQuasiModal( wxID_OK );
}
......@@ -664,7 +664,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::InitBuffers( SCH_COMPONENT* aComponent
// Add template fieldnames:
// Now copy in the template fields, in the order that they are present in the
// template field editor UI.
const TEMPLATE_FIELDNAMES& tfnames = m_Parent->GetTemplateFieldNames();
const TEMPLATE_FIELDNAMES& tfnames = m_parent->GetTemplateFieldNames();
for( TEMPLATE_FIELDNAMES::const_iterator it = tfnames.begin(); it!=tfnames.end(); ++it )
{
......@@ -724,7 +724,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::InitBuffers( SCH_COMPONENT* aComponent
}
#endif
m_FieldsBuf[REFERENCE].SetText( m_cmp->GetRef( &m_Parent->GetCurrentSheet() ) );
m_FieldsBuf[REFERENCE].SetText( m_cmp->GetRef( &m_parent->GetCurrentSheet() ) );
for( unsigned i = 0; i<m_FieldsBuf.size(); ++i )
{
......@@ -958,14 +958,11 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
if( unitcount < 1 )
unitcount = 1;
if( unitcount > 26 )
unitcount = 26;
unitChoice->Clear();
for( int ii=0; ii < unitcount; ii++ )
for( int ii = 1; ii <= unitcount; ii++ )
{
unitChoice->Append( wxString::Format( "%c", "?ABCDEFGHIJKLMNOPQRSTUVWXYZ"[ ii + 1 ] ) );
unitChoice->Append( LIB_PART::SubReference( ii, false ) );
}
// For components with multiple parts per package, set the unit selection
......@@ -973,7 +970,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
unitChoice->SetSelection( m_cmp->GetUnit() - 1 );
// Disable unit selection if only one unit exists:
if( m_cmp->GetUnit() <= 1 )
if( m_cmp->GetUnitCount() <= 1 )
{
unitChoice->Enable( false );
unitsInterchageableLabel->Show( false );
......@@ -1043,10 +1040,10 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::SetInitCmp( wxCommandEvent& event )
{
// save old cmp in undo list if not already in edit, or moving ...
if( m_cmp->m_Flags == 0 )
m_Parent->SaveCopyInUndoList( m_cmp, UR_CHANGED );
m_parent->SaveCopyInUndoList( m_cmp, UR_CHANGED );
INSTALL_UNBUFFERED_DC( dc, m_Parent->GetCanvas() );
m_cmp->Draw( m_Parent->GetCanvas(), &dc, wxPoint( 0, 0 ), g_XorMode );
INSTALL_UNBUFFERED_DC( dc, m_parent->GetCanvas() );
m_cmp->Draw( m_parent->GetCanvas(), &dc, wxPoint( 0, 0 ), g_XorMode );
// Initialize fixed field values to default values found in library
// Note: the field texts are not modified because they are set in schematic,
......@@ -1080,9 +1077,9 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::SetInitCmp( wxCommandEvent& event )
m_cmp->SetOrientation( CMP_NORMAL );
m_Parent->OnModify();
m_parent->OnModify();
m_cmp->Draw( m_Parent->GetCanvas(), &dc, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
m_cmp->Draw( m_parent->GetCanvas(), &dc, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
EndQuasiModal( wxID_OK );
}
......
eeschema/dialogs/dialog_edit_label.cpp
View file @ f2446132
......@@ -38,6 +38,7 @@
#include <drawtxt.h>
#include <confirm.h>
#include <sch_text.h>
#include <typeinfo>
#include <dialog_edit_label_base.h>
......@@ -50,6 +51,30 @@ class DIALOG_LABEL_EDITOR : public DIALOG_LABEL_EDITOR_BASE
public:
DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* parent, SCH_TEXT* aTextItem );
void SetTitle( const wxString& aTitle ) // OVERRIDE wxTopLevelWindow::SetTitle
{
// This class is shared for numerous tasks: a couple of
// single line labels and multi-line text fields.
// Often the desired size of the multi-line text field editor
// is larger than is needed for the single line label.
// Therefore the session retained sizes of these dialogs needs
// to be class independent, make them title dependent.
switch( m_CurrentText->Type() )
{
case SCH_GLOBAL_LABEL_T:
case SCH_HIERARCHICAL_LABEL_T:
case SCH_LABEL_T:
// labels can share retained settings probably.
break;
default:
m_hash_key = TO_UTF8( aTitle );
m_hash_key += typeid(*this).name();
}
DIALOG_LABEL_EDITOR_BASE::SetTitle( aTitle );
}
private:
void InitDialog( );
virtual void OnEnterKey( wxCommandEvent& aEvent );
......
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View file @ f2446132
......@@ -568,7 +568,7 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Pin::GetValue( wxVariant& aValue,
break;
case PIN_TYPE:
aValue = m_Backing->GetTypeString();
aValue = m_Backing->GetElectricalTypeName();
break;
case PIN_POSITION:
......
eeschema/eeschema_id.h
View file @ f2446132
......@@ -40,6 +40,13 @@
*/
#define MAX_SELECT_ITEM_IDS 10
/**
* The maximum number of units per package.
* Increase this number if that ever becomes a problem, but remember
* the popup menu to select a given unit could be not easy to use.
*/
#define MAX_UNIT_COUNT_PER_PACKAGE 64
/**
* Command IDs for the schematic editor.
......@@ -129,31 +136,10 @@ enum id_eeschema_frm
// Unit select context menus command IDs.
ID_POPUP_SCH_SELECT_UNIT_CMP,
ID_POPUP_SCH_SELECT_UNIT1,
ID_POPUP_SCH_SELECT_UNIT2,
ID_POPUP_SCH_SELECT_UNIT3,
ID_POPUP_SCH_SELECT_UNIT4,
ID_POPUP_SCH_SELECT_UNIT5,
ID_POPUP_SCH_SELECT_UNIT6,
ID_POPUP_SCH_SELECT_UNIT7,
ID_POPUP_SCH_SELECT_UNIT8,
ID_POPUP_SCH_SELECT_UNIT9,
ID_POPUP_SCH_SELECT_UNIT10,
ID_POPUP_SCH_SELECT_UNIT11,
ID_POPUP_SCH_SELECT_UNIT12,
ID_POPUP_SCH_SELECT_UNIT13,
ID_POPUP_SCH_SELECT_UNIT14,
ID_POPUP_SCH_SELECT_UNIT15,
ID_POPUP_SCH_SELECT_UNIT16,
ID_POPUP_SCH_SELECT_UNIT17,
ID_POPUP_SCH_SELECT_UNIT18,
ID_POPUP_SCH_SELECT_UNIT19,
ID_POPUP_SCH_SELECT_UNIT20,
ID_POPUP_SCH_SELECT_UNIT21,
ID_POPUP_SCH_SELECT_UNIT22,
ID_POPUP_SCH_SELECT_UNIT23,
ID_POPUP_SCH_SELECT_UNIT24,
ID_POPUP_SCH_SELECT_UNIT25,
ID_POPUP_SCH_SELECT_UNIT26,
// ... leave room for MAX_UNIT_COUNT_PER_PACKAGE IDs ,
// to select one unit among MAX_UNIT_COUNT_PER_PACKAGE in popup menu
ID_POPUP_SCH_SELECT_UNIT_CMP_MAX = ID_POPUP_SCH_SELECT_UNIT1
+ MAX_UNIT_COUNT_PER_PACKAGE,
// Change text type context menu command IDs.
ID_POPUP_SCH_CHANGE_TYPE_TEXT,
......
eeschema/erc.cpp
View file @ f2446132
......@@ -281,7 +281,9 @@ void Diagnose( NETLIST_OBJECT* aNetItemRef, NETLIST_OBJECT* aNetItemTst,
if( aMinConn == NOC ) /* Only 1 element in the net. */
{
msg.Printf( _( "Pin %s (%s) of component %s is unconnected." ),
GetChars( string_pinnum ), MsgPinElectricType[ii], GetChars( cmp_ref ) );
GetChars( string_pinnum ),
GetChars( LIB_PIN::GetElectricalTypeName( ii ) ),
GetChars( cmp_ref ) );
marker->SetData( ERCE_PIN_NOT_CONNECTED,
aNetItemRef->m_Start,
msg,
......@@ -296,7 +298,9 @@ void Diagnose( NETLIST_OBJECT* aNetItemRef, NETLIST_OBJECT* aNetItemTst,
&aNetItemRef->m_SheetPath );
msg.Printf( _( "Pin %s (%s) of component %s is not driven (Net %d)." ),
GetChars( string_pinnum ), MsgPinElectricType[ii], GetChars( cmp_ref ),
GetChars( string_pinnum ),
GetChars( LIB_PIN::GetElectricalTypeName( ii ) ),
GetChars( cmp_ref ),
aNetItemRef->GetNet() );
marker->SetData( ERCE_PIN_NOT_DRIVEN,
aNetItemRef->m_Start,
......@@ -336,10 +340,14 @@ void Diagnose( NETLIST_OBJECT* aNetItemRef, NETLIST_OBJECT* aNetItemTst,
alt_cmp = aNetItemTst->GetComponentParent()->GetRef( &aNetItemTst->m_SheetPath );
msg.Printf( _( "Pin %s (%s) of component %s is connected to " ),
GetChars( string_pinnum ), MsgPinElectricType[ii], GetChars( cmp_ref ) );
GetChars( string_pinnum ),
GetChars( LIB_PIN::GetElectricalTypeName( ii ) ),
GetChars( cmp_ref ) );
marker->SetData( errortype, aNetItemRef->m_Start, msg, aNetItemRef->m_Start );
msg.Printf( _( "pin %s (%s) of component %s (net %d)." ),
GetChars( alt_string_pinnum ), MsgPinElectricType[jj], GetChars( alt_cmp ),
GetChars( alt_string_pinnum ),
GetChars( LIB_PIN::GetElectricalTypeName( jj ) ),
GetChars( alt_cmp ),
aNetItemRef->GetNet() );
marker->SetAuxiliaryData( msg, aNetItemTst->m_Start );
}
......
eeschema/lib_pin.cpp
View file @ f2446132
......@@ -48,29 +48,6 @@
#include <sch_component.h>
/**
* Note: The following name lists are sentence capitalized per the GNOME UI
* standards for list controls. Please do not change the capitalization
* of these strings unless the GNOME UI standards are changed.
*/
static const wxString pin_orientation_names[] =
{
_( "Right" ),
_( "Left" ),
_( "Up" ),
_( "Down" )
};
// bitmaps to show pins orientations in dialog editor
// must have same order than pin_orientation_names
static const BITMAP_DEF s_icons_Pins_Orientations[] =
{
pinorient_right_xpm,
pinorient_left_xpm,
pinorient_up_xpm,
pinorient_down_xpm,
};
static const int pin_orientation_codes[] =
{
PIN_RIGHT,
......@@ -80,26 +57,22 @@ static const int pin_orientation_codes[] =
};
#define PIN_ORIENTATION_CNT ( sizeof( pin_orientation_names ) / \
sizeof( wxString ) )
#define PIN_ORIENTATION_CNT DIM( pin_orientation_codes )
static const wxString pin_style_names[] =
// bitmaps to show pins orientations in dialog editor
// must have same order than pin_orientation_names
static const BITMAP_DEF iconsPinsOrientations[] =
{
_( "Line" ),
_( "Inverted" ),
_( "Clock" ),
_( "Inverted clock" ),
_( "Input low" ),
_( "Clock low" ),
_( "Output low" ),
_( "Falling edge clock" ),
_( "NonLogic" )
pinorient_right_xpm,
pinorient_left_xpm,
pinorient_up_xpm,
pinorient_down_xpm,
};
// bitmaps to show pins shapes in dialog editor
// must have same order than pin_style_names
static BITMAP_DEF s_icons_Pins_Shapes[] =
static BITMAP_DEF iconsPinsShapes[] =
{
pinshape_normal_xpm,
pinshape_invert_xpm,
......@@ -113,8 +86,6 @@ static BITMAP_DEF s_icons_Pins_Shapes[] =
};
#define PIN_STYLE_CNT ( sizeof( pin_style_names ) / sizeof( wxString ) )
static const int pin_style_codes[] =
{
......@@ -129,25 +100,11 @@ static const int pin_style_codes[] =
NONLOGIC
};
static const wxString pin_electrical_type_names[] =
{
_( "Input" ),
_( "Output" ),
_( "Bidirectional" ),
_( "Tri-state" ),
_( "Passive" ),
_( "Unspecified" ),
_( "Power input" ),
_( "Power output" ),
_( "Open collector" ),
_( "Open emitter" ),
_( "Not connected" )
};
#define PIN_STYLE_CNT DIM( pin_style_codes )
// bitmaps to show pins electrical type in dialog editor
// must have same order than pin_electrical_type_names
static const BITMAP_DEF s_icons_Pins_Electrical_Type[] =
// must have same order than enum ElectricPinType (see lib_pin.h)
static const BITMAP_DEF iconsPinsElectricalType[] =
{
pintype_input_xpm,
pintype_output_xpm,
......@@ -162,12 +119,17 @@ static const BITMAP_DEF s_icons_Pins_Electrical_Type[] =
pintype_noconnect_xpm
};
#define PIN_ELECTRICAL_TYPE_CNT ( sizeof( pin_electrical_type_names ) / sizeof( wxString ) )
#define PIN_ELECTRICAL_TYPE_CNT DIM( iconsPinsElectricalType )
const wxChar* MsgPinElectricType[] =
const wxString LIB_PIN::GetCanonicalElectricalTypeName( unsigned aType )
{
// These strings are the canonical name of the electrictal type
// Not translated, no space in name, only ASCII chars.
// to use when the string name must be known and well defined
// must have same order than enum ElectricPinType (see lib_pin.h)
static const wxChar* msgPinElectricType[] =
{
wxT( "input" ),
wxT( "output" ),
wxT( "BiDi" ),
......@@ -180,7 +142,85 @@ const wxChar* MsgPinElectricType[] =
wxT( "openEm" ),
wxT( "NotConnected" ),
wxT( "???" )
};
};
if( aType > PIN_NMAX )
aType = PIN_NMAX;
return msgPinElectricType[ aType ];
}
// Helper functions to get the pin orientation name from pin_orientation_codes
// Note: the strings are *not* static because they are translated and must be built
// on the fly, to be properly translated
static const wxString getPinOrientationName( unsigned aPinOrientationCode )
{
/* Note: The following name lists are sentence capitalized per the GNOME UI
* standards for list controls. Please do not change the capitalization
* of these strings unless the GNOME UI standards are changed.
*/
const wxString pin_orientation_names[] =
{
_( "Right" ),
_( "Left" ),
_( "Up" ),
_( "Down" ),
wxT( "???" )
};
if( aPinOrientationCode > PIN_ORIENTATION_CNT )
aPinOrientationCode = PIN_ORIENTATION_CNT;
return pin_orientation_names[ aPinOrientationCode ];
}
const wxString LIB_PIN::GetElectricalTypeName( unsigned aPinsElectricalType )
{
const wxString pin_electrical_type_names[] =
{ // Keep these translated strings not static
_( "Input" ),
_( "Output" ),
_( "Bidirectional" ),
_( "Tri-state" ),
_( "Passive" ),
_( "Unspecified" ),
_( "Power input" ),
_( "Power output" ),
_( "Open collector" ),
_( "Open emitter" ),
_( "Not connected" ),
wxT( "???" )
};
if( aPinsElectricalType > PIN_ELECTRICAL_TYPE_CNT )
aPinsElectricalType = PIN_ELECTRICAL_TYPE_CNT;
return pin_electrical_type_names[ aPinsElectricalType ];
}
static const wxString getPinStyleName( unsigned aPinsStyle )
{
const wxString pin_style_names[] =
{ // Keep these translated strings not static
_( "Line" ),
_( "Inverted" ),
_( "Clock" ),
_( "Inverted clock" ),
_( "Input low" ),
_( "Clock low" ),
_( "Output low" ),
_( "Falling edge clock" ),
_( "NonLogic" ),
wxT( "???" )
};
if( aPinsStyle > PIN_STYLE_CNT )
aPinsStyle = PIN_STYLE_CNT;
return pin_style_names[ aPinsStyle ];
}
/// Utility for getting the size of the 'internal' pin decorators (as a radius)
......@@ -1935,12 +1975,13 @@ void LIB_PIN::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList )
aList.push_back( MSG_PANEL_ITEM( _( "Number" ), text, DARKCYAN ) );
aList.push_back( MSG_PANEL_ITEM( _( "Type" ),
wxGetTranslation( pin_electrical_type_names[ m_type ] ),
LIB_PIN::GetElectricalTypeName( m_type ),
RED ) );
int styleCodeIndex = GetStyleCodeIndex( m_shape );
if( styleCodeIndex >= 0 )
text = wxGetTranslation( pin_style_names[ styleCodeIndex ] );
text = getPinStyleName( styleCodeIndex );
else
text = wxT( "?" );
......@@ -1957,7 +1998,7 @@ void LIB_PIN::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList )
text = StringFromValue( g_UserUnit, m_length, true );
aList.push_back( MSG_PANEL_ITEM( _( "Length" ), text, MAGENTA ) );
text = wxGetTranslation( pin_orientation_names[ GetOrientationCodeIndex( m_orientation ) ] );
text = getPinOrientationName( (unsigned) GetOrientationCodeIndex( m_orientation ) );
aList.push_back( MSG_PANEL_ITEM( _( "Orientation" ), text, DARKMAGENTA ) );
}
......@@ -2080,7 +2121,7 @@ wxArrayString LIB_PIN::GetOrientationNames( void )
wxArrayString tmp;
for( unsigned ii = 0; ii < PIN_ORIENTATION_CNT; ii++ )
tmp.Add( wxGetTranslation( pin_orientation_names[ii] ) );
tmp.Add( getPinOrientationName( ii ) );
return tmp;
}
......@@ -2142,7 +2183,7 @@ wxArrayString LIB_PIN::GetStyleNames( void )
wxArrayString tmp;
for( unsigned ii = 0; ii < PIN_STYLE_CNT; ii++ )
tmp.Add( wxGetTranslation( pin_style_names[ii] ) );
tmp.Add( getPinStyleName( ii ) );
return tmp;
}
......@@ -2176,7 +2217,7 @@ wxArrayString LIB_PIN::GetElectricalTypeNames( void )
wxArrayString tmp;
for( unsigned ii = 0; ii < PIN_ELECTRICAL_TYPE_CNT; ii++ )
tmp.Add( wxGetTranslation( pin_electrical_type_names[ii] ) );
tmp.Add( LIB_PIN::GetElectricalTypeName( ii ) );
return tmp;
}
......@@ -2184,25 +2225,25 @@ wxArrayString LIB_PIN::GetElectricalTypeNames( void )
const BITMAP_DEF* LIB_PIN::GetElectricalTypeSymbols()
{
return s_icons_Pins_Electrical_Type;
return iconsPinsElectricalType;
}
const BITMAP_DEF* LIB_PIN::GetOrientationSymbols()
{
return s_icons_Pins_Orientations;
return iconsPinsOrientations;
}
const BITMAP_DEF* LIB_PIN::GetStyleSymbols()
{
return s_icons_Pins_Shapes;
return iconsPinsShapes;
}
BITMAP_DEF LIB_PIN::GetMenuImage() const
{
return s_icons_Pins_Electrical_Type[m_type];
return iconsPinsElectricalType[m_type];
}
......@@ -2212,14 +2253,15 @@ wxString LIB_PIN::GetSelectMenuText() const
wxString style;
int styleCode = GetStyleCodeIndex( m_shape );
if( styleCode >= 0 )
style = wxGetTranslation( pin_style_names[ styleCode ] );
style = getPinStyleName( styleCode );
else
style = wxT( "?" );
tmp.Printf( _( "Pin %s, %s, %s" ),
GetChars( GetNumberString() ),
GetChars( GetTypeString() ),
GetChars( GetElectricalTypeName() ),
GetChars( style )
);
return tmp;
......
eeschema/lib_pin.h
View file @ f2446132
......@@ -53,8 +53,6 @@ enum ElectricPinType {
PIN_NMAX /* End of List (no used as pin type) */
};
/* Electrical pin type names. */
extern const wxChar* MsgPinElectricType[];
/* Pin visibility flag bit. */
#define PIN_INVISIBLE 1 /* Set makes pin invisible */
......@@ -268,12 +266,39 @@ public:
*/
int GetType() const { return m_type; }
/**
* return a string giving the electrical type of a pin.
* Can be used when a known, not translated name is needed (for instance in net lists)
* @param aType is the electrical type (see enum ElectricPinType )
* @return The electrical name for a pin type (see enun MsgPinElectricType for names).
*/
static const wxString GetCanonicalElectricalTypeName( unsigned aType );
/**
* return a string giving the electrical type of the pin.
*
* Can be used when a known, not translated name is needed (for instance in net lists)
* @return The canonical electrical name of the pin.
*/
wxString const GetCanonicalElectricalTypeName() const
{
return GetCanonicalElectricalTypeName( m_type );
}
/**
* return a translated string for messages giving the electrical type of a pin.
* @param aType is the electrical type (see enum ElectricPinType )
* @return The electrical name of the pin (see enun MsgPinElectricType for names).
*/
wxString GetTypeString() const { return MsgPinElectricType[m_type]; }
static const wxString GetElectricalTypeName( unsigned aType );
/**
* return a translated string for messages giving the electrical type of the pin.
* @return The electrical name of the pin.
*/
wxString const GetElectricalTypeName() const
{
return GetElectricalTypeName( m_type );
}
/**
* Set the electrical type of the pin.
......
eeschema/load_one_schematic_file.cpp
View file @ f2446132
......@@ -269,7 +269,9 @@ again." );
aScreen->Show( 0, std::cout );
#endif
aScreen->BuildSchCmpLinksToLibCmp(); // Build links between each components and its part lib LIB_PART
// Build links between each components and its part lib LIB_PART
aScreen->CheckComponentsToPartsLinks();
aScreen->TestDanglingEnds();
msgDiag.Printf( _( "Done Loading <%s>" ), GetChars( aScreen->GetFileName() ) );
......
eeschema/netlist_exporters/netlist_exporter_generic.cpp
View file @ f2446132
......@@ -399,7 +399,7 @@ XNODE* NETLIST_EXPORTER_GENERIC::makeLibParts()
pins->AddChild( pin = node( sPin ) );
pin->AddAttribute( sPinNum, pinList[i]->GetNumberString() );
pin->AddAttribute( sPinName, pinList[i]->GetName() );
pin->AddAttribute( sPinType, pinList[i]->GetTypeString() );
pin->AddAttribute( sPinType, pinList[i]->GetCanonicalElectricalTypeName() );
// caution: construction work site here, drive slowly
}
......
eeschema/onrightclick.cpp
View file @ f2446132
......@@ -447,12 +447,17 @@ void AddMenusForEditComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, PART_L
{
wxString num_unit;
int unit = Component->GetUnit();
num_unit.Printf( _( "Unit %c" ), "?ABCDEFGHIJKLMNOPQRSTUVWXYZ"[ ii + 1 ] );
num_unit.Printf( _( "Unit %s" ), GetChars( LIB_PART::SubReference( ii + 1, false ) ) );
wxMenuItem * item = sel_unit_menu->Append( ID_POPUP_SCH_SELECT_UNIT1 + ii,
num_unit, wxEmptyString,
wxITEM_CHECK );
if( unit == ii + 1 )
item->Check(true);
// The ID max for these submenus is ID_POPUP_SCH_SELECT_UNIT_CMP_MAX
// See eeschema_id to modify this value.
if( ii >= (ID_POPUP_SCH_SELECT_UNIT_CMP_MAX - ID_POPUP_SCH_SELECT_UNIT1) )
break; // We have used all IDs for these submenus
}
AddMenuItem( editmenu, sel_unit_menu, ID_POPUP_SCH_SELECT_UNIT_CMP,
......
eeschema/sch_screen.cpp
View file @ f2446132
......@@ -540,7 +540,8 @@ bool SCH_SCREEN::Save( FILE* aFile ) const
return true;
}
void SCH_SCREEN::BuildSchCmpLinksToLibCmp()
void SCH_SCREEN::CheckComponentsToPartsLinks()
{
// Initialize or reinitialize the pointer to the LIB_PART for each component
// found in m_drawList, but only if needed (change in lib or schematic)
......@@ -561,12 +562,14 @@ void SCH_SCREEN::BuildSchCmpLinksToLibCmp()
SCH_COMPONENT::ResolveAll( c, libs );
m_modification_sync = mod_hash; // note the last mod_hash
// guard against unneeded runs through this code path by printing trace
DBG(printf("%s: resync-ing %s\n", __func__, TO_UTF8( GetFileName() ) );)
}
}
}
void SCH_SCREEN::Draw( EDA_DRAW_PANEL* aCanvas, wxDC* aDC, GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor )
{
/* note: SCH_SCREEN::Draw is useful only for schematic.
......@@ -574,7 +577,7 @@ void SCH_SCREEN::Draw( EDA_DRAW_PANEL* aCanvas, wxDC* aDC, GR_DRAWMODE aDrawMode
* their SCH_SCREEN::Draw() draws nothing
*/
BuildSchCmpLinksToLibCmp();
CheckComponentsToPartsLinks();
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
{
......@@ -596,7 +599,7 @@ void SCH_SCREEN::Draw( EDA_DRAW_PANEL* aCanvas, wxDC* aDC, GR_DRAWMODE aDrawMode
*/
void SCH_SCREEN::Plot( PLOTTER* aPlotter )
{
BuildSchCmpLinksToLibCmp();
CheckComponentsToPartsLinks();
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
{
......@@ -1406,7 +1409,7 @@ void SCH_SCREENS::BuildScreenList( EDA_ITEM* aItem )
// up to date (the cost is low if this is the case)
// We do this update here, because most of time this function is called
// to create a netlist, or an ERC, which need this update
screen->BuildSchCmpLinksToLibCmp();
screen->CheckComponentsToPartsLinks();
AddScreenToList( screen );
EDA_ITEM* strct = screen->GetDrawItems();
......
eeschema/schframe.cpp
View file @ f2446132
......@@ -274,7 +274,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
SCH_EDIT_FRAME::Process_Special_Functions )
EVT_MENU_RANGE( ID_POPUP_SCH_SELECT_UNIT1, ID_POPUP_SCH_SELECT_UNIT26,
EVT_MENU_RANGE( ID_POPUP_SCH_SELECT_UNIT1, ID_POPUP_SCH_SELECT_UNIT_CMP_MAX,
SCH_EDIT_FRAME::OnSelectUnit )
EVT_MENU_RANGE( ID_POPUP_SCH_CHANGE_TYPE_TEXT, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,
SCH_EDIT_FRAME::OnConvertTextType )
......
include/bitmaps.h
View file @ f2446132
......@@ -399,6 +399,7 @@ EXTERN_BITMAP( orient_xpm )
EXTERN_BITMAP( pad_sketch_xpm )
EXTERN_BITMAP( pad_xpm )
EXTERN_BITMAP( pad_dimensions_xpm )
EXTERN_BITMAP( pad_enumerate_xpm )
EXTERN_BITMAP( pads_mask_layers_xpm )
EXTERN_BITMAP( pagelayout_load_xpm )
EXTERN_BITMAP( pagelayout_load_default_xpm )
......
include/class_sch_screen.h
View file @ f2446132
......@@ -195,14 +195,15 @@ public:
void Place( SCH_EDIT_FRAME* frame, wxDC* DC ) { };
/**
* Initialize or reinitialize the pointer
* to the LIB_PART for each component found in m_drawList
* must be called:
* in Draw function
* when loading a schematic file
* before creating a netlist (in case a library is modified)
*/
void BuildSchCmpLinksToLibCmp();
* Function CheckComponentsToPartsLink
* initializes or reinitializes the weak reference
* to the LIB_PART for each SCH_COMPONENT found in m_drawList.
* It must be called from:
* - Draw function
* - when loading a schematic file
* - before creating a netlist (in case a library is modified)
*/
void CheckComponentsToPartsLinks();
/**
* Function Draw
......
include/kiway.h
View file @ f2446132
......@@ -56,7 +56,7 @@ CMake target must be defined to build either. Whether that is a separate build
or not is not the important thing. Simply having a single CMake target has
advantages. (Each builder person will have his/her own intentions relative to
use of python or not.) Once a DSO is python capable, it can be driven by any
number of python program tops, including demo-ing (automaton) and testing
number of python program tops, including demo-ing (automation) and testing
separately.</li>
......@@ -198,7 +198,7 @@ struct KIFACE
* @param aCtlBits consists of bit flags from the set of KFCTL_* \#defines above.
*
* @return wxWindow* - and if not NULL, should be cast into the known type using
* and old school cast. dynamic_cast is problemenatic since it needs typeinfo probably
* and old school cast. dynamic_cast is problematic since it needs typeinfo probably
* not contained in the caller's link image.
*/
VTBL_ENTRY wxWindow* CreateWindow( wxWindow* aParent, int aClassId,
......@@ -228,7 +228,7 @@ struct KIFACE
* having to link to the top process module which houses the KIWAY(s). More importantly
* it makes it possible to send custom wxEvents between DSOs and from the top
* process module down into the DSOs. The latter capability is thought useful
* for driving the lower DSOs from a python test rig or for demo (automaton) purposes.
* for driving the lower DSOs from a python test rig or for demo (automation) purposes.
* <p>
* Most all calls are via virtual functions, which means C++ vtables
* are used to hold function pointers and eliminate the need to link to specific
......
include/tool/coroutine.h
View file @ f2446132
......@@ -82,6 +82,9 @@ public:
m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
m_stackSize( c_defaultStackSize ), m_running( false )
{
// Avoid not initialized members, and make static analysers quiet
m_args = 0;
m_retVal = 0;
}
~COROUTINE()
......
include/tool/tool_manager.h
View file @ f2446132
......@@ -52,7 +52,7 @@ public:
~TOOL_MANAGER();
/**
* Generates an unique ID from for a tool with given name.
* Generates a unique ID from for a tool with given name.
*/
static TOOL_ID MakeToolId( const std::string& aToolName );
......
pagelayout_editor/pl_editor_frame.cpp
View file @ f2446132
......@@ -697,7 +697,9 @@ WORKSHEET_DATAITEM* PL_EDITOR_FRAME::Locate( const wxPoint& aPosition )
drawList.SetSheetNumber( screen->m_ScreenNumber );
drawList.SetSheetCount( screen->m_NumberOfScreens );
drawList.SetFileName( GetCurrFileName() );
drawList.SetSheetName( GetScreenDesc() );
// GetScreenDesc() returns a temporary string. Store it to avoid issues.
wxString descr = GetScreenDesc();
drawList.SetSheetName( descr );
drawList.BuildWorkSheetGraphicList( pageInfo, t_block, color, color );
......
pcbnew/class_netclass.h
View file @ f2446132
......@@ -125,7 +125,7 @@ public:
}
/**
* Function AddMember
* Function Add
* adds \a aNetname to this NETCLASS if it is not already in this NETCLASS.
* It is harmless to try and add a second identical name.
*/
......
pcbnew/class_pcb_text.cpp
View file @ f2446132
......@@ -91,7 +91,8 @@ void TEXTE_PCB::Draw( EDA_DRAW_PANEL* panel, wxDC* DC,
EDA_COLOR_T color = brd->GetLayerColor( m_Layer );
EDA_DRAW_MODE_T fillmode = FILLED;
DISPLAY_OPTIONS* displ_opts = (DISPLAY_OPTIONS*)panel->GetDisplayOptions();
DISPLAY_OPTIONS* displ_opts =
panel ? (DISPLAY_OPTIONS*)panel->GetDisplayOptions() : NULL;
if( displ_opts && displ_opts->m_DisplayDrawItemsFill == SKETCH )
fillmode = SKETCH;
......
pcbnew/class_track.cpp
View file @ f2446132
......@@ -531,6 +531,9 @@ TRACK* TRACK::GetEndNetCode( int NetCode )
void TRACK::DrawShortNetname( EDA_DRAW_PANEL* panel,
wxDC* aDC, GR_DRAWMODE aDrawMode, EDA_COLOR_T aBgColor )
{
if( ! panel )
return;
/* we must filter tracks, to avoid a lot of texts.
* - only tracks with a length > 10 * thickness are eligible
* and, of course, if we are not printing the board
......@@ -594,6 +597,7 @@ void TRACK::DrawShortNetname( EDA_DRAW_PANEL* panel,
}
LAYER_ID curr_layer = ( (PCB_SCREEN*) panel->GetScreen() )->m_Active_Layer;
if( ( aDC->LogicalToDeviceXRel( tsize ) >= MIN_TEXT_SIZE )
&& ( !(!IsOnLayer( curr_layer )&& displ_opts->m_ContrastModeDisplay) ) )
{
......@@ -601,8 +605,7 @@ void TRACK::DrawShortNetname( EDA_DRAW_PANEL* panel,
GRSetDrawMode( aDC, GR_COPY );
tsize = (tsize * 7) / 10; // small reduction to give a better look
EDA_RECT* clipbox = panel? panel->GetClipBox() : NULL;
DrawGraphicHaloText( clipbox, aDC, tpos,
DrawGraphicHaloText( panel->GetClipBox(), aDC, tpos,
aBgColor, BLACK, WHITE, net->GetShortNetname(), angle,
wxSize( tsize, tsize ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
......
pcbnew/collectors.cpp
View file @ f2446132
......@@ -466,7 +466,7 @@ void GENERAL_COLLECTOR::Collect( BOARD_ITEM* aItem, const KICAD_T aScanList[],
SetTimeNow(); // when snapshot was taken
// record the length of the primary list before concatonating on to it.
// record the length of the primary list before concatenating on to it.
m_PrimaryLength = m_List.size();
// append 2nd list onto end of the first list
......
pcbnew/collectors.h
View file @ f2446132
......@@ -228,7 +228,7 @@ protected:
/**
* The number of items that were originally in the primary list before the
* m_List2nd was concatonated onto the end of it.
* m_List2nd was concatenated onto the end of it.
*/
int m_PrimaryLength;
......
pcbnew/connect.h
View file @ f2446132
......@@ -107,7 +107,7 @@ public:
/**
* Function BuildPadsList
* Fills m_sortedPads with all pads that be connected to tracks
* pads are sorted by > then Y coordinates to allow fast binary search in list
* pads are sorted by X then Y coordinates to allow fast binary search in list
* @param aNetcode = net code to use to filter pads
* if aNetcode < 0, all pads will be put in list (default)
*/
......
pcbnew/dialogs/dialog_create_array.cpp
View file @ f2446132
......@@ -24,6 +24,7 @@
#include <wxPcbStruct.h>
#include <base_units.h>
#include <macros.h>
#include <class_drawpanel.h>
#include <class_board.h>
......@@ -35,16 +36,6 @@
// initialise statics
DIALOG_CREATE_ARRAY::CREATE_ARRAY_DIALOG_ENTRIES DIALOG_CREATE_ARRAY::m_options;
// character set
// NOTE: do not change the order of this relative to the ARRAY_NUMBERING_TYPE_T enum
static const wxString charSetDescriptions[] =
{
"Numerals (0,1,2,...,9,10)",
"Hexadecimal (0,1,...,F,10,...)",
"Alphabet, minus IOSQXZ",
"Alphabet, full 26 characters"
};
DIALOG_CREATE_ARRAY::DIALOG_CREATE_ARRAY( PCB_BASE_FRAME* aParent, wxPoint aOrigPos,
ARRAY_OPTIONS** aSettings ) :
......@@ -54,9 +45,19 @@ DIALOG_CREATE_ARRAY::DIALOG_CREATE_ARRAY( PCB_BASE_FRAME* aParent, wxPoint aOrig
m_originalItemPosition( aOrigPos )
{
// Set up numbering scheme drop downs
m_choicePriAxisNumbering->Set( boost::size( charSetDescriptions ), charSetDescriptions );
m_choiceSecAxisNumbering->Set( boost::size( charSetDescriptions ), charSetDescriptions );
m_choiceCircNumberingType->Set( boost::size( charSetDescriptions ), charSetDescriptions );;
//
// character set
// NOTE: do not change the order of this relative to the ARRAY_NUMBERING_TYPE_T enum
const wxString charSetDescriptions[] =
{
_( "Numerals (0,1,2,...,9,10)" ),
_( "Hexadecimal (0,1,...,F,10,...)" ),
_( "Alphabet, minus IOSQXZ" ),
_( "Alphabet, full 26 characters" )
};
m_choicePriAxisNumbering->Set( DIM( charSetDescriptions ), charSetDescriptions );
m_choiceSecAxisNumbering->Set( DIM( charSetDescriptions ), charSetDescriptions );
m_choiceCircNumberingType->Set( DIM( charSetDescriptions ), charSetDescriptions );;
m_choicePriAxisNumbering->SetSelection( 0 );
m_choiceSecAxisNumbering->SetSelection( 0 );
......
pcbnew/dialogs/dialog_create_array.h
View file @ f2446132
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 John Beard, john.j.beard@gmail.com
* Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2015 John Beard, john.j.beard@gmail.com
* Copyright (C) 1992-2015 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
......
pcbnew/dialogs/dialog_create_array_base.cpp
View file @ f2446132
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -128,25 +128,25 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID
m_labelPriAxisNumbering = new wxStaticText( m_gridPanel, wxID_ANY, _("Primary axis numbering:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelPriAxisNumbering->Wrap( -1 );
bSizer3->Add( m_labelPriAxisNumbering, 0, wxALL, 5 );
bSizer3->Add( m_labelPriAxisNumbering, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxArrayString m_choicePriAxisNumberingChoices;
m_choicePriAxisNumbering = new wxChoice( m_gridPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePriAxisNumberingChoices, 0 );
m_choicePriAxisNumbering->SetSelection( 0 );
bSizer3->Add( m_choicePriAxisNumbering, 0, wxALL|wxEXPAND, 5 );
bSizer3->Add( m_choicePriAxisNumbering, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_labelSecAxisNumbering = new wxStaticText( m_gridPanel, wxID_ANY, _("Secondary axis numbering:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelSecAxisNumbering->Wrap( -1 );
m_labelSecAxisNumbering->Enable( false );
bSizer3->Add( m_labelSecAxisNumbering, 0, wxALL, 5 );
bSizer3->Add( m_labelSecAxisNumbering, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxArrayString m_choiceSecAxisNumberingChoices;
m_choiceSecAxisNumbering = new wxChoice( m_gridPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceSecAxisNumberingChoices, 0 );
m_choiceSecAxisNumbering->SetSelection( 0 );
m_choiceSecAxisNumbering->Enable( false );
bSizer3->Add( m_choiceSecAxisNumbering, 0, wxALL|wxEXPAND, 5 );
bSizer3->Add( m_choiceSecAxisNumbering, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizer5;
bSizer5 = new wxBoxSizer( wxHORIZONTAL );
......@@ -255,12 +255,12 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID
m_labelCircNumbering = new wxStaticText( m_circularPanel, wxID_ANY, _("Numbering type:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelCircNumbering->Wrap( -1 );
bSizer6->Add( m_labelCircNumbering, 0, wxALL, 5 );
bSizer6->Add( m_labelCircNumbering, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxArrayString m_choiceCircNumberingTypeChoices;
m_choiceCircNumberingType = new wxChoice( m_circularPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceCircNumberingTypeChoices, 0 );
m_choiceCircNumberingType->SetSelection( 0 );
bSizer6->Add( m_choiceCircNumberingType, 0, wxALL|wxEXPAND, 5 );
bSizer6->Add( m_choiceCircNumberingType, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizer7;
bSizer7 = new wxBoxSizer( wxHORIZONTAL );
......
pcbnew/dialogs/dialog_create_array_base.fbp
View file @ f2446132
......@@ -2425,7 +2425,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
......@@ -2508,7 +2508,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxChoice" expanded="0">
<property name="BottomDockable">1</property>
......@@ -2596,7 +2596,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
......@@ -2679,7 +2679,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxChoice" expanded="0">
<property name="BottomDockable">1</property>
......@@ -4572,7 +4572,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
......@@ -4655,7 +4655,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxChoice" expanded="1">
<property name="BottomDockable">1</property>
......
pcbnew/dialogs/dialog_create_array_base.h
View file @ f2446132
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......
pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp
View file @ f2446132
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Sep 11 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -86,7 +86,7 @@ DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWi
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnClose ) );
m_viaTraceGapEqual->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::onViaTraceGapEqualCheck ), NULL, this );
m_viaTraceGapEqual->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnViaTraceGapEqualCheck ), NULL, this );
m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this );
m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this );
}
......@@ -95,7 +95,7 @@ DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE()
{
// Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnClose ) );
m_viaTraceGapEqual->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::onViaTraceGapEqualCheck ), NULL, this );
m_viaTraceGapEqual->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnViaTraceGapEqualCheck ), NULL, this );
m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this );
m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this );
......
pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h
View file @ f2446132
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Sep 11 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -53,7 +53,7 @@ class DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE : public DIALOG_SHIM
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void onViaTraceGapEqualCheck( wxCommandEvent& event ) { event.Skip(); }
virtual void OnViaTraceGapEqualCheck( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
......
pcbnew/edit_pcb_text.cpp
View file @ f2446132
......@@ -25,7 +25,7 @@
/**
* @file edit_pcb_text.cpp
* @brief Editimg of text on copper and technical layers (TEXTE_PCB class)
* @brief Editing of text on copper and technical layers (TEXTE_PCB class)
*/
#include <fctsys.h>
......
pcbnew/modview_frame.cpp
View file @ f2446132
......@@ -256,7 +256,6 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
#else
Zoom_Automatique( false );
#endif
Zoom_Automatique( true );
Show( true );
......
pcbnew/onrightclick.cpp
View file @ f2446132
This diff is collapsed.
pcbnew/pcad2kicadpcb_plugin/pcb_module.cpp
View file @ f2446132
......@@ -430,6 +430,7 @@ void PCB_MODULE::Parse( XNODE* aNode, wxStatusBar* aStatusBar,
}
}
if( lNode )
lNode = lNode->GetParent();
if( lNode )
......
pcbnew/pcbframe.cpp
View file @ f2446132
......@@ -707,6 +707,8 @@ void PCB_EDIT_FRAME::SwitchCanvas( wxCommandEvent& aEvent )
if( !use_gal )
Compile_Ratsnest( NULL, true );
else
GetBoard()->GetRatsnest()->ProcessBoard();
UseGalCanvas( use_gal );
}
......
pcbnew/router/pns_tool_base.cpp
View file @ f2446132
......@@ -57,7 +57,8 @@ using boost::optional;
TOOL_ACTION PNS_TOOL_BASE::ACT_RouterOptions( "pcbnew.InteractiveRouter.RouterOptions",
AS_CONTEXT, 'E',
"Routing Options...", "Shows a dialog containing router options.");
_( "Routing Options..." ),
_( "Shows a dialog containing router options." ) );
PNS_TOOL_BASE::PNS_TOOL_BASE( const std::string& aToolName ) :
......
pcbnew/tools/common_actions.cpp
View file @ f2446132
......@@ -27,6 +27,8 @@
#include <pcbnew_id.h>
#include <wx/defs.h>
// These members are static in class COMMON_ACTIONS: Build them here:
// Selection tool actions
TOOL_ACTION COMMON_ACTIONS::selectionActivate( "pcbnew.InteractiveSelection",
AS_GLOBAL, 0,
......@@ -373,7 +375,7 @@ TOOL_ACTION COMMON_ACTIONS::placePad( "pcbnew.ModuleEditor.placePad",
TOOL_ACTION COMMON_ACTIONS::enumeratePads( "pcbnew.ModuleEditor.enumeratePads",
AS_GLOBAL, 0,
_( "Enumerate pads" ), _( "Enumerate pads" ), NULL, AF_ACTIVATE );
_( "Enumerate pads" ), _( "Enumerate pads" ), pad_enumerate_xpm, AF_ACTIVATE );
TOOL_ACTION COMMON_ACTIONS::copyItems( "pcbnew.ModuleEditor.copyItems",
AS_GLOBAL, MD_CTRL + int( 'C' ),
......@@ -479,7 +481,7 @@ TOOL_ACTION COMMON_ACTIONS::alignBottom( "pcbnew.Place.alignBottom",
TOOL_ACTION COMMON_ACTIONS::alignLeft( "pcbnew.Place.alignLeft",
AS_GLOBAL, 0,
_( "Align items to the left" ),
_( "Aligns selected items to the top left" ) );
_( "Aligns selected items to the left edge" ) );
TOOL_ACTION COMMON_ACTIONS::alignRight( "pcbnew.Place.alignRight",
AS_GLOBAL, 0,
......@@ -493,7 +495,7 @@ TOOL_ACTION COMMON_ACTIONS::distributeHorizontally( "pcbnew.Place.distributeHori
TOOL_ACTION COMMON_ACTIONS::distributeVertically( "pcbnew.Place.distributeVertically",
AS_GLOBAL, 0,
_( "Distribure vertically" ),
_( "Distribute vertically" ),
_( "Distributes selected items along the vertical axis" ) );
......
pcbnew/tools/edit_tool.cpp
View file @ f2446132
......@@ -763,7 +763,15 @@ int EDIT_TOOL::Duplicate( const TOOL_EVENT& aEvent )
if( m_editModules )
new_item = editFrame->GetBoard()->m_Modules->DuplicateAndAddItem( item, increment );
else
{
#if 0
// @TODO: see if we allow zone duplication here
// Duplicate zones is especially tricky (overlaping zones must be merged)
// so zones are not duplicated
if( item->Type() != PCB_ZONE_AREA_T )
#endif
new_item = editFrame->GetBoard()->DuplicateAndAddItem( item, increment );
}
if( new_item )
{
......@@ -872,18 +880,30 @@ int EDIT_TOOL::CreateArray( const TOOL_EVENT& aEvent )
BOARD_ITEM* newItem = NULL;
if( ptN == 0 )
{
newItem = item;
}
else
{
// if renumbering, no need to increment
const bool increment = !array_opts->ShouldRenumberItems();
// Some items cannot be duplicated
// i.e. the ref and value fields of a footprint or zones
// therefore newItem can be null
if( m_editModules )
newItem = editFrame->GetBoard()->m_Modules->DuplicateAndAddItem( item, increment );
else
{
#if 0
// @TODO: see if we allow zone duplication here
// Duplicate zones is especially tricky (overlaping zones must be merged)
// so zones are not duplicated
if( item->Type() == PCB_ZONE_AREA_T )
newItem = NULL;
else
#endif
newItem = editFrame->GetBoard()->DuplicateAndAddItem( item, increment );
}
if( newItem )
{
......@@ -905,7 +925,7 @@ int EDIT_TOOL::CreateArray( const TOOL_EVENT& aEvent )
}
// set the number if needed:
if( array_opts->ShouldRenumberItems() )
if( newItem && array_opts->ShouldRenumberItems() )
{
switch( newItem->Type() )
{
......
pcbnew/tools/pcbnew_control.h
View file @ f2446132
......@@ -86,7 +86,7 @@ private:
///> Sets up handlers for various events.
void setTransitions();
///> Pointerto the currently used edit frame.
///> Pointer to the currently used edit frame.
PCB_BASE_FRAME* m_frame;
};
......
pcbnew/tools/selection_tool.cpp
View file @ f2446132
......@@ -73,7 +73,7 @@ SELECTION_TOOL::SELECTION_TOOL() :
m_selArea = new SELECTION_AREA;
m_selection.group = new KIGFX::VIEW_GROUP;
AddSubMenu( new SELECT_MENU, "Select...",
AddSubMenu( new SELECT_MENU, _( "Select..." ),
(SELECTION_CONDITION) SELECTION_CONDITIONS::OnlyConnectedItems &&
SELECTION_CONDITIONS::Count( 1 ) );
}
......
pcbnew/tools/selection_tool.h
View file @ f2446132
......@@ -225,7 +225,7 @@ private:
void setTransitions();
/**
* Function ClearSelection()
* Function clearSelection()
* Clears the current selection.
*/
void clearSelection();
......@@ -264,7 +264,7 @@ private:
bool selectable( const BOARD_ITEM* aItem ) const;
/**
* Function selectItem()
* Function select()
* Takes necessary action mark an item as selected.
*
* @param aItem is an item to be selected.
......@@ -272,7 +272,7 @@ private:
void select( BOARD_ITEM* aItem );
/**
* Function unselectItem()
* Function unselect()
* Takes necessary action mark an item as unselected.
*
* @param aItem is an item to be unselected.
......@@ -280,7 +280,7 @@ private:
void unselect( BOARD_ITEM* aItem );
/**
* Function unselectVisually()
* Function selectVisually()
* Marks item as selected, but does not add it to the ITEMS_PICKED_LIST.
* @param aItem is an item to be be marked.
*/
......@@ -294,7 +294,7 @@ private:
void unselectVisually( BOARD_ITEM* aItem ) const;
/**
* Function containsSelected()
* Function selectionContains()
* Checks if the given point is placed within any of selected items' bounding box.
*
* @return True if the given point is contained in any of selected items' bouding box.
......
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