haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eeschema: Solved: problem in manual part selection for multiple parts per package components

This commit is contained in:
charras 2008-05-21 09:18:14 +00:00
parent 85a16c5868
commit d87aed0cd0
22 changed files with 479 additions and 975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bitmaps/CMakeLists.txt
View File

@ -181,7 +181,6 @@ set( BITMAP_SRCS
Net_UnLocked.xpm
new_cvpcb.xpm
New_FootPrint.xpm
new_gerb.xpm
New_Library.xpm
New_Module.xpm
new_pcb.xpm

10
bitmaps/makefile.g95 Normal file
View File

@ -0,0 +1,10 @@
include makefile.include
%.cpp %.o: %$(*).xpm
cp $*.xpm $*.cpp
gcc -DXPMMAIN -c -Wall -O2 -o $@ $*.cpp
rm $*.cpp
libbitmaps.a: $(OBJECTS)
ar ruv $@ $(OBJECTS)
ranlib $@

10
bitmaps/makefile.gtk Normal file
View File

@ -0,0 +1,10 @@
include makefile.include
%.cpp %.o: %$(*).xpm
cp $*.xpm $*.cpp
gcc -DXPMMAIN -c -Wall -O2 -o $@ $*.cpp
rm $*.cpp
libbitmaps.a: $(OBJECTS)
ar ruv $@ $(OBJECTS)
ranlib $@

291
bitmaps/makefile.include Normal file
View File

@ -0,0 +1,291 @@
# Generate a static library target named "libbitmaps.a"
# Copy the *.xmp files to *.cpp, on change only.
# Compile those *.cpp files and put them into the library, then done.
OBJECTS = \
3d.o\
Add_Arc.o\
Add_Bus2Bus.o\
add_bus.o\
Add_Circle.o\
Add_Component.o\
Add_Corner.o\
add_cotation.o\
Add_Dashed_Line.o\
Add_Entry.o\
Add_GLabel.o\
add_hierarchical_label.o\
add_hierar_pin.o\
add_hierar_subsheet.o\
Add_Junction.o\
Add_Line2Bus.o\
Add_Line_Label.o\
Add_Line.o\
Add_Mires.o\
Add_Polygon.o\
Add_Power.o\
Add_Rectangle.o\
Add_Text.o\
Add_Tracks.o\
Add_Zone_Cutout.o\
Add_Zone.o\
anchor.o\
annotate_down_right.o\
annotate_right_down.o\
annotate.o\
Apply.o\
auto_associe.o\
Auto_track_width.o\
backanno.o\
book.o\
Break_Line.o\
Browse_Files.o\
cancel_tool.o\
Cancel.o\
config.o\
CopyBlock.o\
copy.o\
Cursor_Shape.o\
cursor.o\
cut.o\
dashline.o\
Datasheet.o\
del_body.o\
Delete_Arc.o\
Delete_Circle.o\
Delete_Cotation.o\
Delete_Field.o\
Delete_Line.o\
Delete_Module.o\
Delete_Net.o\
Delete_Node.o\
Delete_Pad.o\
Delete_Polygon.o\
Delete_Rectangle.o\
Delete_Segment.o\
Delete_Text.o\
Delete_Track.o\
delete.o\
del_track.o\
directory.o\
Display_Options.o\
down.o\
Drag_Module.o\
Drag_Outline_Segment.o\
Drag_Pad.o\
Drag_Segment_WithSlope.o\
Drag_Track_Segment.o\
drc_off.o\
drc.o\
Edges_Sketch.o\
Edit_Module.o\
Editor.o\
Edit_Text.o\
Edit.o\
eeschema.o\
ercerr.o\
ercgreen.o\
ercwarn.o\
erc.o\
Exit.o\
Export_Module.o\
Export_Options_Pad.o\
export.o\
File_FootPrint.o\
fill_zone.o\
find.o\
Flag.o\
Fonts.o\
Footprint_Text.o\
general_deletions.o\
general_ratsnet.o\
Global_Options_Pad.o\
green.o\
grid_select.o\
grid.o\
hammer.o\
help.o\
icon_3d.o\
icon_cvpcb_small.o\
icon_cvpcb.o\
icon_eeschema.o\
icon_gerbview_small.o\
icon_gerbview.o\
icon_kicad.o\
icon_modedit.o\
icon_pcbnew.o\
icon_python_small.o\
icon_python.o\
icon_txt.o\
import_hierarchical_label.o\
Import_Module.o\
import.o\
Info.o\
Insert_Module_Board.o\
Invert_Module.o\
jigsaw.o\
kicad_icon_small.o\
label.o\
left.o\
libedprt.o\
library_update.o\
library.o\
libsavem.o\
libview.o\
Load_Module_Board.o\
Load_Module_Lib.o\
local_ratsnet.o\
Locked.o\
mirepcb.o\
Mirror_H.o\
Mirror_V.o\
modedit.o\
Mode_Module.o\
Mode_Track.o\
modratsnest.o\
Module_Check.o\
Modul_Edit.o\
module_options.o\
Module_Ratsnet.o\
module.o\
Morgan1.o\
Morgan2.o\
Move_Arc.o\
Move_Circle.o\
Move_Field.o\
Move_Line.o\
Move_Module.o\
Move_Pad.o\
Move_Pin.o\
Move_Polygon.o\
Move_Rectangle.o\
Move_Text.o\
Move_Track_Segment.o\
Move_Track.o\
Move.o\
mw_Add_Gap.o\
mw_Add_Line.o\
mw_Add_Shape.o\
mw_Add_stub_arc.o\
mw_Add_Stub.o\
mw_toolbar.o\
Net_HighLight.o\
net_hightlight.o\
netlist.o\
Net_Locked.o\
Net_UnLocked.o\
new_cvpcb.o\
New_FootPrint.o\
New_Library.o\
New_Module.o\
new_pcb.o\
New_Project.o\
new_python.o\
new_sch.o\
new_txt.o\
new.o\
noconn.o\
Open_Library.o\
Open_Project.o\
open.o\
options_all_tracks_and_vias.o\
Options_All_Tracks.o\
Options_All_Vias.o\
Options_Arc.o\
Options_Circle.o\
Options_Module.o\
Options_New_Pad.o\
Options_Pad.o\
Options_Rectangle.o\
Options_Segment.o\
Options_Text.o\
Options_Tracks.o\
Options_Track.o\
Options_Vias.o\
opt_show_polygon.o\
Orient.o\
Pad_Sketch.o\
pad.o\
palette.o\
paste.o\
pcbnew.o\
PcbOffset.o\
pin.o\
plot_HPG.o\
plot_PS.o\
plot.o\
polar.o\
Post_Compo.o\
Post_Drill.o\
Post_Module.o\
preference.o\
print.o\
ratsnest.o\
Read_SetUp.o\
redo.o\
red.o\
reload2.o\
reload.o\
Repaint.o\
right.o\
Rotate_Field.o\
Rotate_Module-.o\
Rotate_Module+.o\
Rotate-.o\
Rotate+.o\
save_as.o\
Save_CmpStuff.o\
Save_Library.o\
Save_NetList.o\
Save_Project.o\
Save_SetUp.o\
save.o\
schematic.o\
select_grid.o\
Select_Layer_Pair.o\
Select_W_Layer.o\
sheetset.o\
showdcode.o\
showmodedge.o\
showtrack.o\
Show_Zone.o\
Swap_Layer.o\
Text_Sketch.o\
tool_ratsnet.o\
tools.o\
Track_Locked.o\
Track_Sketch.o\
Track_UnLocked.o\
transistor.o\
treensel.o\
treesel.o\
undelete.o\
undo.o\
unit_inch.o\
unit_mm.o\
unknown.o\
Unlocked.o\
unzip.o\
Update_Module_Board.o\
up.o\
Web_support.o\
Width_Net.o\
Width_Segment.o\
Width_Track_Via.o\
Width_Track.o\
Width_Vias.o\
zip_tool.o\
zip.o\
Zoom_1.o\
Zoom_Center.o\
Zoom_In.o\
Zoom_Optimal.o\
Zoom_Out.o\
Zoom_Page.o\
Zoom_Selected.o\
Zoom_Select.o\
zoom.o

102
bitmaps/new_gerb.xpm
View File

@ -1,102 +0,0 @@
/* XPM */
#ifndef XPMMAIN
extern const char * new_gerb_xpm[];
#else
const char * new_gerb_xpm[] = {
"16 16 78 1",
" c None",
". c #000000",
"+ c #FEFEFE",
"@ c #090909",
"# c #EEEEEE",
"$ c #F1F1F1",
"% c #FBFBFB",
"& c #767676",
"* c #424040",
"= c #807F7F",
"- c #454343",
"; c #272625",
"> c #7E7D7D",
", c #818080",
"' c #212020",
") c #161616",
"! c #A4A3A3",
"~ c #C4C4C4",
"{ c #766453",
"] c #D4C9C0",
"^ c #D9BFA8",
"/ c #D37017",
"( c #D5A07F",
"_ c #E9B9A3",
": c #A4A3A8",
"< c #ECECEC",
"[ c #737372",
"} c #E4AB79",
"| c #E8A367",
"1 c #F68724",
"2 c #A16A41",
"3 c #E1C3C7",
"4 c #A3A3A8",
"5 c #EBEBEB",
"6 c #6D6C6C",
"7 c #DBBB9E",
"8 c #F7841E",
"9 c #DABEA5",
"0 c #D6C6B7",
"a c #846852",
"b c #E6A787",
"c c #A0A0A6",
"d c #EAEAEA",
"e c #B0631E",
"f c #E6A66D",
"g c #F28F36",
"h c #C87226",
"i c #A2A1B0",
"j c #9B9AA8",
"k c #9C9CA0",
"l c #E8E8E8",
"m c #E8B89F",
"n c #957460",
"o c #876D5E",
"p c #A2898A",
"q c #A58078",
"r c #ABA5C2",
"s c #C2C2D0",
"t c #E7E7E7",
"u c #E6C3BD",
"v c #E2BFBD",
"w c #DEBBBD",
"x c #DAB8BD",
"y c #DEA897",
"z c #CD9D95",
"A c #505068",
"B c #E6E6E6",
"C c #E5E5E5",
"D c #A3A2A2",
"E c #A09FA5",
"F c #9F9FA5",
"G c #9E9DA4",
"H c #9D9DA4",
"I c #9D9CA4",
"J c #9C9BA3",
"K c #C0C0C1",
"L c #E4E4E4",
"M c #E3E3E3",
" ............ ",
".++++++++++@+. ",
".+###$$$$$$@%+. ",
".+###$$$$$$@&++.",
".+#**=-;>,,'@@).",
".+#**=-;>,,!##~.",
".+#,,{]^/(_:#<~.",
".+#[[}}|1234#5~.",
".+#667890abcdd~.",
".+#,,efghijkll~.",
".+#,,mnopqrstt~.",
".+#,,uvwxyzABC~.",
".+#DDEFGHIJKLL~.",
".+########LMMM~.",
".~~~~~~~~~~~~~~.",
" .............. "};
#endif

6
change_log.txt
View File

@ -6,6 +6,12 @@ Please add newer entries at the top, list the date and your name with
email address.
2008-May-21 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+eeschema:
Solved: problem in manual part selection for multiple parts per package components
2008-May-17 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
+all

1
common/makefile.include
View File

@ -22,7 +22,6 @@ OBJECTS= \
gestfich.o\
trigo.o\
selcolor.o\
bitmaps.o\
common.o\
eda_doc.o\
toolbars.o\

2
cvpcb/makefile.include
View File

@ -6,7 +6,7 @@ EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing\
-I../pcbnew -I../3d-viewer\
-I../polygon
EXTRALIBS = ../common/common.a ../polygon/lib_polygon.a
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a ../polygon/lib_polygon.a
LIBVIEWER3D = ../3d-viewer/3d-viewer.a

8
eeschema/edit_component_in_schematic.cpp
View File

@ -347,9 +347,13 @@ void WinEDA_ComponentPropertiesFrame::ComponentPropertiesAccept( wxCommandEvent&
(m_ConvertButt->GetValue() == TRUE) ?
m_Cmp->m_Convert = 2 : m_Cmp->m_Convert = 1;
//Mise a jour de la selection de l'<27>l<EFBFBD>ment dans le boitier
//Set the part selection in multiple part per pakcage
if( m_Cmp->m_Multi )
m_Cmp->m_Multi = m_SelectUnit->GetSelection() + 1;
{
int unit_selection = m_SelectUnit->GetSelection() + 1;
m_Cmp->SetUnitSelection( m_Parent->GetSheet(), unit_selection );
m_Cmp->m_Multi = unit_selection;
}
//Mise a jour de l'orientation:
switch( m_OrientUnit->GetSelection() )

40
eeschema/files-io.cpp
View File

@ -46,46 +46,6 @@ void WinEDA_SchematicFrame::Save_File( wxCommandEvent& event )
}
/******************************************************************************************/
//bool WinEDA_SchematicFrame::LoadOneSheet(DrawSheetStruct* sheet, const wxString& filename )
/******************************************************************************************/
//{
// return FALSE;
//when is this used? and why?
/*
//this must be called with a non-null pointer screen pointer, clearly.
//also note that this is for reading in a *root* file
wxString FullFileName = filename;
if( FullFileName.IsEmpty() )
{
wxString mask;
mask = wxT( "*" ) + g_SchExtBuffer;
FullFileName = EDA_FileSelector( _( "Schematic files:" ),
wxEmptyString, //default path
sheet->m_AssociatedScreen->m_FileName,// default filename
g_SchExtBuffer, // extension par defaut
mask, // Masque d'affichage
this,
wxFD_OPEN,
FALSE
);
if( FullFileName.IsEmpty() )
return FALSE;
}
ClearProjectDrawList( screen, TRUE );
printf("in LoadOneScreen setting screen filename: %s \n", (const char*) FullFileName.mb_str() );
screen->m_FileName = FullFileName;
LoadDrawSheet( DrawSheetStruct * sheet, filename);
screen->SetModify();
if( GetScreen() == screen )
Refresh( TRUE );
return TRUE;
*/
//}
/************************************************************************************/
int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNew )
/************************************************************************************/

