Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
ba1867fe
Commit
ba1867fe
authored
Feb 12, 2014
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged fix from the selection_tool branch.
parent
87d3458e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
3 deletions
+32
-3
class_netinfolist.cpp
pcbnew/class_netinfolist.cpp
+28
-2
legacy_plugin.cpp
pcbnew/legacy_plugin.cpp
+4
-1
No files found.
pcbnew/class_netinfolist.cpp
View file @
ba1867fe
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file class_netinfolist.cpp
*/
...
...
@@ -230,7 +254,8 @@ void NETINFO_MAPPING::Update()
// Prepare the new mapping
m_netMapping
.
clear
();
// Now the nets variable stores all the used net codes (not only for pads)
// Now the nets variable stores all the used net codes (not only for pads) and we are ready to
// assign new consecutive net numbers
int
newNetCode
=
0
;
for
(
std
::
set
<
int
>::
const_iterator
it
=
nets
.
begin
(),
itEnd
=
nets
.
end
();
it
!=
itEnd
;
++
it
)
m_netMapping
[
*
it
]
=
newNetCode
++
;
...
...
@@ -249,5 +274,6 @@ NETINFO_ITEM* NETINFO_MAPPING::iterator::operator->() const
}
const
NETINFO_ITEM
NETINFO_LIST
::
ORPHANED
=
NETINFO_ITEM
(
NULL
,
wxString
::
FromUTF8
(
"orphaned"
),
-
1
);
const
int
NETINFO_LIST
::
UNCONNECTED
=
0
;
const
NETINFO_ITEM
NETINFO_LIST
::
ORPHANED
=
NETINFO_ITEM
(
NULL
,
wxEmptyString
,
NETINFO_LIST
::
UNCONNECTED
);
pcbnew/legacy_plugin.cpp
View file @
ba1867fe
...
...
@@ -1303,7 +1303,10 @@ void LEGACY_PLUGIN::loadPAD( MODULE* aModule )
// read Netname
ReadDelimitedText
(
buf
,
data
,
sizeof
(
buf
)
);
#ifndef NDEBUG
if
(
m_board
)
assert
(
m_board
->
FindNet
(
netcode
)
->
GetNetname
()
==
FROM_UTF8
(
StrPurge
(
buf
)
)
);
#endif
/* NDEBUG */
}
else
if
(
TESTLINE
(
"Po"
)
)
// (Po)sition
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment