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

Gerbview: add in file menu an option to load a zip archive containing Gerber and/or drill files.

This commit is contained in:
jean-pierre charras 2017-01-26 10:45:28 +01:00
parent 8f82f04153
commit 6329ca5065
10 changed files with 2368 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bitmaps_png/CMakeLists.txt
View File

@ -261,6 +261,7 @@ set( BMAPS_MID
gerbview_drill_file
gerbview_clear_layers
gerbview_open_recent_drill_files
gerbview_open_recent_ziparchive_files
general_deletions
general_ratsnest
glabel2label

112
bitmaps_png/cpp_26/gerbview_open_recent_ziparchive_files.cpp Normal file
View File

@ -0,0 +1,112 @@
/* 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, 0x05, 0xf7, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x7f, 0x68, 0x5d,
0x67, 0x19, 0xc7, 0x3f, 0xef, 0x7b, 0xde, 0x7b, 0xee, 0xef, 0x34, 0xb7, 0x4d, 0x9b, 0xa4, 0xbf,
0x96, 0x96, 0x9b, 0x2c, 0xae, 0x8b, 0xab, 0x56, 0x32, 0x10, 0xb6, 0x5a, 0x69, 0x3b, 0xbb, 0x8e,
0x6e, 0x46, 0xe9, 0x18, 0x14, 0xff, 0x29, 0x16, 0x51, 0x98, 0xa0, 0x58, 0x85, 0xa2, 0x56, 0x50,
0x11, 0x44, 0xb4, 0x36, 0x14, 0x29, 0xb4, 0xe8, 0x18, 0xeb, 0x58, 0x26, 0x08, 0x6e, 0x29, 0xd1,
0xe2, 0x50, 0xb4, 0xab, 0xac, 0xd4, 0xfa, 0xa3, 0x5d, 0x33, 0xb5, 0x4b, 0x9a, 0xb6, 0xf7, 0xf6,
0x66, 0x49, 0xee, 0xef, 0x7b, 0xee, 0x39, 0xe7, 0x3d, 0xaf, 0x7f, 0x24, 0xf7, 0x2c, 0x31, 0xa9,
0xe8, 0x1f, 0x3e, 0xf0, 0x72, 0x78, 0xce, 0x39, 0xef, 0xf3, 0x7d, 0x9e, 0xef, 0xf3, 0xe3, 0x7d,
0x05, 0xd0, 0x03, 0x6c, 0xe4, 0xff, 0x2b, 0xef, 0x2a, 0xa0, 0x77, 0x6c, 0x6c, 0xec, 0x7b, 0x9b,
0x37, 0x3f, 0xb0, 0x0c, 0xcc, 0x75, 0x5d, 0xe1, 0xfb, 0x5e, 0x12, 0xb0, 0x82, 0x20, 0xc0, 0xf7,
0x7d, 0x82, 0xc0, 0xa0, 0x03, 0x8d, 0x09, 0x02, 0x82, 0x85, 0xa5, 0xb5, 0x0e, 0x9f, 0x96, 0x65,
0x21, 0x84, 0x20, 0x1a, 0x8d, 0xfa, 0x99, 0x4c, 0xa6, 0x71, 0x63, 0x7c, 0xfc, 0xc6, 0xb3, 0x07,
0x0f, 0x1e, 0x55, 0x00, 0xbd, 0xbd, 0x7d, 0x59, 0x4b, 0xa9, 0xb6, 0xc5, 0x20, 0x5a, 0x6b, 0x2a,
0xd5, 0x0a, 0x6d, 0xe9, 0x34, 0x5a, 0x6b, 0xb4, 0xd6, 0x28, 0xa5, 0xf0, 0x7d, 0x1f, 0xad, 0x65,
0xf8, 0xce, 0x18, 0x83, 0x94, 0x92, 0x20, 0x08, 0x5a, 0xce, 0xe1, 0xfb, 0x3e, 0xe5, 0x72, 0x39,
0x9a, 0xcf, 0xe7, 0x93, 0xeb, 0x3a, 0x3b, 0xfb, 0x01, 0x54, 0xcb, 0xb0, 0xdf, 0xcc, 0x13, 0x0f,
0x7e, 0x8d, 0xc4, 0x07, 0xc0, 0x71, 0x1c, 0x12, 0x6e, 0x05, 0x55, 0x8b, 0x51, 0x73, 0xb6, 0x52,
0xd3, 0xdb, 0x42, 0xe3, 0x2d, 0xef, 0x57, 0xd2, 0x03, 0x63, 0x88, 0xda, 0x76, 0xe8, 0xf0, 0xe4,
0xe4, 0x64, 0x12, 0xb0, 0x15, 0x40, 0xa5, 0x52, 0x11, 0xd1, 0xda, 0x8b, 0xf4, 0x6c, 0x2a, 0x02,
0x72, 0xfe, 0x8f, 0x04, 0xb0, 0x1a, 0xa0, 0x8a, 0xef, 0x5c, 0xe3, 0xfc, 0x5b, 0xd7, 0xf1, 0x4d,
0x17, 0x08, 0x81, 0x58, 0x1c, 0xfa, 0x82, 0x5e, 0x77, 0x92, 0x38, 0x7e, 0x1c, 0x63, 0x0c, 0x6b,
0x3b, 0x3a, 0xc2, 0xcf, 0x4d, 0xc7, 0x11, 0x40, 0x54, 0x01, 0x94, 0x4a, 0x25, 0xd6, 0xdb, 0x60,
0x4c, 0xc7, 0x8a, 0x99, 0xb4, 0xa2, 0x19, 0x9e, 0x1a, 0x9c, 0xc2, 0x98, 0x5b, 0xf7, 0xcd, 0xf6,
0xef, 0xfe, 0x9a, 0x65, 0xc3, 0x43, 0x9f, 0x25, 0x9f, 0xcf, 0x33, 0x3b, 0x3b, 0x1b, 0xbe, 0x37,
0xc6, 0xb0, 0x84, 0x3a, 0xa3, 0x05, 0xc6, 0x0b, 0xee, 0x5f, 0x37, 0x62, 0x23, 0x4b, 0x43, 0x59,
0x2a, 0xcd, 0x66, 0x40, 0x3c, 0x91, 0x40, 0x4a, 0xb9, 0x74, 0x9b, 0x10, 0xff, 0x06, 0xe4, 0x05,
0x04, 0xde, 0x42, 0xb5, 0xcd, 0x94, 0x28, 0xfd, 0xf9, 0x06, 0x95, 0xeb, 0x37, 0xf1, 0x2b, 0x35,
0x8c, 0xaf, 0x11, 0xd1, 0x08, 0x76, 0xa6, 0x8d, 0xb6, 0x6d, 0x59, 0xda, 0xb6, 0xf7, 0xa3, 0x12,
0xb1, 0x25, 0x06, 0x03, 0x2d, 0x91, 0x52, 0x2e, 0x03, 0x6a, 0x89, 0x6a, 0xa1, 0x1a, 0x3f, 0xc0,
0xab, 0xb8, 0xbc, 0x77, 0xe1, 0x22, 0xc5, 0x2b, 0xd7, 0x31, 0x41, 0x40, 0x3a, 0x1e, 0x25, 0x6d,
0x2b, 0xac, 0x88, 0x8d, 0xaf, 0x03, 0x1a, 0xb9, 0x69, 0xf2, 0x13, 0x77, 0x99, 0xbe, 0x70, 0x89,
0x35, 0x8f, 0x7d, 0x84, 0xcc, 0x47, 0x3f, 0x14, 0x7a, 0x2c, 0x82, 0x79, 0x90, 0x96, 0xbe, 0x72,
0x44, 0x02, 0x82, 0xd9, 0x22, 0xb7, 0x5e, 0x79, 0x9d, 0xe6, 0xcc, 0x1c, 0x9d, 0xed, 0x29, 0xd6,
0xae, 0x4a, 0xa1, 0xa4, 0x00, 0x0c, 0x18, 0x16, 0x68, 0x13, 0x38, 0x9e, 0xa6, 0x50, 0xaa, 0x52,
0xb8, 0x70, 0x91, 0xda, 0xbb, 0xb7, 0xe9, 0x7e, 0x66, 0x2f, 0x96, 0x6d, 0x83, 0x31, 0x48, 0x21,
0x10, 0x42, 0xd0, 0x68, 0x34, 0xd0, 0x5a, 0xe3, 0xfb, 0x3e, 0x9e, 0xe7, 0xbd, 0x0f, 0x24, 0xeb,
0x73, 0xc2, 0xf9, 0xe5, 0xcf, 0x51, 0x4e, 0x93, 0x6c, 0xf7, 0x1a, 0x52, 0xb1, 0x08, 0xce, 0x96,
0xc7, 0x28, 0x3f, 0xf2, 0x69, 0xca, 0xab, 0xfb, 0xf8, 0xea, 0x37, 0xbe, 0xcd, 0x4f, 0x7e, 0xf0,
0x1d, 0xec, 0x89, 0x4b, 0xa8, 0x4b, 0x3f, 0x65, 0x73, 0x64, 0x9c, 0x54, 0xcc, 0xe6, 0xd6, 0x3f,
0x6f, 0x71, 0xe7, 0xdc, 0x2b, 0x74, 0xed, 0xee, 0xa5, 0x5e, 0x7c, 0x08, 0xb1, 0x00, 0x94, 0xcb,
0xe5, 0x42, 0x10, 0x21, 0x84, 0x09, 0x81, 0xa2, 0x6f, 0xfc, 0x30, 0x46, 0xbd, 0x41, 0xcf, 0xfa,
0x0e, 0x92, 0xc9, 0x34, 0xb3, 0x9f, 0xf8, 0x16, 0xcd, 0xbe, 0xdd, 0xf3, 0x54, 0x38, 0x0e, 0xd1,
0x78, 0x02, 0xd1, 0xd6, 0x89, 0xb3, 0xed, 0x29, 0xae, 0x38, 0xdd, 0x7c, 0xcc, 0xbb, 0xc2, 0xea,
0xdf, 0xfe, 0x18, 0x63, 0x0c, 0x53, 0x77, 0x4b, 0x14, 0xaf, 0x4e, 0x10, 0x24, 0xb3, 0x08, 0x21,
0xee, 0x9b, 0x23, 0xf9, 0x99, 0x5e, 0xb6, 0xca, 0x77, 0xde, 0x50, 0xdd, 0x99, 0x34, 0xa9, 0x98,
0xcd, 0xdc, 0xfe, 0xef, 0xe2, 0x3e, 0xb8, 0x07, 0xa5, 0x14, 0x4a, 0x29, 0xda, 0xda, 0xda, 0x38,
0x79, 0xf2, 0x24, 0x96, 0x65, 0x71, 0xfa, 0xf4, 0x69, 0x7a, 0xfb, 0xfa, 0x30, 0x7b, 0xbe, 0x44,
0xb0, 0xeb, 0x79, 0xd6, 0xa4, 0x13, 0xb4, 0x27, 0xe3, 0x94, 0xde, 0x2e, 0x22, 0x9a, 0xde, 0xb2,
0xfc, 0x2c, 0x01, 0x7a, 0xba, 0x87, 0x27, 0x2d, 0x01, 0x6b, 0xdb, 0x53, 0x34, 0xfa, 0x76, 0xe3,
0xf5, 0xee, 0x42, 0x29, 0x85, 0x65, 0x59, 0x4b, 0xd6, 0xb5, 0x6b, 0xd7, 0xb8, 0x7c, 0xf9, 0x32,
0x1b, 0x36, 0x6c, 0x98, 0x9f, 0x67, 0x7b, 0xbf, 0x0c, 0x1d, 0x5b, 0x58, 0xb7, 0x2a, 0x49, 0xe0,
0x69, 0x92, 0x33, 0x53, 0xff, 0xa9, 0x18, 0x8c, 0x5c, 0x9f, 0x60, 0xb0, 0x2d, 0x11, 0x43, 0x62,
0x70, 0x76, 0x1c, 0x5a, 0x11, 0xc4, 0xf3, 0x3c, 0x8e, 0x1e, 0x3d, 0xca, 0xfe, 0xfd, 0xfb, 0xb1,
0x2c, 0x6b, 0x7e, 0xb6, 0x21, 0xd1, 0x83, 0x87, 0x48, 0x44, 0x23, 0x44, 0x23, 0x8a, 0x44, 0xe9,
0x5e, 0x98, 0xa3, 0xc5, 0xd2, 0x6a, 0x58, 0x19, 0x53, 0xac, 0x8b, 0x47, 0x23, 0x20, 0x14, 0x66,
0xd3, 0xf6, 0x65, 0x20, 0x4a, 0x29, 0x4e, 0x9c, 0x38, 0xc1, 0xe4, 0xe4, 0x24, 0x07, 0x0e, 0x1c,
0x08, 0x07, 0xae, 0xd6, 0x1a, 0xbd, 0xf9, 0xc3, 0x80, 0x21, 0x6e, 0x2b, 0xe2, 0x32, 0xb2, 0xc4,
0xf0, 0x4a, 0x7d, 0x24, 0x2d, 0x29, 0xf0, 0xa2, 0x29, 0x9e, 0xfe, 0xe4, 0x10, 0xd9, 0x6c, 0x96,
0xe1, 0xe1, 0xe1, 0xb0, 0xf9, 0x46, 0x47, 0x47, 0x39, 0x73, 0xe6, 0x0c, 0x83, 0x83, 0x83, 0x64,
0x32, 0x19, 0xb4, 0xd6, 0xb8, 0xae, 0xcb, 0xbe, 0x7d, 0xfb, 0xc8, 0x3e, 0xb0, 0x89, 0xb3, 0x5d,
0x60, 0x49, 0x89, 0xa9, 0x17, 0x39, 0x77, 0xee, 0xdc, 0x32, 0x20, 0x21, 0x84, 0x06, 0x8c, 0x02,
0x02, 0x1d, 0x18, 0x19, 0x69, 0x56, 0x39, 0xff, 0xfa, 0x25, 0xa4, 0x8a, 0x20, 0xa5, 0x0c, 0x29,
0x1a, 0x1e, 0x1e, 0x26, 0x08, 0x02, 0xa6, 0xa7, 0xa7, 0xa9, 0xd5, 0x6a, 0xd8, 0xb6, 0x8d, 0x10,
0x82, 0xd1, 0xd1, 0x51, 0xc4, 0xed, 0xab, 0x70, 0xe6, 0x37, 0xe8, 0x20, 0x40, 0xdb, 0x29, 0x84,
0x10, 0x68, 0xad, 0x43, 0x10, 0xcf, 0xf3, 0xc8, 0x66, 0xb3, 0x4d, 0xa0, 0x21, 0x1d, 0x9f, 0x42,
0xa3, 0xe9, 0x81, 0xf1, 0x89, 0xdc, 0xbe, 0x12, 0xd2, 0xd5, 0x02, 0x3a, 0x75, 0xea, 0x14, 0x3b,
0x77, 0xee, 0xe4, 0xce, 0x9d, 0x3b, 0x1c, 0x39, 0x72, 0x84, 0x7a, 0xbd, 0x1e, 0x52, 0x27, 0x6f,
0xbe, 0x09, 0x08, 0x1a, 0xae, 0x4f, 0x25, 0xd2, 0x4e, 0xb5, 0x5a, 0xa5, 0x5e, 0xaf, 0xe3, 0xba,
0x2e, 0x42, 0x08, 0x06, 0x06, 0x06, 0xe8, 0xef, 0xef, 0xf7, 0x01, 0xad, 0xa6, 0x6a, 0x5c, 0x4c,
0x44, 0x9c, 0xa1, 0x80, 0x76, 0x22, 0x6f, 0xbd, 0x88, 0x79, 0xf0, 0x71, 0xa4, 0x94, 0x18, 0x63,
0xd0, 0x5a, 0xb3, 0x65, 0xcb, 0x16, 0xce, 0x9e, 0x3d, 0x4b, 0xb9, 0x5c, 0x66, 0x64, 0x64, 0x84,
0x63, 0xc7, 0x8e, 0x71, 0xfc, 0xf8, 0x71, 0x22, 0xd2, 0x60, 0xff, 0x69, 0x84, 0x7a, 0xd3, 0xa3,
0xe9, 0xf9, 0x64, 0xf7, 0x1d, 0xa6, 0x77, 0xe0, 0xc9, 0xf0, 0xd4, 0xb5, 0x6d, 0x9b, 0x54, 0x2a,
0xc5, 0xdc, 0xdc, 0x5c, 0x00, 0xa0, 0x5e, 0x9b, 0xe4, 0x57, 0xbd, 0xed, 0x62, 0x68, 0xba, 0x58,
0xa5, 0xf3, 0xda, 0x79, 0xcc, 0xdf, 0x46, 0x09, 0x1e, 0x7e, 0x7f, 0x43, 0x6b, 0xc5, 0xe3, 0x71,
0x0e, 0x1d, 0x3a, 0x44, 0xb9, 0x5c, 0x66, 0x62, 0x62, 0x82, 0x81, 0xc9, 0x5f, 0x60, 0x15, 0x6f,
0x53, 0x28, 0xd5, 0x50, 0xe9, 0x0e, 0xba, 0x1f, 0x7f, 0x16, 0x63, 0x27, 0x96, 0xed, 0x0b, 0xab,
0xee, 0x85, 0xbf, 0x73, 0x33, 0xb6, 0x7d, 0xbf, 0x97, 0x9b, 0xab, 0x50, 0x75, 0x3c, 0xc4, 0xcb,
0x5f, 0xc4, 0xfc, 0xe5, 0xb5, 0x90, 0x9e, 0x72, 0xb9, 0xcc, 0xe1, 0xc3, 0x87, 0x43, 0x3d, 0x1e,
0x8b, 0xf2, 0xf0, 0xdd, 0x31, 0x12, 0x97, 0x7f, 0xc6, 0x4c, 0xa5, 0x4e, 0xb1, 0xd6, 0x60, 0xf5,
0x81, 0xaf, 0x60, 0xec, 0xc4, 0x92, 0x53, 0xd7, 0x75, 0x3d, 0x9a, 0xcd, 0x66, 0x98, 0x33, 0x05,
0x90, 0x7a, 0xee, 0xfb, 0x8d, 0xa0, 0xf0, 0x8f, 0xc8, 0x44, 0x6e, 0x9c, 0x9e, 0x4e, 0x43, 0xea,
0xa5, 0xcf, 0x21, 0xfa, 0x3e, 0x8e, 0xfb, 0xc1, 0x67, 0x30, 0xab, 0xfb, 0xb0, 0xed, 0x08, 0xcc,
0x4c, 0x10, 0x99, 0xf8, 0x23, 0xf1, 0x2b, 0x2f, 0xa3, 0x0a, 0xe3, 0xcc, 0x56, 0x1b, 0x4c, 0xbd,
0x57, 0x22, 0xfd, 0xe8, 0xa7, 0x58, 0xb5, 0xe7, 0xf3, 0xe8, 0x45, 0x17, 0x15, 0xd7, 0xf3, 0xf0,
0x3d, 0x6f, 0x61, 0xde, 0xe9, 0xd6, 0xdc, 0x66, 0xcf, 0xdd, 0x5c, 0x6e, 0x24, 0x5a, 0xbb, 0xb7,
0x2a, 0xff, 0xa3, 0x83, 0xb8, 0xb9, 0x77, 0xfe, 0xab, 0xe9, 0x3d, 0x5b, 0xa9, 0x93, 0x7a, 0x64,
0x2f, 0x5d, 0x5f, 0x78, 0x01, 0x13, 0x49, 0x2c, 0x8a, 0xc4, 0xc5, 0xf5, 0x3c, 0x3c, 0xd7, 0xc3,
0xf3, 0x3d, 0x1a, 0xf5, 0x7a, 0x6e, 0xc7, 0x8e, 0x1d, 0x43, 0x0a, 0xe0, 0x5e, 0x3e, 0x5f, 0xd8,
0xb8, 0x69, 0x93, 0xb5, 0xf6, 0x6b, 0x63, 0xa2, 0xf4, 0xea, 0x37, 0xed, 0x7b, 0x7f, 0x78, 0x29,
0x72, 0xaf, 0x58, 0x25, 0x1d, 0x8f, 0x12, 0xb3, 0x15, 0x96, 0x94, 0xf3, 0xe7, 0x51, 0xd3, 0xa5,
0xd6, 0xf4, 0x10, 0xd1, 0x94, 0xc9, 0x0c, 0x7d, 0xdd, 0x4b, 0x3f, 0xf1, 0xbc, 0xdb, 0x34, 0x02,
0xb3, 0x40, 0x51, 0x78, 0xf5, 0xd2, 0x0b, 0x79, 0x11, 0x82, 0x42, 0xa1, 0x50, 0x68, 0x45, 0xf4,
0x01, 0x20, 0xbb, 0xb8, 0xc9, 0x9e, 0xd8, 0x48, 0xd7, 0x73, 0xbd, 0xec, 0xda, 0x9a, 0xe2, 0xd1,
0xb8, 0xa2, 0x4b, 0x49, 0x12, 0x6e, 0x40, 0xa9, 0xe4, 0x92, 0x7b, 0x7b, 0x8e, 0x37, 0x4f, 0x5d,
0xe7, 0xf7, 0xe3, 0x45, 0x2a, 0xff, 0xc3, 0x05, 0xf2, 0xea, 0xbf, 0x00, 0x27, 0xea, 0x33, 0x24,
0xfb, 0x08, 0x42, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE gerbview_open_recent_ziparchive_files_xpm[1] = {{ png, sizeof( png ), "gerbview_open_recent_ziparchive_files_xpm" }};
//EOF

1958
bitmaps_png/sources/gerbview_open_recent_ziparchive_files.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

19
gerbview/events_called_functions.cpp
View File

@ -53,6 +53,7 @@ BEGIN_EVENT_TABLE( GERBVIEW_FRAME, EDA_DRAW_FRAME )
EVT_TOOL( wxID_FILE, GERBVIEW_FRAME::Files_io )
EVT_TOOL( ID_GERBVIEW_ERASE_ALL, GERBVIEW_FRAME::Files_io )
EVT_TOOL( ID_GERBVIEW_LOAD_DRILL_FILE, GERBVIEW_FRAME::Files_io )
EVT_TOOL( ID_GERBVIEW_LOAD_ZIP_ARCHIVE_FILE, GERBVIEW_FRAME::Files_io )
EVT_TOOL( ID_NEW_BOARD, GERBVIEW_FRAME::Files_io )
EVT_TOOL( ID_GERBVIEW_SET_PAGE_BORDER, GERBVIEW_FRAME::Process_Special_Functions )
@ -62,9 +63,13 @@ BEGIN_EVENT_TABLE( GERBVIEW_FRAME, EDA_DRAW_FRAME )
EVT_MENU( ID_GERBVIEW_EXPORT_TO_PCBNEW, GERBVIEW_FRAME::ExportDataInPcbnewFormat )
EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, GERBVIEW_FRAME::OnGbrFileHistory )
EVT_MENU_RANGE( ID_GERBVIEW_DRILL_FILE1, ID_GERBVIEW_DRILL_FILE9,
GERBVIEW_FRAME::OnDrlFileHistory )
EVT_MENU_RANGE( ID_GERBVIEW_ZIP_FILE1, ID_GERBVIEW_ZIP_FILE9,
GERBVIEW_FRAME::OnZipFileHistory )
EVT_MENU( wxID_EXIT, GERBVIEW_FRAME::OnQuit )
// menu Preferences
@ -317,7 +322,19 @@ void GERBVIEW_FRAME::OnShowGerberSourceFile( wxCommandEvent& event )
if( !editorname.IsEmpty() )
{
wxFileName fn( gerber_layer->m_FileName );
ExecuteFile( this, editorname, QuoteFullPath( fn ) );
// Call the editor only if the Gerber/drill source file is available.
// This is not always the case, because it can be a temporary file
// if it comes from a zip archive.
if( !fn.FileExists() )
{
wxString msg;
msg.Printf( _( "Source file '%s' is not available" ),
GetChars( fn.GetFullPath() ) );
wxMessageBox( msg );
}
else
ExecuteFile( this, editorname, QuoteFullPath( fn ) );
}
else
wxMessageBox( _( "No editor defined. Please select one" ) );

190
gerbview/files.cpp
View File

@ -27,8 +27,13 @@
*/
#include <fctsys.h>
#include <wx/fs_zip.h>
#include <wx/wfstream.h>
#include <wx/zipstrm.h>
#include <common.h>
#include <class_drawpanel.h>
#include <reporter.h>
#include <gerbview_frame.h>
#include <gerbview_id.h>
@ -63,6 +68,18 @@ void GERBVIEW_FRAME::OnDrlFileHistory( wxCommandEvent& event )
}
}
void GERBVIEW_FRAME::OnZipFileHistory( wxCommandEvent& event )
{
wxString filename;
filename = GetFileFromHistory( event.GetId(), _( "Zip files" ), &m_zipFileHistory );
if( !filename.IsEmpty() )
{
Erase_Current_DrawLayer( false );
LoadZipArchiveFile( filename );
}
}
/* File commands. */
void GERBVIEW_FRAME::Files_io( wxCommandEvent& event )
@ -88,6 +105,11 @@ void GERBVIEW_FRAME::Files_io( wxCommandEvent& event )
m_canvas->Refresh();
break;
case ID_GERBVIEW_LOAD_ZIP_ARCHIVE_FILE:
LoadZipArchiveFile( wxEmptyString );
m_canvas->Refresh();
break;
default:
wxFAIL_MSG( wxT( "File_io: unexpected command id" ) );
break;
@ -301,3 +323,171 @@ bool GERBVIEW_FRAME::LoadExcellonFiles( const wxString& aFullFileName )
return true;
}
bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aReporter )
{
wxFileSystem zipfilesys;
zipfilesys.AddHandler( new wxZipFSHandler );
zipfilesys.ChangePathTo( aFullFileName + wxT( "#zip:" ), true );
wxString localfilename = zipfilesys.FindFirst( wxT( "*.*" ) );
wxFileName fn( aFullFileName );
wxString unzipDir = fn.GetPath();
// Update the list of recent zip files.
UpdateFileHistory( aFullFileName, &m_zipFileHistory );
bool success = true;
wxString msg;
while( !localfilename.IsEmpty() )
{
wxFSFile* zipfile = zipfilesys.OpenFile( localfilename );
if( !zipfile )
{
if( aReporter )
{
msg.Printf( _( "Zip file '%s' cannot be read" ), GetChars( aFullFileName ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
success = false;
break;
}
// In order to load a file in this archive, this file is unzipped and
// a temporary file is created in the same folder as the archive.
// This file will be deleted after being loaded in the viewer.
// One other way is to load it from the memory image, but currently
// Read_GERBER_File and Read_EXCELLON_File expect a file.
wxFileName uzfn = localfilename.AfterLast( ':' );
uzfn.MakeAbsolute( unzipDir );
// The unzipped file in only a temporary file. Give it a filename
// which cannot conflict with an usual gerber or drill file
wxString unzipfilename = uzfn.GetFullPath() + "$";
wxInputStream* stream = zipfile->GetStream();
wxFFileOutputStream* temporary_ofile = new wxFFileOutputStream( unzipfilename );
if( temporary_ofile->Ok() )
temporary_ofile->Write( *stream );
else
{
success = false;
}
delete temporary_ofile;
delete zipfile;
// The archiv contains Gerber and/or Excellon drill files. Use the right loader;
// gerber files ext is usually "gbr", but can be also an other value, starting by "g"
// drill files do not have a well defined ext
// (it is .drl in kicad, but .txt in Altium for istance)
int layer = getActiveLayer();
setActiveLayer( layer, false );
bool read_ok = true;
if( uzfn.GetExt().Lower()[0] == 'g' )
{
// Read gerber files: each file is loaded on a new GerbView layer
read_ok = Read_GERBER_File( unzipfilename );
}
else
{
read_ok = Read_EXCELLON_File( unzipfilename );
}
if( !read_ok )
{
success = false;
if( aReporter )
{
msg.Printf( _("file %s was not read"), GetChars( unzipfilename ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
}
// The unzipped file is only a temporary file, delete it.
wxRemoveFile( unzipfilename );
layer = getNextAvailableLayer( layer );
if( layer == NO_AVAILABLE_LAYERS )
{
if( aReporter )
{
msg = _( "No more empty available layers.\n"
"The remaining files will not be loaded." );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
break;
}
setActiveLayer( layer, false );
localfilename = zipfilesys.FindNext();
}
return success;
}
bool GERBVIEW_FRAME::LoadZipArchiveFile( const wxString& aFullFileName )
{
#define ZipFileExtension "zip"
#define ZipFileWildcard _( "Zip file (*.zip)|*.zip" )
wxFileName filename = aFullFileName;
wxString currentPath;
if( !filename.IsOk() )
{
// Use the current working directory if the file name path does not exist.
if( filename.DirExists() )
currentPath = filename.GetPath();
else
currentPath = m_mruPath;
wxFileDialog dlg( this,
_( "Open Zip File" ),
currentPath,
filename.GetFullName(),
ZipFileWildcard,
wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR );
if( dlg.ShowModal() == wxID_CANCEL )
return false;
filename = dlg.GetPath();
currentPath = wxGetCwd();
m_mruPath = currentPath;
}
else
{
currentPath = filename.GetPath();
m_mruPath = currentPath;
}
if( filename.IsOk() )
{
wxString msg;
WX_STRING_REPORTER reporter( &msg );
bool success = unarchiveFiles( filename.GetFullPath(), &reporter );
if( !success )
wxMessageBox( msg );
}
Zoom_Automatique( false );
// Synchronize layers tools with actual active layer:
ReFillLayerWidget();
setActiveLayer( getActiveLayer() );
m_LayersManager->UpdateLayerIcons();
syncLayerBox();
return true;
}

16
gerbview/gerbview_frame.cpp
View File

@ -80,6 +80,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent ):
m_DCodeSelector = NULL;
m_displayMode = 0;
m_drillFileHistory.SetBaseId( ID_GERBVIEW_DRILL_FILE1 );
m_zipFileHistory.SetBaseId( ID_GERBVIEW_ZIP_FILE1 );
if( m_canvas )
m_canvas->SetEnableBlockCommands( true );
@ -295,11 +296,17 @@ void GERBVIEW_FRAME::LoadSettings( wxConfigBase* aCfg )
aCfg->Read( cfgShowNegativeObjects, &tmp, false );
SetElementVisibility( NEGATIVE_OBJECTS_VISIBLE, tmp );
// because we have 2 file histories, we must read this one
// because we have more than one file history, we must read this one
// using a specific path
aCfg->SetPath( wxT( "drl_files" ) );
m_drillFileHistory.Load( *aCfg );
aCfg->SetPath( wxT( ".." ) );
// because we have more than one file history, we must read this one
// using a specific path
aCfg->SetPath( wxT( "zip_files" ) );
m_zipFileHistory.Load( *aCfg );
aCfg->SetPath( wxT( ".." ) );
}
@ -317,11 +324,16 @@ void GERBVIEW_FRAME::SaveSettings( wxConfigBase* aCfg )
IsElementVisible( NEGATIVE_OBJECTS_VISIBLE ) );
// Save the drill file history list.
// Because we have 2 file histories, we must save this one
// Because we have more than one file history, we must save this one
// in a specific path
aCfg->SetPath( wxT( "drl_files" ) );
m_drillFileHistory.Save( *aCfg );
aCfg->SetPath( wxT( ".." ) );
// Save the zip file history list.
aCfg->SetPath( wxT( "zip_files" ) );
m_zipFileHistory.Save( *aCfg );
aCfg->SetPath( wxT( ".." ) );
}

35
gerbview/gerbview_frame.h
View File

@ -48,6 +48,7 @@ class GBR_LAYER_BOX_SELECTOR;
class GERBER_DRAW_ITEM;
class GERBER_FILE_IMAGE;
class GERBER_FILE_IMAGE_LIST;
class REPORTER;
/**
@ -152,8 +153,12 @@ public:
protected:
GERBER_LAYER_WIDGET* m_LayersManager;
// Auxiliary file history used to store zip files history.
wxFileHistory m_zipFileHistory;
// Auxiliary file history used to store drill files history.
wxFileHistory m_drillFileHistory;
/// The last filename chosen to be proposed to the user
wxString m_lastFileName;
@ -590,6 +595,22 @@ public:
*/
void OnDrlFileHistory( wxCommandEvent& event );
/**
* Function OnZipFileHistory
* deletes the current data and load a zip archive file selected from the
* history list. The archive is expected coantaining a set of gerber and drill file
*/
void OnZipFileHistory( wxCommandEvent& event );
/**
* Extracts gerber and drill files from the zip archive, and load them
* @param aFullFileName is the full filename of the zip archive
* @param aReporter a REPORTER to collect warning and error messages
* @return true if OK, false if a file cannot be readable
*/
bool unarchiveFiles( const wxString& aFullFileName,
REPORTER* aReporter = nullptr );
/**
* function LoadGerberFiles
* Load a photoplot (Gerber) file or many files.
@ -602,16 +623,26 @@ public:
bool Read_GERBER_File( const wxString& GERBER_FullFileName );
/**
* function Read_EXCELLON_File
* function LoadExcellonFiles
* Load a drill (EXCELLON) file or many files.
* @param aFileName - void string or file name with full path to open or empty string to
* open a new file. In this case one one file is loaded
* if void string: user will be prompted for filename(s)
* if empty string: user will be prompted for filename(s)
* @return true if file was opened successfully.
*/
bool LoadExcellonFiles( const wxString& aFileName );
bool Read_EXCELLON_File( const wxString& aFullFileName );
/**
* function LoadZipArchiveFileLoadZipArchiveFile
* Load a zipped archive file.
* @param aFileName - void string or file name with full path to open or empty string to
* open a new file.
* if empty string: user will be prompted for filename(s)
* @return true if file was opened successfully.
*/
bool LoadZipArchiveFile( const wxString& aFileName );
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 ) override;
/**

13
gerbview/gerbview_id.h
View File

@ -41,6 +41,7 @@ enum gerbview_ids
ID_GERBVIEW_SHOW_LIST_DCODES,
ID_GERBVIEW_LOAD_DRILL_FILE,
ID_GERBVIEW_LOAD_ZIP_ARCHIVE_FILE,
ID_GERBVIEW_ERASE_ALL,
ID_TOOLBARH_GERBER_SELECT_ACTIVE_DCODE,
ID_GERBVIEW_SHOW_SOURCE,
@ -65,6 +66,18 @@ enum gerbview_ids
ID_GERBVIEW_DRILL_FILE8,
ID_GERBVIEW_DRILL_FILE9,
// IDs for drill file history (wxID_FILEnn is already in use)
ID_GERBVIEW_ZIP_FILE,
ID_GERBVIEW_ZIP_FILE1,
ID_GERBVIEW_ZIP_FILE2,
ID_GERBVIEW_ZIP_FILE3,
ID_GERBVIEW_ZIP_FILE4,
ID_GERBVIEW_ZIP_FILE5,
ID_GERBVIEW_ZIP_FILE6,
ID_GERBVIEW_ZIP_FILE7,
ID_GERBVIEW_ZIP_FILE8,
ID_GERBVIEW_ZIP_FILE9,
ID_TOOLBARH_GERBVIEW_SELECT_ACTIVE_LAYER,
ID_GERBVIEW_ERASE_CURR_LAYER,
ID_GERBVIEW_OPTIONS_SETUP,

28
gerbview/menubar.cpp
View File

@ -58,20 +58,27 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
// Menu File:
wxMenu* fileMenu = new wxMenu;
// Load
// Load Gerber files
AddMenuItem( fileMenu,
wxID_FILE,
_( "Load &Gerber File" ),
_( "Load a new Gerber file on the current layer. Previous data will be deleted" ),
KiBitmap( gerber_file_xpm ) );
// Excellon
// Load Excellon drill files
AddMenuItem( fileMenu,
ID_GERBVIEW_LOAD_DRILL_FILE,
_( "Load &EXCELLON Drill File" ),
_( "Load excellon drill file" ),
KiBitmap( gerbview_drill_file_xpm ) );
// Load Zip archive files
AddMenuItem( fileMenu,
ID_GERBVIEW_LOAD_ZIP_ARCHIVE_FILE,
_( "Load &Zip Archive File" ),
_( "Load a zipped archive (Gerber and drill) file" ),
KiBitmap( zip_xpm ) );
// Recent gerber files
static wxMenu* openRecentGbrMenu;
@ -106,6 +113,21 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
_( "Open a recent opened drill file" ),
KiBitmap( gerbview_open_recent_drill_files_xpm ) );
// Recent drill files
static wxMenu* openRecentZipArchiveMenu;
if( openRecentZipArchiveMenu )
m_zipFileHistory.RemoveMenu( openRecentZipArchiveMenu );
openRecentZipArchiveMenu = new wxMenu();
m_zipFileHistory.UseMenu( openRecentZipArchiveMenu );
m_zipFileHistory.AddFilesToMenu( );
AddMenuItem( fileMenu, openRecentZipArchiveMenu,
wxID_ANY,
_( "Open Recent Zip &Archive File" ),
_( "Open a recent opened zip archive file" ),
KiBitmap( gerbview_open_recent_ziparchive_files_xpm ) );
// Separator
fileMenu->AppendSeparator();
@ -182,7 +204,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
AddMenuItem( miscellaneousMenu,
ID_GERBVIEW_SHOW_LIST_DCODES,
_( "&List DCodes" ),
_( "List and edit D-codes" ),
_( "List D-codes defined in Gerber files" ),
KiBitmap( show_dcodenumber_xpm ) );
// Show source

7
include/bitmaps.h
View File

@ -1,8 +1,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007-2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2016 KiCad Developers, see CHANGELOG.TXT for contributors.
* Copyright (C) 2007-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2017 KiCad Developers, see CHANGELOG.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
@ -233,7 +233,8 @@ EXTERN_BITMAP( gerber_file_xpm )
EXTERN_BITMAP( gerber_recent_files_xpm )
EXTERN_BITMAP( gerbview_clear_layers_xpm )
EXTERN_BITMAP( gerbview_open_recent_drill_files_xpm )
EXTERN_BITMAP( gerbview_show_negative_objects_xpm );
EXTERN_BITMAP( gerbview_open_recent_ziparchive_files_xpm )
EXTERN_BITMAP( gerbview_show_negative_objects_xpm )
EXTERN_BITMAP( general_deletions_xpm )
EXTERN_BITMAP( general_ratsnest_xpm )
EXTERN_BITMAP( glabel2label_xpm )