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
657325be
Commit
657325be
authored
Oct 13, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed some c_str and GetData functions to GetChars in .Printf functions
parent
b1a8a074
Changes
29
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
216 additions
and
238 deletions
+216
-238
3d_read_mesh.cpp
3d-viewer/3d_read_mesh.cpp
+1
-1
basicframe.cpp
common/basicframe.cpp
+2
-2
common.cpp
common/common.cpp
+1
-1
dcsvg.cpp
common/dcsvg.cpp
+1
-1
dialog_load_error.cpp
common/dialog_load_error.cpp
+1
-1
displlst.cpp
common/displlst.cpp
+1
-1
eda_doc.cpp
common/eda_doc.cpp
+1
-1
gestfich.cpp
common/gestfich.cpp
+1
-1
msgpanel.cpp
common/msgpanel.cpp
+2
-2
autosel.cpp
cvpcb/autosel.cpp
+4
-8
init.cpp
cvpcb/init.cpp
+6
-6
loadcmp.cpp
cvpcb/loadcmp.cpp
+3
-3
savecmp.cpp
cvpcb/savecmp.cpp
+2
-2
writenetlistpcbnew.cpp
cvpcb/writenetlistpcbnew.cpp
+2
-6
class_libentry_fields.cpp
eeschema/class_libentry_fields.cpp
+5
-5
files-io.cpp
eeschema/files-io.cpp
+1
-1
files.cpp
gerbview/files.cpp
+2
-2
gerbview.cpp
gerbview/gerbview.cpp
+0
-3
readgerb.cpp
gerbview/readgerb.cpp
+1
-1
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+153
-162
mainframe.cpp
kicad/mainframe.cpp
+0
-2
dialog_design_rules.cpp
pcbnew/dialog_design_rules.cpp
+3
-3
edit_track_width.cpp
pcbnew/edit_track_width.cpp
+1
-1
librairi.cpp
pcbnew/librairi.cpp
+11
-11
loadcmp.cpp
pcbnew/loadcmp.cpp
+7
-7
pcbcfg.cpp
pcbnew/pcbcfg.cpp
+1
-1
pcbnew.cpp
pcbnew/pcbnew.cpp
+1
-1
xchgmod.cpp
pcbnew/xchgmod.cpp
+2
-2
No files found.
3d-viewer/3d_read_mesh.cpp
View file @
657325be
...
...
@@ -44,7 +44,7 @@ int S3D_MASTER:: ReadData()
if
(
FullFilename
.
IsEmpty
()
)
{
wxLogDebug
(
_
(
"3D part library <%s> could not be found."
),
fn
.
GetFullPath
().
c_str
(
)
);
GetChars
(
fn
.
GetFullPath
()
)
);
return
-
1
;
}
}
...
...
common/basicframe.cpp
View file @
657325be
...
...
@@ -259,7 +259,7 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event )
}
else
{
msg
.
Printf
(
_
(
"Help file %s not found"
),
wxGetApp
().
m_HelpFileName
.
GetData
(
)
);
msg
.
Printf
(
_
(
"Help file %s not found"
),
GetChars
(
wxGetApp
().
m_HelpFileName
)
);
DisplayError
(
this
,
msg
);
}
...
...
@@ -268,7 +268,7 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event )
if
(
!
helpFile
)
{
msg
.
Printf
(
_
(
"Help file %s could not be found."
),
wxGetApp
().
m_HelpFileName
.
c_str
(
)
);
GetChars
(
wxGetApp
().
m_HelpFileName
)
);
DisplayError
(
this
,
msg
);
}
else
...
...
common/common.cpp
View file @
657325be
...
...
@@ -469,7 +469,7 @@ wxString GenDate()
time
(
&
buftime
);
Date
=
gmtime
(
&
buftime
);
string_date
.
Printf
(
wxT
(
"%d %s %d"
),
Date
->
tm_mday
,
mois
[
Date
->
tm_mon
].
GetData
(
),
GetChars
(
mois
[
Date
->
tm_mon
]
),
Date
->
tm_year
+
1900
);
return
string_date
;
}
...
...
common/dcsvg.cpp
View file @
657325be
...
...
@@ -907,7 +907,7 @@ void wxSVGFileDC::DoDrawBitmap( const class wxBitmap& bmp,
int
h
=
myBitmap
.
GetHeight
();
sTmp
.
Printf
(
wxT
(
" <image x=
\"
%d
\"
y=
\"
%d
\"
width=
\"
%dpx
\"
height=
\"
%dpx
\"
"
),
x
,
y
,
w
,
h
);
s
=
s
+
sTmp
;
sTmp
.
Printf
(
wxT
(
" xlink:href=
\"
%s
\"
>
\n
"
),
sPNG
.
c_str
(
)
);
sTmp
.
Printf
(
wxT
(
" xlink:href=
\"
%s
\"
>
\n
"
),
GetChars
(
sPNG
)
);
s
=
s
+
sTmp
+
wxT
(
"<title>Image from wxSVG</title> </image>"
)
+
newline
;
if
(
m_OK
&&
bPNG_OK
)
...
...
common/dialog_load_error.cpp
View file @
657325be
...
...
@@ -47,7 +47,7 @@ void DIALOG_LOAD_ERROR::ListSet(const wxString &list)
void
DIALOG_LOAD_ERROR
::
MessageSet
(
const
wxString
&
message
)
{
wxString
message_value
;
message_value
.
Printf
(
wxT
(
"<b>%s</b><br>"
),
message
.
GetData
(
)
);
message_value
.
Printf
(
wxT
(
"<b>%s</b><br>"
),
GetChars
(
message
)
);
m_htmlWindow
->
AppendToPage
(
message_value
);
}
common/displlst.cpp
View file @
657325be
...
...
@@ -176,7 +176,7 @@ void WinEDAListBox::ClickOnList( wxCommandEvent& event )
m_WinMsg
->
Clear
();
text
=
m_List
->
GetStringSelection
();
m_MoveFct
(
text
);
m_WinMsg
->
WriteText
(
text
.
GetData
()
);
m_WinMsg
->
WriteText
(
text
);
}
}
...
...
common/eda_doc.cpp
View file @
657325be
...
...
@@ -190,7 +190,7 @@ bool GetAssociatedDocument( wxFrame* aFrame,
if
(
!
success
)
{
msg
.
Printf
(
_
(
"Unknown MIME type for doc file <%s>"
),
fullfilename
.
GetData
(
)
);
GetChars
(
fullfilename
)
);
DisplayError
(
aFrame
,
msg
);
}
...
...
common/gestfich.cpp
View file @
657325be
...
...
@@ -442,7 +442,7 @@ int ExecuteFile( wxWindow* frame, const wxString& ExecFile,
}
wxString
msg
;
msg
.
Printf
(
_
(
"Command <%s> could not found"
),
ExecFile
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Command <%s> could not found"
),
GetChars
(
ExecFile
)
);
DisplayError
(
frame
,
msg
,
20
);
return
-
1
;
}
...
...
common/msgpanel.cpp
View file @
657325be
...
...
@@ -209,12 +209,12 @@ void WinEDA_MsgPanel::showItem( wxDC& dc, const MsgItem& aItem )
if
(
!
aItem
.
m_UpperText
.
IsEmpty
()
)
{
dc
.
DrawText
(
aItem
.
m_UpperText
.
GetData
()
,
aItem
.
m_X
,
aItem
.
m_UpperY
);
dc
.
DrawText
(
aItem
.
m_UpperText
,
aItem
.
m_X
,
aItem
.
m_UpperY
);
}
if
(
!
aItem
.
m_LowerText
.
IsEmpty
()
)
{
dc
.
DrawText
(
aItem
.
m_LowerText
.
GetData
()
,
aItem
.
m_X
,
aItem
.
m_LowerY
);
dc
.
DrawText
(
aItem
.
m_LowerText
,
aItem
.
m_X
,
aItem
.
m_LowerY
);
}
}
...
...
cvpcb/autosel.cpp
View file @
657325be
...
...
@@ -92,18 +92,16 @@ void WinEDA_CvpcbFrame::AssocieModule( wxCommandEvent& event )
{
msg
.
Printf
(
_
(
"Footprint alias library file <%s> could not be \
found in the default search paths."
),
fn
.
GetFullName
().
c_str
(
)
);
GetChars
(
fn
.
GetFullName
()
)
);
wxMessageBox
(
msg
,
titleLibLoadError
,
wxOK
|
wxICON_ERROR
);
continue
;
}
wxLogDebug
(
wxT
(
"Opening footprint alias file: %s."
),
tmp
.
c_str
()
);
file
=
wxFopen
(
tmp
,
wxT
(
"rt"
)
);
if
(
file
==
NULL
)
{
msg
.
Printf
(
_
(
"Error opening alias library <%s>."
),
tmp
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Error opening alias library <%s>."
),
GetChars
(
tmp
)
);
wxMessageBox
(
msg
,
titleLibLoadError
,
wxOK
|
wxICON_ERROR
);
continue
;
}
...
...
@@ -128,8 +126,6 @@ found in the default search paths." ),
alias
=
new
FOOTPRINT_ALIAS
();
alias
->
m_Name
=
value
;
alias
->
m_FootprintName
=
footprint
;
wxLogDebug
(
wxT
(
"Adding alias %s for footprint %s"
),
value
.
c_str
(),
footprint
.
c_str
()
);
aliases
.
push_back
(
alias
);
text
++
;
}
...
...
@@ -168,8 +164,8 @@ found in the default search paths." ),
{
msg
.
Printf
(
_
(
"Component %s: footprint %s not found in \
any of the project footprint libraries."
),
component
.
m_Reference
.
c_str
(
),
alias
.
m_FootprintName
.
c_str
(
)
);
GetChars
(
component
.
m_Reference
),
GetChars
(
alias
.
m_FootprintName
)
);
wxMessageBox
(
msg
,
_
(
"CVPcb Error"
),
wxOK
|
wxICON_ERROR
,
this
);
}
...
...
cvpcb/init.cpp
View file @
657325be
...
...
@@ -49,8 +49,8 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
Component
->
m_Module
=
package
;
Line
.
Printf
(
CMP_FORMAT
,
NumCmp
+
1
,
Component
->
m_Reference
.
GetData
(),
Component
->
m_Value
.
GetData
(
),
Component
->
m_Module
.
GetData
(
)
);
GetChars
(
Component
->
m_Reference
),
GetChars
(
Component
->
m_Value
),
GetChars
(
Component
->
m_Module
)
);
m_modified
=
true
;
if
(
isUndefined
)
...
...
@@ -84,7 +84,7 @@ bool WinEDA_CvpcbFrame::ReadNetList()
if
(
error_level
<
0
)
{
msg
.
Printf
(
_
(
"File <%s> does not appear to be a valid Kicad net list file."
),
m_NetlistFileName
.
GetFullPath
().
c_str
(
)
);
GetChars
(
m_NetlistFileName
.
GetFullPath
()
)
);
::
wxMessageBox
(
msg
,
_
(
"File Error"
),
wxOK
|
wxICON_ERROR
,
this
);
return
false
;
}
...
...
@@ -105,9 +105,9 @@ bool WinEDA_CvpcbFrame::ReadNetList()
BOOST_FOREACH
(
COMPONENT
&
component
,
m_components
)
{
msg
.
Printf
(
CMP_FORMAT
,
m_ListCmp
->
GetCount
()
+
1
,
component
.
m_Reference
.
GetData
(
),
component
.
m_Value
.
GetData
(
),
component
.
m_Module
.
GetData
(
)
);
GetChars
(
component
.
m_Reference
),
GetChars
(
component
.
m_Value
),
GetChars
(
component
.
m_Module
)
);
m_ListCmp
->
AppendLine
(
msg
);
if
(
component
.
m_Module
.
IsEmpty
()
)
m_undefinedComponentCnt
+=
1
;
...
...
cvpcb/loadcmp.cpp
View file @
657325be
...
...
@@ -49,7 +49,7 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
{
msg
.
Printf
(
_
(
"PCB foot print library file <%s> could not be \
found in the default search paths."
),
fn
.
GetFullName
().
c_str
(
)
);
GetChars
(
fn
.
GetFullName
()
)
);
wxMessageBox
(
msg
,
titleLibLoadError
,
wxOK
|
wxICON_ERROR
,
this
);
continue
;
}
...
...
@@ -59,7 +59,7 @@ found in the default search paths." ),
if
(
file
==
NULL
)
{
msg
.
Printf
(
_
(
"Could not open PCB foot print library file <%s>."
),
tmp
.
c_str
(
)
);
GetChars
(
tmp
)
);
wxMessageBox
(
msg
,
titleLibLoadError
,
wxOK
|
wxICON_ERROR
,
this
);
continue
;
}
...
...
@@ -72,7 +72,7 @@ found in the default search paths." ),
if
(
strnicmp
(
Line
,
ENTETE_LIBRAIRIE
,
L_ENTETE_LIB
)
!=
0
)
{
msg
.
Printf
(
_
(
"<%s> is not a valid Kicad PCB foot print library."
),
tmp
.
c_str
(
)
);
GetChars
(
tmp
)
);
wxMessageBox
(
msg
,
titleLibLoadError
,
wxOK
|
wxICON_ERROR
,
this
);
fclose
(
file
);
return
NULL
;
...
...
cvpcb/savecmp.cpp
View file @
657325be
...
...
@@ -85,7 +85,7 @@ bool LoadComponentFile( const wxString& fileName, COMPONENT_LIST& list )
if
(
source
==
NULL
)
{
msg
.
Printf
(
_
(
"Cannot open component library <%s>."
),
fn
.
GetFullPath
().
c_str
(
)
);
GetChars
(
fn
.
GetFullPath
()
)
);
wxMessageBox
(
msg
,
titleComponentLibErr
,
wxOK
|
wxICON_ERROR
);
return
false
;
}
...
...
@@ -94,7 +94,7 @@ bool LoadComponentFile( const wxString& fileName, COMPONENT_LIST& list )
if
(
fgets
(
Line
,
79
,
source
)
==
0
)
{
msg
.
Printf
(
_
(
" <%s> does not appear to be a valid Kicad component library."
),
fn
.
GetFullPath
().
c_str
(
)
);
GetChars
(
fn
.
GetFullPath
()
)
);
wxMessageBox
(
msg
,
titleComponentLibErr
,
wxOK
|
wxICON_ERROR
);
fclose
(
source
);
return
false
;
...
...
cvpcb/writenetlistpcbnew.cpp
View file @
657325be
...
...
@@ -54,15 +54,11 @@ static void RemoveDuplicatePins( COMPONENT& component )
if
(
!
same_pin_net
(
pin1
,
pin2
)
)
{
msg
.
Printf
(
_
(
"Component %s %s pin %s : Different Nets"
),
component
.
m_Reference
.
GetData
(
),
component
.
m_Value
.
GetData
(
),
GetChars
(
component
.
m_Reference
),
GetChars
(
component
.
m_Value
),
pin1
->
m_Number
.
GetData
()
);
DisplayError
(
NULL
,
msg
,
60
);
}
wxLogDebug
(
wxT
(
"Removing duplicate pin %s from component %s: %s"
),
pin1
->
m_Number
.
c_str
(),
component
.
m_Reference
.
c_str
(),
component
.
m_Value
.
c_str
()
);
pin1
=
pin2
;
i
=
component
.
m_Pins
.
erase
(
i
);
delete
pin2
;
...
...
eeschema/class_libentry_fields.cpp
View file @
657325be
...
...
@@ -170,7 +170,7 @@ bool LIB_FIELD::Load( char* line, wxString& errorMsg )
if
(
cnt
<
5
)
{
errorMsg
.
Printf
(
_
(
"field %d does not have the correct number of \
errorMsg
.
Printf
(
wxT
(
"field %d does not have the correct number of \
parameters"
),
m_FieldId
);
return
false
;
...
...
@@ -185,7 +185,7 @@ parameters" ),
m_Orient
=
TEXT_ORIENT_VERT
;
else
{
errorMsg
.
Printf
(
_
(
"field %d text orientation parameter <%c> is \
errorMsg
.
Printf
(
wxT
(
"field %d text orientation parameter <%c> is \
not valid"
),
textOrient
);
return
false
;
...
...
@@ -197,7 +197,7 @@ not valid" ),
m_Attributs
|=
TEXT_NO_VISIBLE
;
else
{
errorMsg
.
Printf
(
_
(
"field %d text visible parameter <%c> is not \
errorMsg
.
Printf
(
wxT
(
"field %d text visible parameter <%c> is not \
valid"
),
textVisible
);
return
false
;
...
...
@@ -216,7 +216,7 @@ valid" ),
m_HJustify
=
GR_TEXT_HJUSTIFY_RIGHT
;
else
{
errorMsg
.
Printf
(
_
(
"field %d text horizontal justification \
errorMsg
.
Printf
(
wxT
(
"field %d text horizontal justification \
parameter <%c> is not valid"
),
textHJustify
);
return
false
;
...
...
@@ -230,7 +230,7 @@ parameter <%c> is not valid" ),
m_VJustify
=
GR_TEXT_VJUSTIFY_TOP
;
else
{
errorMsg
.
Printf
(
_
(
"field %d text vertical justification \
errorMsg
.
Printf
(
wxT
(
"field %d text vertical justification \
parameter <%c> is not valid"
),
textVJustify
[
0
]
);
return
false
;
...
...
eeschema/files-io.cpp
View file @
657325be
...
...
@@ -163,7 +163,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
wxString
errMsg
;
wxLogDebug
(
wxT
(
"Load schematic cache library file <%s>"
),
fn
.
GetFullPath
().
c_str
(
)
);
GetChars
(
fn
.
GetFullPath
()
)
);
msg
=
wxT
(
"Load "
)
+
fn
.
GetFullPath
();
CMP_LIBRARY
*
LibCache
=
CMP_LIBRARY
::
LoadLibrary
(
fn
,
errMsg
);
...
...
gerbview/files.cpp
View file @
657325be
...
...
@@ -201,7 +201,7 @@ static void LoadDCodeFile( WinEDA_GerberFrame* frame, const wxString& FullFileNa
if
(
!
fn
.
IsOk
()
)
{
wildcard
.
Printf
(
_
(
"Gerber DCODE files (%s)|*.%s"
),
g_PenFilenameExt
.
c_str
(),
g_PenFilenameExt
.
c_str
(
));
GetChars
(
g_PenFilenameExt
),
GetChars
(
g_PenFilenameExt
));
wildcard
+=
AllFilesWildcard
;
fn
=
frame
->
GetScreen
()
->
m_FileName
;
fn
.
SetExt
(
g_PenFilenameExt
);
...
...
@@ -236,7 +236,7 @@ bool WinEDA_GerberFrame::SaveGerberFile( const wxString& FullFileName, wxDC* DC
fn
=
GetScreen
()
->
m_FileName
;
wildcard
.
Printf
(
_
(
"Gerber DCODE files (%s)|*.%s"
),
g_PenFilenameExt
.
c_str
(),
g_PenFilenameExt
.
c_str
(
));
GetChars
(
g_PenFilenameExt
),
GetChars
(
g_PenFilenameExt
));
wxFileDialog
dlg
(
this
,
_
(
"Save Gerber File"
),
fn
.
GetPath
(),
fn
.
GetFullName
(),
wildcard
,
...
...
gerbview/gerbview.cpp
View file @
657325be
...
...
@@ -104,9 +104,6 @@ bool WinEDA_App::OnInit()
fn
=
wxFileName
(
argv
[
i
]
);
fn
.
SetExt
(
g_PhotoFilenameExt
);
wxLogDebug
(
wxT
(
"Opening file <%s> in GerbView."
),
fn
.
GetFullPath
().
c_str
()
);
if
(
fn
.
FileExists
()
)
{
(
(
PCB_SCREEN
*
)
frame
->
GetScreen
()
)
->
m_Active_Layer
=
i
-
1
;
...
...
gerbview/readgerb.cpp
View file @
657325be
...
...
@@ -272,7 +272,7 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC* DC,
fn
=
GERBER_FullFileName
;
fn
.
SetExt
(
g_PenFilenameExt
);
wildcard
.
Printf
(
_
(
"Gerber DCODE files (%s)|*.%s"
),
g_PenFilenameExt
.
c_str
(),
g_PenFilenameExt
.
c_str
(
));
GetChars
(
g_PenFilenameExt
),
GetChars
(
g_PenFilenameExt
));
wildcard
+=
AllFilesWildcard
;
wxFileDialog
dlg
(
this
,
_
(
"Load GERBER DCODE File"
),
...
...
internat/fr/kicad.mo
View file @
657325be
No preview for this file type
internat/fr/kicad.po
View file @
657325be
This diff is collapsed.
Click to expand it.
kicad/mainframe.cpp
View file @
657325be
...
...
@@ -278,8 +278,6 @@ void WinEDA_MainFrame::OnRunEeschema( wxCommandEvent& event )
{
wxFileName
fn
(
m_ProjectFileName
);
fn
.
SetExt
(
SchematicFileExtension
);
wxLogDebug
(
wxT
(
"Loading EESchema with file <%s>."
),
fn
.
GetFullPath
().
c_str
()
);
ExecuteFile
(
this
,
EESCHEMA_EXE
,
QuoteFullPath
(
fn
)
);
}
...
...
pcbnew/dialog_design_rules.cpp
View file @
657325be
...
...
@@ -105,15 +105,15 @@ void DIALOG_DESIGN_RULES::PrintCurrentSettings( )
// Display min values:
value
=
ReturnStringFromValue
(
g_UnitMetric
,
g_DesignSettings
.
m_TrackMinWidth
,
internal_units
,
true
);
msg
.
Printf
(
_
(
"Minimum value for tracks width: <b>%s</b><br>
\n
"
),
value
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Minimum value for tracks width: <b>%s</b><br>
\n
"
),
GetChars
(
value
)
);
m_MessagesList
->
AppendToPage
(
msg
);
value
=
ReturnStringFromValue
(
g_UnitMetric
,
g_DesignSettings
.
m_ViasMinSize
,
internal_units
,
true
);
msg
.
Printf
(
_
(
"Minimum value for vias diameter: <b>%s</b><br>
\n
"
),
value
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Minimum value for vias diameter: <b>%s</b><br>
\n
"
),
GetChars
(
value
)
);
m_MessagesList
->
AppendToPage
(
msg
);
value
=
ReturnStringFromValue
(
g_UnitMetric
,
g_DesignSettings
.
m_MicroViasMinSize
,
internal_units
,
true
);
msg
.
Printf
(
_
(
"Minimum value for microvias diameter: <b>%s</b><br>
\n
"
),
value
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Minimum value for microvias diameter: <b>%s</b><br>
\n
"
),
GetChars
(
value
)
);
m_MessagesList
->
AppendToPage
(
msg
);
}
...
...
pcbnew/edit_track_width.cpp
View file @
657325be
...
...
@@ -178,7 +178,7 @@ void WinEDA_PcbFrame::Edit_Net_Width( wxDC* DC, int aNetcode )
wxString
netClassName
=
netClass
->
GetName
();
msg
.
Printf
(
_
(
"Set tracks and vias sizes to the Netclass
\"
%s
\"
default value (entire NET
\"
%s
\"
) ?"
),
netClassName
.
c_str
(),
netName
.
c_str
(
)
);
GetChars
(
netClassName
),
GetChars
(
netName
)
);
if
(
!
IsOK
(
this
,
msg
)
)
return
;
...
...
pcbnew/librairi.cpp
View file @
657325be
...
...
@@ -77,7 +77,7 @@ MODULE* WinEDA_ModuleEditFrame::Import_Module( wxDC* DC )
if
(
file
==
NULL
)
{
wxString
msg
;
msg
.
Printf
(
_
(
"File <%s> not found"
),
dlg
.
GetPath
().
GetData
(
)
);
msg
.
Printf
(
_
(
"File <%s> not found"
),
GetChars
(
dlg
.
GetPath
()
)
);
DisplayError
(
this
,
msg
);
return
NULL
;
}
...
...
@@ -187,7 +187,7 @@ void WinEDA_ModuleEditFrame::Export_Module( MODULE* ptmod, bool createlib )
/* Generation du fichier Empreinte */
if
(
(
file
=
wxFopen
(
fn
.
GetFullPath
(),
wxT
(
"wt"
)
)
)
==
NULL
)
{
msg
.
Printf
(
_
(
"Unable to create <%s>"
),
fn
.
GetFullPath
().
c_str
(
)
);
msg
.
Printf
(
_
(
"Unable to create <%s>"
),
GetChars
(
fn
.
GetFullPath
()
)
);
DisplayError
(
this
,
msg
);
return
;
}
...
...
@@ -207,7 +207,7 @@ void WinEDA_ModuleEditFrame::Export_Module( MODULE* ptmod, bool createlib )
fputs
(
"$EndLIBRARY
\n
"
,
file
);
fclose
(
file
);
msg
.
Printf
(
_
(
"Module exported in file <%s>"
),
fn
.
GetFullPath
().
c_str
(
)
);
msg
.
Printf
(
_
(
"Module exported in file <%s>"
),
GetChars
(
fn
.
GetFullPath
()
)
);
DisplayInfoMessage
(
this
,
msg
);
}
...
...
@@ -231,7 +231,7 @@ void WinEDA_ModuleEditFrame::Delete_Module_In_Library( const
/* Confirmation */
msg
.
Printf
(
_
(
"Ok to delete module %s in library %s"
),
CmpName
.
GetData
(),
aLibname
.
GetData
(
)
);
GetChars
(
CmpName
),
GetChars
(
aLibname
)
);
if
(
!
IsOK
(
this
,
msg
)
)
return
;
...
...
@@ -281,7 +281,7 @@ void WinEDA_ModuleEditFrame::Delete_Module_In_Library( const
if
(
NoFound
)
{
fclose
(
lib_module
);
msg
.
Printf
(
_
(
"Module [%s] not found"
),
CmpName
.
GetData
(
)
);
msg
.
Printf
(
_
(
"Module [%s] not found"
),
GetChars
(
CmpName
)
);
DisplayError
(
this
,
msg
);
return
;
}
...
...
@@ -379,8 +379,8 @@ void WinEDA_ModuleEditFrame::Delete_Module_In_Library( const
return
;
}
msg
.
Printf
(
_
(
"Component %s deleted in library %s"
),
CmpName
.
GetData
(
),
oldFileName
.
GetFullPath
().
c_str
(
)
);
msg
.
Printf
(
_
(
"Component %s deleted in library %s"
),
GetChars
(
CmpName
),
GetChars
(
oldFileName
.
GetFullPath
()
)
);
Affiche_Message
(
msg
);
CreateDocLibrary
(
oldFileName
.
GetFullPath
()
);
...
...
@@ -430,7 +430,7 @@ void WinEDA_BasePcbFrame::Archive_Modules( const wxString& LibName,
if
(
!
NewModulesOnly
&&
file_exists
)
{
wxString
msg
;
msg
.
Printf
(
_
(
"File %s exists, OK to replace ?"
),
fileName
.
c_str
(
)
);
msg
.
Printf
(
_
(
"File %s exists, OK to replace ?"
),
GetChars
(
fileName
)
);
if
(
!
IsOK
(
this
,
msg
)
)
return
;
}
...
...
@@ -509,7 +509,7 @@ int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
if
(
!
wxFileExists
(
aLibName
)
)
{
msg
.
Printf
(
_
(
"Library %s not found"
),
aLibName
.
GetData
(
)
);
msg
.
Printf
(
_
(
"Library %s not found"
),
GetChars
(
aLibName
)
);
DisplayError
(
this
,
msg
);
return
0
;
}
...
...
@@ -530,7 +530,7 @@ int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
if
(
(
lib_module
=
wxFopen
(
aLibName
,
wxT
(
"rt"
)
)
)
==
NULL
)
{
msg
.
Printf
(
_
(
"Unable to open %s"
),
aLibName
.
GetData
(
)
);
msg
.
Printf
(
_
(
"Unable to open %s"
),
GetChars
(
aLibName
)
);
DisplayError
(
this
,
msg
);
return
0
;
}
...
...
@@ -540,7 +540,7 @@ int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
if
(
strnicmp
(
Line
,
ENTETE_LIBRAIRIE
,
L_ENTETE_LIB
)
!=
0
)
{
fclose
(
lib_module
);
msg
.
Printf
(
_
(
"File %s is not a eeschema library"
),
aLibName
.
GetData
(
)
);
msg
.
Printf
(
_
(
"File %s is not a eeschema library"
),
GetChars
(
aLibName
)
);
DisplayError
(
this
,
msg
);
return
0
;
}
...
...
pcbnew/loadcmp.cpp
View file @
657325be
...
...
@@ -218,7 +218,7 @@ MODULE* WinEDA_BasePcbFrame::Get_Librairie_Module( const wxString& aLibraryFullF
if
(
aDisplayMessageError
)
{
msg
.
Printf
(
_
(
"PCB footprint library file <%s> not found in search paths."
),
fn
.
GetFullName
().
c_str
(
)
);
GetChars
(
fn
.
GetFullName
()
)
);
wxMessageBox
(
msg
,
_
(
"Library Load Error"
),
wxOK
|
wxICON_ERROR
,
this
);
}
...
...
@@ -230,13 +230,13 @@ MODULE* WinEDA_BasePcbFrame::Get_Librairie_Module( const wxString& aLibraryFullF
if
(
file
==
NULL
)
{
msg
.
Printf
(
_
(
"Could not open PCB footprint library file <%s>."
),
tmp
.
c_str
(
)
);
GetChars
(
tmp
)
);
wxMessageBox
(
msg
,
_
(
"Library Load Error"
),
wxOK
|
wxICON_ERROR
,
this
);
continue
;
}
msg
.
Printf
(
_
(
"Scan Lib: %s"
),
tmp
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Scan Lib: %s"
),
GetChars
(
tmp
)
);
Affiche_Message
(
msg
);
/* lecture entete chaine definie par ENTETE_LIBRAIRIE */
...
...
@@ -246,7 +246,7 @@ MODULE* WinEDA_BasePcbFrame::Get_Librairie_Module( const wxString& aLibraryFullF
if
(
strnicmp
(
Line
,
ENTETE_LIBRAIRIE
,
L_ENTETE_LIB
)
!=
0
)
{
msg
.
Printf
(
_
(
"<%s> is not a valid Kicad PCB footprint library file."
),
tmp
.
c_str
(
)
);
GetChars
(
tmp
)
);
wxMessageBox
(
msg
,
_
(
"Library Load Error"
),
wxOK
|
wxICON_ERROR
,
this
);
fclose
(
file
);
...
...
@@ -312,7 +312,7 @@ MODULE* WinEDA_BasePcbFrame::Get_Librairie_Module( const wxString& aLibraryFullF
if
(
aDisplayMessageError
)
{
msg
.
Printf
(
_
(
"Module <%s> not found"
),
aModuleName
.
c_str
(
)
);
msg
.
Printf
(
_
(
"Module <%s> not found"
),
GetChars
(
aModuleName
)
);
DisplayError
(
NULL
,
msg
);
}
...
...
@@ -370,7 +370,7 @@ wxString WinEDA_BasePcbFrame::Select_1_Module_From_List(
if
(
!
tmp
)
{
msg
.
Printf
(
_
(
"PCB footprint library file <%s> not found in search paths."
),
fn
.
GetFullName
().
c_str
(
)
);
GetChars
(
fn
.
GetFullName
()
)
);
wxMessageBox
(
msg
,
_
(
"Library Load Error"
),
wxOK
|
wxICON_ERROR
,
this
);
continue
;
...
...
@@ -406,7 +406,7 @@ wxString WinEDA_BasePcbFrame::Select_1_Module_From_List(
if
(
strnicmp
(
Line
,
ENTETE_LIBRAIRIE
,
L_ENTETE_LIB
)
!=
0
)
{
msg
.
Printf
(
_
(
"<%s> is not a valid Kicad PCB footprint library file."
),
tmp
.
c_str
(
)
);
GetChars
(
tmp
)
);
wxMessageBox
(
msg
,
_
(
"Library Load Error"
),
wxOK
|
wxICON_ERROR
,
this
);
fclose
(
file
);
...
...
pcbnew/pcbcfg.cpp
View file @
657325be
...
...
@@ -89,7 +89,7 @@ void WinEDA_PcbFrame::Process_Config( wxCommandEvent& event )
if
(
!
wxFileExists
(
dlg
.
GetPath
()
)
)
{
wxString
msg
;
msg
.
Printf
(
_
(
"File %s not found"
),
dlg
.
GetPath
().
c_str
(
)
);
msg
.
Printf
(
_
(
"File %s not found"
),
GetChars
(
dlg
.
GetPath
()
)
);
DisplayError
(
this
,
msg
);
break
;
}
...
...
pcbnew/pcbnew.cpp
View file @
657325be
...
...
@@ -95,7 +95,7 @@ bool WinEDA_App::OnInit()
{
wxLogDebug
(
wxT
(
"PcbNew file <%s> has the wrong extension. \
Changing extension to .brd."
),
fn
.
GetFullPath
().
c_str
(
)
);
GetChars
(
fn
.
GetFullPath
()
)
);
fn
.
SetExt
(
BoardFileExtension
);
}
...
...
pcbnew/xchgmod.cpp
View file @
657325be
...
...
@@ -171,7 +171,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
{
if
(
ShowError
)
{
msg
.
Printf
(
_
(
"file %s not found"
),
fn
.
GetFullPath
().
c_str
(
)
);
msg
.
Printf
(
_
(
"file %s not found"
),
GetChars
(
fn
.
GetFullPath
()
)
);
m_WinMessages
->
AppendText
(
msg
);
}
return
1
;
...
...
@@ -186,7 +186,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
if
(
ShowError
)
{
msg
.
Printf
(
_
(
"Unable to create file %s"
),
tmpFileName
.
GetFullPath
().
c_str
(
)
);
GetChars
(
tmpFileName
.
GetFullPath
()
)
);
m_WinMessages
->
AppendText
(
msg
);
}
return
1
;
...
...
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