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
97767241
Commit
97767241
authored
Aug 11, 2010
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix path bug, use lower case local variable names please
parent
b3f13be3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
19 deletions
+24
-19
netform.cpp
eeschema/netform.cpp
+6
-2
netlist_control.cpp
eeschema/netlist_control.cpp
+18
-17
No files found.
eeschema/netform.cpp
View file @
97767241
...
@@ -335,8 +335,8 @@ wxString EXPORT_HELP::MakeCommandLine( const wxString& aFormatString,
...
@@ -335,8 +335,8 @@ wxString EXPORT_HELP::MakeCommandLine( const wxString& aFormatString,
wxFileName
out
=
aFinalFile
;
wxFileName
out
=
aFinalFile
;
ret
.
Replace
(
wxT
(
"%B"
),
out
.
GetName
().
GetData
(),
true
);
ret
.
Replace
(
wxT
(
"%B"
),
out
.
GetName
().
GetData
(),
true
);
ret
.
Replace
(
wxT
(
"%I"
),
in
.
GetFull
Name
().
GetData
(),
true
);
ret
.
Replace
(
wxT
(
"%I"
),
in
.
GetFull
Path
().
GetData
(),
true
);
ret
.
Replace
(
wxT
(
"%O"
),
out
.
GetFull
Name
().
GetData
(),
true
);
ret
.
Replace
(
wxT
(
"%O"
),
out
.
GetFull
Path
().
GetData
(),
true
);
return
ret
;
return
ret
;
}
}
...
@@ -398,6 +398,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
...
@@ -398,6 +398,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
wxFileName
tmpFile
=
aFullFileName
;
wxFileName
tmpFile
=
aFullFileName
;
tmpFile
.
SetExt
(
wxT
(
"tmp"
)
);
tmpFile
.
SetExt
(
wxT
(
"tmp"
)
);
D
(
printf
(
"tmpFile:'%s'
\n
"
,
CONV_TO_UTF8
(
tmpFile
.
GetFullPath
()
)
);)
ret
=
helper
.
WriteGENERICNetList
(
this
,
tmpFile
.
GetFullPath
()
);
ret
=
helper
.
WriteGENERICNetList
(
this
,
tmpFile
.
GetFullPath
()
);
if
(
!
ret
)
if
(
!
ret
)
break
;
break
;
...
@@ -415,6 +417,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
...
@@ -415,6 +417,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
tmpFile
.
GetFullPath
(),
tmpFile
.
GetFullPath
(),
aFullFileName
);
aFullFileName
);
D
(
printf
(
"commandLine:'%s'
\n
"
,
CONV_TO_UTF8
(
commandLine
)
);)
ProcessExecute
(
commandLine
,
wxEXEC_SYNC
);
ProcessExecute
(
commandLine
,
wxEXEC_SYNC
);
// ::wxRemoveFile( tmpFile.GetFullPath() );
// ::wxRemoveFile( tmpFile.GetFullPath() );
...
...
eeschema/netlist_control.cpp
View file @
97767241
...
@@ -227,7 +227,7 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_SchematicFrame* parent ) :
...
@@ -227,7 +227,7 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_SchematicFrame* parent ) :
// Add custom panels:
// Add custom panels:
InstallCustomPages
();
InstallCustomPages
();
GetSizer
()
->
Fit
(
this
);
//
GetSizer()->Fit( this );
GetSizer
()
->
SetSizeHints
(
this
);
GetSizer
()
->
SetSizeHints
(
this
);
Centre
();
Centre
();
}
}
...
@@ -442,10 +442,10 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
...
@@ -442,10 +442,10 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
* and run the netlist creator
* and run the netlist creator
*/
*/
{
{
wxFileName
fn
;
wxFileName
fn
;
wxString
FileWildcard
,
FileExt
;
wxString
fileWildcard
;
wxString
msg
,
Command
;
wxString
fileExt
;
wxString
title
=
_
(
"Save Netlist File"
);
wxString
title
=
_
(
"Save Netlist File"
);
NetlistUpdateOpt
();
NetlistUpdateOpt
();
...
@@ -458,30 +458,31 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
...
@@ -458,30 +458,31 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
switch
(
CurrPage
->
m_IdNetType
)
switch
(
CurrPage
->
m_IdNetType
)
{
{
case
NET_TYPE_SPICE
:
case
NET_TYPE_SPICE
:
F
ileExt
=
wxT
(
"cir"
);
f
ileExt
=
wxT
(
"cir"
);
F
ileWildcard
=
_
(
"SPICE netlist file (.cir)|*.cir"
);
f
ileWildcard
=
_
(
"SPICE netlist file (.cir)|*.cir"
);
break
;
break
;
case
NET_TYPE_CADSTAR
:
case
NET_TYPE_CADSTAR
:
F
ileExt
=
wxT
(
"frp"
);
f
ileExt
=
wxT
(
"frp"
);
F
ileWildcard
=
_
(
"CadStar netlist file (.frp)|*.frp"
);
f
ileWildcard
=
_
(
"CadStar netlist file (.frp)|*.frp"
);
break
;
break
;
case
NET_TYPE_PCBNEW
:
case
NET_TYPE_PCBNEW
:
FileExt
=
NetlistFileExtension
;
case
NET_TYPE_ORCADPCB2
:
FileWildcard
=
NetlistFileWildcard
;
fileExt
=
NetlistFileExtension
;
fileWildcard
=
NetlistFileWildcard
;
break
;
break
;
default
:
// custom
default
:
// custom
, NET_TYPE_CUSTOM1 and greater
FileExt
=
wxT
(
"*
"
);
fileExt
=
wxEmptyString
;
// wxT( "
" );
F
ileWildcard
=
AllFilesWildcard
;
f
ileWildcard
=
AllFilesWildcard
;
title
=
_
(
"Generic Export"
);
title
.
Printf
(
_
(
"%s Export"
),
CurrPage
->
m_TitleStringCtrl
->
GetValue
().
GetData
()
);
}
}
fn
.
SetExt
(
F
ileExt
);
fn
.
SetExt
(
f
ileExt
);
wxFileDialog
dlg
(
this
,
title
,
fn
.
GetPath
(),
wxFileDialog
dlg
(
this
,
title
,
fn
.
GetPath
(),
fn
.
GetFullName
(),
F
ileWildcard
,
fn
.
GetFullName
(),
f
ileWildcard
,
wxFD_SAVE
);
wxFD_SAVE
);
if
(
dlg
.
ShowModal
()
==
wxID_CANCEL
)
if
(
dlg
.
ShowModal
()
==
wxID_CANCEL
)
...
...
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