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
62c9e7e0
Commit
62c9e7e0
authored
Mar 23, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor code cleaning.
parent
67e24be1
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
2549 additions
and
49 deletions
+2549
-49
CMakeLists.txt
bitmaps/CMakeLists.txt
+1
-0
gerber_recent_files.xpm
bitmaps/gerber_recent_files.xpm
+38
-0
gerber_recent_files.svg
bitmaps/sources/gerber_recent_files.svg
+2463
-0
CMakeLists.txt
cvpcb/CMakeLists.txt
+0
-1
dummy_functions.cpp
cvpcb/dummy_functions.cpp
+0
-21
setvisu.cpp
cvpcb/setvisu.cpp
+17
-0
draw_gerber_screen.cpp
gerbview/draw_gerber_screen.cpp
+1
-1
menubar.cpp
gerbview/menubar.cpp
+1
-1
bitmaps.h
include/bitmaps.h
+1
-0
netlist.cpp
pcbnew/netlist.cpp
+0
-2
protos.h
pcbnew/protos.h
+0
-4
tr_modif.cpp
pcbnew/tr_modif.cpp
+21
-0
track.cpp
pcbnew/track.cpp
+0
-13
xchgmod.cpp
pcbnew/xchgmod.cpp
+6
-6
No files found.
bitmaps/CMakeLists.txt
View file @
62c9e7e0
...
...
@@ -139,6 +139,7 @@ set(BITMAP_SRCS
gbr_select_mode1.xpm
gbr_select_mode2.xpm
gerber_file.xpm
gerber_recent_files.xpm
gerbview_drill_file.xpm
gerbview_clear_layers.xpm
gerber_open_dcode_file.xpm
...
...
bitmaps/gerber_recent_files.xpm
0 → 100644
View file @
62c9e7e0
/* XPM */
char *gerber_recent_files_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"$ c #969997",
"X c #B4B4B3",
"% c #686A67",
"O c #A4A6A4",
"+ c #7F817D",
"; c #8C8D8C",
". c #BEBEBD",
"@ c #D5D5D3",
" c None",
": c #929294",
"& c #2C2D2F",
"= c #5C5E5A",
"- c #505352",
"o c #E4E6E4",
"# c #747674",
"* c #434644",
/* pixels */
" ..... .X. ",
" ooO++.X. . @",
" @.#OO.$#OX X@",
" @ X$$...%&#X.@",
" X@$&*X=-$;$ X@",
" $; @ $X X=; ",
" $O%-=;O+%%%#%O",
" .:O$#-&**-%#+#",
" O;;:;++%##%-",
" .$$$$:;;;;++#--",
"#-=%%#%==--*-%-%",
"%%#+;:;+#%%#%;=#",
"###+;:;+#%=%=#*O",
"#=-=%#%-****-#O ",
"%-+;;:$$OX. ",
"= "
};
bitmaps/sources/gerber_recent_files.svg
0 → 100644
View file @
62c9e7e0
This source diff could not be displayed because it is too large. You can
view the blob
instead.
cvpcb/CMakeLists.txt
View file @
62c9e7e0
...
...
@@ -30,7 +30,6 @@ set(CVPCB_SRCS
class_footprints_listbox.cpp
cvframe.cpp
cvpcb.cpp
dummy_functions.cpp
genequiv.cpp
init.cpp
listboxes.cpp
...
...
cvpcb/dummy_functions.cpp
deleted
100644 → 0
View file @
67e24be1
/* dummy_functions.cpp
*
* There are functions used in some classes.
* they are useful in pcbnew, but have no meaning or are never used
* in cvpcb or gerbview.
* but they must exist because they appear in some classes, and here, no nothing.
*/
#include "fctsys.h"
#include "common.h"
#include "pcbnew.h"
TRACK
*
Marque_Une_Piste
(
BOARD
*
aPcb
,
TRACK
*
aStartSegm
,
int
*
aSegmCount
,
int
*
aTrackLen
,
bool
aReorder
)
{
return
NULL
;
}
cvpcb/setvisu.cpp
View file @
62c9e7e0
...
...
@@ -113,3 +113,20 @@ void BOARD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode, const wxPoin
m_Modules
->
Draw
(
aPanel
,
aDC
,
GR_COPY
);
}
}
/* dummy_functions:
*
* These functions are used in some classes.
* they are useful in pcbnew, but have no meaning or are never used
* in cvpcb or gerbview.
* but they must exist because they appear in some classes.
* Do nothing in CvPcb.
*/
TRACK
*
Marque_Une_Piste
(
BOARD
*
aPcb
,
TRACK
*
aStartSegm
,
int
*
aSegmCount
,
int
*
aTrackLen
,
bool
aReorder
)
{
return
NULL
;
}
gerbview/draw_gerber_screen.cpp
View file @
62c9e7e0
...
...
@@ -353,7 +353,7 @@ void PCB_SCREEN::ClearUndoORRedoList( UNDO_REDO_CONTAINER&, int )
/* dummy_functions
*
* The
re are functions
used in some classes.
* The
se functions are
used in some classes.
* they are useful in pcbnew, but have no meaning or are never used
* in cvpcb or gerbview.
* but they must exist because they appear in some classes, and here, no nothing.
...
...
gerbview/menubar.cpp
View file @
62c9e7e0
...
...
@@ -50,7 +50,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
ADD_MENUITEM_WITH_HELP_AND_SUBMENU
(
filesMenu
,
openRecentGbrMenu
,
wxID_ANY
,
_
(
"Open &Recent Gerber File"
),
_
(
"Open a recent opened Gerber file"
),
open_project
_xpm
);
gerber_recent_files
_xpm
);
wxMenu
*
openRecentDrlMenu
=
new
wxMenu
();
m_drillFileHistory
.
AddFilesToMenu
(
openRecentDrlMenu
);
...
...
include/bitmaps.h
View file @
62c9e7e0
...
...
@@ -134,6 +134,7 @@ extern const char* gbr_select_mode1_xpm[];
extern
const
char
*
gbr_select_mode2_xpm
[];
extern
const
char
*
gerbview_drill_file_xpm
[];
extern
const
char
*
gerber_file_xpm
[];
extern
const
char
*
gerber_recent_files_xpm
[];
extern
const
char
*
gerbview_clear_layers_xpm
[];
extern
const
char
*
gerber_open_dcode_file_xpm
[];
extern
const
char
*
general_deletions_xpm
[];
...
...
pcbnew/netlist.cpp
View file @
62c9e7e0
...
...
@@ -102,8 +102,6 @@ static void LoadListeModules( PCB_EDIT_FRAME* aPcbFrame );
static
int
s_NbNewModules
;
static
MODULEtoLOAD
*
s_ModuleToLoad_List
;
#define BUFFER_CHAR_SIZE 2048
/**
* Function OpenNetlistFile
* used to open a netlist file
...
...
pcbnew/protos.h
View file @
62c9e7e0
...
...
@@ -245,12 +245,8 @@ TRACK* Marque_Une_Piste( BOARD* aPcb,
*/
int
ReturnEndsTrack
(
TRACK
*
RefTrack
,
int
NbSegm
,
TRACK
**
StartTrack
,
TRACK
**
EndTrack
);
/* Update the state of a list of structures. */
void
ListSetState
(
EDA_ITEM
*
Start
,
int
Nbitem
,
int
State
,
int
onoff
);
/***************/
/* DUPLTRAC.CPP */
/***************/
/* Routine to find the point "attachment" at the end of a trace.
...
...
pcbnew/tr_modif.cpp
View file @
62c9e7e0
...
...
@@ -10,6 +10,11 @@
#include "protos.h"
static
void
ListSetState
(
EDA_ITEM
*
Start
,
int
NbItem
,
int
State
,
int
onoff
);
extern
int
ReturnEndsTrack
(
TRACK
*
RefTrack
,
int
NbSegm
,
TRACK
**
StartTrack
,
TRACK
**
EndTrack
);
/**
* Function EraseRedundantTrack
* Called after creating a track
...
...
@@ -273,3 +278,19 @@ int PCB_EDIT_FRAME::EraseRedundantTrack( wxDC* aDC,
return
0
;
}
/* Set the bits of .m_State member to onoff value, using bit mask State
* of a list of EDA_ITEM
*/
static
void
ListSetState
(
EDA_ITEM
*
Start
,
int
NbItem
,
int
State
,
int
onoff
)
{
if
(
Start
==
NULL
)
return
;
for
(
;
(
Start
!=
NULL
)
&&
(
NbItem
>
0
);
NbItem
--
,
Start
=
Start
->
Next
()
)
{
Start
->
SetState
(
State
,
onoff
);
}
}
pcbnew/track.cpp
View file @
62c9e7e0
...
...
@@ -530,16 +530,3 @@ int ReturnEndsTrack( TRACK* RefTrack, int NbSegm,
return
ok
;
}
/* Set to onoff the .m_State member, bit mask State of a list of items
*/
void
ListSetState
(
EDA_ITEM
*
Start
,
int
NbItem
,
int
State
,
int
onoff
)
{
if
(
Start
==
NULL
)
return
;
for
(
;
(
Start
!=
NULL
)
&&
(
NbItem
>
0
);
NbItem
--
,
Start
=
Start
->
Next
()
)
{
Start
->
SetState
(
State
,
onoff
);
}
}
pcbnew/xchgmod.cpp
View file @
62c9e7e0
...
...
@@ -34,7 +34,7 @@ private:
void
BrowseAndSelectFootprint
(
wxCommandEvent
&
event
);
void
Init
();
void
Change_Module
();
void
Change_
Current_
Module
();
void
Change_ModuleId
(
bool
aUseValue
);
void
Change_ModuleAll
();
int
Maj_ListeCmp
(
const
wxString
&
reference
,
const
wxString
&
old_name
,
...
...
@@ -93,7 +93,7 @@ void DIALOG_EXCHANGE_MODULE::OnOkClick( wxCommandEvent& event )
switch
(
m_Selection
->
GetSelection
()
)
{
case
0
:
Change_Module
();
Change_
Current_
Module
();
break
;
case
1
:
...
...
@@ -147,12 +147,12 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
FILE
*
FichCmp
,
*
NewFile
;
char
Line
[
1024
];
wxString
msg
;
char
*
result
;
// quiet compiler
char
*
result
;
// quiet compiler
if
(
old_name
==
new_name
)
return
0
;
/* no change of name */
return
0
;
/*
Calculation CMP file name by changing the extension name NetList
*/
/*
Build CMP file name by changing the extension of NetList filename
*/
fn
=
m_Parent
->
GetScreen
()
->
GetFileName
();
fn
.
SetExt
(
NetCmpExtBuffer
);
...
...
@@ -232,7 +232,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
* - Same text value and ref
* - Same NetNames for pads same name
*/
void
DIALOG_EXCHANGE_MODULE
::
Change_Module
()
void
DIALOG_EXCHANGE_MODULE
::
Change_
Current_
Module
()
{
wxString
newmodulename
=
m_NewModule
->
GetValue
();
...
...
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