Commit fcb482df authored by jean-pierre charras's avatar jean-pierre charras

Pcbnew: Fix bug I created in my previous commit.

More about code refactoring in connect.cpp: RecalculateAllTracksNetcode() is 50 times faster with a board using 27000 tracks
Use right icon in pcbnew for load board and new board.
parents 9f69193a 9cd1fdd9
......@@ -368,6 +368,7 @@ set( BMAPS_MID
noconn
normal
online_help
open_brd_file
open_library
open_project
open_document
......
This diff is collapsed.
/* 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, 0x25, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x7b, 0x4c, 0x9b,
0x55, 0x18, 0xc6, 0x61, 0x98, 0x68, 0x8c, 0x81, 0x60, 0xb2, 0xf9, 0xcf, 0x34, 0x81, 0x68, 0x28,
0x97, 0xe1, 0x10, 0x36, 0x36, 0x22, 0x08, 0x71, 0x8e, 0x65, 0x13, 0xe2, 0xc0, 0x0d, 0xdd, 0x84,
0x29, 0x6c, 0x12, 0x90, 0xcb, 0x1f, 0x5e, 0x18, 0x09, 0x62, 0xc6, 0x74, 0x13, 0x76, 0x41, 0x37,
0x66, 0xdc, 0xcd, 0xcd, 0x84, 0x19, 0x71, 0x0c, 0x98, 0xeb, 0xc6, 0xa0, 0x5c, 0x56, 0xb0, 0x40,
0x29, 0xa5, 0x74, 0xa3, 0x50, 0x2e, 0x2d, 0x94, 0xb6, 0x14, 0x81, 0xb6, 0x40, 0xcb, 0xfd, 0xf2,
0x78, 0xce, 0x59, 0xca, 0x5a, 0x9c, 0xa3, 0xd1, 0xf8, 0x25, 0x4f, 0x7b, 0xbe, 0x7c, 0xed, 0xf3,
0x3b, 0xef, 0xfb, 0x9e, 0xf3, 0x9e, 0xcf, 0xc1, 0xc1, 0xc1, 0xe1, 0xb9, 0xb5, 0x6b, 0xd7, 0xbe,
0xee, 0xe6, 0xe6, 0x16, 0xf2, 0x7f, 0x89, 0x30, 0xd6, 0x3b, 0xd0, 0x0f, 0xb9, 0x5c, 0xde, 0x3f,
0x36, 0x36, 0x86, 0xde, 0xda, 0x3a, 0x08, 0x8e, 0x9d, 0x86, 0x20, 0xf7, 0x3b, 0x34, 0x9e, 0x38,
0x03, 0xe1, 0x99, 0x1f, 0x61, 0x1c, 0x1e, 0x81, 0xd9, 0x6c, 0x86, 0x41, 0x3b, 0x08, 0xbd, 0x46,
0x0b, 0xf3, 0xe4, 0x24, 0x26, 0xf4, 0x06, 0x0c, 0xf7, 0x28, 0x30, 0x39, 0x35, 0xc5, 0x34, 0x45,
0xbf, 0x4d, 0x66, 0x18, 0x07, 0x75, 0x98, 0x9a, 0x9e, 0xb6, 0xd1, 0xfc, 0xfc, 0x3c, 0x08, 0x23,
0x94, 0x81, 0xba, 0xba, 0xbb, 0x35, 0x83, 0xba, 0x21, 0xf4, 0x3d, 0x68, 0x47, 0x47, 0x45, 0x15,
0x3a, 0x2a, 0xab, 0xd1, 0xc9, 0xab, 0x81, 0xf8, 0xea, 0x2f, 0x28, 0x7b, 0x2f, 0x01, 0x43, 0x03,
0x6a, 0x28, 0x05, 0x4d, 0x28, 0x8d, 0x8a, 0xc5, 0x90, 0x42, 0x09, 0xad, 0xac, 0x13, 0x25, 0xef,
0xec, 0x87, 0xfa, 0x81, 0x0c, 0xe3, 0xe3, 0xe3, 0x18, 0x9f, 0x98, 0xc0, 0x9f, 0x7d, 0xfd, 0xa8,
0x4c, 0xfd, 0x02, 0x13, 0x64, 0x6c, 0xad, 0x99, 0x99, 0x99, 0x47, 0xa0, 0x6f, 0x45, 0xf9, 0xa6,
0x93, 0x6d, 0x67, 0x71, 0x52, 0x5a, 0x80, 0x53, 0x44, 0xa7, 0xef, 0x9f, 0x43, 0x9d, 0xaa, 0x01,
0x7a, 0x83, 0x01, 0x9d, 0xb7, 0x2b, 0x50, 0xb6, 0xf7, 0x23, 0x0c, 0xab, 0x35, 0x50, 0x36, 0x08,
0x51, 0x1a, 0x1d, 0xf7, 0x10, 0xd6, 0xde, 0x81, 0x92, 0xdd, 0x1f, 0xb0, 0x6f, 0x93, 0xc9, 0x84,
0x91, 0x7e, 0x15, 0x03, 0x99, 0x48, 0xf4, 0xd6, 0x9a, 0x9d, 0x9d, 0x7d, 0x04, 0xda, 0x53, 0xf7,
0xe1, 0x62, 0xe4, 0xbd, 0xf7, 0xb1, 0x52, 0xc7, 0xda, 0x4e, 0x41, 0x35, 0xaa, 0x86, 0xf0, 0xec,
0x05, 0xc8, 0x6e, 0xfc, 0xce, 0x66, 0xde, 0x5e, 0x54, 0x82, 0x96, 0x73, 0x97, 0x98, 0x89, 0xa2,
0x9a, 0x8f, 0xfa, 0x9c, 0x3c, 0x96, 0x4e, 0x3d, 0x89, 0x9a, 0x97, 0x96, 0x81, 0x49, 0x32, 0xb6,
0xd6, 0xdc, 0xdc, 0xdc, 0xea, 0x20, 0xaa, 0x52, 0xc5, 0x2d, 0x48, 0xae, 0x5c, 0x43, 0x7b, 0xf1,
0x4d, 0x36, 0x73, 0xf9, 0xad, 0xbb, 0x10, 0x11, 0x30, 0x35, 0x51, 0x35, 0x89, 0xf0, 0xc7, 0x91,
0x5c, 0x56, 0x23, 0x03, 0x89, 0x98, 0x82, 0xa6, 0x49, 0x5d, 0xac, 0x65, 0x53, 0xa3, 0xd5, 0x40,
0x6d, 0xa4, 0x56, 0x1d, 0x24, 0x22, 0x3a, 0xf3, 0x2e, 0x6e, 0x05, 0x5a, 0x0a, 0x2e, 0x32, 0x73,
0x75, 0xb3, 0x18, 0x02, 0x12, 0xd1, 0x34, 0xa9, 0xc3, 0x18, 0x59, 0x2c, 0x55, 0xe9, 0x87, 0x59,
0x4d, 0xac, 0x65, 0x37, 0xa8, 0x4c, 0xc9, 0x5d, 0x06, 0x51, 0xf3, 0xee, 0x3b, 0x3c, 0x88, 0x49,
0xea, 0xa8, 0x89, 0x46, 0xd4, 0xca, 0x40, 0xb4, 0x0e, 0xe3, 0x64, 0xc5, 0x51, 0x10, 0x4d, 0x95,
0xb5, 0x16, 0x16, 0x16, 0xec, 0x03, 0xfd, 0x2c, 0xba, 0x86, 0x43, 0x91, 0xbb, 0xf1, 0xe6, 0xe6,
0x40, 0x44, 0x44, 0x44, 0x60, 0xdb, 0x96, 0x20, 0x84, 0xfa, 0xfa, 0xb1, 0x71, 0xf8, 0x1b, 0xa1,
0x08, 0xf6, 0xf4, 0x66, 0xe3, 0x5d, 0xe1, 0x3b, 0xb0, 0xcb, 0x67, 0x23, 0x24, 0x12, 0x09, 0x8b,
0xc2, 0xa2, 0xc5, 0xc5, 0x45, 0x38, 0x39, 0x39, 0x85, 0xad, 0x0a, 0xda, 0xfc, 0xd6, 0x16, 0x7c,
0x12, 0xbd, 0x17, 0xe7, 0xb3, 0xbe, 0x82, 0x4a, 0xa5, 0xc2, 0x4f, 0x47, 0x8f, 0xe3, 0x78, 0x42,
0x22, 0x06, 0x06, 0x06, 0x50, 0x76, 0xf9, 0x0a, 0x32, 0x77, 0xef, 0x81, 0x5a, 0xad, 0x46, 0x3d,
0xaf, 0x0a, 0x07, 0xb6, 0x06, 0x23, 0x20, 0x20, 0x80, 0xd5, 0xcf, 0x1a, 0xb4, 0x6e, 0xdd, 0xba,
0xed, 0xab, 0x82, 0x5e, 0xf6, 0x7d, 0x05, 0xbe, 0x3e, 0x1b, 0x10, 0x1a, 0x1c, 0xcc, 0x52, 0xf1,
0xf6, 0xce, 0x9d, 0xf0, 0xf4, 0xf0, 0x60, 0x26, 0x07, 0xe3, 0xe3, 0xf1, 0xbc, 0xab, 0x2b, 0x1b,
0x7f, 0x99, 0x95, 0x05, 0x47, 0x47, 0x47, 0x24, 0x26, 0x26, 0xa2, 0xb1, 0xb1, 0x91, 0xa5, 0x8c,
0xca, 0x6e, 0x90, 0x87, 0x9f, 0x07, 0xfc, 0xfd, 0xfd, 0x11, 0x16, 0x16, 0xc6, 0x40, 0x51, 0x51,
0x51, 0xe0, 0x70, 0x38, 0xcc, 0x3c, 0x39, 0x39, 0x19, 0xae, 0x04, 0x44, 0x0d, 0x73, 0x72, 0x72,
0x68, 0x2d, 0x90, 0x92, 0x92, 0x02, 0x81, 0x40, 0xc0, 0x00, 0x16, 0xd9, 0x0d, 0xe2, 0xf3, 0xf9,
0x10, 0x0a, 0x85, 0xcc, 0x5c, 0x2c, 0x16, 0xa3, 0xa6, 0xa6, 0x86, 0x99, 0x77, 0x76, 0x76, 0x82,
0xcb, 0xe5, 0x32, 0x33, 0x8d, 0x46, 0x83, 0xa2, 0xa2, 0x22, 0xa4, 0xa5, 0xa5, 0xd9, 0x80, 0x96,
0x96, 0x96, 0xec, 0x05, 0x71, 0x6c, 0x8a, 0x6b, 0x49, 0x89, 0x25, 0x2d, 0xd6, 0x86, 0x54, 0xe9,
0xe9, 0xe9, 0x68, 0x68, 0x68, 0x58, 0xbe, 0xa7, 0x72, 0x76, 0x76, 0xde, 0x66, 0x17, 0x68, 0x64,
0x64, 0x04, 0x06, 0xd2, 0x8e, 0xa8, 0x39, 0x6d, 0xbe, 0xf4, 0x9e, 0x9a, 0xd3, 0xe5, 0x3e, 0x34,
0x34, 0xc4, 0xcc, 0xe8, 0x24, 0x68, 0x54, 0x14, 0x44, 0x6b, 0x64, 0xb9, 0xe8, 0x33, 0xbb, 0x96,
0x37, 0x05, 0xd1, 0xfa, 0xd0, 0xda, 0x50, 0x50, 0x5c, 0x5c, 0x1c, 0x82, 0x82, 0x82, 0x98, 0x41,
0x46, 0x46, 0x06, 0xdc, 0xdd, 0xdd, 0xd9, 0x38, 0x3f, 0x3f, 0x9f, 0xce, 0x1c, 0xa9, 0xa9, 0xa9,
0x2c, 0x22, 0x4b, 0x94, 0xf4, 0xb2, 0x1b, 0xe4, 0xeb, 0xeb, 0x8b, 0x90, 0x90, 0x10, 0xf6, 0xe7,
0xc8, 0xc8, 0x48, 0x78, 0x90, 0x55, 0x47, 0x4d, 0xe8, 0x0a, 0x73, 0x71, 0x71, 0x61, 0x66, 0xd9,
0xd9, 0xd9, 0x78, 0x7a, 0xcd, 0x1a, 0x24, 0x25, 0x25, 0xb1, 0x9a, 0xd2, 0x68, 0x69, 0x0b, 0x9a,
0xb1, 0xb7, 0xd7, 0x71, 0xfc, 0x3d, 0x71, 0x74, 0xdf, 0x01, 0x14, 0xa4, 0x7f, 0xca, 0x40, 0x97,
0x32, 0xb3, 0x71, 0x22, 0x26, 0x96, 0x81, 0xae, 0x9f, 0xfd, 0x01, 0xdf, 0x84, 0x47, 0xb2, 0xb4,
0xf1, 0x78, 0x3c, 0x7c, 0xbd, 0x29, 0x04, 0x01, 0x5e, 0xde, 0x90, 0x4a, 0xa5, 0x6c, 0x9f, 0x69,
0xb5, 0x5a, 0x0c, 0x8e, 0xe8, 0xe7, 0x09, 0x23, 0xf8, 0x89, 0xa0, 0x28, 0x7e, 0x2c, 0xce, 0xdf,
0xbc, 0x88, 0x4d, 0x9e, 0x5e, 0x78, 0xd5, 0x83, 0x83, 0xc0, 0xc0, 0x40, 0x6c, 0xe4, 0x78, 0x62,
0x83, 0x9b, 0x3b, 0x1b, 0xbf, 0x46, 0xf6, 0x97, 0xd7, 0xfa, 0x97, 0xd8, 0x26, 0xf5, 0xf3, 0xf3,
0x83, 0x8f, 0xb7, 0x37, 0x0e, 0xf9, 0x6f, 0x45, 0xe1, 0x8e, 0x68, 0x94, 0x17, 0x90, 0x8e, 0xdf,
0xd5, 0xb3, 0xf0, 0xd9, 0xe1, 0xcc, 0x0b, 0x84, 0xf1, 0x0c, 0x03, 0x15, 0xb7, 0x97, 0xe9, 0xab,
0x35, 0x7c, 0x50, 0xd5, 0x68, 0xeb, 0x50, 0x3b, 0x58, 0xcf, 0xd4, 0x3f, 0x31, 0x80, 0x59, 0xf3,
0x24, 0xca, 0xe3, 0x53, 0xa0, 0x13, 0xb7, 0xb1, 0x28, 0xfa, 0x2a, 0x6b, 0x21, 0x3d, 0x7f, 0x95,
0x8d, 0x8d, 0xe4, 0x68, 0x28, 0x7b, 0xf7, 0x00, 0xe4, 0x12, 0x29, 0xee, 0xf1, 0xeb, 0x50, 0x59,
0xc9, 0x43, 0x5b, 0x9b, 0x14, 0x3a, 0x9d, 0x0e, 0xbd, 0x0a, 0xc5, 0xd2, 0xc1, 0xa4, 0xe4, 0x7c,
0xe2, 0xef, 0xf4, 0xb0, 0x4c, 0x04, 0xa4, 0x54, 0x2a, 0x35, 0x34, 0x9f, 0xa3, 0xbd, 0x4a, 0x08,
0xf3, 0xbe, 0x5f, 0x56, 0x33, 0x39, 0xce, 0xb9, 0xfb, 0x3f, 0x86, 0x82, 0x74, 0x6c, 0x4b, 0x71,
0x35, 0x02, 0x21, 0xe4, 0x45, 0xa5, 0x6c, 0x61, 0xd0, 0x23, 0xbe, 0x9d, 0x9c, 0xc6, 0xd7, 0xf7,
0x25, 0xe0, 0xd7, 0xa2, 0xdf, 0xd8, 0xf3, 0xd9, 0xd9, 0x19, 0xc8, 0x3a, 0x64, 0x4b, 0x31, 0x71,
0xb1, 0x9f, 0x53, 0x80, 0x45, 0x36, 0x20, 0x33, 0x79, 0x17, 0xd0, 0xb6, 0x48, 0x30, 0x48, 0x66,
0x4f, 0xa5, 0x6b, 0x95, 0xc2, 0xa0, 0xe8, 0xb3, 0xd9, 0x2b, 0x96, 0x25, 0x4b, 0xbb, 0x84, 0xd1,
0x68, 0x84, 0x4c, 0x26, 0xc3, 0x6d, 0xee, 0x1d, 0x94, 0x97, 0xdf, 0x25, 0xc5, 0x9f, 0x42, 0x53,
0xb3, 0x70, 0x21, 0x7a, 0x5f, 0x4c, 0x9c, 0x35, 0xe4, 0x6f, 0x20, 0xda, 0xee, 0xa9, 0xc1, 0xca,
0xcd, 0xf9, 0x38, 0x10, 0xfd, 0xed, 0xe8, 0xe8, 0x28, 0x5a, 0x5a, 0xc4, 0xb8, 0x51, 0x52, 0x02,
0x25, 0x39, 0xca, 0x6f, 0x55, 0x54, 0x98, 0xc2, 0xb6, 0x87, 0x05, 0xae, 0x84, 0xfc, 0x27, 0x10,
0x3d, 0x8f, 0xe8, 0xc6, 0x15, 0x89, 0x5a, 0xd0, 0xd8, 0x2a, 0x59, 0xba, 0x5c, 0x58, 0xd8, 0x4b,
0x5a, 0xcd, 0x0b, 0x8f, 0x83, 0x2c, 0x83, 0xba, 0xbb, 0xbb, 0xfb, 0x2d, 0x80, 0x95, 0xad, 0xc5,
0xba, 0xbd, 0xd8, 0x44, 0x44, 0x7e, 0xaf, 0x37, 0x8e, 0xe3, 0xbe, 0xbc, 0x67, 0xfe, 0x48, 0x6e,
0x5e, 0x31, 0xf1, 0x79, 0xf6, 0x9f, 0x20, 0x16, 0xd0, 0xbf, 0x7e, 0x81, 0x7c, 0x91, 0x88, 0x74,
0x83, 0x4d, 0xc4, 0xe3, 0xa9, 0x27, 0x41, 0xa8, 0xfe, 0x02, 0x33, 0x31, 0x2c, 0x1a, 0x6a, 0xeb,
0x4f, 0x55, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE open_brd_file_xpm[1] = {{ png, sizeof( png ), "open_brd_file_xpm" }};
//EOF
This diff is collapsed.
This diff is collapsed.
......@@ -337,6 +337,7 @@ EXTERN_BITMAP( new_xpm )
EXTERN_BITMAP( noconn_xpm )
EXTERN_BITMAP( normal_xpm )
EXTERN_BITMAP( online_help_xpm )
EXTERN_BITMAP( open_brd_file_xpm )
EXTERN_BITMAP( open_document_xpm )
EXTERN_BITMAP( open_library_xpm )
EXTERN_BITMAP( open_project_xpm )
......
......@@ -63,6 +63,7 @@ protected:
public:
BOARD_ITEM* start; // pointers to a connected item (pad or track)
BOARD_ITEM* end;
std::vector<TRACK*> m_TracksConnected; // list of other tracks connected to me
int m_Param; // Auxiliary variable ( used in some computations )
......
This diff is collapsed.
/////////////////////////////////////////////////////////////////////////////
// Name: dialog_drc.cpp
// Author: jean-pierre Charras
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
/**
* @file dialog_drc.cpp
*/
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2011 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "fctsys.h"
#include "dialog_drc.h"
......
......@@ -221,7 +221,6 @@ void DRC::RunTests( wxTextCtrl* aMessages )
aMessages->AppendText( _( "Track clearances...\n" ) );
wxSafeYield();
}
testTracks();
// Before testing segments and unconnected, refill all zones:
......@@ -233,6 +232,7 @@ void DRC::RunTests( wxTextCtrl* aMessages )
}
m_mainWindow->Fill_All_Zones( false );
wxSafeYield();
// test zone clearances to other zones, pads, tracks, and vias
if( aMessages && m_doZonesTest )
......@@ -249,7 +249,7 @@ void DRC::RunTests( wxTextCtrl* aMessages )
if( aMessages )
{
aMessages->AppendText( _( "Unconnected pads...\n" ) );
wxSafeYield();
aMessages->Refresh();
}
testUnconnected();
......
......@@ -64,13 +64,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( filesMenu, ID_NEW_BOARD,
_( "&New" ),
_( "Clear current board and initialize a new one" ),
KiBitmap( new_xpm ) );
KiBitmap( new_pcb_xpm ) );
// Open
text = AddHotkeyName( _( "&Open" ), g_Board_Editor_Hokeys_Descr, HK_LOAD_BOARD );
AddMenuItem( filesMenu, ID_LOAD_FILE, text,
_( "Delete current board and load new board" ),
KiBitmap( open_document_xpm ) );
KiBitmap( open_brd_file_xpm ) );
// Load Recent submenu
static wxMenu* openRecentMenu;
......
......@@ -189,9 +189,9 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->SetRows( 1 );
// Set up toolbar
m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, KiBitmap( new_xpm ),
m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, KiBitmap( new_pcb_xpm ),
_( "New board" ) );
m_HToolBar->AddTool( ID_LOAD_FILE, wxEmptyString, KiBitmap( open_document_xpm ),
m_HToolBar->AddTool( ID_LOAD_FILE, wxEmptyString, KiBitmap( open_brd_file_xpm ),
_( "Open existing board" ) );
m_HToolBar->AddTool( ID_SAVE_BOARD, wxEmptyString, KiBitmap( save_xpm ),
_( "Save board" ) );
......
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