1
eeschema/getpart.cpp
View File

@ -387,6 +387,7 @@ void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent,
DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode );
/* Mise a jour du numero d'unite */
DrawComponent->SetUnitSelection( GetSheet(), unit );
DrawComponent->m_Multi = unit;
/* Redessine le composant dans la nouvelle position */

2
eeschema/makefile.include
View File

@ -4,7 +4,7 @@ FINAL = 1
EESCHEMA_FLAGS= -DEESCHEMA
EXTRACPPFLAGS += $(KICAD_FLAGS) $(EESCHEMA_FLAGS) -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../eeschema
EXTRALIBS = ../common/common.a
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a
# DEPEND = program.h general.h

9
eeschema/menubar.cpp
View File

@ -49,13 +49,6 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item->SetBitmap( open_xpm );
m_FilesMenu->Append( item );
item = new wxMenuItem( m_FilesMenu, ID_LOAD_ONE_SHEET,
_( "&Reload the current sheet" ),
_(
"Load or reload a schematic file from file into the current sheet" ) );
item->SetBitmap( import_xpm );
m_FilesMenu->Append( item );
m_FilesMenu->AppendSeparator();
item = new wxMenuItem( m_FilesMenu, ID_SAVE_PROJECT,
_( "&Save" ),
@ -165,7 +158,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
editMenu->AppendSeparator();
item = new wxMenuItem( editMenu, ID_BACKANNO_ITEMS,
_( "BackAnno" ), _( "Back Annotated Footprints" ),
_( "BackAnno" ), _( "Back Annotated Footprint Fields" ),
wxITEM_NORMAL );
item->SetBitmap( backanno_xpm );
editMenu->Append( item );

4
gerbview/makefile.include
View File

@ -1,4 +1,4 @@
EXTRALIBS = ../common/common.a ../polygon/lib_polygon.a
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a ../polygon/lib_polygon.a
EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\
-I./ -I../gerbview -I../include\
@ -82,7 +82,7 @@ class_drawsegment.o: ../pcbnew/class_drawsegment.cpp ../pcbnew/class_drawsegment
class_drc_item.o: ../pcbnew/class_drc_item.cpp $(COMMON)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
sel_layer.o: ../pcbnew/sel_layer.cpp $(COMMON)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

950
internat/fr/kicad.po
View File

File diff suppressed because it is too large Load Diff

2
kicad/makefile.include
View File

@ -1,4 +1,4 @@
EXTRALIBS = ../common/common.a
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a
EXTRACPPFLAGS += -DKICAD -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../kicad -I../share
DEPEND =

4
libs.win
View File

@ -22,9 +22,9 @@ DEBUG = 0
#Define the wxWidget path (if not found in environment variables):
ifndef WXWIN
ifeq ($(DEBUG), 1)
WXWIN=f:/wxMSW-2.8.7-debug
WXWIN=f:/wxMSW-2.8.8-debug
else
WXWIN=f:/wxMSW-2.8.7
WXWIN=f:/wxMSW-2.8.8
endif
endif
LIBVERSION = 2.8

5
makefile.g95
View File

@ -1,4 +1,4 @@
KICAD_SUBDIRS = common 3d-viewer polygon eeschema eeschema/plugins pcbnew kicad cvpcb gerbview
KICAD_SUBDIRS = common bitmaps 3d-viewer polygon eeschema eeschema/plugins pcbnew kicad cvpcb gerbview
KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
# How to invoke make:
MAKE = make -k -f makefile.g95
@ -10,7 +10,6 @@ all:
install:
@for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE_INSTALL)); done
clean:
@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE_CLEAN)); done

2
makefile.gtk
View File

@ -1,6 +1,6 @@
MAKEGTK = $(MAKE) -f makefile.gtk
KICAD_SUBDIRS = common 3d-viewer polygon pcbnew eeschema eeschema/plugins cvpcb kicad gerbview
KICAD_SUBDIRS = common bitmaps 3d-viewer polygon pcbnew eeschema eeschema/plugins cvpcb kicad gerbview
KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
KICAD_SUBDIRS_RES = internat modules template library
KICAD_SUBDIRS_HELP = help

2
pcbnew/makefile.g95
View File

@ -6,7 +6,7 @@ TARGET=pcbnew
include ../libs.win
EXTRACPPFLAGS += -I /f/boost/boost_1_34_1
EXTRACPPFLAGS += -I /f/kicad-sourceforge/trunk/kicad
all: $(TARGET).exe
include makefile.include

2
pcbnew/makefile.include
View File

@ -1,5 +1,5 @@
EXTRALIBS = ../common/common.a ../polygon/lib_polygon.a
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a ../polygon/lib_polygon.a
EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share\
-I../pcbnew -I../3d-viewer -I../polygon