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
ce4d22f0
Commit
ce4d22f0
authored
Oct 05, 2009
by
dickelbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
work around some gcc 4.3.3 compiler warnings
parent
b34df533
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
455 additions
and
436 deletions
+455
-436
3d_draw.cpp
3d-viewer/3d_draw.cpp
+1
-1
edaappl.cpp
common/edaappl.cpp
+1
-1
hotkeys_basic.cpp
common/hotkeys_basic.cpp
+8
-10
listlib.cpp
cvpcb/listlib.cpp
+91
-91
readschematicnetlist.cpp
cvpcb/readschematicnetlist.cpp
+1
-1
writenetlistpcbnew.cpp
cvpcb/writenetlistpcbnew.cpp
+1
-1
export_to_pcbnew.cpp
gerbview/export_to_pcbnew.cpp
+1
-1
class_drc_item.h
include/class_drc_item.h
+5
-5
minizip.c
kicad/minizip/minizip.c
+334
-313
build_BOM_from_board.cpp
pcbnew/build_BOM_from_board.cpp
+2
-2
class_module.cpp
pcbnew/class_module.cpp
+3
-3
dialog_drc.cpp
pcbnew/dialog_drc.cpp
+2
-2
ioascii.cpp
pcbnew/ioascii.cpp
+1
-1
onrightclick.cpp
pcbnew/onrightclick.cpp
+2
-2
xchgmod.cpp
pcbnew/xchgmod.cpp
+2
-2
No files found.
3d-viewer/3d_draw.cpp
View file @
ce4d22f0
...
@@ -658,7 +658,7 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
...
@@ -658,7 +658,7 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
default
:
default
:
s
.
Printf
(
wxT
(
"Error: Shape nr %d not implemented!
\n
"
),
m_Shape
);
s
.
Printf
(
wxT
(
"Error: Shape nr %d not implemented!
\n
"
),
m_Shape
);
printf
(
CONV_TO_UTF8
(
s
)
);
D
(
printf
(
"%s"
,
CONV_TO_UTF8
(
s
)
);)
break
;
break
;
}
}
}
}
...
...
common/edaappl.cpp
View file @
ce4d22f0
...
@@ -417,7 +417,7 @@ bool WinEDA_App::SetBinDir()
...
@@ -417,7 +417,7 @@ bool WinEDA_App::SetBinDir()
if
(
(
ftmp
=
fopen
(
TMP_FILE
,
"rt"
)
)
!=
NULL
)
if
(
(
ftmp
=
fopen
(
TMP_FILE
,
"rt"
)
)
!=
NULL
)
{
{
fgets
(
Line
,
1000
,
ftmp
);
(
void
)
fgets
(
Line
,
1000
,
ftmp
);
fclose
(
ftmp
);
fclose
(
ftmp
);
remove
(
TMP_FILE
);
remove
(
TMP_FILE
);
}
}
...
...
common/hotkeys_basic.cpp
View file @
ce4d22f0
...
@@ -412,12 +412,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
...
@@ -412,12 +412,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
wxString
keyname
,
infokey
;
wxString
keyname
,
infokey
;
msg
=
wxT
(
"$hotkey list
\n
"
);
msg
=
wxT
(
"$hotkey list
\n
"
);
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
/* print the allowed keys, for info
/* print the allowed keys, for info
*/
*/
msg
=
wxT
(
"# "
);
msg
+=
_
(
"Allowed keys:
\n
"
);
msg
=
wxT
(
"# "
);
msg
+=
_
(
"Allowed keys:
\n
"
);
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
msg
.
Empty
();
msg
.
Empty
();
for
(
int
ii
=
0
;
;
ii
++
)
for
(
int
ii
=
0
;
;
ii
++
)
{
{
...
@@ -431,7 +431,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
...
@@ -431,7 +431,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
if
(
msg
.
Len
()
>
60
)
if
(
msg
.
Len
()
>
60
)
{
{
msg
+=
wxT
(
"
\n
"
);
msg
+=
wxT
(
"
\n
"
);
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
msg
.
Empty
();
msg
.
Empty
();
}
}
}
}
...
@@ -440,7 +440,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
...
@@ -440,7 +440,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
if
(
!
msg
.
IsEmpty
()
)
if
(
!
msg
.
IsEmpty
()
)
msg
+=
wxT
(
"
\n
"
);
msg
+=
wxT
(
"
\n
"
);
msg
+=
wxT
(
"#
\n
#
\n
"
);
msg
+=
wxT
(
"#
\n
#
\n
"
);
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
/* Print the current hotkey list */
/* Print the current hotkey list */
Ki_HotkeyInfo
**
List
;
Ki_HotkeyInfo
**
List
;
...
@@ -449,12 +449,10 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
...
@@ -449,12 +449,10 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
if
(
DescList
->
m_Comment
)
if
(
DescList
->
m_Comment
)
{
{
fprintf
(
cfgfile
,
"# "
);
fprintf
(
cfgfile
,
"# "
);
fprintf
(
cfgfile
,
DescList
->
m_Comment
);
fprintf
(
cfgfile
,
"%s
\n
"
,
DescList
->
m_Comment
);
fprintf
(
cfgfile
,
"
\n
"
);
}
}
msg
=
*
DescList
->
m_SectionTag
;
msg
=
*
DescList
->
m_SectionTag
;
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s
\n
"
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"
\n
"
);
List
=
DescList
->
m_HK_InfoList
;
List
=
DescList
->
m_HK_InfoList
;
for
(
;
*
List
!=
NULL
;
List
++
)
for
(
;
*
List
!=
NULL
;
List
++
)
{
{
...
@@ -465,12 +463,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
...
@@ -465,12 +463,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
infokey
=
hk_decr
->
m_InfoMsg
;
infokey
=
hk_decr
->
m_InfoMsg
;
AddDelimiterString
(
infokey
);
AddDelimiterString
(
infokey
);
msg
+=
keyname
+
wxT
(
": "
)
+
infokey
+
wxT
(
"
\n
"
);
msg
+=
keyname
+
wxT
(
": "
)
+
infokey
+
wxT
(
"
\n
"
);
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
}
}
}
}
msg
=
wxT
(
"$Endlist
\n
"
);
msg
=
wxT
(
"$Endlist
\n
"
);
fprintf
(
cfgfile
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
cfgfile
,
"%s
\n
"
,
CONV_TO_UTF8
(
msg
)
);
fclose
(
cfgfile
);
fclose
(
cfgfile
);
return
1
;
return
1
;
}
}
...
...
cvpcb/listlib.cpp
View file @
ce4d22f0
...
@@ -44,19 +44,19 @@ static void ReadDocLib( const wxString& ModLibName, FOOTPRINT_LIST& list );
...
@@ -44,19 +44,19 @@ static void ReadDocLib( const wxString& ModLibName, FOOTPRINT_LIST& list );
bool
LoadFootprintFiles
(
const
wxArrayString
&
libNames
,
bool
LoadFootprintFiles
(
const
wxArrayString
&
libNames
,
FOOTPRINT_LIST
&
list
)
FOOTPRINT_LIST
&
list
)
{
{
FILE
*
file
;
/* pour lecture librairie */
FILE
*
file
;
/* pour lecture librairie */
char
buffer
[
1024
];
char
buffer
[
1024
];
wxFileName
filename
;
wxFileName
filename
;
int
end
;
int
end
;
FOOTPRINT
*
ItemLib
;
FOOTPRINT
*
ItemLib
;
unsigned
i
;
unsigned
i
;
wxString
tmp
,
msg
;
wxString
tmp
,
msg
;
/* Check if footprint list is not empty */
/* Check if footprint list is not empty */
if
(
!
list
.
empty
()
)
if
(
!
list
.
empty
()
)
list
.
clear
();
list
.
clear
();
/* Check if there are footprint libraries in project file */
/* Check if there are footprint libraries in project file */
if
(
libNames
.
GetCount
()
==
0
)
if
(
libNames
.
GetCount
()
==
0
)
{
{
wxMessageBox
(
_
(
"No PCB foot print libraries are listed in the current project file."
),
wxMessageBox
(
_
(
"No PCB foot print libraries are listed in the current project file."
),
...
@@ -90,7 +90,7 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
...
@@ -90,7 +90,7 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
}
}
/* Check if library type is valid */
/* Check if library type is valid */
fgets
(
buffer
,
32
,
file
);
(
void
)
fgets
(
buffer
,
32
,
file
);
if
(
strncmp
(
buffer
,
ENTETE_LIBRAIRIE
,
L_ENTETE_LIB
)
!=
0
)
if
(
strncmp
(
buffer
,
ENTETE_LIBRAIRIE
,
L_ENTETE_LIB
)
!=
0
)
{
{
s_files_invalid
<<
tmp
<<
_
(
" (Not a Kicad file)"
)
<<
wxT
(
"
\n
"
);
s_files_invalid
<<
tmp
<<
_
(
" (Not a Kicad file)"
)
<<
wxT
(
"
\n
"
);
...
@@ -132,8 +132,8 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
...
@@ -132,8 +132,8 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
ReadDocLib
(
tmp
,
list
);
ReadDocLib
(
tmp
,
list
);
}
}
/* Display if there are mdc files not found */
/* Display if there are mdc files not found */
if
(
!
s_files_not_found
.
IsEmpty
()
||
!
s_files_invalid
.
IsEmpty
()
)
if
(
!
s_files_not_found
.
IsEmpty
()
||
!
s_files_invalid
.
IsEmpty
()
)
{
{
DIALOG_LOAD_ERROR
dialog
(
NULL
);
DIALOG_LOAD_ERROR
dialog
(
NULL
);
if
(
!
s_files_not_found
.
IsEmpty
()
)
if
(
!
s_files_not_found
.
IsEmpty
()
)
...
@@ -154,9 +154,9 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
...
@@ -154,9 +154,9 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
dialog
.
ShowModal
();
dialog
.
ShowModal
();
}
}
list
.
sort
();
list
.
sort
();
return
true
;
return
true
;
}
}
...
@@ -169,77 +169,77 @@ static void
...
@@ -169,77 +169,77 @@ static void
ReadDocLib
(
const
wxString
&
ModLibName
,
ReadDocLib
(
const
wxString
&
ModLibName
,
FOOTPRINT_LIST
&
list
)
FOOTPRINT_LIST
&
list
)
{
{
FOOTPRINT
*
NewMod
;
FOOTPRINT
*
NewMod
;
char
Line
[
1024
];
char
Line
[
1024
];
wxString
ModuleName
;
wxString
ModuleName
;
FILE
*
mdc_file
;
FILE
*
mdc_file
;
wxFileName
mdc_filename
=
ModLibName
;
wxFileName
mdc_filename
=
ModLibName
;
/* Set mdc filename extension */
/* Set mdc filename extension */
mdc_filename
.
SetExt
(
wxT
(
"mdc"
)
);
mdc_filename
.
SetExt
(
wxT
(
"mdc"
)
);
/* Check if mdc file exists and can be opened */
/* Check if mdc file exists and can be opened */
if
(
(
mdc_file
=
wxFopen
(
mdc_filename
.
GetFullPath
(),
wxT
(
"rt"
)
)
)
==
NULL
)
if
(
(
mdc_file
=
wxFopen
(
mdc_filename
.
GetFullPath
(),
wxT
(
"rt"
)
)
)
==
NULL
)
{
{
s_files_not_found
+=
mdc_filename
.
GetFullPath
()
+
wxT
(
"
\n
"
);
s_files_not_found
+=
mdc_filename
.
GetFullPath
()
+
wxT
(
"
\n
"
);
return
;
return
;
}
}
/* Check if mdc file is valid */
/* Check if mdc file is valid */
GetLine
(
mdc_file
,
Line
,
NULL
,
sizeof
(
Line
)
-
1
);
GetLine
(
mdc_file
,
Line
,
NULL
,
sizeof
(
Line
)
-
1
);
if
(
strnicmp
(
Line
,
ENTETE_LIBDOC
,
L_ENTETE_LIB
)
!=
0
)
if
(
strnicmp
(
Line
,
ENTETE_LIBDOC
,
L_ENTETE_LIB
)
!=
0
)
{
{
s_files_invalid
+=
mdc_filename
.
GetFullPath
()
+
wxT
(
"
\n
"
);
s_files_invalid
+=
mdc_filename
.
GetFullPath
()
+
wxT
(
"
\n
"
);
return
;
return
;
}
}
/* Read the mdc file */
/* Read the mdc file */
while
(
GetLine
(
mdc_file
,
Line
,
NULL
,
sizeof
(
Line
)
-
1
)
)
while
(
GetLine
(
mdc_file
,
Line
,
NULL
,
sizeof
(
Line
)
-
1
)
)
{
{
NewMod
=
NULL
;
NewMod
=
NULL
;
if
(
Line
[
0
]
!=
'$'
)
if
(
Line
[
0
]
!=
'$'
)
continue
;
continue
;
if
(
Line
[
1
]
==
'E'
)
if
(
Line
[
1
]
==
'E'
)
break
;
break
;
if
(
Line
[
1
]
==
'M'
)
/* 1 module description */
if
(
Line
[
1
]
==
'M'
)
/* 1 module description */
{
{
/* Parse file line by line */
/* Parse file line by line */
while
(
GetLine
(
mdc_file
,
Line
,
NULL
,
sizeof
(
Line
)
-
1
)
)
while
(
GetLine
(
mdc_file
,
Line
,
NULL
,
sizeof
(
Line
)
-
1
)
)
{
{
/* $EndMODULE */
/* $EndMODULE */
if
(
Line
[
0
]
==
'$'
)
if
(
Line
[
0
]
==
'$'
)
break
;
break
;
switch
(
Line
[
0
]
)
switch
(
Line
[
0
]
)
{
{
/* LibName */
/* LibName */
case
'L'
:
/* LibName */
case
'L'
:
/* LibName */
ModuleName
=
CONV_FROM_UTF8
(
StrPurge
(
Line
+
3
)
);
ModuleName
=
CONV_FROM_UTF8
(
StrPurge
(
Line
+
3
)
);
BOOST_FOREACH
(
FOOTPRINT
&
footprint
,
list
)
BOOST_FOREACH
(
FOOTPRINT
&
footprint
,
list
)
{
{
if
(
ModuleName
==
footprint
.
m_Module
)
if
(
ModuleName
==
footprint
.
m_Module
)
{
{
NewMod
=
&
footprint
;
NewMod
=
&
footprint
;
break
;
break
;
}
}
}
}
break
;
break
;
/* KeyWords */
/* KeyWords */
case
'K'
:
case
'K'
:
if
(
NewMod
&&
(
!
NewMod
->
m_KeyWord
)
)
if
(
NewMod
&&
(
!
NewMod
->
m_KeyWord
)
)
NewMod
->
m_KeyWord
=
CONV_FROM_UTF8
(
StrPurge
(
Line
+
3
)
);
NewMod
->
m_KeyWord
=
CONV_FROM_UTF8
(
StrPurge
(
Line
+
3
)
);
break
;
break
;
/* Doc */
/* Doc */
case
'C'
:
case
'C'
:
if
(
NewMod
&&
(
!
NewMod
->
m_Doc
)
)
if
(
NewMod
&&
(
!
NewMod
->
m_Doc
)
)
NewMod
->
m_Doc
=
CONV_FROM_UTF8
(
StrPurge
(
Line
+
3
)
);
NewMod
->
m_Doc
=
CONV_FROM_UTF8
(
StrPurge
(
Line
+
3
)
);
break
;
break
;
}
}
}
}
}
/* Parsed one module documentation */
}
/* Parsed one module documentation */
}
/* Parsed complete library documentation */
}
/* Parsed complete library documentation */
fclose
(
mdc_file
);
fclose
(
mdc_file
);
}
}
cvpcb/readschematicnetlist.cpp
View file @
ce4d22f0
...
@@ -118,7 +118,7 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
...
@@ -118,7 +118,7 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
/* Read the file header (must be "( { OrCAD PCB" or "({ OrCAD PCB" )
/* Read the file header (must be "( { OrCAD PCB" or "({ OrCAD PCB" )
* or "# EESchema Netliste"
* or "# EESchema Netliste"
*/
*/
fgets
(
Line
,
BUFFER_CHAR_SIZE
,
source
);
(
void
)
fgets
(
Line
,
BUFFER_CHAR_SIZE
,
source
);
/* test for netlist type PCB2 */
/* test for netlist type PCB2 */
i
=
strnicmp
(
Line
,
"( {"
,
3
);
i
=
strnicmp
(
Line
,
"( {"
,
3
);
if
(
i
!=
0
)
if
(
i
!=
0
)
...
...
cvpcb/writenetlistpcbnew.cpp
View file @
ce4d22f0
...
@@ -93,7 +93,7 @@ int GenNetlistPcbnew( FILE* file, COMPONENT_LIST& list, bool isEESchemaNetlist,
...
@@ -93,7 +93,7 @@ int GenNetlistPcbnew( FILE* file, COMPONENT_LIST& list, bool isEESchemaNetlist,
fprintf
(
file
,
" ( %s "
,
CONV_TO_UTF8
(
component
.
m_TimeStamp
)
);
fprintf
(
file
,
" ( %s "
,
CONV_TO_UTF8
(
component
.
m_TimeStamp
)
);
if
(
!
component
.
m_Module
.
IsEmpty
()
)
if
(
!
component
.
m_Module
.
IsEmpty
()
)
fprintf
(
file
,
CONV_TO_UTF8
(
component
.
m_Module
)
);
fprintf
(
file
,
"%s"
,
CONV_TO_UTF8
(
component
.
m_Module
)
);
else
else
fprintf
(
file
,
"$noname$"
);
fprintf
(
file
,
"$noname$"
);
...
...
gerbview/export_to_pcbnew.cpp
View file @
ce4d22f0
...
@@ -94,7 +94,7 @@ static int WriteSetup( FILE* File, BOARD* Pcb )
...
@@ -94,7 +94,7 @@ static int WriteSetup( FILE* File, BOARD* Pcb )
fprintf
(
File
,
"$SETUP
\n
"
);
fprintf
(
File
,
"$SETUP
\n
"
);
sprintf
(
text
,
"InternalUnit %f INCH
\n
"
,
1.0
/
PCB_INTERNAL_UNIT
);
sprintf
(
text
,
"InternalUnit %f INCH
\n
"
,
1.0
/
PCB_INTERNAL_UNIT
);
fprintf
(
File
,
text
);
fprintf
(
File
,
"%s"
,
text
);
Pcb
->
m_BoardSettings
->
m_CopperLayerCount
=
g_DesignSettings
.
m_CopperLayerCount
;
Pcb
->
m_BoardSettings
->
m_CopperLayerCount
=
g_DesignSettings
.
m_CopperLayerCount
;
fprintf
(
File
,
"Layers %d
\n
"
,
g_DesignSettings
.
m_CopperLayerCount
);
fprintf
(
File
,
"Layers %d
\n
"
,
g_DesignSettings
.
m_CopperLayerCount
);
...
...
include/class_drc_item.h
View file @
ce4d22f0
...
@@ -188,16 +188,16 @@ public:
...
@@ -188,16 +188,16 @@ public:
{
{
ret
.
Printf
(
wxT
(
"ErrType(%d): %s
\n
%s: %s
\n
%s: %s
\n
"
),
ret
.
Printf
(
wxT
(
"ErrType(%d): %s
\n
%s: %s
\n
%s: %s
\n
"
),
m_ErrorCode
,
m_ErrorCode
,
Get
ErrorText
().
GetData
(
),
Get
Chars
(
GetErrorText
()
),
ShowCoord
(
m_MainPosition
).
GetData
(),
m_MainText
.
GetData
(
),
GetChars
(
ShowCoord
(
m_MainPosition
)
),
GetChars
(
m_MainText
),
ShowCoord
(
m_AuxiliaryPosition
).
GetData
(),
m_AuxiliaryText
.
GetData
(
)
);
GetChars
(
ShowCoord
(
m_AuxiliaryPosition
)
),
GetChars
(
m_AuxiliaryText
)
);
}
}
else
else
{
{
ret
.
Printf
(
wxT
(
"ErrType(%d): %s
\n
%s: %s
\n
"
),
ret
.
Printf
(
wxT
(
"ErrType(%d): %s
\n
%s: %s
\n
"
),
m_ErrorCode
,
m_ErrorCode
,
Get
ErrorText
().
GetData
(
),
Get
Chars
(
GetErrorText
()
),
ShowCoord
(
m_MainPosition
).
GetData
(),
m_MainText
.
GetData
(
)
);
GetChars
(
ShowCoord
(
m_MainPosition
)
),
GetChars
(
m_MainText
)
);
}
}
return
ret
;
return
ret
;
...
...
kicad/minizip/minizip.c
View file @
ce4d22f0
This diff is collapsed.
Click to expand it.
pcbnew/build_BOM_from_board.cpp
View file @
ce4d22f0
...
@@ -90,7 +90,7 @@ void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
...
@@ -90,7 +90,7 @@ void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
msg
<<
_
(
"Number"
)
<<
wxT
(
"
\"
;
\"
"
);
msg
<<
_
(
"Number"
)
<<
wxT
(
"
\"
;
\"
"
);
msg
<<
_
(
"Designation"
)
<<
wxT
(
"
\"
;
\"
"
);
msg
<<
_
(
"Designation"
)
<<
wxT
(
"
\"
;
\"
"
);
msg
<<
_
(
"Supplier and ref"
)
<<
wxT
(
"
\"
;
\n
"
);
msg
<<
_
(
"Supplier and ref"
)
<<
wxT
(
"
\"
;
\n
"
);
fprintf
(
FichBom
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
FichBom
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
// Build list
// Build list
CmpList
list
;
CmpList
list
;
...
@@ -142,7 +142,7 @@ void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
...
@@ -142,7 +142,7 @@ void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
msg
<<
current
->
m_Pkg
<<
wxT
(
"
\"
;"
);
msg
<<
current
->
m_Pkg
<<
wxT
(
"
\"
;"
);
msg
<<
current
->
m_CmpCount
<<
wxT
(
";
\"
"
);
msg
<<
current
->
m_CmpCount
<<
wxT
(
";
\"
"
);
msg
<<
current
->
m_Val
<<
wxT
(
"
\"
;;;
\n
"
);
msg
<<
current
->
m_Val
<<
wxT
(
"
\"
;;;
\n
"
);
fprintf
(
FichBom
,
CONV_TO_UTF8
(
msg
)
);
fprintf
(
FichBom
,
"%s"
,
CONV_TO_UTF8
(
msg
)
);
list
.
DeleteObject
(
current
);
list
.
DeleteObject
(
current
);
delete
(
current
);
delete
(
current
);
...
...
pcbnew/class_module.cpp
View file @
ce4d22f0
...
@@ -365,19 +365,19 @@ int MODULE::Write_3D_Descr( FILE* File ) const
...
@@ -365,19 +365,19 @@ int MODULE::Write_3D_Descr( FILE* File ) const
t3D
->
m_MatScale
.
x
,
t3D
->
m_MatScale
.
x
,
t3D
->
m_MatScale
.
y
,
t3D
->
m_MatScale
.
y
,
t3D
->
m_MatScale
.
z
);
t3D
->
m_MatScale
.
z
);
fprintf
(
File
,
to_point
(
buf
)
);
fprintf
(
File
,
"%s"
,
to_point
(
buf
)
);
sprintf
(
buf
,
"Of %lf %lf %lf
\n
"
,
sprintf
(
buf
,
"Of %lf %lf %lf
\n
"
,
t3D
->
m_MatPosition
.
x
,
t3D
->
m_MatPosition
.
x
,
t3D
->
m_MatPosition
.
y
,
t3D
->
m_MatPosition
.
y
,
t3D
->
m_MatPosition
.
z
);
t3D
->
m_MatPosition
.
z
);
fprintf
(
File
,
to_point
(
buf
)
);
fprintf
(
File
,
"%s"
,
to_point
(
buf
)
);
sprintf
(
buf
,
"Ro %lf %lf %lf
\n
"
,
sprintf
(
buf
,
"Ro %lf %lf %lf
\n
"
,
t3D
->
m_MatRotation
.
x
,
t3D
->
m_MatRotation
.
x
,
t3D
->
m_MatRotation
.
y
,
t3D
->
m_MatRotation
.
y
,
t3D
->
m_MatRotation
.
z
);
t3D
->
m_MatRotation
.
z
);
fprintf
(
File
,
to_point
(
buf
)
);
fprintf
(
File
,
"%s"
,
to_point
(
buf
)
);
fprintf
(
File
,
"$EndSHAPE3D
\n
"
);
fprintf
(
File
,
"$EndSHAPE3D
\n
"
);
}
}
...
...
pcbnew/dialog_drc.cpp
View file @
ce4d22f0
...
@@ -523,14 +523,14 @@ void DIALOG_DRC_CONTROL::writeReport( FILE* fp )
...
@@ -523,14 +523,14 @@ void DIALOG_DRC_CONTROL::writeReport( FILE* fp )
fprintf
(
fp
,
"
\n
** Found %d DRC errors **
\n
"
,
count
);
fprintf
(
fp
,
"
\n
** Found %d DRC errors **
\n
"
,
count
);
for
(
int
i
=
0
;
i
<
count
;
++
i
)
for
(
int
i
=
0
;
i
<
count
;
++
i
)
fprintf
(
fp
,
m_ClearanceListBox
->
GetItem
(
i
)
->
ShowReport
().
mb_str
(
)
);
fprintf
(
fp
,
"%s"
,
CONV_TO_UTF8
(
m_ClearanceListBox
->
GetItem
(
i
)
->
ShowReport
()
)
);
count
=
m_UnconnectedListBox
->
GetItemCount
();
count
=
m_UnconnectedListBox
->
GetItemCount
();
fprintf
(
fp
,
"
\n
** Found %d unconnected pads **
\n
"
,
count
);
fprintf
(
fp
,
"
\n
** Found %d unconnected pads **
\n
"
,
count
);
for
(
int
i
=
0
;
i
<
count
;
++
i
)
for
(
int
i
=
0
;
i
<
count
;
++
i
)
fprintf
(
fp
,
m_UnconnectedListBox
->
GetItem
(
i
)
->
ShowReport
().
mb_str
(
)
);
fprintf
(
fp
,
"%s"
,
CONV_TO_UTF8
(
m_UnconnectedListBox
->
GetItem
(
i
)
->
ShowReport
()
)
);
fprintf
(
fp
,
"
\n
** End of Report **
\n
"
);
fprintf
(
fp
,
"
\n
** End of Report **
\n
"
);
}
}
...
...
pcbnew/ioascii.cpp
View file @
ce4d22f0
...
@@ -524,7 +524,7 @@ static int WriteSetup( FILE* aFile, WinEDA_BasePcbFrame* aFrame, BOARD* aBoard )
...
@@ -524,7 +524,7 @@ static int WriteSetup( FILE* aFile, WinEDA_BasePcbFrame* aFrame, BOARD* aBoard )
fprintf
(
aFile
,
"$SETUP
\n
"
);
fprintf
(
aFile
,
"$SETUP
\n
"
);
sprintf
(
text
,
"InternalUnit %f INCH
\n
"
,
1.0
/
PCB_INTERNAL_UNIT
);
sprintf
(
text
,
"InternalUnit %f INCH
\n
"
,
1.0
/
PCB_INTERNAL_UNIT
);
fprintf
(
aFile
,
text
);
fprintf
(
aFile
,
"%s"
,
text
);
fprintf
(
aFile
,
"ZoneGridSize %d
\n
"
,
g_GridRoutingSize
);
fprintf
(
aFile
,
"ZoneGridSize %d
\n
"
,
g_GridRoutingSize
);
...
...
pcbnew/onrightclick.cpp
View file @
ce4d22f0
...
@@ -881,7 +881,7 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
...
@@ -881,7 +881,7 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
trackwidth_menu
->
Check
(
ID_POPUP_PCB_SELECT_AUTO_WIDTH
,
true
);
trackwidth_menu
->
Check
(
ID_POPUP_PCB_SELECT_AUTO_WIDTH
,
true
);
else
else
{
{
if
(
aBoard
->
m_TrackWidthSelector
<
(
int
)
aBoard
->
m_TrackWidthHistory
.
size
()
)
if
(
aBoard
->
m_TrackWidthSelector
<
aBoard
->
m_TrackWidthHistory
.
size
()
)
trackwidth_menu
->
Check
(
ID_POPUP_PCB_SELECT_WIDTH1
+
aBoard
->
m_TrackWidthSelector
,
true
);
trackwidth_menu
->
Check
(
ID_POPUP_PCB_SELECT_WIDTH1
+
aBoard
->
m_TrackWidthSelector
,
true
);
}
}
...
@@ -899,7 +899,7 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
...
@@ -899,7 +899,7 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
msg
<<
_
(
" (from NetClass)"
);
msg
<<
_
(
" (from NetClass)"
);
trackwidth_menu
->
Append
(
ID_POPUP_PCB_SELECT_VIASIZE1
+
ii
,
msg
,
wxEmptyString
,
true
);
trackwidth_menu
->
Append
(
ID_POPUP_PCB_SELECT_VIASIZE1
+
ii
,
msg
,
wxEmptyString
,
true
);
}
}
if
(
aBoard
->
m_ViaSizeSelector
<
(
int
)
aBoard
->
m_ViaSizeHistory
.
size
()
)
if
(
aBoard
->
m_ViaSizeSelector
<
aBoard
->
m_ViaSizeHistory
.
size
()
)
trackwidth_menu
->
Check
(
ID_POPUP_PCB_SELECT_VIASIZE1
+
aBoard
->
m_ViaSizeSelector
,
true
);
trackwidth_menu
->
Check
(
ID_POPUP_PCB_SELECT_VIASIZE1
+
aBoard
->
m_ViaSizeSelector
,
true
);
return
trackwidth_menu
;
return
trackwidth_menu
;
...
...
pcbnew/xchgmod.cpp
View file @
ce4d22f0
...
@@ -192,7 +192,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
...
@@ -192,7 +192,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
return
1
;
return
1
;
}
}
fgets
(
Line
,
sizeof
(
Line
),
FichCmp
);
(
void
)
fgets
(
Line
,
sizeof
(
Line
),
FichCmp
);
fprintf
(
NewFile
,
"Cmp-Mod V01 Genere par PcbNew le %s
\n
"
,
fprintf
(
NewFile
,
"Cmp-Mod V01 Genere par PcbNew le %s
\n
"
,
DateAndTime
(
Line
)
);
DateAndTime
(
Line
)
);
...
@@ -601,7 +601,7 @@ void WinEDA_PcbFrame::RecreateCmpFileFromBoard( wxCommandEvent& aEvent )
...
@@ -601,7 +601,7 @@ void WinEDA_PcbFrame::RecreateCmpFileFromBoard( wxCommandEvent& aEvent )
return
;
return
;
}
}
fgets
(
Line
,
sizeof
(
Line
),
FichCmp
);
(
void
)
fgets
(
Line
,
sizeof
(
Line
),
FichCmp
);
fprintf
(
FichCmp
,
"Cmp-Mod V01 Genere par PcbNew le %s
\n
"
,
fprintf
(
FichCmp
,
"Cmp-Mod V01 Genere par PcbNew le %s
\n
"
,
DateAndTime
(
Line
)
);
DateAndTime
(
Line
)
);
...
...
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