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
d76cd0cf
Commit
d76cd0cf
authored
Jul 03, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Very minor fixes.
parent
52211afb
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
54 additions
and
90 deletions
+54
-90
CMakeLists.txt
bitmaps/CMakeLists.txt
+0
-1
backanno.xpm
bitmaps/backanno.xpm
+0
-31
build_version.cpp
common/build_version.cpp
+1
-1
bus-wire-junction.cpp
eeschema/bus-wire-junction.cpp
+0
-28
edit_label.cpp
eeschema/edit_label.cpp
+30
-0
menubar.cpp
eeschema/menubar.cpp
+14
-17
pinedit.cpp
eeschema/pinedit.cpp
+3
-0
protos.h
eeschema/protos.h
+0
-7
sch_text.cpp
eeschema/sch_text.cpp
+2
-0
bitmaps.h
include/bitmaps.h
+0
-1
install.nsi
packaging/windows/nsis/install.nsi
+1
-1
menubar_pcbframe.cpp
pcbnew/menubar_pcbframe.cpp
+1
-1
version.txt
version.txt
+2
-2
No files found.
bitmaps/CMakeLists.txt
View file @
d76cd0cf
...
@@ -52,7 +52,6 @@ set(BITMAP_SRCS
...
@@ -52,7 +52,6 @@ set(BITMAP_SRCS
axis3d_right.xpm
axis3d_right.xpm
axis3d_top.xpm
axis3d_top.xpm
axis3d.xpm
axis3d.xpm
backanno.xpm
book.xpm
book.xpm
Break_Bus.xpm
Break_Bus.xpm
Break_Line.xpm
Break_Line.xpm
...
...
bitmaps/backanno.xpm
deleted
100644 → 0
View file @
52211afb
/* XPM */
#ifndef XPMMAIN
extern const char *backanno_xpm[];
#else
const char *backanno_xpm[] = {
/* width height num_colors chars_per_pixel */
" 16 16 3 1",
/* colors */
" c None",
". c yellow",
"# c black",
/* pixels */
" ",
" .... ",
" ...... ",
" ...##... ",
" ....##.... ",
" .####....... ",
" ..#.###..##... ",
" .###########.. ",
" ...##....##... ",
" ...###.....#.. ",
" ..#.#..##... ",
" .#.#.####. ",
" ........ ",
" ...... ",
" .... ",
" "
};
#endif
common/build_version.cpp
View file @
d76cd0cf
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
#endif
#endif
#ifndef KICAD_BUILD_VERSION
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2011-0
6-08
)"
#define KICAD_BUILD_VERSION "(2011-0
7-03
)"
#endif
#endif
...
...
eeschema/bus-wire-junction.cpp
View file @
d76cd0cf
...
@@ -543,31 +543,3 @@ void SCH_EDIT_FRAME::RepeatDrawItem( wxDC* DC )
...
@@ -543,31 +543,3 @@ void SCH_EDIT_FRAME::RepeatDrawItem( wxDC* DC )
}
}
}
}
/* Routine incrementing labels, ie for the text ending with a number, adding
* that a number <RepeatDeltaLabel>
*/
void
IncrementLabelMember
(
wxString
&
name
)
{
int
ii
,
nn
;
long
number
=
0
;
ii
=
name
.
Len
()
-
1
;
nn
=
0
;
if
(
!
isdigit
(
name
.
GetChar
(
ii
)
)
)
return
;
while
(
(
ii
>=
0
)
&&
isdigit
(
name
.
GetChar
(
ii
)
)
)
{
ii
--
;
nn
++
;
}
ii
++
;
/* digits are starting at ii position */
wxString
litt_number
=
name
.
Right
(
nn
);
if
(
litt_number
.
ToLong
(
&
number
)
)
{
number
+=
g_RepeatDeltaLabel
;
name
.
Remove
(
ii
);
name
<<
number
;
}
}
eeschema/edit_label.cpp
View file @
d76cd0cf
...
@@ -301,3 +301,33 @@ void SCH_EDIT_FRAME::OnConvertTextType( wxCommandEvent& aEvent )
...
@@ -301,3 +301,33 @@ void SCH_EDIT_FRAME::OnConvertTextType( wxCommandEvent& aEvent )
delete
text
;
delete
text
;
}
}
}
}
/* Function to increment bus label members numbers,
* i.e. when a text is ending with a number, adds
* <RepeatDeltaLabel> to this number
*/
void
IncrementLabelMember
(
wxString
&
name
)
{
int
ii
,
nn
;
long
number
=
0
;
ii
=
name
.
Len
()
-
1
;
nn
=
0
;
if
(
!
isdigit
(
name
.
GetChar
(
ii
)
)
)
return
;
while
(
(
ii
>=
0
)
&&
isdigit
(
name
.
GetChar
(
ii
)
)
)
{
ii
--
;
nn
++
;
}
ii
++
;
/* digits are starting at ii position */
wxString
litt_number
=
name
.
Right
(
nn
);
if
(
litt_number
.
ToLong
(
&
number
)
)
{
number
+=
g_RepeatDeltaLabel
;
name
.
Remove
(
ii
);
name
<<
number
;
}
}
eeschema/menubar.cpp
View file @
d76cd0cf
...
@@ -102,7 +102,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
...
@@ -102,7 +102,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Page settings
// Page settings
ADD_MENUITEM_WITH_HELP
(
fileMenu
,
ADD_MENUITEM_WITH_HELP
(
fileMenu
,
ID_SHEET_SET
,
ID_SHEET_SET
,
_
(
"P&age
s
ettings"
),
_
(
"P&age
S
ettings"
),
_
(
"Settigns for page size and information"
),
_
(
"Settigns for page size and information"
),
sheetset_xpm
);
sheetset_xpm
);
...
@@ -191,16 +191,20 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
...
@@ -191,16 +191,20 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
_
(
"Delete"
),
HELP_DELETE_ITEMS
,
_
(
"Delete"
),
HELP_DELETE_ITEMS
,
delete_body_xpm
);
delete_body_xpm
);
// Separator
editMenu
->
AppendSeparator
();
// Find
// Find
editMenu
->
AppendSeparator
();
text
=
AddHotkeyName
(
_
(
"&Find"
),
s_Schematic_Hokeys_Descr
,
HK_FIND_ITEM
);
text
=
AddHotkeyName
(
_
(
"&Find"
),
s_Schematic_Hokeys_Descr
,
HK_FIND_ITEM
);
ADD_MENUITEM_WITH_HELP
(
editMenu
,
ID_FIND_ITEMS
,
text
,
HELP_FIND
,
ADD_MENUITEM_WITH_HELP
(
editMenu
,
ID_FIND_ITEMS
,
text
,
HELP_FIND
,
find_xpm
);
find_xpm
);
//
Separator
//
Backannotate
editMenu
->
AppendSeparator
();
editMenu
->
AppendSeparator
();
ADD_MENUITEM_WITH_HELP
(
editMenu
,
ID_BACKANNO_ITEMS
,
_
(
"&Backannotate"
),
_
(
"Back annotate the footprint fields"
),
import_footprint_names_xpm
);
...
@@ -437,7 +441,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
...
@@ -437,7 +441,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Library viewer
// Library viewer
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ID_TO_LIBRARY
,
ID_TO_LIBRARY
,
_
(
"Library &
b
rowser"
),
_
(
"Library &
B
rowser"
),
_
(
"Library browser"
),
_
(
"Library browser"
),
library_browse_xpm
);
library_browse_xpm
);
...
@@ -445,7 +449,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
...
@@ -445,7 +449,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Library editor
// Library editor
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ID_TO_LIBRARY
,
ID_TO_LIBRARY
,
_
(
"Library &
e
ditor"
),
_
(
"Library &
E
ditor"
),
_
(
"Library editor"
),
_
(
"Library editor"
),
libedit_xpm
);
libedit_xpm
);
...
@@ -459,13 +463,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
...
@@ -459,13 +463,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
_
(
"Annotate the components in the schematic"
),
_
(
"Annotate the components in the schematic"
),
annotate_xpm
);
annotate_xpm
);
// Backannotate
ADD_MENUITEM_WITH_HELP
(
editMenu
,
ID_BACKANNO_ITEMS
,
_
(
"&Backannotate"
),
_
(
"Back annotate the footprint fields"
),
backanno_xpm
);
// ERC
// ERC
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ID_GET_ERC
,
ID_GET_ERC
,
...
@@ -476,14 +473,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
...
@@ -476,14 +473,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Generate netlist
// Generate netlist
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ID_GET_NETLIST
,
ID_GET_NETLIST
,
_
(
"Generate &
n
etlist"
),
_
(
"Generate &
N
etlist"
),
_
(
"Generate the component netlist"
),
_
(
"Generate the component netlist"
),
netlist_xpm
);
netlist_xpm
);
// Generate bill of materials
// Generate bill of materials
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ADD_MENUITEM_WITH_HELP
(
toolsMenu
,
ID_GET_TOOLS
,
ID_GET_TOOLS
,
_
(
"Generate
bill of m
aterials"
),
_
(
"Generate
Bill of M
aterials"
),
_
(
"Generate bill of materials"
),
_
(
"Generate bill of materials"
),
tools_xpm
);
tools_xpm
);
...
...
eeschema/pinedit.cpp
View file @
d76cd0cf
...
@@ -20,6 +20,9 @@
...
@@ -20,6 +20,9 @@
#include "dialog_lib_edit_pin.h"
#include "dialog_lib_edit_pin.h"
extern
void
IncrementLabelMember
(
wxString
&
name
);
static
void
CreateImagePins
(
LIB_PIN
*
Pin
,
int
unit
,
int
convert
,
bool
asDeMorgan
);
static
void
CreateImagePins
(
LIB_PIN
*
Pin
,
int
unit
,
int
convert
,
bool
asDeMorgan
);
static
void
AbortPinMove
(
EDA_DRAW_PANEL
*
Panel
,
wxDC
*
DC
);
static
void
AbortPinMove
(
EDA_DRAW_PANEL
*
Panel
,
wxDC
*
DC
);
static
void
DrawMovePin
(
EDA_DRAW_PANEL
*
aPanel
,
wxDC
*
aDC
,
const
wxPoint
&
aPositon
,
bool
aErase
);
static
void
DrawMovePin
(
EDA_DRAW_PANEL
*
aPanel
,
wxDC
*
aDC
,
const
wxPoint
&
aPositon
,
bool
aErase
);
...
...
eeschema/protos.h
View file @
d76cd0cf
...
@@ -31,13 +31,6 @@ wxString DataBaseGetName( EDA_DRAW_FRAME* frame, wxString& Keys, wxString& BufNa
...
@@ -31,13 +31,6 @@ wxString DataBaseGetName( EDA_DRAW_FRAME* frame, wxString& Keys, wxString& BufNa
/*********************/
/*********************/
bool
SegmentIntersect
(
wxPoint
aSegStart
,
wxPoint
aSegEnd
,
wxPoint
aTestPoint
);
bool
SegmentIntersect
(
wxPoint
aSegStart
,
wxPoint
aSegEnd
,
wxPoint
aTestPoint
);
/*************************/
/* BUS_WIRE_JUNCTION.CPP */
/*************************/
void
IncrementLabelMember
(
wxString
&
name
);
/****************/
/****************/
/* EDITPART.CPP */
/* EDITPART.CPP */
/****************/
/****************/
...
...
eeschema/sch_text.cpp
View file @
d76cd0cf
...
@@ -17,6 +17,8 @@
...
@@ -17,6 +17,8 @@
#include "protos.h"
#include "protos.h"
#include "sch_text.h"
#include "sch_text.h"
extern
void
IncrementLabelMember
(
wxString
&
name
);
/************************/
/************************/
/* class SCH_TEXT */
/* class SCH_TEXT */
...
...
include/bitmaps.h
View file @
d76cd0cf
...
@@ -47,7 +47,6 @@ extern const char* axis3d_left_xpm[];
...
@@ -47,7 +47,6 @@ extern const char* axis3d_left_xpm[];
extern
const
char
*
axis3d_right_xpm
[];
extern
const
char
*
axis3d_right_xpm
[];
extern
const
char
*
axis3d_top_xpm
[];
extern
const
char
*
axis3d_top_xpm
[];
extern
const
char
*
axis3d_xpm
[];
extern
const
char
*
axis3d_xpm
[];
extern
const
char
*
backanno_xpm
[];
extern
const
char
*
book_xpm
[];
extern
const
char
*
book_xpm
[];
extern
const
char
*
break_bus_xpm
[];
extern
const
char
*
break_bus_xpm
[];
extern
const
char
*
break_line_xpm
[];
extern
const
char
*
break_line_xpm
[];
...
...
packaging/windows/nsis/install.nsi
View file @
d76cd0cf
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
; General Product Description Definitions
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
!define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.0
6.08
"
!define PRODUCT_VERSION "2011.0
7.03
"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
!define COMPANY_NAME ""
...
...
pcbnew/menubar_pcbframe.cpp
View file @
d76cd0cf
...
@@ -591,7 +591,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
...
@@ -591,7 +591,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
/* Netlist */
/* Netlist */
item
=
new
wxMenuItem
(
toolsMenu
,
ID_GET_NETLIST
,
item
=
new
wxMenuItem
(
toolsMenu
,
ID_GET_NETLIST
,
_
(
"Netlist"
),
_
(
"Netlist"
),
_
(
"Read
or update the netlist
"
)
);
_
(
"Read
the netlist and update board connectivity
"
)
);
SET_BITMAP
(
netlist_xpm
);
SET_BITMAP
(
netlist_xpm
);
toolsMenu
->
Append
(
item
);
toolsMenu
->
Append
(
item
);
...
...
version.txt
View file @
d76cd0cf
release version:
release version:
2011 ju
ne 08
2011 ju
l 03
files (.zip,.tgz):
files (.zip,.tgz):
kicad-2011-0
6-08
kicad-2011-0
7-03
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