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
69de7189
Commit
69de7189
authored
May 04, 2015
by
unknown
Committed by
jean-pierre charras
May 04, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib-cache-rescue coding style fix. lib-cache-rescue set default button OK in dialog.
parent
425ddb92
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
dialog_rescue_each.cpp
eeschema/dialogs/dialog_rescue_each.cpp
+6
-5
lib_cache_rescue.cpp
eeschema/lib_cache_rescue.cpp
+2
-2
No files found.
eeschema/dialogs/dialog_rescue_each.cpp
View file @
69de7189
...
@@ -86,6 +86,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( SCH_EDIT_FRAME* aParent, std::vector<RES
...
@@ -86,6 +86,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( SCH_EDIT_FRAME* aParent, std::vector<RES
m_insideUpdateEvent
(
false
)
m_insideUpdateEvent
(
false
)
{
{
m_Config
=
Kiface
().
KifaceSettings
();
m_Config
=
Kiface
().
KifaceSettings
();
m_stdButtonsOK
->
SetDefault
();
}
}
...
@@ -99,10 +100,10 @@ bool DIALOG_RESCUE_EACH::TransferDataToWindow()
...
@@ -99,10 +100,10 @@ bool DIALOG_RESCUE_EACH::TransferDataToWindow()
if
(
!
wxDialog
::
TransferDataToWindow
()
)
if
(
!
wxDialog
::
TransferDataToWindow
()
)
return
false
;
return
false
;
m_ListOfConflicts
->
AppendToggleColumn
(
_
(
"Rescue symbol"
)
);
m_ListOfConflicts
->
AppendToggleColumn
(
_
(
"Rescue symbol"
)
);
m_ListOfConflicts
->
AppendTextColumn
(
_
(
"Symbol name"
)
);
m_ListOfConflicts
->
AppendTextColumn
(
_
(
"Symbol name"
)
);
m_ListOfInstances
->
AppendTextColumn
(
_
(
"Reference"
)
);
m_ListOfInstances
->
AppendTextColumn
(
_
(
"Reference"
)
);
m_ListOfInstances
->
AppendTextColumn
(
_
(
"Value"
)
);
m_ListOfInstances
->
AppendTextColumn
(
_
(
"Value"
)
);
PopulateConflictList
();
PopulateConflictList
();
PopulateInstanceList
();
PopulateInstanceList
();
...
@@ -152,7 +153,7 @@ void DIALOG_RESCUE_EACH::PopulateInstanceList()
...
@@ -152,7 +153,7 @@ void DIALOG_RESCUE_EACH::PopulateInstanceList()
data
.
clear
();
data
.
clear
();
data
.
push_back
(
each_component
->
GetRef
(
&
m_Parent
->
GetCurrentSheet
()
)
);
data
.
push_back
(
each_component
->
GetRef
(
&
m_Parent
->
GetCurrentSheet
()
)
);
data
.
push_back
(
valueField
?
valueField
->
GetText
()
:
wxT
(
""
)
);
data
.
push_back
(
valueField
?
valueField
->
GetText
()
:
wxT
(
""
)
);
m_ListOfInstances
->
AppendItem
(
data
);
m_ListOfInstances
->
AppendItem
(
data
);
}
}
...
...
eeschema/lib_cache_rescue.cpp
View file @
69de7189
...
@@ -247,7 +247,7 @@ static void find_rescues( std::vector<SCH_COMPONENT*>& aComponents, PART_LIBS* a
...
@@ -247,7 +247,7 @@ static void find_rescues( std::vector<SCH_COMPONENT*>& aComponents, PART_LIBS* a
static
PART_LIB
*
create_rescue_library
(
wxFileName
&
aFileName
)
static
PART_LIB
*
create_rescue_library
(
wxFileName
&
aFileName
)
{
{
wxFileName
fn
(
g_RootSheet
->
GetScreen
()
->
GetFileName
()
);
wxFileName
fn
(
g_RootSheet
->
GetScreen
()
->
GetFileName
()
);
fn
.
SetName
(
fn
.
GetName
()
+
wxT
(
"-rescue"
)
);
fn
.
SetName
(
fn
.
GetName
()
+
wxT
(
"-rescue"
)
);
fn
.
SetExt
(
SchematicLibraryFileExtension
);
fn
.
SetExt
(
SchematicLibraryFileExtension
);
aFileName
.
SetPath
(
fn
.
GetPath
()
);
aFileName
.
SetPath
(
fn
.
GetPath
()
);
aFileName
.
SetName
(
fn
.
GetName
()
);
aFileName
.
SetName
(
fn
.
GetName
()
);
...
@@ -321,7 +321,7 @@ bool SCH_EDIT_FRAME::RescueCacheConflicts( bool aRunningOnDemand )
...
@@ -321,7 +321,7 @@ bool SCH_EDIT_FRAME::RescueCacheConflicts( bool aRunningOnDemand )
get_components
(
components
);
get_components
(
components
);
prj
=
&
Prj
();
prj
=
&
Prj
();
libs
=
prj
->
SchLibs
();
libs
=
prj
->
SchLibs
();
part_name_suffix
=
wxT
(
"-RESCUE-"
)
+
prj
->
GetProjectName
();
part_name_suffix
=
wxT
(
"-RESCUE-"
)
+
prj
->
GetProjectName
();
// Start!
// Start!
find_rescues
(
components
,
libs
,
candidates
);
find_rescues
(
components
,
libs
,
candidates
);
...
...
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