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
612e2ddb
Commit
612e2ddb
authored
Dec 29, 2013
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bugs 1264240, 1264247, 1264239, 1264233 (clang report errors)
parent
a455ab4a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
12 deletions
+14
-12
basicframe.cpp
common/basicframe.cpp
+2
-1
fp_lib_table.cpp
common/fp_lib_table.cpp
+8
-4
schematic_undo_redo.cpp
eeschema/schematic_undo_redo.cpp
+2
-6
drc.cpp
pcbnew/drc.cpp
+2
-1
No files found.
common/basicframe.cpp
View file @
612e2ddb
...
@@ -221,6 +221,7 @@ void EDA_BASE_FRAME::LoadSettings()
...
@@ -221,6 +221,7 @@ void EDA_BASE_FRAME::LoadSettings()
// Once this is fully implemented, wxAuiManager will be used to maintain the persistance of
// Once this is fully implemented, wxAuiManager will be used to maintain the persistance of
// the main frame and all it's managed windows and all of the legacy frame persistence
// the main frame and all it's managed windows and all of the legacy frame persistence
// position code can be removed.
// position code can be removed.
if
(
config
)
config
->
Read
(
m_FrameName
+
entryPerspective
,
&
m_perspective
);
config
->
Read
(
m_FrameName
+
entryPerspective
,
&
m_perspective
);
}
}
...
...
common/fp_lib_table.cpp
View file @
612e2ddb
...
@@ -827,11 +827,15 @@ bool FP_LIB_TABLE::ConvertFromLegacy( NETLIST& aNetList, const wxArrayString& aL
...
@@ -827,11 +827,15 @@ bool FP_LIB_TABLE::ConvertFromLegacy( NETLIST& aNetList, const wxArrayString& aL
newFPID
.
SetLibNickname
(
libNickname
);
newFPID
.
SetLibNickname
(
libNickname
);
if
(
!
newFPID
.
IsValid
()
)
if
(
!
newFPID
.
IsValid
()
)
{
if
(
aReporter
)
{
{
msg
.
Printf
(
_
(
"Component `%s` FPID <%s> is not valid.
\n
"
),
msg
.
Printf
(
_
(
"Component `%s` FPID <%s> is not valid.
\n
"
),
GetChars
(
component
->
GetReference
()
),
GetChars
(
component
->
GetReference
()
),
GetChars
(
FROM_UTF8
(
newFPID
.
Format
().
c_str
()
)
)
);
GetChars
(
FROM_UTF8
(
newFPID
.
Format
().
c_str
()
)
)
);
aReporter
->
Report
(
msg
);
aReporter
->
Report
(
msg
);
}
retv
=
false
;
retv
=
false
;
}
}
else
else
...
...
eeschema/schematic_undo_redo.cpp
View file @
612e2ddb
...
@@ -269,8 +269,8 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
...
@@ -269,8 +269,8 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
for
(
int
ii
=
aList
->
GetCount
()
-
1
;
ii
>=
0
;
ii
--
)
for
(
int
ii
=
aList
->
GetCount
()
-
1
;
ii
>=
0
;
ii
--
)
{
{
item
=
(
SCH_ITEM
*
)
aList
->
GetPickedItem
(
ii
);
item
=
(
SCH_ITEM
*
)
aList
->
GetPickedItem
(
ii
);
wxAssert
(
item
);
if
(
item
)
item
->
ClearFlags
();
item
->
ClearFlags
();
SCH_ITEM
*
image
=
(
SCH_ITEM
*
)
aList
->
GetPickedItemLink
(
ii
);
SCH_ITEM
*
image
=
(
SCH_ITEM
*
)
aList
->
GetPickedItemLink
(
ii
);
...
@@ -278,10 +278,6 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
...
@@ -278,10 +278,6 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
switch
(
aList
->
GetPickedItemStatus
(
ii
)
)
switch
(
aList
->
GetPickedItemStatus
(
ii
)
)
{
{
case
UR_CHANGED
:
/* Exchange old and new data for each item */
case
UR_CHANGED
:
/* Exchange old and new data for each item */
// tmp = item->Clone();
// *item = *image;
// *image = *tmp;
// delete tmp;
item
->
SwapData
(
image
);
item
->
SwapData
(
image
);
break
;
break
;
...
...
pcbnew/drc.cpp
View file @
612e2ddb
...
@@ -224,7 +224,8 @@ void DRC::RunTests( wxTextCtrl* aMessages )
...
@@ -224,7 +224,8 @@ void DRC::RunTests( wxTextCtrl* aMessages )
wxSafeYield
();
wxSafeYield
();
}
}
m_mainWindow
->
Fill_All_Zones
(
aMessages
->
GetParent
(),
false
);
m_mainWindow
->
Fill_All_Zones
(
aMessages
?
aMessages
->
GetParent
()
:
m_mainWindow
,
false
);
// test zone clearances to other zones
// test zone clearances to other zones
if
(
aMessages
)
if
(
aMessages
)
...
...
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