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

merge from testing

This commit is contained in:
Dick Hollenbeck 2010-12-18 09:48:21 -06:00
parent 2e45c1a180 d18ce728c0
commit c02ca2edb5
762 changed files with 168195 additions and 213683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.bzrignore
View File

@ -5,7 +5,8 @@ eeschema/cmp_library_lexer.h
eeschema/cmp_library_keywords.*
eeschema/template_fieldnames_keywords.*
eeschema/template_fieldnames_lexer.h
pcbnew/dialog_freeroute_exchange_help_html.h
new/html
pcbnew/dialogs/dialog_freeroute_exchange_help_html.h
Makefile
CMakeFiles
CMakeCache.txt

5
3d-viewer/3d_canvas.cpp
View File

@ -623,6 +623,11 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event )
if( FullFileName.IsEmpty() )
return;
// Be sure the screen area destroyed by the file dialog is redrawn before making
// a screen copy.
// Without this call, under Linux the screen refresh is made to late.
wxYield();
}
wxSize image_size = GetClientSize();

10
3d-viewer/3d_class.cpp
View File

@ -20,7 +20,7 @@ S3D_Vertex::S3D_Vertex()
S3D_MATERIAL::S3D_MATERIAL( S3D_MASTER* father, const wxString& name ) :
EDA_BaseStruct( father, NOT_USED )
EDA_ITEM( father, NOT_USED )
{
m_DiffuseColor.x = m_DiffuseColor.y = m_DiffuseColor.z = 1.0;
m_SpecularColor.x = m_SpecularColor.y = m_SpecularColor.z = 1.0;
@ -57,8 +57,8 @@ void S3D_MASTER::Copy( S3D_MASTER* pattern )
}
S3D_MASTER::S3D_MASTER( EDA_BaseStruct* aParent ) :
EDA_BaseStruct( aParent, NOT_USED )
S3D_MASTER::S3D_MASTER( EDA_ITEM* aParent ) :
EDA_ITEM( aParent, NOT_USED )
{
m_MatScale.x = m_MatScale.y = m_MatScale.z = 1.0;
m_3D_Drawings = NULL;
@ -85,8 +85,8 @@ S3D_MASTER:: ~S3D_MASTER()
}
Struct3D_Shape::Struct3D_Shape( EDA_BaseStruct* aParent ) :
EDA_BaseStruct( aParent, NOT_USED )
Struct3D_Shape::Struct3D_Shape( EDA_ITEM* aParent ) :
EDA_ITEM( aParent, NOT_USED )
{
m_3D_Coord = NULL;
m_3D_CoordIndex = NULL;

22
3d-viewer/3d_draw.cpp
View File

@ -320,10 +320,9 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
}
/* draw graphic items */
EDA_BaseStruct* PtStruct;
for( PtStruct = pcb->m_Drawings;
PtStruct != NULL;
PtStruct = PtStruct->Next() )
EDA_ITEM* PtStruct;
for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Next() )
{
switch( PtStruct->Type() )
{
@ -384,7 +383,8 @@ void Pcb3D_GLCanvas::Draw3D_Track( TRACK* track )
}
/** Function Draw3D_SolidPolygonsInZones
/**
* Function Draw3D_SolidPolygonsInZones
* draw all solid polygons used as filles areas in a zone
* @param aZone_c = the zone to draw
*/
@ -604,7 +604,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
SetGLColor( color );
s_Text3DZPos = g_Parm_3D_Visu.m_LayerZcoord[layer];
s_Text3DWidth = text->m_Width * g_Parm_3D_Visu.m_BoardScale;
s_Text3DWidth = text->m_Thickness * g_Parm_3D_Visu.m_BoardScale;
glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
wxSize size = text->m_Size;
if( text->m_Mirror )
@ -624,7 +624,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
DrawGraphicText( NULL, NULL, pos, (EDA_Colors) color,
txt, text->m_Orient, size,
text->m_HJustify, text->m_VJustify,
text->m_Width, text->m_Italic,
text->m_Thickness, text->m_Italic,
true, Draw3dTextSegm );
pos += offset;
}
@ -635,7 +635,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
DrawGraphicText( NULL, NULL, text->m_Pos, (EDA_Colors) color,
text->m_Text, text->m_Orient, size,
text->m_HJustify, text->m_VJustify,
text->m_Width, text->m_Italic,
text->m_Thickness, text->m_Italic,
true,
Draw3dTextSegm );
}
@ -690,8 +690,9 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
if( !As3dShape )
{
// The footprint does not have a 3D shape, draw its 2D shape instead
EDA_BaseStruct* Struct = m_Drawings;
EDA_ITEM* Struct = m_Drawings;
glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis
for( ; Struct != NULL; Struct = Struct->Next() )
{
switch( Struct->Type() )
@ -1252,7 +1253,8 @@ static void Draw3D_CircleSegment( double startx, double starty, double endx,
}
/** Function Pcb3D_GLCanvas::Draw3D_Polygon
/**
* Function Draw3D_Polygon
* draw one solid polygon
* @param aCornersList = a std::vector<wxPoint> liste of corners, in physical coordinates
* @param aZpos = the z position in 3D units

10
3d-viewer/3d_struct.h
View File

@ -34,7 +34,7 @@ public:
public: S3D_Vertex();
};
class S3D_MATERIAL : public EDA_BaseStruct /* openGL "material" data*/
class S3D_MATERIAL : public EDA_ITEM /* openGL "material" data*/
{
public:
wxString m_Name;
@ -55,7 +55,7 @@ public: S3D_MATERIAL( S3D_MASTER* father, const wxString& name );
/* Master structure for a 3D item description */
class S3D_MASTER : public EDA_BaseStruct
class S3D_MASTER : public EDA_ITEM
{
public:
wxString m_Shape3DName; /* 3D shape name in 3D library */
@ -65,7 +65,7 @@ public:
Struct3D_Shape* m_3D_Drawings;
S3D_MATERIAL* m_Materials;
public: S3D_MASTER( EDA_BaseStruct* aParent );
public: S3D_MASTER( EDA_ITEM* aParent );
~S3D_MASTER();
S3D_MASTER* Next() const { return (S3D_MASTER*) Pnext; }
@ -90,14 +90,14 @@ public: S3D_MASTER( EDA_BaseStruct* aParent );
/* Describes a complex 3D */
class Struct3D_Shape : public EDA_BaseStruct
class Struct3D_Shape : public EDA_ITEM
{
public:
S3D_Vertex* m_3D_Coord;
int* m_3D_CoordIndex;
int m_3D_Points;
public: Struct3D_Shape( EDA_BaseStruct* aParent );
public: Struct3D_Shape( EDA_ITEM* aParent );
~Struct3D_Shape();
Struct3D_Shape* Next() const { return (Struct3D_Shape*) Pnext; }

160
CHANGELOG.txt
View File

@ -4,6 +4,166 @@ KiCad ChangeLog 2010
Please add newer entries at the top, list the date and your name with
email address.
2010-dec-15, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
Gerbview:
Added: in file dialog, multiple file selection.
Added: Draw mode selector (in left toolbar):
Raw mode:
a Gerber image is drawn on screen without buffering.
Artifacts happen if there are negative items drawn, if more than one
Gerber file is shown.
Stacked mode:
each Geber image is drawn in a buffer and after drawn on screen
No artifact with negative items.
Each Gerber image covers previous images.
OR mode (transparency mode):
each Geber image is drawn in a buffer and after drawn on screen
No artifact with negative items.
Each Gerber image is "ORed" with previous images, like in Pcbnew.
Try to optimize Draw function in buffered modes.
(Useful for PC that have problems with "blit" graphic function)
Fix minor issues.
2010-dec-13 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
* Remove deprecated options and quoted project name option in Doxygen file.
* Make Bazaar ignore the files generated by Doxygen in the new folder.
++EESchema
* More schematic component encapsulation work.
* Doxygen comment fixes.
2010-Dec-13 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
++eeschema:
Committed a new design for a "Distributed Library System".
To make the html docs, run doxygen in <kicad_base>/new with that as your
current working directory, or run the shell script in there. You need
Doxygen installed.
2010-dec-13 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++common
* Make base marker hit test method const.
++EESchema
* Improve hit testing for schematic components.
* Add initial support for hit test filtering.
* Moved static function CountConnectedItems() into SCH_SCREEN object.
* Add IsConnected() method to SCH_ITEM object.
2010-dec-10 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++All
* Make a whole bunch of object methods const in order to make HitTest() const.
* Lots of coding policy fixes.
++common
* Add Inside override to EDA_Rect to test if another EDA_Rect is inside.
* Add additional parameter to EDA_TextStruct GetTextBox method to support
Y axis inversion and non-default thickness.
* Add accuracy parameter to EDA_TextStruct TextHitTest method.
++EESchema
* Refactor schematic object hit testing to provide coherent object interface.
* Remove redundant GetBoundaryBox from schematic component object.
* Remove redundant layer member from schematic text object.
* Create hit test override to check for rectangle intersection and
containment.
* Simplify schematic block selection hit testing.
* Make schematic and component library object enum naming consistent.
2010-dec-08 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++All
* Coding policy object naming and formating fixes.
++GerbView
* Fix compiler warnings.
++Common
* Change item list type from SCH_ITEM to EDA_BaseStruct in BASE_SCREEN
object.
* Encapsulate BASE_SCREEN drawing item list member.
* Change grid container from wxWidgets to standard C++ container.
2010-dec-07 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++EESchema
* Finish encapsulating LIB_FIELD object.
* Encapsulated all members currently in use in LIB_PIN object.
++Common
* Add SetModified() helper to EDA_BaseStruct object that checks for a parent
object and sets it's modified status as well.
2010-dec-02 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++EESchema
* Move color configuration dialog to dialogs folder.
* Simplify color configuration dialog design, remove enable grid checkbox( I
think we have enough places to do this), and remove abbreviated labels.
* Restore changing value field behavior to create new component from the
current one and handle all of the potential library naming conflict issues.
* Create a toolbar button perform the same function as renaming the value
field for improved usability.
* Add new copy component bitmap contributed by Jean-Pierre Charras.
2010-dec-02, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
Pcbnew:
For zone filling algo, change the default polygon library from Kbool to Boost::polygon.
2010-dec-01, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
Gerbview:
Added support for complex definitions of parameters in aperture macros and primitives macro
(a complex definition in a parameter that is calculated by an arithmetical expression)
Gerbview should now have a decent support of Gerber language.
Currently only the obscure knockout command is not supported (I have no motivation to do that)
Other "bug":
scale in A and B axis is poorly supported: coordinates are scaled, but shapes can have problem:
fro instance, a circle is drawn as a circle when A and B scales are different,
and perhaps should be an ellipse.
On the other hand, Gerber doc is not clear about the meaning of A and B scale.
(Alas! Gerber doc is not clear about most of advanced commands)
2010-nov-19 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++EESchema
* Move library new component and schematic edit sheet dialogs to dialogs
folder.
* Set library new component and schematic edit sheet dialogs default button.
* Create wxFormBuilder version of edit sheet label dialog and remove hand
coded version.
* More coding policy fixes.
2010-nov-19 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++EESchema
* Move library dimension, schematic configuration, and schematic options
dialogs to dialogs folder.
* Set library dimension, schematic configuration, and schematic options
dialogs default button to OK button.
* Kicad coding policy clean ups.
2010-nov-17 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++EESchema
* Move library text edit, library draw item edit, SVG print, and BOM dialogs
to dialogs folder.
* Rename library text edit dialog file and object names to comply with
coding policy.
* Set default button in library text edit, library draw item edit, SVG print,
and BOM dialogs.
* Move BOM dialog code into BOM dialog object source file.
2010-nov-11 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++EESchema

7
CMakeLists.txt
View File

@ -31,7 +31,8 @@ option(USE_WX_OVERLAY
"Use wxOverlay: Always ON for MAC (default OFF). Warning, this is experimental")
option(USE_BOOST_POLYGON_LIBRARY
"Use boost polygon library instead of Kbool to calculate filled areas in zones (default OFF). Warning, this is experimental")
"Use boost polygon library instead of Kbool to calculate filled areas in zones (default ON)."
ON )
#================================================
# Set flags for GCC.
@ -39,9 +40,9 @@ option(USE_BOOST_POLYGON_LIBRARY
if(CMAKE_COMPILER_IS_GNUCXX)
# Set default flags for Release build.
set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG ")
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s -static-libgcc")
# Set default flags for Debug build.
set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")

5
Doxyfile
View File

@ -4,7 +4,7 @@
# Project related configuration options
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = KiCad PCB EDA Suite
PROJECT_NAME = "KiCad PCB EDA Suite"
PROJECT_NUMBER =
OUTPUT_DIRECTORY = Documentation/doxygen
CREATE_SUBDIRS = NO
@ -21,13 +21,11 @@ SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = YES
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 4
ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_FOR_CPP = YES
OPTIMIZE_OUTPUT_JAVA = NO
BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO
@ -83,7 +81,6 @@ INPUT = kicad \
3d-viewer \
common \
gerbview \
share \
include \
polygon \
potrace

45
bitmap2component/bitmap2cmp_gui_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -29,54 +29,55 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
m_notebook1->AddPage( m_GreyscalePicturePanel, _("Greyscale Picture"), false );
m_BNPicturePanel = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
m_BNPicturePanel->SetScrollRate( 5, 5 );
m_notebook1->AddPage( m_BNPicturePanel, _("Binary Picture"), false );
m_notebook1->AddPage( m_BNPicturePanel, _("Black&&White Picture"), false );
bMainSizer->Add( m_notebook1, 1, wxEXPAND, 5 );
m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* brightSizer;
brightSizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizerInfo;
sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Bitmap info:") ), wxVERTICAL );
sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info:") ), wxVERTICAL );
wxFlexGridSizer* fgSizerInfo;
fgSizerInfo = new wxFlexGridSizer( 3, 3, 0, 0 );
fgSizerInfo->SetFlexibleDirection( wxBOTH );
fgSizerInfo->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticTextSizeX = new wxStaticText( this, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextSizeX = new wxStaticText( m_panelRight, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextSizeX->Wrap( -1 );
fgSizerInfo->Add( m_staticTextSizeX, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SizeXValue = new wxStaticText( this, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeXValue = new wxStaticText( m_panelRight, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeXValue->Wrap( -1 );
fgSizerInfo->Add( m_SizeXValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SizeXunits = new wxStaticText( this, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeXunits = new wxStaticText( m_panelRight, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeXunits->Wrap( -1 );
fgSizerInfo->Add( m_SizeXunits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_staticTextSizeY = new wxStaticText( this, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextSizeY = new wxStaticText( m_panelRight, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextSizeY->Wrap( -1 );
fgSizerInfo->Add( m_staticTextSizeY, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SizeYValue = new wxStaticText( this, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeYValue = new wxStaticText( m_panelRight, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeYValue->Wrap( -1 );
fgSizerInfo->Add( m_SizeYValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SizeYunits = new wxStaticText( this, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeYunits = new wxStaticText( m_panelRight, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeYunits->Wrap( -1 );
fgSizerInfo->Add( m_SizeYunits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_staticTextBPP = new wxStaticText( this, wxID_ANY, _("BPP:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextBPP = new wxStaticText( m_panelRight, wxID_ANY, _("BPP:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextBPP->Wrap( -1 );
fgSizerInfo->Add( m_staticTextBPP, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_BPPValue = new wxStaticText( this, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );
m_BPPValue = new wxStaticText( m_panelRight, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );
m_BPPValue->Wrap( -1 );
fgSizerInfo->Add( m_BPPValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_BPPunits = new wxStaticText( this, wxID_ANY, _("bits"), wxDefaultPosition, wxDefaultSize, 0 );
m_BPPunits = new wxStaticText( m_panelRight, wxID_ANY, _("bits"), wxDefaultPosition, wxDefaultSize, 0 );
m_BPPunits->Wrap( -1 );
fgSizerInfo->Add( m_BPPunits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@ -84,35 +85,38 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
brightSizer->Add( sbSizerInfo, 0, wxEXPAND|wxALL, 5 );
m_buttonLoad = new wxButton( this, wxID_ANY, _("Load Bitmap"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonLoad = new wxButton( m_panelRight, wxID_ANY, _("Load Bitmap"), wxDefaultPosition, wxDefaultSize, 0 );
brightSizer->Add( m_buttonLoad, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
m_buttonExportEeschema = new wxButton( this, wxID_ANY, _("Export to eeschema"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonExportEeschema = new wxButton( m_panelRight, wxID_ANY, _("Export to Eeschema"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonExportEeschema->SetToolTip( _("Create a library file for Eeschema\nThis library contains only one component: logo") );
brightSizer->Add( m_buttonExportEeschema, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
m_buttonExportPcbnew = new wxButton( this, wxID_ANY, _("Export to Pcbnew"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonExportPcbnew = new wxButton( m_panelRight, wxID_ANY, _("Export to Pcbnew"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonExportPcbnew->SetToolTip( _("Create a footprint file for PcbNew\nThis footprint contains only one footprint: logo") );
brightSizer->Add( m_buttonExportPcbnew, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
wxString m_rbOptionsChoices[] = { _("Normal"), _("Negative") };
int m_rbOptionsNChoices = sizeof( m_rbOptionsChoices ) / sizeof( wxString );
m_rbOptions = new wxRadioBox( this, wxID_ANY, _("Options"), wxDefaultPosition, wxDefaultSize, m_rbOptionsNChoices, m_rbOptionsChoices, 1, wxRA_SPECIFY_COLS );
m_rbOptions = new wxRadioBox( m_panelRight, wxID_ANY, _("Options"), wxDefaultPosition, wxDefaultSize, m_rbOptionsNChoices, m_rbOptionsChoices, 1, wxRA_SPECIFY_COLS );
m_rbOptions->SetSelection( 0 );
brightSizer->Add( m_rbOptions, 0, wxALL|wxEXPAND, 5 );
m_ThresholdText = new wxStaticText( this, wxID_ANY, _("Threshold Value:"), wxDefaultPosition, wxDefaultSize, 0 );
m_ThresholdText = new wxStaticText( m_panelRight, wxID_ANY, _("Threshold Value:"), wxDefaultPosition, wxDefaultSize, 0 );
m_ThresholdText->Wrap( -1 );
brightSizer->Add( m_ThresholdText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_sliderThreshold = new wxSlider( this, wxID_ANY, 25, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_TOP );
m_sliderThreshold->SetToolTip( _("Adjust the level to convert the greysvale picture to the binary picture.") );
m_sliderThreshold = new wxSlider( m_panelRight, wxID_ANY, 25, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_TOP );
m_sliderThreshold->SetToolTip( _("Adjust the level to convert the greyscale picture to a black and white picture.") );
brightSizer->Add( m_sliderThreshold, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bMainSizer->Add( brightSizer, 0, wxEXPAND, 5 );
m_panelRight->SetSizer( brightSizer );
m_panelRight->Layout();
brightSizer->Fit( m_panelRight );
bMainSizer->Add( m_panelRight, 0, wxEXPAND, 0 );
this->SetSizer( bMainSizer );
this->Layout();
@ -140,4 +144,5 @@ BM2CMP_FRAME_BASE::~BM2CMP_FRAME_BASE()
m_buttonExportPcbnew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BM2CMP_FRAME_BASE::OnExportPcbnew ), NULL, this );
m_rbOptions->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( BM2CMP_FRAME_BASE::OnOptionsSelection ), NULL, this );
m_sliderThreshold->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( BM2CMP_FRAME_BASE::OnThresholdChange ), NULL, this );
}

1781
bitmap2component/bitmap2cmp_gui_base.fbp
View File

File diff suppressed because it is too large Load Diff

19
bitmap2component/bitmap2cmp_gui_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -26,6 +26,7 @@
#include <wx/button.h>
#include <wx/radiobox.h>
#include <wx/slider.h>
#include <wx/panel.h>
#include <wx/statusbr.h>
#include <wx/frame.h>
@ -44,6 +45,7 @@ class BM2CMP_FRAME_BASE : public wxFrame
wxScrolledWindow* m_InitialPicturePanel;
wxScrolledWindow* m_GreyscalePicturePanel;
wxScrolledWindow* m_BNPicturePanel;
wxPanel* m_panelRight;
wxStaticText* m_staticTextSizeX;
wxStaticText* m_SizeXValue;
wxStaticText* m_SizeXunits;
@ -62,16 +64,17 @@ class BM2CMP_FRAME_BASE : public wxFrame
wxStatusBar* m_statusBar;
// Virtual event handlers, overide them in your derived class
virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }
virtual void OnLoadFile( wxCommandEvent& event ){ event.Skip(); }
virtual void OnExportEeschema( wxCommandEvent& event ){ event.Skip(); }
virtual void OnExportPcbnew( wxCommandEvent& event ){ event.Skip(); }
virtual void OnOptionsSelection( wxCommandEvent& event ){ event.Skip(); }
virtual void OnThresholdChange( wxScrollEvent& event ){ event.Skip(); }
virtual void OnPaint( wxPaintEvent& event ) { event.Skip(); }
virtual void OnLoadFile( wxCommandEvent& event ) { event.Skip(); }
virtual void OnExportEeschema( wxCommandEvent& event ) { event.Skip(); }
virtual void OnExportPcbnew( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOptionsSelection( wxCommandEvent& event ) { event.Skip(); }
virtual void OnThresholdChange( wxScrollEvent& event ) { event.Skip(); }
public:
BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,419 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,419 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
~BM2CMP_FRAME_BASE();
};

3
bitmap2component/bitmap2component.cpp
View File

@ -96,7 +96,8 @@ BITMAPCONV_INFO::BITMAPCONV_INFO()
}
/** Function ArmBoolEng
/**
* Function ArmBoolEng
* Initialise parameters used in kbool
* @param aBooleng = pointer to the Bool_Engine to initialise
* @param aConvertHoles = mode for holes when a boolean operation is made

4
bitmaps/CMakeLists.txt
View File

@ -64,6 +64,7 @@ set(BITMAP_SRCS
component_select_alternate_shape.xpm
config.xpm
CopyBlock.xpm
copyComponent.xmp
copy.xpm
copper_layers_setup.cpp
Cursor_Shape.xpm
@ -134,6 +135,9 @@ set(BITMAP_SRCS
Flag.xpm
Fonts.xpm
Footprint_Text.xpm
gbr_select_mode0.xpm
gbr_select_mode1.xpm
gbr_select_mode2.xpm
general_deletions.xpm
general_ratsnet.xpm
GLabel2Label.xpm

38
bitmaps/copyComponent.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *copyComponent_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"; c #DC4149",
"# c #9B979D",
"& c #332A95",
"% c #060383",
"O c #D2D2FB",
"o c #60AE68",
"= c #FA0606",
"X c #4C924C",
"@ c #AFAAE5",
"+ c #CDD0D4",
". c #0A840A",
"* c #A3A9A7",
" c #F8F9FC",
": c #E44A6C",
"$ c #7F74B4",
"- c #74124C",
/* pixels */
" ......Xo ",
" . O O +o. ",
"... O@@OOXo ",
" #. O$%%&@*.+ ",
" . $%%%%+... ",
" .OOO@$%%$.**# ",
" .=====-%-X* ",
"...= $%-=+ ",
" === &%%%%%%+ ",
" *= OO&%%%%-+ ",
" =O OO&%%@=== ",
" = OOO@&@$=**#",
" =OOOOO@O;;* ",
" ===OOOOO@:=#+ ",
" #=======;#* ",
" #####**+ "
};

38
bitmaps/gbr_select_mode0.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *gbr_select_mode0_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
": c #BC9694",
"% c #B43B3C",
"& c #B46A6C",
"* c #643E3C",
"O c #8C8D8C",
"$ c #8C1A1C",
"- c #7C2A2C",
"X c #717071",
"o c None",
". c #4C4E4C",
"= c #BC9A9C",
"+ c #ACAAAC",
"# c #AC0204",
" c #585858",
"@ c #AC1614",
"; c #AC0A0C",
/* pixels */
" ............Xoo",
"X............ oo",
"O.............+o",
"+.............Oo",
"o ............Xo",
"oX............ o",
"@############$.+",
"%#############.O",
"&#############*X",
"=#############- ",
"o;############%o",
"o%############;o",
"o&#############=",
"o:#############&",
"oo;############%",
"oo%############@"
};

38
bitmaps/gbr_select_mode1.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *gbr_select_mode1_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
": c #BC9694",
"; c #4C4604",
"% c #B43B3C",
"= c #246604",
"* c #B46A6C",
"+ c #9CB29C",
"X c None",
"$ c #742A04",
"O c #94B294",
"- c #BC9A9C",
"# c #AC0204",
"& c #047E04",
"@ c #AC1614",
" c #058205",
". c #3C943C",
"o c #6CA56C",
/* pixels */
" .XX",
". XX",
"o OX",
"+ oX",
"X .X",
"X. X",
"@############$ +",
"%#############&o",
"*#############=.",
"-#############; ",
"X#############%X",
"X%#############X",
"X*#############-",
"X:#############*",
"XX#############%",
"XX%############@"
};

38
bitmaps/gbr_select_mode2.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *gbr_select_mode2_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"$ c #213C2F",
"X c #3C3C94",
"O c #6C6AA4",
"* c #8D3616",
" c #0E1F72",
"; c #B28D96",
"o c None",
". c #040284",
"+ c #A2A89F",
"# c #04562C",
"@ c #38783C",
"- c #BC6B6C",
"% c #599A5F",
"= c #751F14",
"& c #BC4745",
": c #745224",
/* pixels */
" ............Xoo",
"X.............oo",
"O.............+o",
"@############$Oo",
"%#############Xo",
"+@############ o",
"&*===========$ +",
"-*============$O",
";*============$X",
"+&============$ ",
"o&************:+",
"o-*************%",
"o;*************@",
"o+&&&&&&&&&&&&&;",
"oo&&&&&&&&&&&&&-",
"oo-&&&&&&&&&&&&&"
};

64
bitmaps/import_cmp_from_lib.xpm
View File

@ -2,37 +2,37 @@
const char *import_cmp_from_lib_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"O c #76787C",
"$ c #979A9C",
"= c #404440",
"; c #ACB1B5",
"# c #04BA04",
"+ c #CACCCC",
"o c #F5F6F7",
". c #2E3031",
" c None",
"* c #124912",
"@ c #049304",
"& c #505355",
"X c #0C290C",
"% c #046404",
"- c #DADBDB",
": c #83888C",
"$ c #234B22",
"; c #CBAED1",
"# c #676669",
"- c #C76161",
". c #AEA8A8",
"& c #B09399",
"+ c #04B104",
"X c None",
": c #E1E0FC",
"@ c #046A04",
"o c #B97E7C",
" c #1E0D0C",
"% c #AF768C",
"O c #25311D",
"= c #CF3839",
"* c #CE4B4A",
/* pixels */
" .X ",
" ooO ",
" +o++. ",
" @#X$++.$ ",
" %#@X$+X.& ",
" *##@%%%%=&.=.. ",
" OX######%Oooo-.",
" $&*@@##%Ooo-; ",
" :;+:&%@&ooo+: ",
" O;+$*=-oo-;X ",
" =:$+.oooo+O ",
" &O-+oooo; ",
" X&++--o+: ",
" .=O$$$ ",
" .XX ",
" "
" .Xo.XXXXXXXXX",
"O+@#X#OXXXXXXXXX",
"$@+O#$@$XXXXXXXX",
".$+++@+@$XXXXXXX",
"X%$+++++ &XXXXXX",
"XX*OO$+@=-&XXXXX",
"XX*;X#@#;&=oXXXX",
"-*=X:##:::;=.XXX",
"&o=X:;:::::*-XXX",
"X.*X:::::::&=-oX",
"XX*X:::::::&=--.",
"XX*X::::::X%-&..",
"&&*;:::::X;=&.XX",
"**=.;;;;;%=-&XXX",
"X.*=====**o&.XXX",
"XXX.&&&&&&..XXXX"
};

87
bitmaps/new_component.xpm
View File

@ -1,50 +1,37 @@
/* XPM */
#ifndef XPMMAIN
extern const char *new_component_xpm[];
#else
const char * new_component_xpm[] = {
"16 16 26 1",
" c None",
"! c black",
"# c #FEFEFE",
"$ c #090909",
"% c #B4FFE6",
"& c #D90000",
"' c #EEEEEE",
"( c #F1F1F1",
") c white",
"* c #767676",
"+ c #F0F0F0",
", c #161616",
"- c #A0A0A4",
". c #EFEFEF",
"0 c #C4C4C4",
"1 c #ECECEC",
"2 c #FFE6B4",
"3 c #FFB4B4",
"4 c #EDEDED",
"5 c #E8E8E8",
"6 c #E7E7E7",
"7 c #B8B8B8",
"8 c #E6E6E6",
"9 c #E5E5E5",
": c #E4E4E4",
"; c #E3E3E3",
" !!!!!!!!!!!! ",
"!##########$%! ",
"!#&&'(((((($%%! ",
"!#&)&&((((($*%%!",
"!&&'))&(((+$$$,!",
"!-&''()&&...''0!",
"!#&''..))&&''10!",
"!#&'''''233&&&0!",
"!#&''4223&&---0!",
"!#&'223&&--5550!",
"!&&233&--555660!",
"!-&3&&788888890!",
"!#&&--688899::0!",
"!#--'''''':;;;0!",
"!00000000000000!",
" !!!!!!!!!!!!!! "};
#endif
/* XPM */
const char *new_component_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 15 1",
"# c #8C8D14",
"& c #7878B0",
"= c #9797AC",
"% c #30302D",
"o c #CDCF65",
"- c #4E4E68",
"$ c #AAABF8",
" c none",
"@ c #0A090C",
"X c #D3D30B",
"* c #B4B5B4",
"; c #6C6E6C",
". c #E0E09C",
"+ c #F6F704",
"O c #BEBE1C",
/* pixels */
" . ",
" Xo ",
" .XX ",
" oOXX++XXO.",
" oX++++Xo ",
" .O+++Xo ",
" @@@@@#+X+X. ",
" @$$$$OO##Xo ",
"%%%@$$$$o$$&%o ",
"**=@$$$$$$$$@* ",
" @$$$$$$$$-%;;",
" @$$$$$$$$-%;;",
" @$$$$$$$$%= ",
"***@$$$$$$$&@ ",
"%%@@$=$=$&-@* ",
" @@@@@@%-* "
};

2903
bitmaps/sources/Add_Cotation.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 99 KiB

169
bitmaps/sources/Add_Junction.svg Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\Add_Junction.png"
width="16.000000px"
height="16.000000px"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="Add_Junction.svg"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective23" />
<linearGradient
id="linearGradient2606">
<stop
id="stop2608"
offset="0.00000000"
style="stop-color:#ff7800;stop-opacity:1.0000000;" />
<stop
id="stop2610"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="4.6406250"
x2="6.0964284"
y1="8.6835938"
x1="8.9892855"
id="linearGradient2612"
xlink:href="#linearGradient2606"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="25.707317"
inkscape:cx="13.915774"
inkscape:cy="6.7377915"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
gridtolerance="0.50000000px"
inkscape:guide-points="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1024"
inkscape:window-height="708"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
transform="matrix(1.888888,0.000000,0.000000,1.777777,-7.333328,-3.999997)"
d="M 10.500000 6.7500000 A 2.2500000 2.2500000 0 1 1 6.0000000,6.7500000 A 2.2500000 2.2500000 0 1 1 10.500000 6.7500000 z"
sodipodi:ry="2.2500000"
sodipodi:rx="2.2500000"
sodipodi:cy="6.7500000"
sodipodi:cx="8.2500000"
id="path2624"
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="ccccc"
id="path2602"
d="M 8.0000000,16.000000 L 7.9999990,1.0000000 L 9.4999988,1.0000000 L 9.4999999,16.000000 L 8.0000000,16.000000 z "
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
<path
sodipodi:nodetypes="ccccc"
id="path2598"
d="M 1.0000000,7.0000013 L 16.000000,7.0000002 L 16.000000,8.5000000 L 0.99999990,8.5000012 L 1.0000000,7.0000013 z "
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
<path
sodipodi:nodetypes="ccccc"
id="rect3900"
d="M -3.8125001e-008,6.0000013 L 15.000000,6.0000002 L 15.000000,7.5000000 L -1.0000000e-007,7.5000012 L -3.8125001e-008,6.0000013 z "
style="fill:#007d00;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
<path
sodipodi:nodetypes="ccccc"
id="path2600"
d="M 7.0000012,15.000000 L 7.0000002,1.9984014e-015 L 8.5000000,1.9984014e-015 L 8.5000011,15.000000 L 7.0000012,15.000000 z "
style="fill:#007d00;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
<path
transform="matrix(1.888888,0.000000,0.000000,1.777777,-7.833328,-4.999997)"
d="M 10.500000 6.7500000 A 2.2500000 2.2500000 0 1 1 6.0000000,6.7500000 A 2.2500000 2.2500000 0 1 1 10.500000 6.7500000 z"
sodipodi:ry="2.2500000"
sodipodi:rx="2.2500000"
sodipodi:cy="6.7500000"
sodipodi:cx="8.2500000"
id="path2614"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
sodipodi:type="arc" />
<path
transform="matrix(1.444445,0.000000,0.000000,1.333333,-4.166670,-1.999999)"
d="M 10.500000 6.7500000 A 2.2500000 2.2500000 0 1 1 6.0000000,6.7500000 A 2.2500000 2.2500000 0 1 1 10.500000 6.7500000 z"
sodipodi:ry="2.2500000"
sodipodi:rx="2.2500000"
sodipodi:cy="6.7500000"
sodipodi:cx="8.2500000"
id="path2604"
style="fill:url(#linearGradient2612);fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
sodipodi:type="arc" />
</g>
<g
sodipodi:insensitive="true"
inkscape:label="fondo"
id="layer2"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect2277"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

154
bitmaps/sources/Add_Label.svg Normal file
View File

@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="Add_Line_Label.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\Add_Line_Label1.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective21" />
<linearGradient
id="linearGradient2889">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2891" />
<stop
style="stop-color:#afadff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2893" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2889"
id="linearGradient2895"
gradientTransform="matrix(-1.258306,0.000000,0.000000,-0.794719,0.000000,3.966793)"
x1="-5.3089843"
y1="-7.6678033"
x2="-11.064180"
y2="-12.337296"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2889"
id="linearGradient2905"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.258306,0.000000,0.000000,-0.794719,1.000000,1.466793)"
x1="-5.3089843"
y1="-7.6678033"
x2="-11.064180"
y2="-12.337296" />
</defs>
<sodipodi:namedview
inkscape:window-y="-6"
inkscape:window-x="4"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="6.9012704"
inkscape:cx="13.915774"
inkscape:zoom="25.707317"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
id="rect4110"
width="15.500000"
height="1.5000000"
x="0.50000000"
y="12.500000" />
<path
style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr-tb"
d="M 7.5000000,8.4667931 L 7.0000000,9.9667931 L 5.0000000,9.9667931 L 8.0000000,1.9667931 L 10.000000,1.9667931 L 13.000000,9.9667931 L 11.000000,9.9667931 L 10.500000,8.4667931 M 10.000000,6.9667931 L 9.0878906,4.0175744 L 8.0000000,6.9667931"
id="path2958"
sodipodi:nodetypes="ccccccccccc" />
<rect
style="fill:#009b00;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
id="rect2897"
width="16.000000"
height="1.5332069"
x="0.00000000"
y="11.466793" />
<path
style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr-tb"
d="M 6.0000000,7.4667931 L 5.5000000,8.9667931 L 3.5000000,8.9667931 L 6.5000000,0.96679306 L 8.5000000,0.96679306 L 11.500000,8.9667931 L 9.5000000,8.9667931 L 9.0000000,7.4667931 M 8.5000000,5.9667931 L 7.5878906,3.0175744 L 6.5000000,5.9667931"
id="text3011"
sodipodi:nodetypes="ccccccccccc" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="fondo"
sodipodi:insensitive="true">
<rect
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2277"
width="16.000000"
height="16.000000"
x="0.00000000"
y="0.00000000" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

512
bitmaps/sources/BOM.svg Normal file
View File

@ -0,0 +1,512 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="BOM.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\kk3.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective79" />
<linearGradient
inkscape:collect="always"
id="linearGradient11304">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop11306" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop11308" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient11304"
id="linearGradient11348"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(7.635655e-17,1.481774,-0.813325,5.546220e-17,-1.101647,1.000000)"
x1="8.6456900"
y1="-11.388012"
x2="2.2014821"
y2="-11.159442" />
<linearGradient
id="linearGradient11328">
<stop
style="stop-color:#000000;stop-opacity:1.0000000;"
offset="0.00000000"
id="stop11330" />
<stop
style="stop-color:#ff7800;stop-opacity:0;"
offset="1"
id="stop11332" />
</linearGradient>
<linearGradient
id="linearGradient11314">
<stop
style="stop-color:#ff7800;stop-opacity:1;"
offset="0"
id="stop11316" />
<stop
style="stop-color:#ff7800;stop-opacity:0;"
offset="1"
id="stop11318" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient11314"
id="linearGradient11354"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.662923e-17,0.303785,-0.411476,2.850725e-17,10.66667,2.250000)"
x1="1.2344268"
y1="6.4807407"
x2="14.195908"
y2="6.4807407" />
<linearGradient
id="linearGradient2889">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2891" />
<stop
style="stop-color:#afadff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2893" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2889"
id="linearGradient2895"
gradientTransform="matrix(-1.258306,0.000000,0.000000,-0.794719,0.000000,3.966793)"
x1="-5.3089843"
y1="-7.6678033"
x2="-11.064180"
y2="-12.337296"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2889"
id="linearGradient2905"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.258306,0.000000,0.000000,-0.794719,1.000000,1.466793)"
x1="-5.3089843"
y1="-7.6678033"
x2="-11.064180"
y2="-12.337296" />
<linearGradient
y2="6.4807405"
x2="14.195908"
y1="6.4807405"
x1="1.2344269"
gradientTransform="matrix(0.000000,0.424334,-0.617214,0.000000,12.00000,1.476190)"
gradientUnits="userSpaceOnUse"
id="linearGradient2433"
xlink:href="#linearGradient11328"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
inkscape:window-y="182"
inkscape:window-x="166"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="5.2354212"
inkscape:cx="8"
inkscape:zoom="28.9375"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<path
sodipodi:nodetypes="ccccccccc"
id="path2586"
d="M 1.0000000,2.0000000 L 2.0000000,1.0000000 L 15.000000,1.0000000 L 16.000000,2.0000000 L 16.000000,15.000000 L 15.000000,16.000000 L 2.0000000,16.000000 L 1.0000000,15.000000 L 1.0000000,2.0000000 z "
style="fill:#000000;fill-opacity:0.39215687;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccccc"
id="path2588"
d="M 0.00000000,1.0000000 L 1.0000000,0.00000000 L 14.000000,0.00000000 L 15.000000,1.0000000 L 15.000000,14.000000 L 14.000000,15.000000 L 1.0000000,15.000000 L 0.00000000,14.000000 L 0.00000000,1.0000000 z "
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="1.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2590"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="2.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2592"
style="fill:#bfe5ff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="3.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2594"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2596"
style="fill:#bfe5ff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="5.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2598"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="6.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2600"
style="fill:#bfe5ff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="7.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2602"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2604"
style="fill:#bfe5ff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="9.0000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2606"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="10.000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2608"
style="fill:#bfe5ff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="11.000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2610"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2612"
style="fill:#bfe5ff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="13.000000"
x="1.0000000"
height="1.0000000"
width="13.000000"
id="rect2614"
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="2.0000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2616"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2618"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2620"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="6.0000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2622"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2624"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2626"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="10.000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2628"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2630"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="2.0000000"
height="1.0000000"
width="1.0000000"
id="rect2632"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="2.0000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2634"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2636"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2638"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="6.0000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2640"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2642"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2644"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="10.000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2646"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2648"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="12.000000"
height="1.0000000"
width="1.0000000"
id="rect2650"
style="fill:#696969;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="2.0000000"
x="4.0000000"
height="1.0000000"
width="2.0000000"
id="rect2652"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="2.0000000"
x="7.0000000"
height="1.0000000"
width="4.0000000"
id="rect2654"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="4.0000000"
height="1.0000000"
width="2.0000000"
id="rect2656"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="4.0000000"
x="7.0000000"
height="1.0000000"
width="2.0000000"
id="rect2658"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="6.0000000"
x="4.0000000"
height="1.0000000"
width="2.0000000"
id="rect2660"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="6.0000000"
x="7.0000000"
height="1.0000000"
width="4.0000000"
id="rect2662"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="4.0000000"
height="1.0000000"
width="2.0000000"
id="rect2664"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="8.0000000"
x="7.0000000"
height="1.0000000"
width="3.0000000"
id="rect2666"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="10.000000"
x="4.0000000"
height="1.0000000"
width="2.0000000"
id="rect2668"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="10.000000"
x="7.0000000"
height="1.0000000"
width="4.0000000"
id="rect2670"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="4.0000000"
height="1.0000000"
width="2.0000000"
id="rect2672"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="7.0000000"
height="1.0000000"
width="2.0000000"
id="rect2674"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="12.000000"
x="10.000000"
height="1.0000000"
width="2.0000000"
id="rect2676"
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="fondo"
sodipodi:insensitive="true">
<rect
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2277"
width="16.000000"
height="16.000000"
x="0.00000000"
y="0.00000000" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

224
bitmaps/sources/Enter_Sheet.svg Normal file
View File

@ -0,0 +1,224 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="Enter_Sheet.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\Add_Line_Label1.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective54" />
<linearGradient
id="linearGradient2683">
<stop
id="stop2685"
offset="0"
style="stop-color:#6d6ddf;stop-opacity:1;" />
<stop
id="stop2687"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient2889">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2891" />
<stop
style="stop-color:#afadff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2893" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2889"
id="linearGradient2895"
gradientTransform="matrix(-1.258306,0.000000,0.000000,-0.794719,0.000000,3.966793)"
x1="-5.3089843"
y1="-7.6678033"
x2="-11.064180"
y2="-12.337296"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2889"
id="linearGradient2905"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.258306,0.000000,0.000000,-0.794719,1.000000,1.466793)"
x1="-5.3089843"
y1="-7.6678033"
x2="-11.064180"
y2="-12.337296" />
<linearGradient
id="linearGradient2606">
<stop
style="stop-color:#ff7800;stop-opacity:1.0000000;"
offset="0.00000000"
id="stop2608" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2610" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="-10.441892"
x2="-3.2939968"
y1="-5.0785108"
x1="2.9362376"
gradientTransform="scale(1.101946,0.907485)"
id="linearGradient2689"
xlink:href="#linearGradient2683"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
inkscape:window-y="-6"
inkscape:window-x="4"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="g2597"
inkscape:document-units="px"
inkscape:cy="11.058423"
inkscape:cx="10.96875"
inkscape:zoom="14.469067"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<g
transform="translate(5.937500,15.99930)"
id="g2597"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<path
sodipodi:nodetypes="ccccccccc"
id="path2238"
d="M 0.062500000,-13.999300 L 1.0625000,-14.999300 L 7.5625000,-14.999300 L 10.062500,-11.999300 L 10.062500,-1.9993000 L 9.0625000,-0.99930000 L 1.0625000,-0.99930000 L 0.062500000,-1.9993000 L 0.062500000,-13.999300 z "
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccc"
id="path2240"
d="M 1.0625000,-13.999300 L 7.0625000,-13.999300 L 7.1250000,-11.000000 L 9.1250000,-11.000000 L 9.1250000,-5.0000000 L 1.1250000,-5.0000000 L 1.0625000,-13.999300 z "
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccc"
id="path2242"
d="M 2.0625000,-12.999300 L 7.0625000,-12.999300 L 7.0625000,-10.999300 L 8.0751582,-10.999300 L 8.1384494,-2.9993000 L 2.0625000,-2.9993000 L 2.0625000,-12.999300 z "
style="fill:#ebebeb;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="-2.9993000"
x="1.1013994"
height="1.0000000"
width="7.9611006"
id="rect2244"
style="fill:#c3c3c3;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccc"
id="path2246"
d="M 9.1250003,-11.000000 L 9.1369504,-3.0001504 L 8.1369501,-2.9993000 L 8.1250000,-10.999150 L 9.1250003,-11.000000 z "
style="fill:#c3c3c3;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="cccc"
id="path2248"
d="M 7.5625000,-13.652052 L 7.5625000,-11.499300 L 9.0625000,-11.499300 L 7.5625000,-13.652052 z "
style="fill:#ebebeb;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="cccccccccc"
id="path2659"
d="M -5.9261148,-10.999300 L -5.9375000,-4.9993000 L -0.93750000,-4.9993000 L -0.93750000,-2.9907611 L 0.062500000,-2.9907611 L 5.0625000,-7.9993000 L 0.062500000,-12.990761 L -0.93750000,-12.990761 L -0.93750000,-10.990761 L -5.9261148,-10.999300 z "
style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="cccccccc"
id="path2661"
d="M -4.9375000,-9.9993000 L -4.9375000,-5.9993000 L 0.062500000,-5.9993000 L 0.062500000,-4.4993000 L 3.5625000,-7.9993000 L 0.062500000,-11.499300 L 0.062500000,-9.9993000 L -4.9375000,-9.9993000 z "
style="fill:url(#linearGradient2689);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
</g>
<g
transform="translate(5.937500,15.99930)"
inkscape:groupmode="layer"
id="g2627"
inkscape:label="fondo"
sodipodi:insensitive="true">
<rect
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2629"
width="16.000000"
height="16.000000"
x="0.00000000"
y="0.00000000" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="fondo"
sodipodi:insensitive="true">
<rect
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2277"
width="16.000000"
height="16.000000"
x="0.00000000"
y="0.00000000" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

181
bitmaps/sources/Export.svg Normal file
View File

@ -0,0 +1,181 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="Export.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\Export.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective29" />
<linearGradient
id="linearGradient10731">
<stop
id="stop10733"
offset="0.00000000"
style="stop-color:#8787ff;stop-opacity:1.0000000;" />
<stop
id="stop10735"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="12.266582"
x2="6.0408001"
y1="17.050747"
x1="11.430959"
gradientTransform="scale(1.224745,0.816497)"
id="linearGradient10737"
xlink:href="#linearGradient10731"
inkscape:collect="always" />
<linearGradient
id="linearGradient2606">
<stop
style="stop-color:#ff7800;stop-opacity:1.0000000;"
offset="0.00000000"
id="stop2608" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2610" />
</linearGradient>
</defs>
<sodipodi:namedview
inkscape:window-y="-4"
inkscape:window-x="-4"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="8"
inkscape:cx="8"
inkscape:zoom="28.9375"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<g
transform="translate(-5.000000,9.568000e-4)"
id="g11567">
<path
sodipodi:nodetypes="ccccccccc"
id="rect1375"
d="M 5.0000000,1.1527520 L 6.0000000,0.00000000 L 13.562500,0.00000000 L 16.000000,2.5590020 L 16.000000,14.000000 L 15.000000,15.000000 L 6.0000000,15.000000 L 5.0000000,14.000000 L 5.0000000,1.1527520 z "
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccc"
id="rect2149"
d="M 6.0000000,1.0000000 L 12.000000,1.0000000 L 12.000000,3.5000000 L 15.000000,3.5000000 L 15.000000,13.000000 L 6.0000000,13.000000 L 6.0000000,1.0000000 z "
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccc"
id="rect2170"
d="M 7.0000000,2.0000000 L 12.000000,2.0000000 L 12.000000,3.5000000 L 14.000000,3.5000000 L 14.000000,13.000000 L 7.0000000,13.000000 L 7.0000000,2.0000000 z "
style="fill:#ebebeb;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="13.000000"
x="6.0000000"
height="1.0000000"
width="9.0000000"
id="rect2172"
style="fill:#c3c3c3;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccc"
id="rect2174"
d="M 15.000000,3.4990432 L 15.000000,12.999044 L 14.000000,13.000000 L 14.000000,3.5000000 L 15.000000,3.4990432 z "
style="fill:#c3c3c3;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="cccc"
id="path2178"
d="M 12.500000,0.50000000 L 12.500000,3.0000000 L 15.000000,3.0000000 L 12.500000,0.50000000 z "
style="fill:#ebebeb;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
</g>
<g
transform="translate(5.039129,3.000000)"
id="g11563">
<path
sodipodi:nodetypes="cccccccc"
id="path11528"
d="M 6.9608710,5.5000000 L 7.0000000,2.6039230 L 10.960871,7.0000000 L 6.9608710,11.500000 L 6.9608710,8.5000000 C 3.4608710,8.5000000 2.4492127e-016,6.0000000 0.00000000,2.0000000 L 4.0000000,2.0000000 C 4.0000000,4.0000000 5.4608710,5.5000000 6.9608710,5.5000000 z "
style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="cccccccc"
id="path11530"
d="M 7.4608710,6.0000000 L 7.4608710,4.5000000 L 9.9608710,7.0000000 L 7.4608710,10.000000 L 7.4608710,8.0000000 C 5.4608710,8.0000000 1.0000000,7.0000000 1.0000000,3.0000000 L 3.0000000,3.0000000 C 3.0000000,5.0000000 5.9608710,6.0000000 7.4608710,6.0000000 z "
style="fill:#00bd00;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="fondo"
sodipodi:insensitive="true">
<rect
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2277"
width="16.000000"
height="16.000000"
x="0.00000000"
y="0.00000000" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

177
bitmaps/sources/addCompo.svg Normal file
View File

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="addCompo3.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\AddCompo3.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective23" />
<linearGradient
id="linearGradient2283">
<stop
style="stop-color:#afafff;stop-opacity:1;"
offset="0"
id="stop2285" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2287" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2283"
id="linearGradient2289"
gradientTransform="matrix(1.069045,0.000000,0.000000,0.935414,-4.537750e-2,-2.000000)"
x1="11.123842"
y1="13.722196"
x2="3.7416565"
y2="6.4142709"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
inkscape:window-y="-4"
inkscape:window-x="-4"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="10.165746"
inkscape:cx="10"
inkscape:zoom="18.1"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2293"
width="3.9999990"
height="1.0000029"
x="11.954623"
y="8.0000000" />
<rect
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2295"
width="3.9999990"
height="1.0000000"
x="1.9546225"
y="11.000000" />
<rect
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2297"
width="3.9999990"
height="1.0000000"
x="1.9546225"
y="6.0000000" />
<path
sodipodi:nodetypes="cczzccc"
id="path2291"
d="M 3.8767881,4.0000001 L 8.3314106,4.0000001 L 9.4546225,4.0000001 C 15.242369,4.0000001 15.378389,13.000000 9.4546225,13.000000 L 8.3314106,13.000000 L 3.8767881,13.000000 L 3.8767881,4.0000001 z "
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2499998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:1.0000000" />
<rect
style="stroke-opacity:0.48858449;stroke-miterlimit:0.00000000;stroke-linejoin:round;stroke-linecap:butt;stroke-width:1.2500000;stroke:none;fill-opacity:1.0000000;fill:#d72e2e"
id="rect2108"
width="2.9999990"
height="1.0000029"
x="11.954623"
y="7.0000000" />
<path
sodipodi:nodetypes="cczzccc"
id="path3966"
d="M 3.0000000,3.0000001 L 7.4546225,3.0000001 L 8.5778344,3.0000001 C 14.365581,3.0000001 14.501600,12.000000 8.5778344,12.000000 L 7.4546225,12.000000 L 3.0000000,12.000000 L 3.0000000,3.0000001 z "
style="stroke-opacity:1.0000000;stroke-miterlimit:0.00000000;stroke-linejoin:round;stroke-linecap:butt;stroke-width:1.2499998;stroke:none;fill-opacity:1.0000000;fill:#d72e2e" />
<rect
style="stroke-opacity:0.48858449;stroke-miterlimit:0.00000000;stroke-linejoin:round;stroke-linecap:butt;stroke-width:1.2500000;stroke:none;fill-opacity:1.0000000;fill:#d72e2e"
id="rect2067"
width="2.9999990"
height="1.0000000"
x="0.95462251"
y="10.000000" />
<rect
style="stroke-opacity:0.48858449;stroke-miterlimit:0.00000000;stroke-linejoin:round;stroke-linecap:butt;stroke-width:1.2500000;stroke:none;fill-opacity:1.0000000;fill:#d72e2e"
id="rect2065"
width="2.9999990"
height="1.0000000"
x="0.95462251"
y="5.0000000" />
<path
sodipodi:nodetypes="cczzccc"
id="path2069"
d="M 3.9546225,4.0000001 L 7.3435333,4.0000001 L 8.6133795,4.0000001 C 13.016481,4.0000001 13.119960,11.000000 8.6133795,11.000000 L 7.3435333,11.000000 L 3.9546225,11.000000 L 3.9546225,4.0000001 z "
style="fill:url(#linearGradient2289);fill-opacity:1.0000000;stroke:none;stroke-width:1.2499998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:1.0000000" />
</g>
<g
sodipodi:insensitive="true"
inkscape:label="Fondo"
id="layer3"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect3969"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

155
bitmaps/sources/addVCC.svg Normal file
View File

@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="AddVCC1.svg"
sodipodi:docbase="C:\Documents and Settings\inigo\Escritorio\iconos"
inkscape:version="0.40+cvs"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\AddVCC.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000">
<defs
id="defs3">
<linearGradient
id="linearGradient2350">
<stop
id="stop2352"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop2354"
offset="1.0000000"
style="stop-color:#9b9bff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
gradientTransform="translate(2.000000,0.000000)"
gradientUnits="userSpaceOnUse"
y2="4.9531260"
x2="6.9765625"
y1="2.0234385"
x1="4.0000000"
id="linearGradient2356"
xlink:href="#linearGradient2350"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="16.970564"
x2="5.3033009"
y1="16.970564"
x1="2.4748738"
gradientTransform="matrix(1.414214,0.000000,0.000000,0.707107,2.000000,0.000000)"
id="linearGradient3122"
xlink:href="#linearGradient2350"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
gridspacingy="0.50000000px"
gridspacingx="0.50000000px"
inkscape:window-y="-4"
inkscape:window-x="-4"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
gridempspacing="2"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="10.994475"
inkscape:cx="9.3922652"
inkscape:zoom="18.100000"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base" />
<metadata
id="metadata4">
<rdf:RDF
id="RDF5">
<cc:Work
id="Work6"
rdf:about="">
<dc:format
id="format7">image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"
id="type9" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<path
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
d="M 8.5000000,2.0000000 C 7.1199975,2.0000000 6.0000000,3.1199994 6.0000000,4.5000000 C 6.0000000,5.8800006 7.1199976,7.0000000 8.5000000,7.0000000 C 9.8800025,7.0000000 11.000000,5.8800005 11.000000,4.5000000 C 11.000000,3.1199994 9.8800026,2.0000000 8.5000000,2.0000000 z "
id="path3126" />
<rect
style="fill:#9b9b9b;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect3128"
width="3.9999990"
height="1.0000000"
x="-9.9999990"
y="8.0000000"
transform="matrix(0.000000,-1.000000,1.000000,0.000000,0.000000,0.000000)" />
<path
style="fill:#9b9b9b;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 4.0000000,11.000000 L 8.5000000,15.500000 L 13.000000,11.000000 L 4.0000000,11.000000 z "
id="path3124" />
<path
style="fill:#d72e2e;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
d="M 7.5000000,1.0000010 C 6.1199975,1.0000010 5.0000000,2.1200004 5.0000000,3.5000010 C 5.0000000,4.8800016 6.1199976,6.0000010 7.5000000,6.0000010 C 8.8800025,6.0000010 9.9999998,4.8800015 10.000000,3.5000010 C 10.000000,2.1200004 8.8800026,1.0000010 7.5000000,1.0000010 z "
id="path2851" />
<path
style="fill:url(#linearGradient2356);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
d="M 7.5000000,2.0000010 C 8.3280002,2.0000010 9.0000000,2.6720018 9.0000000,3.5000010 C 9.0000000,4.3280001 8.3280001,5.0000010 7.5000000,5.0000010 C 6.6719999,5.0000009 6.0000000,4.3280002 6.0000000,3.5000010 C 6.0000000,2.6720018 6.6719999,2.0000010 7.5000000,2.0000010 z "
id="path2900" />
<rect
style="fill:#d72e2e;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2065"
width="3.9999990"
height="1.0000000"
x="-9.0000000"
y="7.0000000"
transform="matrix(0.000000,-1.000000,1.000000,0.000000,0.000000,0.000000)" />
<path
style="fill:#d72e2e;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 3.0000000,10.000000 L 7.5000000,14.500000 L 12.000000,10.000000 L 3.0000000,10.000000 z "
id="path2865" />
<path
style="fill:url(#linearGradient3122);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 5.5000000,11.000000 L 9.5000000,11.000000 L 7.5000000,13.000000 L 5.5000000,11.000000 z "
id="path2904" />
</g>
<g
sodipodi:insensitive="true"
inkscape:label="Fondo"
id="layer3"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect3969"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

283
bitmaps/sources/copyComponent.svg Normal file
View File

@ -0,0 +1,283 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="copyComponent.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\copyComponent.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective23" />
<linearGradient
id="linearGradient2283">
<stop
style="stop-color:#afafff;stop-opacity:1;"
offset="0"
id="stop2285" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2287" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2283"
id="linearGradient2289"
gradientTransform="matrix(1.069045,0,0,0.935414,-0.99999905,-5.038674)"
x1="11.123842"
y1="13.722196"
x2="3.7416565"
y2="6.4142709"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
id="perspective2836"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2283-7"
id="linearGradient2289-1"
gradientTransform="matrix(1.069045,0,0,0.935414,17.743093,-1.6546967)"
x1="11.123842"
y1="13.722196"
x2="3.7416565"
y2="6.4142709"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient2283-7">
<stop
style="stop-color:#afafff;stop-opacity:1;"
offset="0"
id="stop2285-4" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2287-0" />
</linearGradient>
<inkscape:perspective
id="perspective3940"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
inkscape:window-y="72"
inkscape:window-x="19"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="8.019337"
inkscape:cx="8.5000002"
inkscape:zoom="28.867723"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<g
id="g2897"
transform="translate(0,0.06928153)">
<rect
y="4.9613261"
x="11.000002"
height="1.0000029"
width="3.999999"
id="rect2293"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<rect
y="7.9613261"
x="1.000001"
height="1"
width="3.999999"
id="rect2295"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<rect
y="2.9613259"
x="1.000001"
height="1"
width="3.999999"
id="rect2297"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<path
style="fill:#9b9b9b;fill-opacity:1;stroke:none"
d="m 2.9221665,0.96132607 4.4546225,0 1.1232119,0 c 5.7877461,0 5.9237661,8.99999993 0,8.99999993 l -1.1232119,0 -4.4546225,0 0,-8.99999993 z"
id="path2291"
sodipodi:nodetypes="cczzccc" />
<rect
y="3.9613259"
x="11.000002"
height="1.0000029"
width="2.999999"
id="rect2108"
style="fill:#008000;fill-opacity:1;stroke:none" />
<path
style="fill:#008000;fill-opacity:1;stroke:none"
d="m 2.0453784,-0.03867393 4.4546225,0 1.1232119,0 c 5.7877462,0 5.9237652,8.99999993 0,8.99999993 l -1.1232119,0 -4.4546225,0 0,-8.99999993 z"
id="path3966"
sodipodi:nodetypes="cczzccc" />
<rect
y="6.9613261"
x="9.5367432e-07"
height="1"
width="2.999999"
id="rect2067"
style="fill:#008000;fill-opacity:1;stroke:none" />
<rect
y="1.961326"
x="9.5367432e-07"
height="1"
width="2.999999"
id="rect2065"
style="fill:#008000;fill-opacity:1;stroke:none" />
<path
style="fill:url(#linearGradient2289);fill-opacity:1;stroke:none"
d="m 3.0000009,0.96132607 3.3889108,0 1.2698462,0 c 4.4031011,0 4.5065801,6.99999993 0,6.99999993 l -1.2698462,0 -3.3889108,0 0,-6.99999993 z"
id="path2069"
sodipodi:nodetypes="cczzccc" />
</g>
<g
id="g2886"
transform="translate(-17.743094,2.6546965)">
<rect
y="8.3453035"
x="29.743095"
height="1.0000029"
width="3.999999"
id="rect2293-9"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<rect
y="11.345304"
x="19.743095"
height="1"
width="3.999999"
id="rect2295-4"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<rect
y="6.345304"
x="19.743095"
height="1"
width="3.999999"
id="rect2297-8"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<path
style="fill:#9b9b9b;fill-opacity:1;stroke:none"
d="m 21.665259,4.3453034 4.454622,0 1.123212,0 c 5.787746,0 5.923766,9.0000006 0,9.0000006 l -1.123212,0 -4.454622,0 0,-9.0000006 z"
id="path2291-8"
sodipodi:nodetypes="cczzccc" />
<rect
y="7.345304"
x="29.743095"
height="1.0000029"
width="2.999999"
id="rect2108-2"
style="fill:#ff0000;fill-opacity:1;stroke:none" />
<path
style="fill:#ff0000;fill-opacity:1;stroke:none"
d="m 20.788471,3.3453034 4.454622,0 1.123212,0 c 5.787746,0 5.923765,9.0000006 0,9.0000006 l -1.123212,0 -4.454622,0 0,-9.0000006 z"
id="path3966-4"
sodipodi:nodetypes="cczzccc" />
<rect
y="10.345304"
x="18.743095"
height="1"
width="2.999999"
id="rect2067-5"
style="fill:#ff0000;fill-opacity:1;stroke:none" />
<rect
y="5.345304"
x="18.743095"
height="1"
width="2.999999"
id="rect2065-5"
style="fill:#ff0000;fill-opacity:1;stroke:none" />
<path
style="fill:url(#linearGradient2289-1);fill-opacity:1;stroke:none"
d="m 21.743093,4.3453034 3.388911,0 1.269846,0 c 4.403101,0 4.50658,7.0000006 0,7.0000006 l -1.269846,0 -3.388911,0 0,-7.0000006 z"
id="path2069-1"
sodipodi:nodetypes="cczzccc" />
</g>
<path
sodipodi:nodetypes="cccccccc"
id="path10768"
d="m 8.5678733,8 -2.896077,0.039129 4,3.999999 4.0000007,-3.999999 -3,0 c 0,-3.5 -1.1039237,-5.5 -5.1039237,-5.5 l 0,2.5 c 2,0 3,0.5 3,2.960871 z"
style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
<g
sodipodi:insensitive="true"
inkscape:label="Fondo"
id="layer3"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect3969"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

325
bitmaps/sources/gbr_select_mode0.svg Normal file
View File

@ -0,0 +1,325 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\gbr_select_mode0.png"
width="16"
height="16"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="gbr_select_mode0.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<title
id="title2867">fabrication.svg</title>
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective62" />
<linearGradient
inkscape:collect="always"
id="linearGradient2250">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2252" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2254" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2265">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop2267" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop2269" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2257">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2259" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2261" />
</linearGradient>
<linearGradient
id="linearGradient3087">
<stop
style="stop-color:#3465a4;stop-opacity:1;"
offset="0"
id="stop3089" />
<stop
id="stop3095"
offset="0"
style="stop-color:#9fbce1;stop-opacity:1;" />
<stop
style="stop-color:#6b95ca;stop-opacity:1;"
offset="0"
id="stop2242" />
<stop
id="stop2244"
offset="0.75"
style="stop-color:#3d6aa5;stop-opacity:1;" />
<stop
style="stop-color:#386eb4;stop-opacity:1;"
offset="1"
id="stop3091" />
</linearGradient>
<linearGradient
id="linearGradient3077">
<stop
style="stop-color:#98a0a9;stop-opacity:1;"
offset="0"
id="stop3079" />
<stop
style="stop-color:#c3d0dd;stop-opacity:1;"
offset="1"
id="stop3081" />
</linearGradient>
<linearGradient
id="linearGradient3061">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3063" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3065" />
</linearGradient>
<linearGradient
id="linearGradient3049">
<stop
style="stop-color:#b6b6b6;stop-opacity:1;"
offset="0"
id="stop3051" />
<stop
id="stop2262"
offset="0.5"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#fafafa;stop-opacity:1;"
offset="0.67612958"
id="stop2264" />
<stop
id="stop2268"
offset="0.84051722"
style="stop-color:#d8d8d8;stop-opacity:1;" />
<stop
id="stop2266"
offset="0.875"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#dbdbdb;stop-opacity:1;"
offset="1"
id="stop3053" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3041">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3043" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3045" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient3047"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3061"
id="linearGradient3067"
x1="50.152931"
y1="-3.6324477"
x2="25.291086"
y2="-4.3002653"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.25783861,0,0,0.2595286,32.155794,28.984379)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3087"
id="linearGradient3093"
x1="9.7503242"
y1="32.28376"
x2="16.915297"
y2="39.443218"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28963035,0,0,0.22349527,2.044995,37.38192)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2257"
id="linearGradient2263"
x1="12.004697"
y1="35.688461"
x2="10.650805"
y2="33.194965"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.33216589,-0.00670924,0.00869457,0.2563181,1.7338281,36.137935)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2265"
id="linearGradient2271"
x1="14.017542"
y1="36.942543"
x2="15.415793"
y2="38.268368"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28957395,-0.0044084,0.0057129,0.22345175,1.92189,37.152949)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2250"
id="linearGradient2256"
x1="31.177404"
y1="19.821514"
x2="40.859177"
y2="9.6568537"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.3297737,0,0,0.25447215,1.2083631,36.117783)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient2260"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875" />
</defs>
<sodipodi:namedview
stroke="#204a87"
fill="#3465a4"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="0.25490196"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="5.730549"
inkscape:cy="8.561168"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1280"
inkscape:window-height="968"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2865"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
empcolor="#0000ff"
empopacity="0.1372549"
dotted="true" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:title>fabrication.svg</dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-32)">
<rect
style="fill:#4d4d4d"
id="rect2932"
width="13.536558"
height="10.298958"
x="-7.8830147"
y="32.956669"
transform="matrix(1,0,0.23919332,0.97097197,0,0)"
rx="0.25089604"
ry="0.38427848"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
ry="0.38427848"
rx="0.25089604"
transform="matrix(1,0,0.23919332,0.97097196,0,0)"
y="39.136044"
x="-9.3610802"
height="10.298958"
width="13.536558"
id="rect2878"
style="fill:#aa0000" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

325
bitmaps/sources/gbr_select_mode1.svg Normal file
View File

@ -0,0 +1,325 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\gbr_select_mode1.png"
width="16"
height="16"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="gbr_select_mode1.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<title
id="title2867">fabrication.svg</title>
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective62" />
<linearGradient
inkscape:collect="always"
id="linearGradient2250">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2252" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2254" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2265">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop2267" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop2269" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2257">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2259" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2261" />
</linearGradient>
<linearGradient
id="linearGradient3087">
<stop
style="stop-color:#3465a4;stop-opacity:1;"
offset="0"
id="stop3089" />
<stop
id="stop3095"
offset="0"
style="stop-color:#9fbce1;stop-opacity:1;" />
<stop
style="stop-color:#6b95ca;stop-opacity:1;"
offset="0"
id="stop2242" />
<stop
id="stop2244"
offset="0.75"
style="stop-color:#3d6aa5;stop-opacity:1;" />
<stop
style="stop-color:#386eb4;stop-opacity:1;"
offset="1"
id="stop3091" />
</linearGradient>
<linearGradient
id="linearGradient3077">
<stop
style="stop-color:#98a0a9;stop-opacity:1;"
offset="0"
id="stop3079" />
<stop
style="stop-color:#c3d0dd;stop-opacity:1;"
offset="1"
id="stop3081" />
</linearGradient>
<linearGradient
id="linearGradient3061">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3063" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3065" />
</linearGradient>
<linearGradient
id="linearGradient3049">
<stop
style="stop-color:#b6b6b6;stop-opacity:1;"
offset="0"
id="stop3051" />
<stop
id="stop2262"
offset="0.5"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#fafafa;stop-opacity:1;"
offset="0.67612958"
id="stop2264" />
<stop
id="stop2268"
offset="0.84051722"
style="stop-color:#d8d8d8;stop-opacity:1;" />
<stop
id="stop2266"
offset="0.875"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#dbdbdb;stop-opacity:1;"
offset="1"
id="stop3053" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3041">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3043" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3045" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient3047"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3061"
id="linearGradient3067"
x1="50.152931"
y1="-3.6324477"
x2="25.291086"
y2="-4.3002653"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.25783861,0,0,0.2595286,32.155794,28.984379)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3087"
id="linearGradient3093"
x1="9.7503242"
y1="32.28376"
x2="16.915297"
y2="39.443218"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28963035,0,0,0.22349527,2.044995,37.38192)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2257"
id="linearGradient2263"
x1="12.004697"
y1="35.688461"
x2="10.650805"
y2="33.194965"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.33216589,-0.00670924,0.00869457,0.2563181,1.7338281,36.137935)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2265"
id="linearGradient2271"
x1="14.017542"
y1="36.942543"
x2="15.415793"
y2="38.268368"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28957395,-0.0044084,0.0057129,0.22345175,1.92189,37.152949)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2250"
id="linearGradient2256"
x1="31.177404"
y1="19.821514"
x2="40.859177"
y2="9.6568537"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.3297737,0,0,0.25447215,1.2083631,36.117783)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient2260"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875" />
</defs>
<sodipodi:namedview
stroke="#204a87"
fill="#3465a4"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="0.25490196"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="5.730549"
inkscape:cy="8.561168"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1280"
inkscape:window-height="968"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2865"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
empcolor="#0000ff"
empopacity="0.1372549"
dotted="true" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:title>fabrication.svg</dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-32)">
<rect
style="fill:#008000"
id="rect2932"
width="13.536558"
height="10.298958"
x="-7.8830147"
y="32.956669"
transform="matrix(1,0,0.23919332,0.97097197,0,0)"
rx="0.25089604"
ry="0.38427848"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
ry="0.38427848"
rx="0.25089604"
transform="matrix(1,0,0.23919332,0.97097196,0,0)"
y="39.136044"
x="-9.3610802"
height="10.298958"
width="13.536558"
id="rect2878"
style="fill:#aa0000" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

252
bitmaps/sources/gbr_select_mode2.svg Normal file
View File

@ -0,0 +1,252 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\gbr_select_mode2.png"
width="16"
height="16"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="gbr_select_mode2.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<title
id="title2867">fabrication.svg</title>
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective62" />
<linearGradient
id="linearGradient3087">
<stop
style="stop-color:#3465a4;stop-opacity:1;"
offset="0"
id="stop3089" />
<stop
id="stop3095"
offset="0"
style="stop-color:#9fbce1;stop-opacity:1;" />
<stop
style="stop-color:#6b95ca;stop-opacity:1;"
offset="0"
id="stop2242" />
<stop
id="stop2244"
offset="0.75"
style="stop-color:#3d6aa5;stop-opacity:1;" />
<stop
style="stop-color:#386eb4;stop-opacity:1;"
offset="1"
id="stop3091" />
</linearGradient>
<linearGradient
id="linearGradient3077">
<stop
style="stop-color:#98a0a9;stop-opacity:1;"
offset="0"
id="stop3079" />
<stop
style="stop-color:#c3d0dd;stop-opacity:1;"
offset="1"
id="stop3081" />
</linearGradient>
<linearGradient
id="linearGradient3061">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3063" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3065" />
</linearGradient>
<linearGradient
id="linearGradient3049">
<stop
style="stop-color:#b6b6b6;stop-opacity:1;"
offset="0"
id="stop3051" />
<stop
id="stop2262"
offset="0.5"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#fafafa;stop-opacity:1;"
offset="0.67612958"
id="stop2264" />
<stop
id="stop2268"
offset="0.84051722"
style="stop-color:#d8d8d8;stop-opacity:1;" />
<stop
id="stop2266"
offset="0.875"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#dbdbdb;stop-opacity:1;"
offset="1"
id="stop3053" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3041">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3043" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3045" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient3047"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient2260"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875" />
</defs>
<sodipodi:namedview
stroke="#204a87"
fill="#3465a4"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="0.25490196"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="7.0561897"
inkscape:cy="8.4031019"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1280"
inkscape:window-height="968"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2865"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
empcolor="#0000ff"
empopacity="0.1372549"
dotted="true" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:title>fabrication.svg</dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-32)">
<rect
style="fill:#000080"
id="rect2932"
width="13.536558"
height="10.298958"
x="-7.8830147"
y="32.956669"
transform="matrix(1,0,0.23919332,0.97097197,0,0)"
rx="0.25089604"
ry="0.38427848"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
ry="0.38427848"
rx="0.25089604"
transform="matrix(1,0,0.23919332,0.97097196,0,0)"
y="36.046356"
x="-8.6220474"
height="10.298958"
width="13.536558"
id="rect2878"
style="fill:#008000;opacity:0.66666667" />
<rect
style="fill:#b90000;opacity:0.64102563999999995;fill-opacity:1"
id="rect3120"
width="13.536557"
height="10.298958"
x="-9.3610792"
y="39.136044"
transform="matrix(1,0,0.23919331,0.97097197,0,0)"
rx="0.25089604"
ry="0.38427848"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

261
bitmaps/sources/import_GLabel.svg Normal file
View File

@ -0,0 +1,261 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\Import_GLabel.png"
width="16.000000px"
height="16.000000px"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="import_GLabel.svg"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective50" />
<linearGradient
id="linearGradient10731">
<stop
style="stop-color:#8787ff;stop-opacity:1.0000000;"
offset="0.00000000"
id="stop10733" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop10735" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10731"
id="linearGradient10737"
gradientTransform="scale(1.224745,0.816497)"
x1="11.430959"
y1="17.050747"
x2="6.0408001"
y2="12.266582"
gradientUnits="userSpaceOnUse" />
<linearGradient
y2="12.266582"
x2="6.0408001"
y1="17.050747"
x1="11.430959"
gradientTransform="scale(1.224745,0.816497)"
gradientUnits="userSpaceOnUse"
id="linearGradient2068"
xlink:href="#linearGradient10731"
inkscape:collect="always" />
<linearGradient
id="linearGradient2606">
<stop
style="stop-color:#ff7800;stop-opacity:1.0000000;"
offset="0.00000000"
id="stop2608" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2610" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="12.266582"
x2="6.0408001"
y1="17.050747"
x1="11.430959"
gradientTransform="scale(1.224745,0.816497)"
id="linearGradient2182"
xlink:href="#linearGradient10731"
inkscape:collect="always" />
<linearGradient
id="linearGradient2176">
<stop
id="stop2178"
offset="0.00000000"
style="stop-color:#8787ff;stop-opacity:1.0000000;" />
<stop
id="stop2180"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
y2="12.266582"
x2="6.0408001"
y1="17.050747"
x1="11.430959"
gradientTransform="scale(1.224745,0.816497)"
gradientUnits="userSpaceOnUse"
id="linearGradient2222"
xlink:href="#linearGradient10731"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="18.198469"
inkscape:cx="16.5"
inkscape:cy="7.6758261"
inkscape:document-units="px"
inkscape:current-layer="g2189"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
gridtolerance="0.50000000px"
inkscape:guide-points="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1024"
inkscape:window-height="708"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<g
transform="translate(17.00000,9.440998)"
id="g2189"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<path
sodipodi:nodetypes="ccccccccc"
id="rect1375"
d="M -13.000000,-8.4409980 L -12.000000,-9.4409980 L -3.4375000,-9.4417000 L -1.0000000,-7.0354500 L -1.0000000,4.5583000 L -2.0000000,5.5583000 L -12.000000,5.5590020 L -13.000000,4.5590020 L -13.000000,-8.4409980 z "
style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccc"
id="rect2149"
d="M -12.000000,-8.4409980 L -4.0000000,-8.4409980 L -4.0000000,-6.4409980 L -2.0000000,-6.4409980 L -2.0000000,3.5590020 L -12.000000,3.5590020 L -12.000000,-8.4409980 z "
style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccccc"
id="rect2170"
d="M -11.000000,-8.4409980 L -3.9375000,-8.4417000 L -3.9375000,-6.4417000 L -2.9375000,-6.4417000 L -3.0000000,3.5590020 L -11.125000,3.5597040 L -11.000000,-8.4409980 z "
style="fill:#ebebeb;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<rect
y="3.5590019"
x="-11.961101"
height="1.0000000"
width="9.9611006"
id="rect2172"
style="fill:#c3c3c3;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="ccccc"
id="rect2174"
d="M -2.0000000,-6.4416891 L -2.0000000,3.5590020 L -3.0000003,3.5596930 L -3.0000003,-6.4409980 L -2.0000000,-6.4416891 z "
style="fill:#c3c3c3;fill-opacity:1.0000000;stroke:none;stroke-width:1.8000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
id="path2178"
d="M -3.4688093,-8.5944515 L -3.4375000,-6.9417000 L -1.9375000,-6.9417000 L -3.4688093,-8.5944515 z "
style="fill:#ebebeb;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
<path
style="fill:#6f6500;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M -9.5000000,-2.4409980 L -7.5000000,-8.4409980 L -5.5000000,-8.4409980 L -3.5000000,-2.4409980 L -5.0000000,-2.4409980 L -5.5000000,-4.4409980 L -7.5000000,-4.4409980 L -8.0000000,-2.4409980 L -9.5000000,-2.4409980 z "
id="path1319"
sodipodi:nodetypes="ccccccccc" />
<path
style="fill:#e7e7e7;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M -7.0000000,-5.4409980 L -6.0000000,-5.4409980 L -6.5000000,-7.4409980 L -7.0000000,-5.4409980 z "
id="path2079"
sodipodi:nodetypes="cccc" />
</g>
<g
transform="translate(17.00000,9.440998)"
inkscape:groupmode="layer"
id="g2218"
inkscape:label="fondo"
sodipodi:insensitive="true">
<rect
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
id="rect2220"
width="16.000000"
height="16.000000"
x="0.00000000"
y="0.00000000" />
</g>
<g
transform="matrix(-1.000000,0.000000,0.000000,-1.000000,21.50000,22.00000)"
id="g2064">
<path
style="fill:#695f00;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 14.000000,8.0000000 L 9.5000000,8.0000000 L 6.5000000,11.500000 L 9.5000000,15.000000 L 14.000000,15.000000 L 14.000000,8.0000000 z "
id="path10727"
sodipodi:nodetypes="cccccc" />
<path
style="fill:url(#linearGradient2068);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 13.000000,9.0000000 L 10.000000,9.0000000 L 8.0000000,11.500000 L 10.000000,14.000000 L 13.000000,14.000000 L 13.000000,9.0000000 z "
id="path10729"
sodipodi:nodetypes="cccccc" />
</g>
<g
transform="translate(-6.539129,11.44100)"
id="g2254">
<path
sodipodi:nodetypes="cccccccc"
id="path11528"
d="M 12.000000,-8.4409980 L 12.039129,-11.337075 L 16.000000,-6.9409980 L 12.000000,-2.4409980 L 12.000000,-5.4409980 C 8.5000000,-5.4409980 6.5391290,-7.4409980 6.5391290,-11.440998 L 9.5000000,-11.440998 C 9.5000000,-9.4409980 10.500000,-8.4409980 12.000000,-8.4409980 z "
style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
<path
sodipodi:nodetypes="cccccccc"
id="path11530"
d="M 12.500000,-7.9409980 L 12.500000,-9.4409980 L 15.000000,-6.9409980 L 12.500000,-3.9409980 L 12.500000,-5.9409980 C 10.500000,-5.9409980 7.5000000,-6.4409980 7.5000000,-10.440998 L 9.0000000,-10.440998 C 9.0000000,-8.4409980 11.000000,-7.9409980 12.500000,-7.9409980 z "
style="fill:#00bd00;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
</g>
</g>
<g
sodipodi:insensitive="true"
inkscape:label="fondo"
id="layer2"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect2277"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

217
bitmaps/sources/load_component_from_lib.svg Normal file
View File

@ -0,0 +1,217 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="load_component_from_lib.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\load_component_from_lib.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective23" />
<linearGradient
id="linearGradient2283">
<stop
style="stop-color:#afafff;stop-opacity:1;"
offset="0"
id="stop2285" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2287" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2283"
id="linearGradient2289"
gradientTransform="matrix(1.069045,0,0,0.935414,0.0778344,0.9999999)"
x1="11.123842"
y1="13.722196"
x2="3.7416565"
y2="6.4142709"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
id="perspective2836"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2852"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2865"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
inkscape:window-y="-7"
inkscape:window-x="175"
inkscape:window-height="708"
inkscape:window-width="1024"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="10.165746"
inkscape:cx="10"
inkscape:zoom="18.1"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<g
id="g2863"
transform="matrix(1.0778341,0,0,1.1,-1.140907,-1.5)">
<rect
y="11"
x="12.077835"
height="1.0000029"
width="3.999999"
id="rect2293"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<rect
y="14"
x="2.0778344"
height="1"
width="3.999999"
id="rect2295"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<rect
y="9"
x="2.0778344"
height="1"
width="3.999999"
id="rect2297"
style="fill:#9b9b9b;fill-opacity:1;stroke:none" />
<path
style="fill:#9b9b9b;fill-opacity:1;stroke:none"
d="m 4,7 4.4546225,0 1.1232119,0 c 5.7877466,0 5.9237666,9 0,9 L 8.4546225,16 4,16 4,7 z"
id="path2291"
sodipodi:nodetypes="cczzccc" />
<rect
y="10"
x="12.077835"
height="1.0000029"
width="2.999999"
id="rect2108"
style="fill:#d72e2e;fill-opacity:1;stroke:none" />
<path
style="fill:#d72e2e;fill-opacity:1;stroke:none"
d="m 3.1232119,6 4.4546225,0 1.1232119,0 c 5.7877467,0 5.9237657,9 0,9 l -1.1232119,0 -4.4546225,0 0,-9 z"
id="path3966"
sodipodi:nodetypes="cczzccc" />
<rect
y="13"
x="1.0778344"
height="1"
width="2.999999"
id="rect2067"
style="fill:#d72e2e;fill-opacity:1;stroke:none" />
<rect
y="8"
x="1.0778344"
height="1"
width="2.999999"
id="rect2065"
style="fill:#d72e2e;fill-opacity:1;stroke:none" />
<path
style="fill:url(#linearGradient2289);fill-opacity:1;stroke:none"
d="m 4.0778344,7 3.3889108,0 1.2698462,0 c 4.4031016,0 4.5065806,7 0,7 l -1.2698462,0 -3.3889108,0 0,-7 z"
id="path2069"
sodipodi:nodetypes="cczzccc" />
</g>
<g
id="g2859"
transform="matrix(1.0064467,0,0,0.97943529,14.08712,-3.3075037)">
<path
sodipodi:nodetypes="cccccccc"
id="path11528"
d="m -8.5513325,6.3232044 0.039129,-2.896077 3.960871,4.396077 -4,4.4999996 0,-2.9999996 c -3.4999995,0 -5.4608705,-2 -5.4608705,-6 l 2.960871,0 c 0,2 1,3 2.4999995,3 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
sodipodi:nodetypes="cccccccc"
id="path11530-7"
d="m -8.0513325,6.8232044 0,-1.5 2.5,2.5 -2.5,2.9999996 0,-1.9999996 c -1.9999995,0 -4.9999995,-0.5 -4.9999995,-4.5 l 1.5,0 c 0,2 1.9999995,2.5 3.4999995,2.5 z"
style="fill:#00bd00;fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
</g>
<g
sodipodi:insensitive="true"
inkscape:label="Fondo"
id="layer3"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect3969"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

182
bitmaps/sources/new_component.svg Normal file
View File

@ -0,0 +1,182 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="new_component.svg"
inkscape:version="0.47 r22583"
sodipodi:version="0.32"
id="svg2"
height="16.000000px"
width="16.000000px"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\new_component.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective18" />
</defs>
<sodipodi:namedview
inkscape:window-y="240"
inkscape:window-x="348"
inkscape:window-height="708"
inkscape:window-width="663"
inkscape:guide-bbox="true"
showguides="true"
inkscape:guide-points="true"
gridtolerance="0.50000000px"
inkscape:grid-points="true"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer1"
inkscape:document-units="px"
inkscape:cy="10.110497"
inkscape:cx="10"
inkscape:zoom="18.1"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.50000000px"
spacingy="0.50000000px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect2108"
width="3.5138123"
height="1.1227779"
x="12.657458"
y="10.430326" />
<path
sodipodi:nodetypes="cczzccc"
id="path3966"
d="m 2.9359993,5.9392265 4.836097,0 1.219399,0 c 6.2833827,0 6.4310507,10.1049725 0,10.1049725 l -1.219399,0 -4.836097,0 0,-10.1049725 z"
style="fill:#000000;fill-opacity:1;stroke:none" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect2067"
width="3.9005527"
height="1.1227747"
x="0.071817406"
y="13.79865" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect2065"
width="3.9005527"
height="1.1227747"
x="0.071817406"
y="8.1847754" />
<path
sodipodi:nodetypes="cczzccc"
id="path2069"
d="m 3.9723713,7.0620012 3.679122,0 1.378591,0 c 4.7801627,0 4.8925037,7.8594228 0,7.8594228 l -1.378591,0 -3.679122,0 0,-7.8594228 z"
style="fill:#afafff;fill-opacity:1;stroke:none" />
<g
transform="matrix(1.4036237,0,0,1.3328082,-5.2815663,8.6427528)"
id="g2893">
<path
transform="matrix(0.864991,0,0,0.864991,3.363824,-4.516702)"
d="M 12,5.5000001 9.482647,4.1505113 6.9438446,5.4592008 7.4493798,2.6480409 5.420209,0.63790363 8.25,0.24999993 9.5347059,-2.3010227 10.778078,0.27039962 13.60124,0.70391816 11.539895,2.6810482 12,5.5000001 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5788654"
sodipodi:arg1="0.95054684"
sodipodi:r2="2.1505814"
sodipodi:r1="4.3011627"
sodipodi:cy="2"
sodipodi:cx="9.5"
sodipodi:sides="5"
id="path2863"
style="fill:#afaf00;fill-opacity:1;stroke:none"
sodipodi:type="star" />
<path
transform="matrix(0.616241,0,0,0.616241,5.729624,-4.118829)"
d="M 12,5.5000001 9.482647,4.1505113 6.9438446,5.4592008 7.4493798,2.6480409 5.420209,0.63790363 8.25,0.24999993 9.5347059,-2.3010227 10.778078,0.27039962 13.60124,0.70391816 11.539895,2.6810482 12,5.5000001 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5788654"
sodipodi:arg1="0.95054684"
sodipodi:r2="2.1505814"
sodipodi:r1="4.3011627"
sodipodi:cy="2"
sodipodi:cx="9.5"
sodipodi:sides="5"
id="path2869"
style="fill:#ebeb00;fill-opacity:1;stroke:none"
sodipodi:type="star" />
<path
transform="matrix(0.381496,0,0,0.381496,7.962214,-3.743358)"
d="M 12,5.5000001 9.482647,4.1505113 6.9438446,5.4592008 7.4493798,2.6480409 5.420209,0.63790363 8.25,0.24999993 9.5347059,-2.3010227 10.778078,0.27039962 13.60124,0.70391816 11.539895,2.6810482 12,5.5000001 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5788654"
sodipodi:arg1="0.95054684"
sodipodi:r2="2.1505814"
sodipodi:r1="4.3011627"
sodipodi:cy="2"
sodipodi:cx="9.5"
sodipodi:sides="5"
id="path2871"
style="fill:#ffff00;fill-opacity:1;stroke:none"
sodipodi:type="star" />
</g>
</g>
<g
sodipodi:insensitive="true"
inkscape:label="Fondo"
id="layer3"
inkscape:groupmode="layer">
<rect
y="0.00000000"
x="0.00000000"
height="16.000000"
width="16.000000"
id="rect3969"
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

14
common/CMakeLists.txt
View File

@ -1,4 +1,5 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/dialogs
${Boost_INCLUDE_DIR}
../3d-viewer
../pcbnew
@ -9,6 +10,13 @@ set( COMMON_ABOUT_DLG_SRCS
dialog_about/AboutDialog_main.cpp
dialog_about/dialog_about.cpp
dialog_about/dialog_about_base.cpp
dialogs/dialog_display_info_HTML_base.cpp
dialogs/dialog_get_component.cpp
dialogs/dialog_get_component_base.cpp
dialogs/dialog_hotkeys_editor.cpp
dialogs/dialog_hotkeys_editor_base.cpp
dialogs/dialog_load_error.cpp
dialogs/dialog_page_settings_base.cpp
)
set(COMMON_SRCS
@ -32,12 +40,7 @@ set(COMMON_SRCS
common_plotDXF_functions.cpp
confirm.cpp
copy_to_clipboard.cpp
dialog_display_info_HTML_base.cpp
dialog_hotkeys_editor.cpp
dialog_hotkeys_editor_base.cpp
dialog_load_error.cpp
dcsvg.cpp
dialog_page_settings_base.cpp
displlst.cpp
dlist.cpp
drawframe.cpp
@ -48,7 +51,6 @@ set(COMMON_SRCS
eda_dde.cpp
eda_doc.cpp
gestfich.cpp
get_component_dialog.cpp
gr_basic.cpp
hotkeys_basic.cpp
hotkey_grid_table.cpp

98
common/base_screen.cpp
View File

@ -9,22 +9,18 @@
#include "fctsys.h"
#include "common.h"
#include "base_struct.h"
#include "sch_item_struct.h"
#include "class_base_screen.h"
#include "id.h"
/* Implement wxSize array for grid list implementation. */
#include <wx/arrimpl.cpp>
WX_DEFINE_OBJARRAY( GridArray )
BASE_SCREEN* ActiveScreen = NULL;
#define CURSOR_SIZE 12 /* size of the cross cursor. */
BASE_SCREEN::BASE_SCREEN( KICAD_T aType ) : EDA_BaseStruct( aType )
BASE_SCREEN::BASE_SCREEN( KICAD_T aType ) : EDA_ITEM( aType )
{
EEDrawList = NULL; /* Schematic items list */
m_drawList = NULL; /* Draw items list */
m_UndoRedoCountMax = 10; /* undo/Redo command Max depth, 10 is a
* reasonable value */
m_FirstRedraw = TRUE;
@ -122,11 +118,12 @@ wxPoint BASE_SCREEN::CursorRealPosition( const wxPoint& ScreenPos )
return curpos;
}
/** Function SetScalingFactor
/**
* Function SetScalingFactor
* calculates the .m_Zoom member to have a given scaling factor
* @param the the current scale used to draw items on screen
* draw coordinates are user coordinates * GetScalingFactor( )
*/
* @param aScale - the the current scale used to draw items on screen
* draw coordinates are user coordinates * GetScalingFactor()
*/
void BASE_SCREEN::SetScalingFactor(double aScale )
{
int zoom = static_cast<int>( ceil(aScale * m_ZoomScalar) );
@ -340,34 +337,41 @@ bool BASE_SCREEN::SetLastZoom()
}
void BASE_SCREEN::SetGridList( GridArray& gridlist )
void BASE_SCREEN::SetGridList( GRIDS& gridlist )
{
if( !m_GridList.IsEmpty() )
m_GridList.Clear();
if( !m_grids.empty() )
m_grids.clear();
m_GridList = gridlist;
m_grids = gridlist;
}
void BASE_SCREEN::GetGrids( GRIDS& aList )
{
for( size_t i = 0; i < m_grids.size(); i++ )
aList.push_back( m_grids[ i ] );
}
void BASE_SCREEN::SetGrid( const wxRealPoint& size )
{
wxASSERT( !m_GridList.IsEmpty() );
wxASSERT( !m_grids.empty() );
size_t i;
GRID_TYPE nearest_grid = m_GridList[0];
GRID_TYPE nearest_grid = m_grids[0];
for( i = 0; i < m_GridList.GetCount(); i++ )
for( i = 0; i < m_grids.size(); i++ )
{
if( m_GridList[i].m_Size == size )
if( m_grids[i].m_Size == size )
{
m_Grid = m_GridList[i];
m_Grid = m_grids[i];
return;
}
// keep trace of the nearest grill size, if the exact size is not found
if ( size.x < m_GridList[i].m_Size.x )
nearest_grid = m_GridList[i];
if ( size.x < m_grids[i].m_Size.x )
nearest_grid = m_grids[i];
}
m_Grid = nearest_grid;
@ -381,20 +385,20 @@ void BASE_SCREEN::SetGrid( const wxRealPoint& size )
/* Set grid size from command ID. */
void BASE_SCREEN::SetGrid( int id )
{
wxASSERT( !m_GridList.IsEmpty() );
wxASSERT( !m_grids.empty() );
size_t i;
for( i = 0; i < m_GridList.GetCount(); i++ )
for( i = 0; i < m_grids.size(); i++ )
{
if( m_GridList[i].m_Id == id )
if( m_grids[i].m_Id == id )
{
m_Grid = m_GridList[i];
m_Grid = m_grids[i];
return;
}
}
m_Grid = m_GridList[0];
m_Grid = m_grids[0];
wxLogWarning( wxT( "Grid ID %d not in grid list, falling back to " ) \
wxT( "grid size( %g, %g )." ), id, m_Grid.m_Size.x,
@ -406,29 +410,27 @@ void BASE_SCREEN::AddGrid( const GRID_TYPE& grid )
{
size_t i;
for( i = 0; i < m_GridList.GetCount(); i++ )
for( i = 0; i < m_grids.size(); i++ )
{
if( m_GridList[i].m_Size == grid.m_Size
&& grid.m_Id != ID_POPUP_GRID_USER )
if( m_grids[i].m_Size == grid.m_Size && grid.m_Id != ID_POPUP_GRID_USER )
{
wxLogDebug( wxT( "Discarding duplicate grid size( %g, %g )." ),
grid.m_Size.x, grid.m_Size.y );
return;
}
if( m_GridList[i].m_Id == grid.m_Id )
if( m_grids[i].m_Id == grid.m_Id )
{
wxLogDebug( wxT( "Changing grid ID %d from size( %g, %g ) to " ) \
wxT( "size( %g, %g )." ),
grid.m_Id, m_GridList[i].m_Size.x,
m_GridList[i].m_Size.y, grid.m_Size.x, grid.m_Size.y );
m_GridList[i].m_Size = grid.m_Size;
grid.m_Id, m_grids[i].m_Size.x,
m_grids[i].m_Size.y, grid.m_Size.x, grid.m_Size.y );
m_grids[i].m_Size = grid.m_Size;
return;
}
}
// wxLogDebug( wxT( "Adding grid ID %d size( %d, %d ) to grid list." ), grid.m_Id, grid.m_Size.x, grid.m_Size.y );
m_GridList.Add( grid );
m_grids.push_back( grid );
}
@ -472,18 +474,27 @@ void BASE_SCREEN::AddGrid( const wxRealPoint& size, UserUnitType aUnit, int id )
}
GRID_TYPE& BASE_SCREEN::GetGrid( size_t aIndex )
{
wxCHECK_MSG( !m_grids.empty() && aIndex < m_grids.size(), m_Grid,
wxT( "Cannot get grid object outside the bounds of the grid list." ) );
return m_grids[ aIndex ];
}
GRID_TYPE BASE_SCREEN::GetGrid()
{
return m_Grid;
}
/*********************************/
const wxPoint& BASE_SCREEN::GetGridOrigin()
/*********************************/
{
return m_GridOrigin;
}
wxRealPoint BASE_SCREEN::GetGridSize()
{
return m_Grid.m_Size;
@ -514,6 +525,7 @@ void BASE_SCREEN::PushCommandToUndoList( PICKED_ITEMS_LIST* aNewitem )
/* Delete the extra items, if count max reached */
int extraitems = GetUndoCommandCount() - m_UndoRedoCountMax;
if( extraitems > 0 ) // Delete the extra items
ClearUndoORRedoList( m_UndoList, extraitems );
}
@ -525,6 +537,7 @@ void BASE_SCREEN::PushCommandToRedoList( PICKED_ITEMS_LIST* aNewitem )
/* Delete the extra items, if count max reached */
int extraitems = GetRedoCommandCount() - m_UndoRedoCountMax;
if( extraitems > 0 ) // Delete the extra items
ClearUndoORRedoList( m_RedoList, extraitems );
}
@ -542,7 +555,7 @@ PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromRedoList( )
}
void BASE_SCREEN::AddItem( EDA_BaseStruct* aItem )
void BASE_SCREEN::AddItem( EDA_ITEM* aItem )
{
wxCHECK_RET( aItem != NULL, wxT( "Attempt to add NULL item pointer to " ) + GetClass() +
wxT( "item list" ) );
@ -550,7 +563,7 @@ void BASE_SCREEN::AddItem( EDA_BaseStruct* aItem )
}
void BASE_SCREEN::InsertItem( EDA_ITEMS::iterator aIter, EDA_BaseStruct* aItem )
void BASE_SCREEN::InsertItem( EDA_ITEMS::iterator aIter, EDA_ITEM* aItem )
{
wxCHECK_RET( aItem != NULL, wxT( "Attempt to insert NULL item pointer to " ) + GetClass() +
wxT( "item list" ) );
@ -568,11 +581,10 @@ void BASE_SCREEN::InsertItem( EDA_ITEMS::iterator aIter, EDA_BaseStruct* aItem )
*/
void BASE_SCREEN::Show( int nestLevel, std::ostream& os )
{
SCH_ITEM* item = EEDrawList;
EDA_ITEM* item = m_drawList;
// for now, make it look like XML, expand on this later.
NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() <<
">\n";
NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() << ">\n";
for( ; item; item = item->Next() )
{

214
common/base_struct.cpp
View File

@ -1,7 +1,7 @@
/****************************************/
/* Basic classes for Kicad: */
/* EDA_BaseStruct */
/* EDA_TextStruct */
/* Basic classes for Kicad: */
/* EDA_ITEM */
/* EDA_TextStruct */
/****************************************/
#include "fctsys.h"
@ -20,9 +20,7 @@ enum textbox {
};
/******************************************************************************/
EDA_BaseStruct::EDA_BaseStruct( EDA_BaseStruct* parent, KICAD_T idType )
/******************************************************************************/
EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType )
{
InitVars();
m_StructType = idType;
@ -30,16 +28,14 @@ EDA_BaseStruct::EDA_BaseStruct( EDA_BaseStruct* parent, KICAD_T idType )
}
/********************************************/
EDA_BaseStruct::EDA_BaseStruct( KICAD_T idType )
/********************************************/
EDA_ITEM::EDA_ITEM( KICAD_T idType )
{
InitVars();
m_StructType = idType;
}
EDA_BaseStruct::EDA_BaseStruct( const EDA_BaseStruct& base )
EDA_ITEM::EDA_ITEM( const EDA_ITEM& base )
{
m_StructType = base.m_StructType;
m_Parent = base.m_Parent;
@ -51,9 +47,7 @@ EDA_BaseStruct::EDA_BaseStruct( const EDA_BaseStruct& base )
}
/********************************************/
void EDA_BaseStruct::InitVars()
/********************************************/
void EDA_ITEM::InitVars()
{
m_StructType = TYPE_NOT_INIT;
Pnext = NULL; // Linked list: Link (next struct)
@ -69,13 +63,23 @@ void EDA_BaseStruct::InitVars()
}
// see base_struct.h
SEARCH_RESULT EDA_BaseStruct::IterateForward( EDA_BaseStruct* listStart,
INSPECTOR* inspector,
const void* testData,
const KICAD_T scanTypes[] )
void EDA_ITEM::SetModified()
{
EDA_BaseStruct* p = listStart;
m_Flags |= IS_CHANGED;
// If this a child object, then the parent modification state also needs to be set.
if( m_Parent )
m_Parent->SetModified();
}
// see base_struct.h
SEARCH_RESULT EDA_ITEM::IterateForward( EDA_ITEM* listStart,
INSPECTOR* inspector,
const void* testData,
const KICAD_T scanTypes[] )
{
EDA_ITEM* p = listStart;
for( ; p; p = p->Pnext )
{
@ -89,8 +93,8 @@ SEARCH_RESULT EDA_BaseStruct::IterateForward( EDA_BaseStruct* listStart,
// see base_struct.h
// many classes inherit this method, be careful:
SEARCH_RESULT EDA_BaseStruct::Visit( INSPECTOR* inspector, const void* testData,
const KICAD_T scanTypes[] )
SEARCH_RESULT EDA_ITEM::Visit( INSPECTOR* inspector, const void* testData,
const KICAD_T scanTypes[] )
{
KICAD_T stype;
@ -139,7 +143,7 @@ std::ostream& operator<<( std::ostream& out, const wxPoint& pt )
* of nesting of this object within the overall tree.
* @param os The ostream& to output to.
*/
void EDA_BaseStruct::Show( int nestLevel, std::ostream& os )
void EDA_ITEM::Show( int nestLevel, std::ostream& os ) const
{
// XML output:
wxString s = GetClass();
@ -157,7 +161,7 @@ void EDA_BaseStruct::Show( int nestLevel, std::ostream& os )
* @param os The ostream&, where to output
* @return std::ostream& - for continuation.
**/
std::ostream& EDA_BaseStruct::NestedSpace( int nestLevel, std::ostream& os )
std::ostream& EDA_ITEM::NestedSpace( int nestLevel, std::ostream& os )
{
for( int i = 0; i<nestLevel; ++i )
os << " ";
@ -182,7 +186,7 @@ EDA_TextStruct::EDA_TextStruct( const wxString& text )
m_Mirror = false; // display mirror if true
m_HJustify = GR_TEXT_HJUSTIFY_CENTER;
m_VJustify = GR_TEXT_VJUSTIFY_CENTER; /* Justifications Horiz et Vert du texte */
m_Width = 0; /* thickness */
m_Thickness = 0; /* thickness */
m_Italic = false; /* true = italic shape */
m_Bold = false;
m_MultilineAllowed = false; // Set to true only for texts that can use multiline.
@ -203,70 +207,68 @@ EDA_TextStruct::~EDA_TextStruct()
*/
int EDA_TextStruct::LenSize( const wxString& aLine ) const
{
return ReturnGraphicTextWidth(aLine, m_Size.x, m_Italic, m_Bold ) + m_Width;
return ReturnGraphicTextWidth(aLine, m_Size.x, m_Italic, m_Bold ) + m_Thickness;
}
/** Function GetTextBox
* useful in multiline texts to calculate the full text or a line area (for zones filling, locate functions....)
* @return the rect containing the line of text (i.e. the position and the size of one line)
* this rectangle is calculated for 0 orient text. if orient is not 0 the rect must be rotated to match the physical area
* @param aLine : the line of text to consider.
* for single line text, aLine is unused
* If aLine == -1, the full area (considering all lines) is returned
*/
EDA_Rect EDA_TextStruct::GetTextBox( int aLine )
EDA_Rect EDA_TextStruct::GetTextBox( int aLine, int aThickness, bool aInvertY ) const
{
EDA_Rect rect;
wxPoint pos;
wxArrayString* list = NULL;
wxString* text = &m_Text;
wxString text = m_Text;
int thickness = ( aThickness < 0 ) ? m_Thickness : aThickness;
if( m_MultilineAllowed )
{
list = wxStringSplit( m_Text, '\n' );
if ( list->GetCount() ) // GetCount() == 0 for void strings
{
if( aLine >= 0 && (aLine < (int)list->GetCount()) )
text = &list->Item( aLine );
text = list->Item( aLine );
else
text = &list->Item( 0 );
text = list->Item( 0 );
}
}
// calculate the H and V size
int dx = LenSize( *text );
int dx = LenSize( text );
int dy = GetInterline();
/* Creates bounding box (rectangle) for an horizontal text */
wxSize textsize = wxSize( dx, dy );
rect.SetOrigin( m_Pos );
if( aInvertY )
rect.SetOrigin( m_Pos.x, -m_Pos.y );
else
rect.SetOrigin( m_Pos );
// extra dy interval for letters like j and y and ]
int extra_dy = dy - m_Size.y;
rect.Move(wxPoint(0, -extra_dy/2 ) ); // move origin by the half extra interval
rect.Move( wxPoint( 0, -extra_dy / 2 ) ); // move origin by the half extra interval
// for multiline texts and aLine < 0, merge all rectangles
if( m_MultilineAllowed && list && aLine < 0 )
{
for( unsigned ii = 1; ii < list->GetCount(); ii++ )
{
text = &list->Item( ii );
dx = LenSize( *text );
text = list->Item( ii );
dx = LenSize( text );
textsize.x = MAX( textsize.x, dx );
textsize.y += dy;
}
}
delete list;
rect.SetSize( textsize );
rect.Inflate( m_Width/2 ); // ensure a small margin
rect.Inflate( thickness / 2 ); // ensure a small margin
/* Now, calculate the rect origin, according to text justification
* At this point the rectangle origin is the text origin (m_Pos).
* This is true only for left and top text justified texts (using top to bottom Y axis orientation).
* and must be recalculated for others justifications
* This is true only for left and top text justified texts (using top to bottom Y axis
* orientation). and must be recalculated for others justifications
* also, note the V justification is relative to the first line
*/
switch( m_HJustify )
@ -283,7 +285,8 @@ EDA_Rect EDA_TextStruct::GetTextBox( int aLine )
break;
}
dy = m_Size.y + m_Width;
dy = m_Size.y + thickness;
switch( m_VJustify )
{
case GR_TEXT_VJUSTIFY_TOP:
@ -299,46 +302,36 @@ EDA_Rect EDA_TextStruct::GetTextBox( int aLine )
}
rect.Normalize(); // Make h and v sizes always >= 0
return rect;
}
/*************************************************/
bool EDA_TextStruct::TextHitTest( const wxPoint& posref )
/*************************************************/
/**
* Function TextHitTest (overlayed)
* tests if the given point is inside this object.
* @param posref point to test
* @return bool - true if a hit, else false
*/
bool EDA_TextStruct::TextHitTest( const wxPoint& aPoint, int aAccuracy ) const
{
EDA_Rect rect = GetTextBox( -1 ); // Get the full text area.
wxPoint location = aPoint;
/* Is the ref point inside the text area ? */
wxPoint location = posref;
rect.Inflate( aAccuracy );
RotatePoint( &location, m_Pos, -m_Orient );
return rect.Inside ( location);
return rect.Inside( location );
}
/**
* Function TextHitTest (overlayed)
* tests if the given EDA_Rect intersect this object.
* @param refArea the given EDA_Rect to test
* @return bool - true if a hit, else false
*/
/*********************************************************/
bool EDA_TextStruct::TextHitTest( EDA_Rect& refArea )
/*********************************************************/
bool EDA_TextStruct::TextHitTest( const EDA_Rect& aRect, bool aContains, int aAccuracy ) const
{
if( refArea.Inside( m_Pos ) )
return true;
return false;
EDA_Rect rect = aRect;
rect.Inflate( aAccuracy );
if( aContains )
return rect.Inside( GetTextBox( -1 ) );
return rect.Intersects( GetTextBox( -1 ) );
}
/***************************************************************/
void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
const wxPoint& aOffset, EDA_Colors aColor,
@ -346,7 +339,8 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
GRTraceMode aFillMode, EDA_Colors aAnchor_color )
/***************************************************************/
/** Function Draw
/**
* Function Draw
* Draws this, that can be a multiline text
* @param aPanel = the current DrawPanel
* @param aDC = the current Device Context
@ -397,7 +391,8 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
}
/** Function DrawOneLineOfText
/**
* Function DrawOneLineOfText
* Draw a single text line.
* Used to draw each line of this EDA_TextStruct, that can be multiline
* @param aPanel = the current DrawPanel
@ -416,7 +411,7 @@ void EDA_TextStruct::DrawOneLineOfText( WinEDA_DrawPanel* aPanel, wxDC* aDC,
GRTraceMode aFillMode, EDA_Colors aAnchor_color,
wxString& aText, wxPoint aPos )
{
int width = m_Width;
int width = m_Thickness;
if( aFillMode == FILAIRE )
width = 0;
@ -460,6 +455,27 @@ void EDA_TextStruct::DrawOneLineOfText( WinEDA_DrawPanel* aPanel, wxDC* aDC,
m_HJustify, m_VJustify, width, m_Italic, m_Bold );
}
/**
* Function GetStyleName
* @return a wwString withe the style name( Normal, Italic, Bold, Bold+Italic)
*/
wxString EDA_TextStruct::GetTextStyleName()
{
int style = 0;
if( m_Italic )
style = 1;
if( m_Bold )
style += 2;
wxString stylemsg[4] = {
_("Normal"),
_("Italic"),
_("Bold"),
_("Bold+Italic")
};
return stylemsg[style];
}
/******************/
/* Class EDA_Rect */
@ -485,7 +501,8 @@ void EDA_Rect::Normalize()
/** Function Move
/**
* Function Move
* Move this rectangle by the aMoveVector value (this is a relative move)
* @param aMoveVector = a wxPoint that is the value to move this rectangle
*/
@ -494,13 +511,11 @@ void EDA_Rect::Move( const wxPoint& aMoveVector )
m_Pos += aMoveVector;
}
/*******************************************/
bool EDA_Rect::Inside( const wxPoint& point )
/*******************************************/
/* Return TRUE if point is in Rect
* Accept rect size < 0
*/
bool EDA_Rect::Inside( const wxPoint& point ) const
{
int rel_posx = point.x - m_Pos.x;
int rel_posy = point.y - m_Pos.y;
@ -518,10 +533,16 @@ bool EDA_Rect::Inside( const wxPoint& point )
rel_posy += size.y;
}
return (rel_posx >= 0) && (rel_posy >= 0)
&& ( rel_posy <= size.y)
&& ( rel_posx <= size.x)
;
return (rel_posx >= 0) && (rel_posy >= 0) && ( rel_posy <= size.y) && ( rel_posx <= size.x);
}
bool EDA_Rect::Inside( const EDA_Rect& aRect ) const
{
wxRect rect = aRect;
wxRect me = wxRect();
return me.Contains( rect );
}
@ -548,7 +569,8 @@ bool EDA_Rect::Intersects( const EDA_Rect aRect ) const
EDA_Rect& EDA_Rect::Inflate( int aDelta )
/**************************************************/
/** Function Inflate
/**
* Function Inflate
* Inflate "this": move each horizontal edgeand each vertical edge by aDelta
* toward rect outside
* if aDelta is negative, move toward rect inside (deflate)
@ -564,7 +586,8 @@ EDA_Rect& EDA_Rect::Inflate( int aDelta )
EDA_Rect& EDA_Rect::Inflate( wxCoord dx, wxCoord dy )
/**************************************************/
/** Function Inflate
/**
* Function Inflate
* Inflate "this": move each horizontal edge by dx and each vertical edge by dy
* toward rect outside
* if dx and/or dy is negative, move toward rect inside (deflate)
@ -660,3 +683,22 @@ void EDA_Rect::Merge( const EDA_Rect& aRect )
end.y = MAX( end.y, rect_end.y );
SetEnd( end );
}
/**
* Function Merge
* modifies Position and Size of this in order to contain the given point
* mainly used to calculate bounding boxes
* @param aPoint = given point to merge with this
*/
void EDA_Rect::Merge( const wxPoint& aPoint )
{
Normalize(); // ensure width and height >= 0
wxPoint end = GetEnd();
// Change origin and size in order to contain the given rect
m_Pos.x = MIN( m_Pos.x, aPoint.x );
m_Pos.y = MIN( m_Pos.y, aPoint.y );
end.x = MAX( end.x, aPoint.x );
end.y = MAX( end.y, aPoint.y );
SetEnd( end );
}

3
common/basicframe.cpp
View File

@ -83,7 +83,8 @@ void WinEDA_BasicFrame::ReCreateMenuBar()
}
/** Virtual function SetLanguage
/**
* Function SetLanguage (virtual)
* called on a language menu selection
* when using a derived function, do not forget to call this one
*/

12
common/bezier_curves.cpp
View File

@ -36,24 +36,12 @@ static void recursive_bezier( int x1,
/***********************************************************************************/
/**
* Function Bezier2Poly
* convert a Bezier curve to a polyline
* @return a std::vector<wxPoint> containing the points of the polyline
* @param C1, c2, c3, c4 = wxPoints of the Bezier curve
*/
std::vector<wxPoint> Bezier2Poly( wxPoint c1, wxPoint c2, wxPoint c3, wxPoint c4 )
{
return Bezier2Poly( c1.x, c1.y, c2.x, c2.y, c3.x, c3.y, c4.x, c4.y );
}
/**
* Function Bezier2Poly
* convert a Bezier curve to a polyline
* @return a std::vector<wxPoint> containing the points of the polyline
* @param C1, c2, c3 = wxPoints of the Bezier curve
*/
std::vector<wxPoint> Bezier2Poly( wxPoint c1, wxPoint c2, wxPoint c3 )
{
return Bezier2Poly( c1.x, c1.y, c2.x, c2.y, c3.x, c3.y );

18
common/block_commande.cpp
View File

@ -16,7 +16,7 @@
BLOCK_SELECTOR::BLOCK_SELECTOR() :
EDA_BaseStruct( BLOCK_LOCATE_STRUCT_TYPE ),
EDA_ITEM( BLOCK_LOCATE_STRUCT_TYPE ),
EDA_Rect()
{
m_State = STATE_NO_BLOCK; /* State (enum BlockState) of block. */
@ -115,7 +115,8 @@ void BLOCK_SELECTOR::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
}
/** function InitData
/**
* Function InitData
* Init the initial values of a BLOCK_SELECTOR, before starting a block command
*/
void BLOCK_SELECTOR::InitData( WinEDA_DrawPanel* aPanel,
@ -130,8 +131,9 @@ void BLOCK_SELECTOR::InitData( WinEDA_DrawPanel* aPanel,
}
/** Function ClearItemsList
* delete only the list of EDA_BaseStruct * pointers, NOT the pointed data
/**
* Function ClearItemsList
* delete only the list of EDA_ITEM * pointers, NOT the pointed data
* itself
*/
void BLOCK_SELECTOR::ClearItemsList()
@ -139,8 +141,9 @@ void BLOCK_SELECTOR::ClearItemsList()
m_ItemsSelection.ClearItemsList();
}
/** Function ClearListAndDeleteItems
* delete only the list of EDA_BaseStruct * pointers, AND the data pinted
/**
* Function ClearListAndDeleteItems
* delete only the list of EDA_ITEM * pointers, AND the data pinted
* by m_Item
*/
void BLOCK_SELECTOR::ClearListAndDeleteItems()
@ -148,7 +151,8 @@ void BLOCK_SELECTOR::ClearListAndDeleteItems()
m_ItemsSelection.ClearListAndDeleteItems();
}
/** Function PushItem
/**
* Function PushItem
* Add aItem to the list of items
* @param aItem = an ITEM_PICKER to add to the list
*/

5
common/build_version.cpp
View File

@ -6,14 +6,15 @@
#endif
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2010-04-19 BZR 23xx)"
#define KICAD_BUILD_VERSION "(2010-12-10 BZR 26xx)"
#endif
//#define VERSION_STABILITY "stable"
#define VERSION_STABILITY "testing"
/** Function GetBuildVersion()
/**
* Function GetBuildVersion
* Return the build date and version
*/
wxString GetBuildVersion()

1
common/class_layerchoicebox.cpp
View File

@ -5,7 +5,6 @@
#include "colors_selection.h"
#include "bitmaps.h"
#include "pcbnew_id.h"
#include "hotkeys.h"
#include "help_common_strings.h"

17
common/class_marker_base.cpp
View File

@ -112,17 +112,16 @@ void MARKER_BASE::SetData( int aErrorCode, const wxPoint& aMarkerPos,
}
/******************************************************/
bool MARKER_BASE::HitTestMarker( const wxPoint& refPos )
/******************************************************/
bool MARKER_BASE::HitTestMarker( const wxPoint& refPos ) const
{
wxPoint rel_pos = refPos - m_Pos;
rel_pos.x /= m_ScalingFactor;
rel_pos.y /= m_ScalingFactor;
return m_ShapeBoundingBox.Inside(rel_pos);
return m_ShapeBoundingBox.Inside( rel_pos );
}
/**
* Function GetBoundingBoxMarker
* returns the orthogonal, bounding box of this object for display purposes.
@ -130,7 +129,7 @@ bool MARKER_BASE::HitTestMarker( const wxPoint& refPos )
* object, and the units should be in the pcb or schematic coordinate system.
* It is OK to overestimate the size by a few counts.
*/
EDA_Rect MARKER_BASE::GetBoundingBoxMarker()
EDA_Rect MARKER_BASE::GetBoundingBoxMarker() const
{
wxSize realsize = m_ShapeBoundingBox.GetSize();
wxPoint realposition = m_ShapeBoundingBox.GetPosition();
@ -139,7 +138,7 @@ EDA_Rect MARKER_BASE::GetBoundingBoxMarker()
realposition.x *= m_ScalingFactor;
realposition.y *= m_ScalingFactor;
realposition += m_Pos;
return EDA_Rect( m_Pos,realsize );
return EDA_Rect( m_Pos, realsize );
}
/**********************************************************************/
@ -147,7 +146,8 @@ void MARKER_BASE::DrawMarker( WinEDA_DrawPanel* aPanel, wxDC* aDC, int aDrawMode
const wxPoint& aOffset )
/**********************************************************************/
/** Function DrawMarker
/**
* Function DrawMarker
* The shape is the polygon defined in m_Corners (array of wxPoints)
*/
{
@ -172,7 +172,8 @@ void MARKER_BASE::DrawMarker( WinEDA_DrawPanel* aPanel, wxDC* aDC, int aDrawMode
}
/** Function DisplayMarkerInfo()
/**
* Function DisplayMarkerInfo
* Displays the full info of this marker, within an HTML window
*/
void MARKER_BASE::DisplayMarkerInfo( WinEDA_DrawFrame* aFrame )

4
common/class_plotter.cpp
View File

@ -28,7 +28,7 @@ PLOTTER::PLOTTER( PlotFormat aPlotType )
default_pen_width = 0;
current_pen_width = -1; /* To-be-set marker */
pen_state = 'Z'; /* End-of-path idle */
plot_orient_options = 0; /* Mirror flag */
plotMirror = 0; /* Mirror flag */
output_file = 0;
color_mode = false; /* Start as a BW plot */
negative_mode = false;
@ -43,7 +43,7 @@ void PLOTTER::user_to_device_coordinates( wxPoint& pos )
{
pos.x = (int) ( (pos.x - plot_offset.x) * plot_scale * device_scale );
if( plot_orient_options == PLOT_MIROIR )
if( plotMirror )
pos.y = (int) ( ( pos.y - plot_offset.y ) * plot_scale * device_scale );
else
pos.y = (int) ( ( paper_size.y - ( pos.y - plot_offset.y )

64
common/class_undoredo_container.cpp
View File

@ -31,7 +31,7 @@
#include "class_undoredo_container.h"
ITEM_PICKER::ITEM_PICKER( EDA_BaseStruct* aItem, UndoRedoOpType aUndoRedoStatus )
ITEM_PICKER::ITEM_PICKER( EDA_ITEM* aItem, UndoRedoOpType aUndoRedoStatus )
{
m_UndoRedoStatus = aUndoRedoStatus;
m_PickedItem = aItem;
@ -78,7 +78,8 @@ ITEM_PICKER PICKED_ITEMS_LIST::PopItem()
}
/** Function ClearItemsList
/**
* Function ClearItemsList
* delete only the list of pickers, NOT the picked data itself
*/
void PICKED_ITEMS_LIST::ClearItemsList()
@ -87,7 +88,8 @@ void PICKED_ITEMS_LIST::ClearItemsList()
}
/** Function ClearListAndDeleteItems
/**
* Function ClearListAndDeleteItems
* delete the list of pickers, AND the data pointed
* by m_PickedItem or m_PickedItemLink, according to the type of undo/redo command recorded
*/
@ -113,11 +115,12 @@ void PICKED_ITEMS_LIST::ClearListAndDeleteItems()
{
// Specific to eeschema: a linked list of wires is stored.
// the wrapper picks only the first item (head of list), and is owner of all picked items
EDA_BaseStruct* item = wrapper.m_PickedItem;
EDA_ITEM* item = wrapper.m_PickedItem;
while( item )
{
// Delete old copy of wires
EDA_BaseStruct* nextitem = item->Next();
EDA_ITEM* nextitem = item->Next();
delete item;
item = nextitem;
}
@ -161,7 +164,8 @@ void PICKED_ITEMS_LIST::ClearListAndDeleteItems()
}
/** function GetItemWrapper
/**
* Function GetItemWrapper
* @return the picker of a picked item
* @param aIdx = index of the picker in the picked list
* if this picker does not exist, a picker is returned,
@ -178,11 +182,12 @@ ITEM_PICKER PICKED_ITEMS_LIST::GetItemWrapper( unsigned int aIdx )
}
/** function GetPickedItem
/**
* Function GetPickedItem
* @return a pointer to the picked item, or null if does not exist
* @param aIdx = index of the picked item in the picked list
*/
EDA_BaseStruct* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx )
EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx )
{
if( aIdx < m_ItemsList.size() )
return m_ItemsList[aIdx].m_PickedItem;
@ -191,11 +196,12 @@ EDA_BaseStruct* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx )
}
/** function GetPickedItemLink
/**
* Function GetPickedItemLink
* @return link of the picked item, or null if does not exist
* @param aIdx = index of the picked item in the picked list
*/
EDA_BaseStruct* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx )
EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx )
{
if( aIdx < m_ItemsList.size() )
return m_ItemsList[aIdx].m_Link;
@ -204,7 +210,8 @@ EDA_BaseStruct* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx )
}
/** function GetPickedItemStatus
/**
* Function GetPickedItemStatus
* @return the type of undo/redo opertaion associated to the picked item,
* or UR_UNSPECIFIED if does not exist
* @param aIdx = index of the picked item in the picked list
@ -217,7 +224,8 @@ UndoRedoOpType PICKED_ITEMS_LIST::GetPickedItemStatus( unsigned int aIdx )
return UR_UNSPECIFIED;
}
/** function GetPickerFlags
/**
* Function GetPickerFlags
* return the value of the picker flag
* @param aIdx = index of the picker in the picked list
* @return the value stored in the picker, if the picker exists, or 0 if does not exist
@ -230,12 +238,13 @@ int PICKED_ITEMS_LIST::GetPickerFlags( unsigned aIdx )
return 0;
}
/** function SetPickedItem
/**
* Function SetPickedItem
* @param aItem = a pointer to the item to pick
* @param aIdx = index of the picker in the picked list
* @return true if the picker exists, or false if does not exist
*/
bool PICKED_ITEMS_LIST::SetPickedItem( EDA_BaseStruct* aItem, unsigned aIdx )
bool PICKED_ITEMS_LIST::SetPickedItem( EDA_ITEM* aItem, unsigned aIdx )
{
if( aIdx < m_ItemsList.size() )
{
@ -247,13 +256,14 @@ bool PICKED_ITEMS_LIST::SetPickedItem( EDA_BaseStruct* aItem, unsigned aIdx )
}
/** function SetPickedItemLink
/**
* Function SetPickedItemLink
* Set the link associated to a given picked item
* @param aLink = the link to the item associated to the picked item
* @param aIdx = index of the picker in the picked list
* @return true if the picker exists, or false if does not exist
*/
bool PICKED_ITEMS_LIST::SetPickedItemLink( EDA_BaseStruct* aLink, unsigned aIdx )
bool PICKED_ITEMS_LIST::SetPickedItemLink( EDA_ITEM* aLink, unsigned aIdx )
{
if( aIdx < m_ItemsList.size() )
{
@ -265,15 +275,14 @@ bool PICKED_ITEMS_LIST::SetPickedItemLink( EDA_BaseStruct* aLink, unsigned aIdx
}
/** function SetPickedItem
/**
* Function SetPickedItem
* @param aItem = a pointer to the item to pick
* @param aStatus = the type of undo/redo operation associated to the item to pick
* @param aIdx = index of the picker in the picked list
* @return true if the picker exists, or false if does not exist
*/
bool PICKED_ITEMS_LIST::SetPickedItem( EDA_BaseStruct* aItem,
UndoRedoOpType aStatus,
unsigned aIdx )
bool PICKED_ITEMS_LIST::SetPickedItem( EDA_ITEM* aItem, UndoRedoOpType aStatus, unsigned aIdx )
{
if( aIdx < m_ItemsList.size() )
{
@ -286,7 +295,8 @@ bool PICKED_ITEMS_LIST::SetPickedItem( EDA_BaseStruct* aItem,
}
/** function SetPickedItemStatus
/**
* Function SetPickedItemStatus
* Set the the type of undo/redo operation for a given picked item
* @param aStatus = the type of undo/redo operation associated to the picked item
* @param aIdx = index of the picker in the picked list
@ -302,7 +312,8 @@ bool PICKED_ITEMS_LIST::SetPickedItemStatus( UndoRedoOpType aStatus, unsigned aI
else
return false;
}
/** function SetPickerFlags
/**
* Function SetPickerFlags
* Set the flags of the picker (usually to the picked item m_Flags value)
* @param aFlags = the value to save in picker
* @param aIdx = index of the picker in the picked list
@ -320,7 +331,8 @@ bool PICKED_ITEMS_LIST::SetPickerFlags( int aFlags, unsigned aIdx )
}
/** function RemovePicker
/**
* Function RemovePicker
* rem<EFBFBD>ove one entry (one picker) from the list of picked items
* @param aIdx = index of the picker in the picked list
* @return true if ok, or false if did not exist
@ -334,7 +346,8 @@ bool PICKED_ITEMS_LIST::RemovePicker( unsigned aIdx )
}
/** Function CopyList
/**
* Function CopyList
* copy all data from aSource
* Picked items are not copied. just pointers on them are copied
*/
@ -343,7 +356,8 @@ void PICKED_ITEMS_LIST::CopyList( const PICKED_ITEMS_LIST& aSource )
m_ItemsList = aSource.m_ItemsList; // Vector's copy
}
/** function ReversePickersListOrder()
/**
* Function ReversePickersListOrder
* reverses the order of pickers stored in this list
* Useful when pop a list from Undo to Redo (and vice-versa)
* because sometimes undo (or redo) a command needs to keep the

12
common/common.cpp
View File

@ -119,7 +119,8 @@ StructColors ColorRefs[NBCOLOR] =
{ 128, 255, 255, LIGHTYELLOW, wxT( "LIGHTYELLOW" ), LIGHTYELLOW }
};
/** Function to use local notation or C standard notation for floating point numbers
/**
* Function to use local notation or C standard notation for floating point numbers
* some countries use 1,5 and others (and C) 1.5
* so we switch from local to C and C to local when reading or writing files
* And other problem is a bug when cross compiling under linux:
@ -130,7 +131,8 @@ StructColors ColorRefs[NBCOLOR] =
bool g_DisableFloatingPointLocalNotation = false;
/** function SetLocaleTo_C_standard
/**
* Function SetLocaleTo_C_standard
* because kicad is internationalized, switch internalization to "C" standard
* i.e. uses the . (dot) as separator in print/read float numbers
* (some countries (France, Germany ..) use , (comma) as separator)
@ -147,7 +149,8 @@ void SetLocaleTo_C_standard( void )
}
/** function SetLocaleTo_Default
/**
* Function SetLocaleTo_Default
* because kicad is internationalized, switch internalization to default
* to use the default separator in print/read float numbers
* (. (dot) but some countries (France, Germany ..) use , (comma) as separator)
@ -334,7 +337,8 @@ int ReturnValueFromTextCtrl( const wxTextCtrl& TextCtr, int Internal_Unit )
}
/** Function ReturnStringFromValue
/**
* Function ReturnStringFromValue
* Return the string from Value, according to units (inch, mm ...) for display,
* and the initial unit for value
* @param aUnit = display units (INCHES, MILLIMETRE ..)

12
common/common_plotDXF_functions.cpp
View File

@ -14,15 +14,14 @@
/* Set the plot offset for the current plotting
*/
void DXF_PLOTTER::set_viewport( wxPoint offset,
double aScale, int orient )
void DXF_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror )
{
wxASSERT( !output_file );
plot_offset = offset;
plot_offset = aOffset;
plot_scale = aScale;
device_scale = 1;
set_default_line_width( 0 ); /* No line width on DXF */
plot_orient_options = 0; /* No mirroring on DXF */
plotMirror = false; /* No mirroring on DXF */
current_color = BLACK;
}
@ -111,7 +110,7 @@ void DXF_PLOTTER::circle( wxPoint centre, int diameter, FILL_T fill, int width )
fprintf( output_file, "0\nVERTEX\n8\n%s\n", CONV_TO_UTF8( cname ));
fprintf( output_file, "10\n%d.0\n 20\n%d.0\n42\n1.0\n", centre.x+r,centre.y);
fprintf( output_file, "0\nSEQEND\n");
}
}
}
}
@ -175,7 +174,8 @@ void DXF_PLOTTER::set_dash( bool dashed )
}
/** Function Plot a filled segment (track)
/**
* Function Plot a filled segment (track)
* @param start = starting point
* @param end = ending point
* @param aWidth = segment width (thickness)

35
common/common_plotGERBER_functions.cpp
View File

@ -15,18 +15,19 @@
#include "build_version.h"
/** function set_viewport
/**
* Function set_viewport
* Set the plot offset for the current plotting
* @param aOffset = plot offset
* @param aScale = coordinate scale (scale coefficient for coordinates)
* @param aMirror - Mirror plot if true.
*/
void GERBER_PLOTTER::set_viewport( wxPoint offset,
double aScale, int orient )
void GERBER_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror )
{
wxASSERT( !output_file );
wxASSERT( orient == 0 );
plot_orient_options = 0;
plot_offset = offset;
wxASSERT( aMirror == false );
plotMirror = false;
plot_offset = aOffset;
wxASSERT( aScale == 1 );
plot_scale = 1;
device_scale = 1;
@ -34,7 +35,8 @@ void GERBER_PLOTTER::set_viewport( wxPoint offset,
}
/** Function start_plot
/**
* Function start_plot
* Write GERBER header to file
* initialize global variable g_Plot_PlotOutputFile
* @param aFile: an opened file to write to
@ -259,7 +261,8 @@ void GERBER_PLOTTER::rect( wxPoint p1, wxPoint p2, FILL_T fill, int width )
}
/** Function circle
/**
* Function circle
* writes a non filled circle to output file
* Plot one circle as segments (6 to 16 depending on its radius
* @param aCentre = center coordinates
@ -290,15 +293,15 @@ void GERBER_PLOTTER::circle( wxPoint aCentre, int aDiameter, FILL_T fill,
}
/** Function PlotFilledPolygon_GERBER
/**
* Function PlotFilledPolygon_GERBER
* writes a filled polyline to output file
* @param aCornersCount = number of corners
* @param aCoord = buffer of corners coordinates
* @param aFill = plot option (NO_FILL, FILLED_SHAPE, FILLED_WITH_BG_BODYCOLOR)
* @param aCoord = buffer of corners coordinates
* @param aWidth = Width of the line to plot.
*/
void GERBER_PLOTTER::poly( int aCornersCount, int* aCoord, FILL_T aFill,
int aWidth )
void GERBER_PLOTTER::poly( int aCornersCount, int* aCoord, FILL_T aFill, int aWidth )
{
wxASSERT( output_file );
wxPoint pos, startpos;
@ -500,3 +503,11 @@ void GERBER_PLOTTER::flash_pad_rect( wxPoint pos, wxSize size,
set_current_line_width( -1 );
poly( 5, &polygon[0].x, aTrace_Mode==FILLED ? FILLED_SHAPE : NO_FILL );
}
void GERBER_PLOTTER::SetLayerPolarity( bool aPositive )
{
if( aPositive )
fprintf( output_file, "%%LPD*%%\n" );
else
fprintf( output_file, "%%LPC*%%\n" );
}

18
common/common_plotHPGL_functions.cpp
View File

@ -17,14 +17,14 @@ const double SCALE_HPGL = 0.102041;
/* Set the plot offset for the current plotting
*/
void HPGL_PLOTTER::set_viewport( wxPoint offset, double aScale, int orient )
void HPGL_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror )
{
wxASSERT( !output_file );
plot_offset = offset;
plot_offset = aOffset;
plot_scale = aScale;
device_scale = SCALE_HPGL;
set_default_line_width( 100 ); /* default line width in 1 / 1000 inch */
plot_orient_options = orient;
plotMirror = aMirror;
}
@ -166,14 +166,14 @@ void HPGL_PLOTTER::set_dash( bool dashed )
}
/** Function Plot a filled segment (track)
/**
* Function Plot a filled segment (track)
* @param start = starting point
* @param end = ending point
* @param aWidth = segment width (thickness)
* @param aPlotMode = FILLED, SKETCH ..
* @param width = segment width (thickness)
* @param tracemode = FILLED, SKETCH ..
*/
void HPGL_PLOTTER::thick_segment( wxPoint start, wxPoint end, int width,
GRTraceMode tracemode )
void HPGL_PLOTTER::thick_segment( wxPoint start, wxPoint end, int width, GRTraceMode tracemode )
{
wxASSERT( output_file );
wxPoint center;
@ -212,7 +212,7 @@ void HPGL_PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int rayon,
cpos = centre;
user_to_device_coordinates( cpos );
if( plot_orient_options == PLOT_MIROIR )
if( plotMirror )
angle = (StAngle - EndAngle) / 10.0;
else
angle = (EndAngle - StAngle) / 10.0;

11
common/common_plotPS_functions.cpp
View File

@ -13,11 +13,11 @@
/* Set the plot offset for the current plotting */
void PS_PLOTTER::set_viewport( wxPoint offset, double aScale, int orient )
void PS_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror )
{
wxASSERT( !output_file );
plot_orient_options = orient;
plot_offset = offset;
plotMirror = aMirror;
plot_offset = aOffset;
plot_scale = aScale;
device_scale = 1; /* PS references in decimals */
set_default_line_width( 100 ); /* default line width in 1/1000 inch */
@ -157,7 +157,7 @@ void PS_PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int radius,
// Calculate start point.
user_to_device_coordinates( centre );
radius = wxRound( user_to_device_size( radius ) );
if( plot_orient_options == PLOT_MIROIR )
if( plotMirror )
fprintf( output_file, "%d %d %d %g %g arc%d\n", centre.x, centre.y,
radius, (double) -EndAngle / 10, (double) -StAngle / 10,
fill );
@ -168,7 +168,8 @@ void PS_PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int radius,
}
/** Function poly
/**
* Function poly
* @brief Draw a polygon ( a filled polygon if fill == 1 ) in POSTSCRIPT format
* @param nb_segm = corner count
* @param coord = corner list (a corner uses 2 int = X coordinate followed by Y

22
common/dialog_about/AboutDialog_main.cpp
View File

@ -13,10 +13,10 @@
/* Used icons:
* lang_xx_xpm[]; // Icons of various national flags
* show_3d_xpm[]; // 3D icon
* lang_xx_xpm[]; // Icons of various national flags
* show_3d_xpm[]; // 3D icon
* edit_module_xpm[];
* kicad_icon_xpm[]; // Icon of the application
* kicad_icon_xpm[]; // Icon of the application
*/
#include "bitmaps.h"
#include "wxstruct.h"
@ -36,7 +36,7 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
/**
* Initializes the <code>AboutAppInfo</code> object with applicaion specific information.
*
* @info is the object which holds all information about the application
* This the object which holds all information about the application
*/
static void InitKiCadAboutNew( AboutAppInfo& info )
{
@ -73,7 +73,14 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
#else
<< wxT( " Ansi " );
#endif
libVersion << wxT( "and " )
#if USE_BOOST_POLYGON_LIBRARY
<< wxT( "boost::polygon" );
#else
<< wxT( "kbool library" );
#endif
libVersion << wxT( "\n" );
/* Operating System Information */
@ -281,8 +288,8 @@ bool ShowAboutDialog( wxWindow* parent )
* Wraps the given url with a HTML anchor tag containing a hyperlink text reference
* to form a HTML hyperlink.
*
* @url the url that will be embedded in an anchor tag containing a hyperlink reference
* @description the optional describing text that will be represented as a hyperlink.
* @param url the url that will be embedded in an anchor tag containing a hyperlink reference
* @param description the optional describing text that will be represented as a hyperlink.
* If not specified the url will be used as hyperlink.
* @return a HTML conform hyperlink like <a href='url'>description</a>
*/
@ -302,7 +309,8 @@ static wxString HtmlHyperlink( const wxString& url, const wxString& description
/**
* Creates a HTML newline character sequence.
*
* @amount the amount of HTML newline tags to concatenate, default is to return just one <br> tag
* @param amount - the amount of HTML newline tags to concatenate, default is to return just
* one <br> tag
* @return the concatenated amount of HTML newline tag(s) <br>
*/
static wxString HtmlNewline( const unsigned int amount )

0
common/dialog_display_info_HTML_base.cpp → common/dialogs/dialog_display_info_HTML_base.cpp
View File

0
common/dialog_display_info_HTML_base.fbp → common/dialogs/dialog_display_info_HTML_base.fbp
View File

0
common/dialog_display_info_HTML_base.h → common/dialogs/dialog_display_info_HTML_base.h
View File

167
common/dialogs/dialog_get_component.cpp Normal file
View File

@ -0,0 +1,167 @@
/*********************************/
/* dialog_get_component.cpp */
/*********************************/
#include "fctsys.h"
//#include "gr_basic.h"
#include "common.h"
#include "macros.h"
#include "wxstruct.h"
#include "dialog_get_component.h"
/****************************************************************************/
/* Show a dialog frame to choose a name from an history list, or a new name */
/* to select a component or a module */
/****************************************************************************/
static unsigned s_HistoryMaxCount = 8; // Max number of items displayed in history list
/*
* Dialog frame to choose a component or a footprint
* This dialog shows an history of last selected items
*/
DIALOG_GET_COMPONENT::DIALOG_GET_COMPONENT( WinEDA_DrawFrame* parent,
const wxPoint& framepos,
wxArrayString& HistoryList,
const wxString& Title,
bool show_extra_tool ) :
DIALOG_GET_COMPONENT_BASE( parent, -1, Title, framepos )
{
#ifdef __WXMAC__
m_auxToolSelector = false;
#else
m_auxToolSelector = show_extra_tool;
#endif
initDialog( HistoryList );
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
}
void DIALOG_GET_COMPONENT::initDialog( wxArrayString& aHistoryList )
{
SetFocus();
m_GetExtraFunction = false;
m_historyList->Append( aHistoryList );
if( !m_auxToolSelector )
{
m_buttonBrowse->Show( false );
m_buttonBrowse->Enable( false );
}
}
void DIALOG_GET_COMPONENT::OnCancel( wxCommandEvent& event )
{
m_Text = wxEmptyString;
EndModal( wxID_CANCEL );
}
void DIALOG_GET_COMPONENT::Accept( wxCommandEvent& event )
{
switch( event.GetId() )
{
case ID_SEL_BY_LISTBOX:
m_Text = m_historyList->GetStringSelection();
break;
case wxID_OK:
m_Text = m_textCmpNameCtrl->GetValue();
break;
case ID_ACCEPT_KEYWORD:
m_Text = wxT( "= " ) + m_textCmpNameCtrl->GetValue();
break;
case ID_LIST_ALL:
m_Text = wxT( "*" );
break;
}
m_Text.Trim( false ); // Remove blanks at beginning
m_Text.Trim( true ); // Remove blanks at end
EndModal( wxID_OK );
}
/* Get the component name by the extra function */
void DIALOG_GET_COMPONENT::GetExtraSelection( wxCommandEvent& event )
{
m_GetExtraFunction = true;
EndModal( wxID_OK );
}
// Return the component name selected by the dialog
wxString DIALOG_GET_COMPONENT::GetComponentName( void )
{
return m_Text;
}
/* Initialize the default component name default choice
*/
void DIALOG_GET_COMPONENT::SetComponentName( const wxString& name )
{
if( m_textCmpNameCtrl )
{
m_textCmpNameCtrl->SetValue( name );
m_textCmpNameCtrl->SetSelection(-1, -1);
}
}
wxPoint GetComponentDialogPosition( void )
{
wxPoint pos;
int x, y, w, h;
pos = wxGetMousePosition();
wxClientDisplayRect( &x, &y, &w, &h );
pos.x -= 100;
pos.y -= 50;
if( pos.x < x )
pos.x = x;
if( pos.y < y )
pos.y = y;
if( pos.x < x )
pos.x = x;
x += w - 350;
if( pos.x > x )
pos.x = x;
if( pos.y < y )
pos.y = y;
return pos;
}
/*
* Add the string "aName" to the history list aHistoryList
*/
void AddHistoryComponentName( wxArrayString& aHistoryList, const wxString& aName )
{
if( ( aHistoryList.GetCount() > 0 ) && ( aName == aHistoryList[0] ) )
return;
/* remove an old identical name if exists */
for( unsigned ii = 1; ii < aHistoryList.GetCount(); ii++ )
{
if( aName == aHistoryList[ii] )
{
aHistoryList.RemoveAt( ii );
ii--;
}
}
// Add the new name at the beginning of the history list
aHistoryList.Insert(aName, 0);
// Remove extra names
while( aHistoryList.GetCount() >= s_HistoryMaxCount )
aHistoryList.RemoveAt( aHistoryList.GetCount()-1 );
}

85
common/dialogs/dialog_get_component_base.cpp Normal file
View File

@ -0,0 +1,85 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_get_component_base.h"
///////////////////////////////////////////////////////////////////////////
DIALOG_GET_COMPONENT_BASE::DIALOG_GET_COMPONENT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerMain;
bSizerMain = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizerLeft;
bSizerLeft = new wxBoxSizer( wxVERTICAL );
m_staticTextName = new wxStaticText( this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextName->Wrap( -1 );
bSizerLeft->Add( m_staticTextName, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCmpNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerLeft->Add( m_textCmpNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_staticTextHistory = new wxStaticText( this, wxID_ANY, _("History list:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextHistory->Wrap( -1 );
bSizerLeft->Add( m_staticTextHistory, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_historyList = new wxListBox( this, ID_SEL_BY_LISTBOX, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
m_historyList->SetMinSize( wxSize( 200,100 ) );
bSizerLeft->Add( m_historyList, 1, wxALL|wxEXPAND, 5 );
bSizerMain->Add( bSizerLeft, 1, wxEXPAND, 5 );
wxBoxSizer* bSizerRight;
bSizerRight = new wxBoxSizer( wxVERTICAL );
m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOK->SetDefault();
bSizerRight->Add( m_buttonOK, 0, wxALL|wxEXPAND, 5 );
m_buttonKW = new wxButton( this, ID_ACCEPT_KEYWORD, _("Search by Keyword"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_buttonKW, 0, wxALL|wxEXPAND, 5 );
m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_buttonCancel, 0, wxALL|wxEXPAND, 5 );
m_buttonList = new wxButton( this, ID_LIST_ALL, _("List All"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_buttonList, 0, wxALL|wxEXPAND, 5 );
m_buttonBrowse = new wxButton( this, ID_EXTRA_TOOL, _("Select by Browser"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_buttonBrowse, 0, wxALL|wxEXPAND, 5 );
bSizerMain->Add( bSizerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
this->SetSizer( bSizerMain );
this->Layout();
this->Centre( wxBOTH );
// Connect Events
m_historyList->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonKW->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::OnCancel ), NULL, this );
m_buttonList->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::GetExtraSelection ), NULL, this );
}
DIALOG_GET_COMPONENT_BASE::~DIALOG_GET_COMPONENT_BASE()
{
// Disconnect Events
m_historyList->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonKW->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::OnCancel ), NULL, this );
m_buttonList->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::Accept ), NULL, this );
m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GET_COMPONENT_BASE::GetExtraSelection ), NULL, this );
}

626
common/dialogs/dialog_get_component_base.fbp Normal file
View File

@ -0,0 +1,626 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="10" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
<property name="disconnect_python_events">0</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_get_component_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_get_component_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
<property name="skip_python_events">1</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
<property name="bg"></property>
<property name="center">wxBOTH</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">DIALOG_GET_COMPONENT_BASE</property>
<property name="pos"></property>
<property name="size">375,210</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property>
<property name="title"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
<event name="OnChar"></event>
<event name="OnClose"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnHibernate"></event>
<event name="OnIconize"></event>
<event name="OnIdle"></event>
<event name="OnInitDialog"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizerMain</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizerLeft</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Name:</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticTextName</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">m_textCmpNameCtrl</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">History list:</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticTextHistory</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxListBox" expanded="1">
<property name="bg"></property>
<property name="choices"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_SEL_BY_LISTBOX</property>
<property name="maximum_size"></property>
<property name="minimum_size">200,100</property>
<property name="name">m_historyList</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnListBox">Accept</event>
<event name="OnListBoxDClick"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizerRight</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
<property name="label">OK</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">Accept</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_ACCEPT_KEYWORD</property>
<property name="label">Search by Keyword</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonKW</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">Accept</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnCancel</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_LIST_ALL</property>
<property name="label">List All</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonList</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">Accept</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_EXTRA_TOOL</property>
<property name="label">Select by Browser</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonBrowse</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">GetExtraSelection</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</wxFormBuilder_Project>

63
common/dialogs/dialog_get_component_base.h Normal file
View File

@ -0,0 +1,63 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_get_component_base__
#define __dialog_get_component_base__
#include <wx/intl.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
#define ID_SEL_BY_LISTBOX 1000
#define ID_ACCEPT_KEYWORD 1001
#define ID_LIST_ALL 1002
#define ID_EXTRA_TOOL 1003
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_GET_COMPONENT_BASE
///////////////////////////////////////////////////////////////////////////////
class DIALOG_GET_COMPONENT_BASE : public wxDialog
{
private:
protected:
wxStaticText* m_staticTextName;
wxTextCtrl* m_textCmpNameCtrl;
wxStaticText* m_staticTextHistory;
wxListBox* m_historyList;
wxButton* m_buttonOK;
wxButton* m_buttonKW;
wxButton* m_buttonCancel;
wxButton* m_buttonList;
wxButton* m_buttonBrowse;
// Virtual event handlers, overide them in your derived class
virtual void Accept( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
virtual void GetExtraSelection( wxCommandEvent& event ) { event.Skip(); }
public:
DIALOG_GET_COMPONENT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 375,210 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_GET_COMPONENT_BASE();
};
#endif //__dialog_get_component_base__

0
common/dialog_hotkeys_editor.cpp → common/dialogs/dialog_hotkeys_editor.cpp
View File

0
common/dialog_hotkeys_editor_base.cpp → common/dialogs/dialog_hotkeys_editor_base.cpp
View File

0
common/dialog_hotkeys_editor_base.fbp → common/dialogs/dialog_hotkeys_editor_base.fbp
View File

0
common/dialog_hotkeys_editor_base.h → common/dialogs/dialog_hotkeys_editor_base.h
View File

17
common/dialog_load_error.cpp → common/dialogs/dialog_load_error.cpp
View File

@ -18,10 +18,11 @@ void DIALOG_LOAD_ERROR::OnCloseButtonClick( wxCommandEvent& event )
void DIALOG_LOAD_ERROR::ListClear(void)
{
m_htmlWindow->SetPage(wxEmptyString);
m_htmlWindow->SetPage(wxEmptyString);
}
/** Function ListSet
/**
* Function ListSet
* Add a list of items.
* @param aList = a string containing items. Items are separated by '\n'
*/
@ -31,7 +32,7 @@ void DIALOG_LOAD_ERROR::ListSet(const wxString &aList)
wxArrayString* strings_list = wxStringSplit( aList, wxChar('\n') );
m_htmlWindow->AppendToPage(wxT("<ul>") );
for ( unsigned ii = 0; ii < strings_list->GetCount(); ii ++ )
for ( unsigned ii = 0; ii < strings_list->GetCount(); ii ++ )
{
m_htmlWindow->AppendToPage(wxT("<li>") );
m_htmlWindow->AppendToPage( strings_list->Item(ii) );
@ -42,14 +43,15 @@ void DIALOG_LOAD_ERROR::ListSet(const wxString &aList)
delete strings_list;
}
/** Function ListSet
/**
* Function ListSet
* Add a list of items.
* @param aList = a wxArrayString containing items
*/
void DIALOG_LOAD_ERROR::ListSet(const wxArrayString &aList)
{
m_htmlWindow->AppendToPage(wxT("<ul>") );
for ( unsigned ii = 0; ii < aList.GetCount(); ii ++ )
for ( unsigned ii = 0; ii < aList.GetCount(); ii ++ )
{
m_htmlWindow->AppendToPage(wxT("<li>") );
m_htmlWindow->AppendToPage( aList.Item(ii) );
@ -58,13 +60,14 @@ void DIALOG_LOAD_ERROR::ListSet(const wxArrayString &aList)
m_htmlWindow->AppendToPage(wxT("</ul>") );
}
/** Function MessageSet
/**
* Function MessageSet
* Add a message (in bold) to message list.
* @param message = the message
*/
void DIALOG_LOAD_ERROR::MessageSet(const wxString &message)
{
wxString message_value;
wxString message_value;
message_value.Printf(wxT("<b>%s</b><br>"), GetChars( message ) );
m_htmlWindow->AppendToPage( message_value );
}

0
common/dialog_page_settings.cpp → common/dialogs/dialog_page_settings.cpp
View File

0
common/dialog_page_settings.h → common/dialogs/dialog_page_settings.h
View File

0
common/dialog_page_settings_base.cpp → common/dialogs/dialog_page_settings_base.cpp
View File

0
common/dialog_page_settings_base.fbp → common/dialogs/dialog_page_settings_base.fbp
View File

0
common/dialog_page_settings_base.h → common/dialogs/dialog_page_settings_base.h
View File

138
common/displlst.cpp
View File

@ -8,6 +8,7 @@
#include "common.h"
#include "macros.h"
#include "kicad_string.h"
#include "dialog_helpers.h"
enum listbox {
@ -16,65 +17,54 @@ enum listbox {
BEGIN_EVENT_TABLE( WinEDAListBox, wxDialog )
EVT_BUTTON( wxID_OK, WinEDAListBox::OnOkClick )
EVT_BUTTON( wxID_CANCEL, WinEDAListBox::OnCancelClick )
EVT_LISTBOX( ID_LISTBOX_LIST, WinEDAListBox::ClickOnList )
EVT_LISTBOX_DCLICK( ID_LISTBOX_LIST, WinEDAListBox::D_ClickOnList )
EVT_CHAR( WinEDAListBox::OnKeyEvent )
EVT_CHAR_HOOK( WinEDAListBox::OnKeyEvent )
EVT_CLOSE( WinEDAListBox::OnClose )
EVT_BUTTON( wxID_OK, WinEDAListBox::OnOkClick )
EVT_BUTTON( wxID_CANCEL, WinEDAListBox::OnCancelClick )
EVT_LISTBOX( ID_LISTBOX_LIST, WinEDAListBox::ClickOnList )
EVT_LISTBOX_DCLICK( ID_LISTBOX_LIST, WinEDAListBox::D_ClickOnList )
EVT_CHAR( WinEDAListBox::OnKeyEvent )
EVT_CHAR_HOOK( WinEDAListBox::OnKeyEvent )
EVT_CLOSE( WinEDAListBox::OnClose )
END_EVENT_TABLE()
/* Used to display a list of elements for selection.
* ITEMLIST* = pointer to the list of names
* = Reftext preselection
* = Movefct callback function to display comments
/**
* Used to display a list of elements for selection, and display comment of info lines
* about the selected item.
* @param aParent = apointeur to the parent window
* @param aTitle = the title shown on top.
* @param aItemList = a wxArrayString: the list of elements.
* @param aRefText = an item name if an item must be preselected.
* @param aCallBackFunction callback function to display comments
* @param aPos = position of the dialog.
*/
WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
const wxChar** itemlist, const wxString& reftext,
void(* movefct)(wxString& Text) ,
const wxColour& colour, wxPoint dialog_position ) :
wxDialog( parent, -1, title, dialog_position, wxDefaultSize,
WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* aParent, const wxString& aTitle,
const wxArrayString& aItemList, const wxString& aRefText,
void(* aCallBackFunction)(wxString& Text), wxPoint aPos ) :
wxDialog( aParent, wxID_ANY, aTitle, aPos, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | MAYBE_RESIZE_BORDER )
{
const wxChar** names;
m_ItemList = itemlist;
m_Parent = parent;
m_MoveFct = movefct;
m_WinMsg = NULL;
SetReturnCode( -1 );
m_callBackFct = aCallBackFunction;
m_messages = NULL;
wxBoxSizer* GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
SetSizer( GeneralBoxSizer );
m_List = new wxListBox( this, ID_LISTBOX_LIST, wxDefaultPosition,
m_listBox = new wxListBox( this, ID_LISTBOX_LIST, wxDefaultPosition,
wxSize( 300, 200 ), 0, NULL,
wxLB_NEEDED_SB | wxLB_SINGLE | wxLB_HSCROLL );
if( colour != wxNullColour )
{
m_List->SetBackgroundColour( colour );
m_List->SetForegroundColour( *wxBLACK );
}
GeneralBoxSizer->Add( m_listBox, 0, wxGROW | wxALL, 5 );
GeneralBoxSizer->Add( m_List, 0, wxGROW | wxALL, 5 );
InsertItems( aItemList, 0 );
if( itemlist )
if( m_callBackFct )
{
for( names = m_ItemList; *names != NULL; names++ )
m_List->Append( *names );
}
if( m_MoveFct )
{
m_WinMsg = new wxTextCtrl( this, -1, wxEmptyString,
m_messages = new wxTextCtrl( this, -1, wxEmptyString,
wxDefaultPosition, wxSize( -1, 60 ),
wxTE_READONLY | wxTE_MULTILINE );
GeneralBoxSizer->Add( m_WinMsg, 0, wxGROW | wxALL, 5 );
GeneralBoxSizer->Add( m_messages, 0, wxGROW | wxALL, 5 );
}
wxSizer* buttonSizer = CreateButtonSizer( wxOK | wxCANCEL );
@ -84,32 +74,7 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
if( dialog_position == wxDefaultPosition )
{
Centre();
}
else // Ensure the window dialog is inside the main window :
{
wxPoint pos = dialog_position;
wxPoint maxpos;
maxpos.x = parent->GetPosition().x + parent->GetSize().x;
maxpos.y = parent->GetPosition().y + parent->GetSize().y;
wxPoint endpoint;
endpoint.x = pos.x + GetSize().x;
endpoint.y = pos.y + GetSize().y;
if( endpoint.x > maxpos.x )
pos.x -= endpoint.x - maxpos.x;
if( endpoint.y > maxpos.y )
pos.y -= endpoint.y - maxpos.y;
if( pos.x < parent->GetPosition().x )
pos.x = parent->GetPosition().x;
if( pos.y < parent->GetPosition().y )
pos.y = parent->GetPosition().y;
Move( pos );
}
Centre();
}
@ -121,9 +86,9 @@ WinEDAListBox::~WinEDAListBox()
void WinEDAListBox::MoveMouseToOrigin()
{
int x, y, w, h;
wxSize list_size = m_List->GetSize();
int orgx = m_List->GetRect().GetLeft();
int orgy = m_List->GetRect().GetTop();
wxSize list_size = m_listBox->GetSize();
int orgx = m_listBox->GetRect().GetLeft();
int orgy = m_listBox->GetRect().GetTop();
wxClientDisplayRect( &x, &y, &w, &h );
@ -133,27 +98,26 @@ void WinEDAListBox::MoveMouseToOrigin()
wxString WinEDAListBox::GetTextSelection()
{
wxString text = m_List->GetStringSelection();
wxString text = m_listBox->GetStringSelection();
return text;
}
void WinEDAListBox::Append( const wxString& item )
{
m_List->Append( item );
m_listBox->Append( item );
}
void WinEDAListBox::InsertItems( const wxArrayString& itemlist, int position )
{
m_List->InsertItems( itemlist, position );
m_listBox->InsertItems( itemlist, position );
}
void WinEDAListBox::OnCancelClick( wxCommandEvent& event )
{
EndModal( -1 );
EndModal( wxID_CANCEL );
}
@ -161,35 +125,31 @@ void WinEDAListBox::ClickOnList( wxCommandEvent& event )
{
wxString text;
if( m_MoveFct )
if( m_callBackFct )
{
m_WinMsg->Clear();
text = m_List->GetStringSelection();
m_MoveFct( text );
m_WinMsg->WriteText( text );
m_messages->Clear();
text = m_listBox->GetStringSelection();
m_callBackFct( text );
m_messages->WriteText( text );
}
}
void WinEDAListBox::D_ClickOnList( wxCommandEvent& event )
{
int ii = m_List->GetSelection();
EndModal( ii );
EndModal( wxID_OK );
}
void WinEDAListBox::OnOkClick( wxCommandEvent& event )
{
int ii = m_List->GetSelection();
EndModal( ii );
EndModal( wxID_OK );
}
void WinEDAListBox::OnClose( wxCloseEvent& event )
{
EndModal( -1 );
EndModal( wxID_CANCEL );
}
@ -203,7 +163,7 @@ static int SortItems( const wxString** ptr1, const wxString** ptr2 )
void WinEDAListBox:: SortList()
{
int ii, NbItems = m_List->GetCount();
int ii, NbItems = m_listBox->GetCount();
const wxString** BufList;
if( NbItems <= 0 )
@ -212,16 +172,16 @@ void WinEDAListBox:: SortList()
BufList = (const wxString**) MyZMalloc( 100 * NbItems * sizeof(wxString*) );
for( ii = 0; ii < NbItems; ii++ )
{
BufList[ii] = new wxString( m_List->GetString (ii) );
BufList[ii] = new wxString( m_listBox->GetString( ii ) );
}
qsort( BufList, NbItems, sizeof(wxString*),
( int( * ) ( const void*, const void* ) )SortItems );
m_List->Clear();
m_listBox->Clear();
for( ii = 0; ii < NbItems; ii++ )
{
m_List->Append( *BufList[ii] );
m_listBox->Append( *BufList[ii] );
delete BufList[ii];
}

14
common/dlist.cpp
View File

@ -40,8 +40,8 @@ DHEAD::~DHEAD()
void DHEAD::DeleteAll()
{
EDA_BaseStruct* next;
EDA_BaseStruct* item = first;
EDA_ITEM* next;
EDA_ITEM* item = first;
while( item )
{
@ -56,7 +56,7 @@ void DHEAD::DeleteAll()
}
void DHEAD::append( EDA_BaseStruct* aNewElement )
void DHEAD::append( EDA_ITEM* aNewElement )
{
wxASSERT( aNewElement != NULL );
@ -85,7 +85,7 @@ void DHEAD::append( EDA_BaseStruct* aNewElement )
}
void DHEAD::insert( EDA_BaseStruct* aNewElement, EDA_BaseStruct* aAfterMe )
void DHEAD::insert( EDA_ITEM* aNewElement, EDA_ITEM* aAfterMe )
{
wxASSERT( aNewElement != NULL );
@ -109,7 +109,7 @@ void DHEAD::insert( EDA_BaseStruct* aNewElement, EDA_BaseStruct* aAfterMe )
}
else
{
EDA_BaseStruct* oldBack = aAfterMe->Back();
EDA_ITEM* oldBack = aAfterMe->Back();
aAfterMe->SetBack( aNewElement );
@ -126,7 +126,7 @@ void DHEAD::insert( EDA_BaseStruct* aNewElement, EDA_BaseStruct* aAfterMe )
}
void DHEAD::remove( EDA_BaseStruct* aElement )
void DHEAD::remove( EDA_ITEM* aElement )
{
wxASSERT( aElement );
wxASSERT( aElement->GetList() == this );
@ -162,7 +162,7 @@ void DHEAD::remove( EDA_BaseStruct* aElement )
void DHEAD::VerifyListIntegrity()
{
EDA_BaseStruct* item;
EDA_ITEM* item;
unsigned i = 0;
for( item = first; item && i<count; ++i, item = item->Next() )

29
common/drawframe.cpp
View File

@ -18,6 +18,7 @@
#include "wxstruct.h"
#include "confirm.h"
#include "kicad_device_context.h"
#include "dialog_helpers.h"
#include <wx/fontdlg.h>
@ -173,8 +174,7 @@ void WinEDA_DrawFrame::ReCreateMenuBar()
// Virtual function
void WinEDA_DrawFrame::OnHotKey( wxDC* DC, int hotkey,
EDA_BaseStruct* DrawStruct )
void WinEDA_DrawFrame::OnHotKey( wxDC* DC, int hotkey, EDA_ITEM* DrawStruct )
{
}
@ -184,15 +184,15 @@ void WinEDA_DrawFrame::ToolOnRightClick( wxCommandEvent& event )
{
}
/** Virtual function PrintPage
/**
* Function PrintPage (virtual)
* used to print a page
* this basic function must be derived to be used for printing
* because WinEDA_DrawFrame does not know how to print a page
* This is the reason it is a virtual function
*/
void WinEDA_DrawFrame::PrintPage( wxDC* aDC, bool aPrint_Sheet_Ref,
int aPrintMask, bool aPrintMirrorMode,
void * aData)
void WinEDA_DrawFrame::PrintPage( wxDC* aDC, bool aPrint_Sheet_Ref,int aPrintMask,
bool aPrintMirrorMode, void* aData )
{
wxMessageBox( wxT("WinEDA_DrawFrame::PrintPage() error"));
}
@ -364,12 +364,13 @@ void WinEDA_DrawFrame::OnSize( wxSizeEvent& SizeEv )
}
/** Function SetToolID
/**
* Function SetToolID
* Enables the icon of the selected tool in the vertical toolbar.
* (Or tool ID_NO_SELECT_BUTT default if no new selection)
* @param aId = new m_ID_current_state value (if aId >= 0)
* @param aCursor = the new cursor shape (0 = default cursor)
* @param aTitle = tool message in status bar
* @param aToolMsg = tool message in status bar
* if (aId >= 0)
* Updates all variables related:
* m_ID_current_state, cursor shape and message in status bar
@ -377,8 +378,7 @@ void WinEDA_DrawFrame::OnSize( wxSizeEvent& SizeEv )
* Only updates the cursor shape and message in status bar
* (does not the current m_ID_current_state value
*/
void WinEDA_DrawFrame::SetToolID( int aId, int aCursor,
const wxString& aToolMsg )
void WinEDA_DrawFrame::SetToolID( int aId, int aCursor, const wxString& aToolMsg )
{
// Keep default cursor in toolbars
SetCursor( wxNullCursor );
@ -460,9 +460,9 @@ void WinEDA_DrawFrame::HandleBlockPlace( wxDC* DC )
}
int WinEDA_DrawFrame::HandleBlockEnd( wxDC* DC )
bool WinEDA_DrawFrame::HandleBlockEnd( wxDC* DC )
{
return 0;
return false;
}
@ -552,7 +552,8 @@ void WinEDA_DrawFrame::AdjustScrollBars()
}
/** function SetLanguage
/**
* Function SetLanguage
* called on a language menu selection
* when using a derived function, do not forget to call this one
*/
@ -591,7 +592,7 @@ double RoundTo0( double x, double precision )
}
/**
* Function UpdateStatusBar()
* Function UpdateStatusBar
* Displays in the bottom of the main window a stust:
* - Absolute Cursor coordinates
* - Relative Cursor coordinates (relative to the last coordinate stored

21
common/drawpanel.cpp
View File

@ -220,7 +220,8 @@ wxPoint WinEDA_DrawPanel::CursorRealPosition( const wxPoint& aPosition )
}
/** Function IsPointOnDisplay
/**
* Function IsPointOnDisplay
* @param ref_pos is the position to test in pixels, relative to the panel.
* @return TRUE if ref_pos is a point currently visible on screen
* false if ref_pos is out of screen
@ -320,7 +321,8 @@ void WinEDA_DrawPanel::ConvertPcbUnitsToPixelsUnits( wxPoint* aPosition )
}
/** Function CursorScreenPosition
/**
* Function CursorScreenPosition
* @return the cursor current position in pixels in the screen draw area
*/
wxPoint WinEDA_DrawPanel::CursorScreenPosition()
@ -335,7 +337,8 @@ wxPoint WinEDA_DrawPanel::CursorScreenPosition()
}
/** Function GetScreenCenterRealPosition()
/**
* Function GetScreenCenterRealPosition
* @return position (in internal units) of the current area center showed
* on screen
*/
@ -509,7 +512,8 @@ void WinEDA_DrawPanel::OnSize( wxSizeEvent& event )
}
/** Function SetBoundaryBox()
/**
* Function SetBoundaryBox
* Set the clip box to the current displayed rectangle dimensions.
*
* When using wxDC for scaling, the clip box coordinates are in drawing (logical)
@ -713,7 +717,8 @@ void WinEDA_DrawPanel::ReDraw( wxDC* DC, bool erasebg )
}
/** Function DrawBackGround
/**
* Function DrawBackGround
* @param DC = current Device Context
* Draws (if allowed) :
* the grid
@ -750,7 +755,8 @@ void WinEDA_DrawPanel::DrawBackGround( wxDC* DC )
}
/** Function DrawGrid
/**
* Function DrawGrid
* @param DC = current Device Context
* draws the grid
* - the grid is drawn only if the zoom level allows a good visibility
@ -926,7 +932,8 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
}
/** function DrawAuxiliaryAxis
/**
* Function DrawAuxiliaryAxis
* Draw the Auxiliary Axis, used in pcbnew which as origin coordinates
* for gerber and excellon files
* @param DC = current Device Context

20
common/drawtxt.cpp
View File

@ -29,7 +29,8 @@
double s_HerscheyScaleFactor = HERSHEY_SCALE_FACTOR;
/** Function GetPensizeForBold
/**
* Function GetPensizeForBold
* @return the "best" value for a pen size to draw/plot a bold text
* @param aTextSize = the char size (height or width)
*/
@ -39,7 +40,8 @@ int GetPenSizeForBold( int aTextSize )
}
/** Function Clamp_Text_PenSize
/**
* Function Clamp_Text_PenSize
*As a rule, pen width should not be >1/4em, otherwise the character
* will be cluttered up in its own fatness
* so pen width max is aSize/4 for bold text, and aSize/6 for normal text
@ -78,7 +80,8 @@ int Clamp_Text_PenSize( int aPenSize, wxSize aSize, bool aBold )
* substrings between ~ markers can be "negated" (i.e. with an over bar
*/
/** Function NegableTextLength
/**
* Function NegableTextLength
* Return the text length of a negable string, excluding the ~ markers */
int NegableTextLength( const wxString& aText )
{
@ -97,7 +100,7 @@ int NegableTextLength( const wxString& aText )
}
/* Function GetHersheyShapeDescription()
/* Function GetHersheyShapeDescription
* return a pointer to the shape corresponding to unicode value AsciiCode
* Note we use the same font for Bold and Normal texts
* because kicad handles a variable pen size to do that
@ -198,7 +201,8 @@ static int overbar_position( int size_v, int thickness )
}
/** Function DrawGraphicText
/**
* Function DrawGraphicText
* Draw a graphic text (like module texts)
* @param aPanel = the current DrawPanel. NULL if draw within a 3D GL Canvas
* @param aDC = the current Device Context. NULL if draw within a 3D GL Canvas
@ -493,9 +497,9 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
}
/** Function PlotGraphicText
/**
* Function PlotGraphicText
* same as DrawGraphicText, but plot graphic text insteed of draw it
* @param aFormat_plot = plot format (PLOT_FORMAT_POST, PLOT_FORMAT_HPGL, PLOT_FORMAT_GERBER)
* @param aPos = text position (according to aH_justify, aV_justify)
* @param aColor (enum EDA_Colors) = text color
* @param aText = text to draw
@ -509,7 +513,6 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
* @param aItalic = true to simulate an italic font
* @param aBold = true to use a bold font Useful only with default width value (aWidth = 0)
*/
/******************************************************************************************/
void PLOTTER::text( const wxPoint& aPos,
enum EDA_Colors aColor,
const wxString& aText,
@ -520,7 +523,6 @@ void PLOTTER::text( const wxPoint& aPos,
int aWidth,
bool aItalic,
bool aBold )
/******************************************************************************************/
{
if( aWidth == 0 && aBold ) // Use default values if aWidth == 0
aWidth = GetPenSizeForBold( MIN( aSize.x, aSize.y ) );

7
common/eda_doc.cpp
View File

@ -54,21 +54,22 @@ static const wxFileTypeInfo EDAfallbacks[] =
wxT( "wxhtml %s" ),
wxT( "html document (from Kicad)" ),
wxT( "htm" ),
wxT( "html" ),NULL ),
wxT( "html" ),wxNullPtr ),
wxFileTypeInfo( wxT( "application/sch" ),
wxT( "eeschema %s" ),
wxT( "eeschema -p %s" ),
wxT( "sch document (from Kicad)" ),
wxT( "sch" ),
wxT( "SCH" ), NULL ),
wxT( "SCH" ), wxNullPtr ),
// must terminate the table with this!
wxFileTypeInfo()
};
/** Function GetAssociatedDocument
/**
* Function GetAssociatedDocument
* open a document (file) with the suitable browser
* @param aFrame = main frame
* if DocName is starting by http: or ftp: or www. the default internet

21
common/edaappl.cpp
View File

@ -258,7 +258,8 @@ WinEDA_App::~WinEDA_App()
}
/** Function InitEDA_Appl
/**
* Function InitEDA_Appl
* initialise some general parameters
* - Default paths (help, libs, bin)and configuration flies names
* - Language and locale
@ -595,7 +596,8 @@ void WinEDA_App::SetDefaultSearchPaths( void )
}
/** Function GetSettings
/**
* Function GetSettings
* Get application settings
* @param aReopenLastUsedDirectory = true to switch to last opened directory, false to use current CWD
* @return none
@ -628,11 +630,11 @@ void WinEDA_App::GetSettings(bool aReopenLastUsedDirectory)
m_EDA_Config->Read( wxT( "BgColor" ), &g_DrawBgColor );
/* Load per-user search paths from settings file */
wxString upath;
int i = 1;
while( 1 )
{
while( 1 )
{
upath = m_EDA_CommonConfig->Read( wxString::Format( wxT( "LibraryPath%d" ), i ), wxT( "" ) );
if( upath.IsSameAs( wxT( "" ) ) ) break;
m_libSearchPaths.Add( upath );
@ -787,7 +789,8 @@ void WinEDA_App::SetLanguagePath( void )
}
/** Function AddMenuLanguageList
/**
* Function AddMenuLanguageList
* Create menu list for language choice, and add it as submenu to a main menu
* @param MasterMenu : The main menu. The sub menu list will be accessible
* from the menu item with id ID_LANGUAGE_CHOICE
@ -1084,7 +1087,8 @@ wxString WinEDA_App::FindLibraryPath( const wxString& aFileName )
}
/** Function RemoveLibraryPath
/**
* Function RemoveLibraryPath
* Removes the given path(s) from the library path list
* @param aPaths = path or path list to remove. paths must be separated by ";"
*/
@ -1103,7 +1107,8 @@ void WinEDA_App::RemoveLibraryPath( const wxString& aPaths )
}
/** Function InsertLibraryPath
/**
* Function InsertLibraryPath
* insert path(s) int lib paths list.
* @param aPaths = path or path list to add. paths must be separated by ";"
* @param aIndex = insertion point

16
common/gestfich.cpp
View File

@ -114,7 +114,8 @@ static wxString s_KicadBinaryPathList[] = {
};
/** Function MakeReducedFileName
/**
* Function MakeReducedFileName
* Calculate the "reduced" filename from
* @param fullfilename = full filename
* @param default_path = default path
@ -180,7 +181,8 @@ wxString MakeReducedFileName( const wxString& fullfilename,
}
/** Function AddDelimiterString
/**
* Function AddDelimiterString
* Add un " to the start and the end of string (if not already done).
* @param string = string to modify
*/
@ -287,13 +289,14 @@ wxString EDA_FileSelector( const wxString& Title,
}
/** Function FindKicadHelpPath
* Find an absolute path for KiCad "help" (or "help/<language>")
/**
* Function FindKicadHelpPath
* Find an absolute path for KiCad "help" (or "help/&ltlanguage&gt")
* Find path kicad/doc/help/xx/ or kicad/doc/help/:
* from BinDir
* else from environment variable KICAD
* else from one of s_HelpPathList
* typically c:\kicad\doc\help or /usr/share/kicad/help
* typically c:/kicad/doc/help or /usr/share/kicad/help
* or /usr/local/share/kicad/help
* (must have kicad in path name)
*
@ -563,7 +566,8 @@ wxString& WinEDA_App::GetEditorName()
}
/** Function OpenPDF
/**
* Function OpenPDF
* run the PDF viewer and display a PDF file
* @param file = PDF file to open
* @return true is success, false if no PDF viewer found

242
common/get_component_dialog.cpp
View File

@ -1,242 +0,0 @@
/*********************************/
/* get_component_dialog.cpp */
/*********************************/
#include "fctsys.h"
#include "gr_basic.h"
#include "common.h"
#include "macros.h"
#include "wxstruct.h"
#include "get_component_dialog.h"
/****************************************************************************/
/* Show a dialog frame to choose a name from an history list, or a new name */
/* to select a component or a module */
/****************************************************************************/
static unsigned s_HistoryMaxCount = 8; // Max number of items displayed in history list
BEGIN_EVENT_TABLE( WinEDA_SelectCmp, wxDialog )
EVT_BUTTON( ID_ACCEPT_NAME, WinEDA_SelectCmp::Accept )
EVT_BUTTON( ID_ACCEPT_KEYWORD, WinEDA_SelectCmp::Accept )
EVT_BUTTON( wxID_CANCEL, WinEDA_SelectCmp::Accept )
EVT_BUTTON( ID_LIST_ALL, WinEDA_SelectCmp::Accept )
EVT_BUTTON( ID_EXTRA_TOOL, WinEDA_SelectCmp::GetExtraSelection )
EVT_LISTBOX( ID_SEL_BY_LISTBOX, WinEDA_SelectCmp::Accept )
END_EVENT_TABLE()
/*
* Dialog frame to choose a component or a footprint
* This dialog shows an history of last selected items
*/
WinEDA_SelectCmp::WinEDA_SelectCmp( WinEDA_DrawFrame* parent,
const wxPoint& framepos,
wxArrayString& HistoryList,
const wxString& Title,
bool show_extra_tool ) :
wxDialog( parent, -1, Title, framepos, wxDefaultSize, DIALOG_STYLE )
{
m_AuxTool = show_extra_tool;
InitDialog( HistoryList );
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
}
void WinEDA_SelectCmp::InitDialog( wxArrayString& aHistoryList )
{
wxButton* Button;
wxStaticText* Text;
m_GetExtraFunction = false;
wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
SetSizer( MainBoxSizer );
wxBoxSizer* LeftBoxSizer = new wxBoxSizer( wxVERTICAL );
MainBoxSizer->Add( LeftBoxSizer,
0,
wxALIGN_CENTER_HORIZONTAL | wxALL | wxADJUST_MINSIZE,
5 );
wxBoxSizer* RightBoxSizer = new wxBoxSizer( wxVERTICAL );
MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 5 );
Text = new wxStaticText( this, -1, _( "Name:" ) );
LeftBoxSizer->Add( Text, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5 );
m_TextCtrl = new wxTextCtrl( this, wxID_ANY );
m_TextCtrl->SetFocus(); // text value will be initialized later by calling GetComponentName()
LeftBoxSizer->Add( m_TextCtrl,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM | wxADJUST_MINSIZE,
5 );
Text = new wxStaticText( this, -1, _( "History list:" ) );
LeftBoxSizer->Add( Text, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5 );
m_List = new wxListBox( this, ID_SEL_BY_LISTBOX, wxDefaultPosition,
wxSize( 220, -1 ), aHistoryList, wxLB_SINGLE );
LeftBoxSizer->Add( m_List,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM | wxADJUST_MINSIZE,
5 );
Button = new wxButton( this, ID_ACCEPT_NAME, _( "OK" ) );
Button->SetDefault();
RightBoxSizer->Add( Button,
0,
wxGROW | wxLEFT | wxRIGHT | wxTOP | wxBOTTOM,
5 );
Button = new wxButton( this, ID_ACCEPT_KEYWORD, _( "Search by Keyword" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
Button = new wxButton( this, ID_LIST_ALL, _( "List All" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
#ifndef __WXMAC__
if( m_AuxTool ) /* The selection can be done by an extra function */
{
Button = new wxButton( this, ID_EXTRA_TOOL, _( "Select by Browser" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
}
#endif
}
void WinEDA_SelectCmp::Accept( wxCommandEvent& event )
{
int id = wxID_OK;
switch( event.GetId() )
{
case ID_SEL_BY_LISTBOX:
m_Text = m_List->GetStringSelection();
break;
case ID_ACCEPT_NAME:
m_Text = m_TextCtrl->GetValue();
break;
case ID_ACCEPT_KEYWORD:
m_Text = wxT( "= " ) + m_TextCtrl->GetValue();
break;
case wxID_CANCEL:
m_Text = wxEmptyString;
id = wxID_CANCEL;
break;
case ID_LIST_ALL:
m_Text = wxT( "*" );
break;
}
m_Text.Trim( false ); // Remove blanks at beginning
m_Text.Trim( true ); // Remove blanks at end
if( IsModal() )
EndModal( id );
else
Close( id );
}
/* Get the component name by the extra function */
void WinEDA_SelectCmp::GetExtraSelection( wxCommandEvent& event )
{
m_GetExtraFunction = true;
if( IsModal() )
EndModal( wxID_OK );
else
Close( wxID_OK );
}
// Return the component name selected by the dialog
wxString WinEDA_SelectCmp::GetComponentName( void )
{
return m_Text;
}
/* Initialize the default component name default choice
*/
void WinEDA_SelectCmp::SetComponentName( const wxString& name )
{
if( m_TextCtrl )
{
m_TextCtrl->SetValue( name );
m_TextCtrl->SetSelection(-1, -1);
}
}
wxPoint GetComponentDialogPosition( void )
{
wxPoint pos;
int x, y, w, h;
pos = wxGetMousePosition();
wxClientDisplayRect( &x, &y, &w, &h );
pos.x -= 100;
pos.y -= 50;
if( pos.x < x )
pos.x = x;
if( pos.y < y )
pos.y = y;
if( pos.x < x )
pos.x = x;
x += w - 350;
if( pos.x > x )
pos.x = x;
if( pos.y < y )
pos.y = y;
return pos;
}
/*
* Add the string "Name" to the history list HistoryList
*/
void AddHistoryComponentName( wxArrayString& HistoryList, const wxString& Name )
{
int ii, c_max;
if( HistoryList.GetCount() > 0 )
{
if( Name == HistoryList[0] )
return;
/* remove an old identical selection if exists */
for( ii = 1; (unsigned) ii < HistoryList.GetCount(); ii++ )
{
if( Name == HistoryList[ii] )
{
HistoryList.RemoveAt( ii ); ii--;
}
}
/* shift the list */
if( HistoryList.GetCount() < s_HistoryMaxCount )
HistoryList.Add( wxT( "" ) );
c_max = HistoryList.GetCount() - 2;
for( ii = c_max; ii >= 0; ii-- )
HistoryList[ii + 1] = HistoryList[ii];
/* Add the new name at the beginning of the history list */
HistoryList[0] = Name;
}
else
HistoryList.Add( Name );
}

16
common/gr_basic.cpp
View File

@ -624,7 +624,8 @@ void GRSetBrush( wxDC* DC, int Color, int fill )
}
/** function GRForceBlackPen
/**
* Function GRForceBlackPen
* @param flagforce True to force a black pen whenever the asked color
*/
void GRForceBlackPen( bool flagforce )
@ -633,7 +634,8 @@ void GRForceBlackPen( bool flagforce )
}
/** function GetGRForceBlackPenState
/**
* Function GetGRForceBlackPenState
* @return s_ForceBlackPen (True if a black pen was forced)
*/
bool GetGRForceBlackPenState( void )
@ -687,6 +689,10 @@ void GRSetDrawMode( wxDC* DC, int draw_mode )
#endif
else
DC->SetLogicalFunction( wxCOPY );
#ifdef USE_WX_OVERLAY
DC->SetLogicalFunction( wxCOPY );
#endif
}
@ -898,7 +904,8 @@ void GRSLine( EDA_Rect* ClipBox,
}
/** Function GRLineArray
/**
* Function GRLineArray
* draws an array of lines (not a polygon).
* @param aClipBox = the clip box
* @param aDC = the device context into which drawing should occur.
@ -1893,7 +1900,8 @@ void GRSFilledRect( EDA_Rect* ClipBox, wxDC* DC,
#ifdef USE_CLIP_FILLED_POLYGONS
/** Function ClipAndDrawFilledPoly
/**
* Function ClipAndDrawFilledPoly
* Used to clip a polygon and draw it as Filled Polygon
* uses the Sutherland and Hodgman algo to clip the given poly against a
* rectangle. This rectangle is the drawing area this is useful under

41
common/hotkeys_basic.cpp
View File

@ -116,7 +116,8 @@ static struct hotkey_name_descr s_Hotkey_Name_List[] =
#define MODIFIER_SHIFT wxT( "Shift+" )
/** function ReturnKeyNameFromKeyCode
/**
* Function ReturnKeyNameFromKeyCode
* return the key name from the key code
* Only some wxWidgets key values are handled for function key ( see
* s_Hotkey_Name_List[] )
@ -169,7 +170,8 @@ wxString ReturnKeyNameFromKeyCode( int aKeycode, bool* aIsFound )
}
/** function AddHotkeyName
/**
* Function AddHotkeyName
* Add the key name from the Command id value ( m_Idcommand member value)
* @param aText = a wxString. returns aText + key name
* @param aList = pointer to a Ki_HotkeyInfo list of commands
@ -198,7 +200,8 @@ wxString AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
}
/** function AddHotkeyName
/**
* Function AddHotkeyName
* Add the key name from the Command id value ( m_Idcommand member value)
* @param aText = a wxString. returns aText + key name
* @param aList = pointer to a Ki_HotkeyInfoSectionDescriptor DescrList of commands
@ -237,7 +240,8 @@ wxString AddHotkeyName( const wxString& aText,
}
/** function ReturnKeyNameFromCommandId
/**
* Function ReturnKeyNameFromCommandId
* return the key name from the Command id value ( m_Idcommand member value)
* @param aList = pointer to a Ki_HotkeyInfo list of commands
* @param aCommandId = Command Id value
@ -261,7 +265,8 @@ wxString ReturnKeyNameFromCommandId( Ki_HotkeyInfo** aList, int aCommandId )
}
/** function ReturnKeyCodeFromKeyName
/**
* Function ReturnKeyCodeFromKeyName
* return the key code from its key name
* Only some wxWidgets key values are handled for function key
* @param keyname = wxString key name to find in s_Hotkey_Name_List[],
@ -320,7 +325,8 @@ int ReturnKeyCodeFromKeyName( const wxString& keyname )
}
/** function DisplayHotkeyList
/**
* Function DisplayHotkeyList
* Displays the current hotkey list
* @param aFrame = current active frame
* @param aList = pointer to a Ki_HotkeyInfoSectionDescriptor list
@ -351,7 +357,8 @@ void DisplayHotkeyList( WinEDA_DrawFrame* aFrame,
}
/** function GetDescriptorFromHotkey
/**
* Function GetDescriptorFromHotkey
* Return a Ki_HotkeyInfo * pointer fron a key code for OnHotKey() function
* @param aKey = key code (ascii value, or wxWidgets value for function keys
* @param aList = pointer to a Ki_HotkeyInfo list of commands
@ -370,7 +377,8 @@ Ki_HotkeyInfo* GetDescriptorFromHotkey( int aKey, Ki_HotkeyInfo** aList )
}
/** Function WriteHotkeyConfig
/**
* Function WriteHotkeyConfig
* Store the current hotkey list
* It is stored using the standard wxConfig mechanism or a file.
*
@ -437,8 +445,9 @@ int WinEDA_BasicFrame::WriteHotkeyConfig( struct Ki_HotkeyInfoSectionDescriptor*
}
/** Function ReadHotkeyConfigFile
* Read an old configuration file (<file>.key) and fill the current hotkey list
/**
* Function ReadHotkeyConfigFile
* Read an old configuration file (&ltfile&gt.key) and fill the current hotkey list
* with hotkeys
* @param aFilename = file name to read.
* @param aDescList = current hotkey list descr. to initialise.
@ -488,7 +497,8 @@ void ReadHotkeyConfig( const wxString& Appname,
}
/** Function ReadHotkeyConfig
/**
* Function ReadHotkeyConfig
* Read configuration data and fill the current hotkey list with hotkeys
* @param aDescList = current hotkey list descr. to initialise.
*/
@ -499,7 +509,8 @@ int WinEDA_BasicFrame::ReadHotkeyConfig( struct Ki_HotkeyInfoSectionDescriptor*
}
/** Function ParseHotkeyConfig
/**
* Function ParseHotkeyConfig
* the input format is: shortcut "key" "function"
* lines starting by # are ignored (comments)
* lines like [xxx] are tags (example: [common] or [libedit] which identify
@ -570,7 +581,8 @@ void ParseHotkeyConfig(
}
/** Function ImportHotkeyConfigFromFile
/**
* Function ImportHotkeyConfigFromFile
* Prompt the user for an old hotkey file to read, and read it.
* @param aDescList = current hotkey list descr. to initialise.
*/
@ -598,7 +610,8 @@ void WinEDA_BasicFrame::ImportHotkeyConfigFromFile(
}
/** Function ExportHotkeyConfigToFile
/**
* Function ExportHotkeyConfigToFile
* Prompt the user for an old hotkey file to read, and read it.
* @param aDescList = current hotkey list descr. to initialise.
*/

17
common/projet_config.cpp
View File

@ -225,7 +225,8 @@ void WinEDA_App::WriteProjectConfig( const wxString& fileName,
}
/** Function SaveCurrentSetupValues()
/**
* Function SaveCurrentSetupValues
* Save the current setup values in m_EDA_Config
* saved parameters are parameters that have the .m_Setup member set to true
* @param aList = array of PARAM_CFG_BASE pointers
@ -275,7 +276,8 @@ void WinEDA_App::SaveCurrentSetupValues( PARAM_CFG_ARRAY& List )
}
/** Function ReadProjectConfig
/**
* Function ReadProjectConfig
* Read the current "projet" parameters
* Parameters are parameters that have the .m_Setup member set to false
* read file is the .pro file project
@ -390,7 +392,8 @@ bool WinEDA_App::ReadProjectConfig( const wxString& local_config_filename,
}
/** Function ReadCurrentSetupValues()
/**
* Function ReadCurrentSetupValues
* Raed the current setup values previously saved, from m_EDA_Config
* saved parameters are parameters that have the .m_Setup member set to true
* @param aList = array of PARAM_CFG_BASE pointers
@ -738,13 +741,13 @@ void PARAM_CFG_LIBNAME_LIST::SaveParam( wxConfigBase* aConfig )
wxArrayString* libname_list = m_Pt_param;
unsigned indexlib = 0;
wxString cle_config;
wxString configkey;
for( ; indexlib < libname_list->GetCount(); indexlib++ )
{
cle_config = m_Ident;
configkey = m_Ident;
// We use indexlib+1 because first lib name is LibName1
cle_config << (indexlib + 1);
aConfig->Write( cle_config, libname_list->Item( indexlib ) );
configkey << (indexlib + 1);
aConfig->Write( configkey, libname_list->Item( indexlib ) );
}
}

19
common/sch_item_struct.cpp
View File

@ -22,8 +22,8 @@
* in debug mode
*/
SCH_ITEM::SCH_ITEM( EDA_BaseStruct* aParent, KICAD_T aType ) :
EDA_BaseStruct( aParent, aType )
SCH_ITEM::SCH_ITEM( EDA_ITEM* aParent, KICAD_T aType ) :
EDA_ITEM( aParent, aType )
{
m_Layer = 0;
}
@ -40,18 +40,20 @@ SCH_ITEM::~SCH_ITEM()
/**
* place the struct in EEDrawList.
* place the struct in m_drawList.
* if it is a new item, it it also put in undo list
* for an "old" item, saving it in undo list must be done before editiing,
* and not here!
*/
void SCH_ITEM::Place( WinEDA_SchematicFrame* frame, wxDC* DC )
void SCH_ITEM::Place( SCH_EDIT_FRAME* frame, wxDC* DC )
{
if( m_Flags & IS_NEW )
{
SCH_SCREEN* screen = frame->GetScreen();
if( !screen->CheckIfOnDrawList( this ) ) //don't want a loop!
screen->AddToDrawList( this );
g_ItemToRepeat = this;
frame->SaveCopyInUndoList( this, UR_NEW );
}
@ -92,3 +94,12 @@ bool SCH_ITEM::Matches( const wxString& aText, wxFindReplaceData& aSearchData )
return text.MakeUpper().Find( searchText.MakeUpper() ) != wxNOT_FOUND;
}
bool SCH_ITEM::IsConnected( const wxPoint& aPosition ) const
{
if( m_Flags & STRUCT_DELETED || m_Flags & SKIP_STRUCT )
return false;
return DoIsConnected( aPosition );
}

6
common/trigo.cpp
View File

@ -5,7 +5,8 @@
#include "fctsys.h"
#include "trigo.h"
/** Function TestSegmentHit
/**
* Function TestSegmentHit
* test for hit on line segment
* i.e. cursor within a given distance from segment
* @param aRefPoint = cursor (point to test) coords
@ -22,7 +23,8 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
}
/** Function DistanceTest
/**
* Function DistanceTest
* Calculate the distance from mouse cursor to a line segment.
* Returns:
* False if distance > threshold

3
common/worksheet.cpp
View File

@ -1519,7 +1519,8 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen,
}
/** Function GetXYSheetReferences
/**
* Function GetXYSheetReferences
* Return the X,Y sheet references where the point position is located
* @param aScreen = screen to use
* @param aPosition = position to identify by YX ref

64
common/wxwineda.cpp
View File

@ -2,14 +2,10 @@
/* wxwineda.cpp */
/****************/
#ifdef __GNUG__
#pragma implementation
#endif
#include "fctsys.h"
#include "common.h"
#include "wxstruct.h"
#include "dialog_helpers.h"
/*
* Text entry dialog to enter one or more lines of text.
@ -390,61 +386,3 @@ void WinEDA_ValueCtrl::Enable( bool enbl )
m_ValueCtrl->Enable( enbl );
m_Text->Enable( enbl );
}
/**********************************************************************/
/* Class to display and edit a double precision floating point value. */
/**********************************************************************/
WinEDA_DFloatValueCtrl::WinEDA_DFloatValueCtrl( wxWindow* parent,
const wxString& title,
double value,
wxBoxSizer* BoxSizer )
{
wxString buffer;
wxString label = title;
m_Value = value;
m_Text = new wxStaticText( parent, -1, label );
BoxSizer->Add( m_Text, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
buffer.Printf( wxT( "%f" ), m_Value );
m_ValueCtrl = new wxTextCtrl( parent, -1, buffer );
BoxSizer->Add( m_ValueCtrl, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
}
WinEDA_DFloatValueCtrl::~WinEDA_DFloatValueCtrl()
{
delete m_ValueCtrl;
delete m_Text;
}
double WinEDA_DFloatValueCtrl::GetValue()
{
double coord = 0;
m_ValueCtrl->GetValue().ToDouble( &coord );
return coord;
}
void WinEDA_DFloatValueCtrl::SetValue( double new_value )
{
wxString buffer;
m_Value = new_value;
buffer.Printf( wxT( "%f" ), m_Value );
m_ValueCtrl->SetValue( buffer );
}
void WinEDA_DFloatValueCtrl::Enable( bool enbl )
{
m_ValueCtrl->Enable( enbl );
m_Text->Enable( enbl );
}

24
common/zoom.cpp
View File

@ -47,7 +47,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )
/** Adjust the coordinate to the nearest grid value
* @param aCoord = coordinate to adjust
* @param aGridSize = pointer to a grid value. if NULL uses the current grid size
* @param aGridSize = pointer to a grid value. if NULL uses the current grid size
*/
void WinEDA_DrawFrame::PutOnGrid( wxPoint* aCoord , wxRealPoint* aGridSize )
{
@ -57,12 +57,12 @@ void WinEDA_DrawFrame::PutOnGrid( wxPoint* aCoord , wxRealPoint* aGridSize )
else
grid_size = GetBaseScreen()->GetGridSize();
const wxPoint& grid_origin = GetBaseScreen()->GetGridOrigin();
double offset = fmod(grid_origin.x, grid_size.x);
const wxPoint& grid_origin = GetBaseScreen()->GetGridOrigin();
double offset = fmod(grid_origin.x, grid_size.x);
int tmp = wxRound( (aCoord->x - offset) / grid_size.x );
aCoord->x = wxRound( tmp * grid_size.x + offset );
offset = fmod(grid_origin.y, grid_size.y);
offset = fmod(grid_origin.y, grid_size.y);
tmp = wxRound( (aCoord->y - offset) / grid_size.y );
aCoord->y = wxRound ( tmp * grid_size.y + offset );
}
@ -102,7 +102,8 @@ void WinEDA_DrawFrame::Window_Zoom( EDA_Rect& Rect )
}
/** Function OnZoom
/**
* Function OnZoom
* Called from any zoom event (toolbar , hotkey or popup )
*/
void WinEDA_DrawFrame::OnZoom( wxCommandEvent& event )
@ -227,19 +228,18 @@ void WinEDA_DrawFrame::AddMenuZoomAndGrid( wxMenu* MasterMenu )
}
/* Create grid submenu as required. */
if( !screen->m_GridList.IsEmpty() )
if( screen->GetGridCount() )
{
wxMenu* gridMenu = new wxMenu;
ADD_MENUITEM_WITH_SUBMENU( MasterMenu, gridMenu,
ID_POPUP_GRID_SELECT, _( "Grid Select" ),
grid_select_xpm );
ADD_MENUITEM_WITH_SUBMENU( MasterMenu, gridMenu, ID_POPUP_GRID_SELECT,
_( "Grid Select" ), grid_select_xpm );
GRID_TYPE tmp;
wxRealPoint grid = screen->GetGridSize();
for( unsigned i = 0; i < screen->m_GridList.GetCount(); i++ )
for( size_t i = 0; i < screen->GetGridCount(); i++ )
{
tmp = screen->m_GridList[i];
tmp = screen->GetGrid( i );
double gridValueInch = To_User_Unit( INCHES, tmp.m_Size.x, m_InternalUnits );
double gridValue_mm = To_User_Unit( MILLIMETRES, tmp.m_Size.x, m_InternalUnits );
@ -266,7 +266,9 @@ void WinEDA_DrawFrame::AddMenuZoomAndGrid( wxMenu* MasterMenu )
break;
}
}
gridMenu->Append( tmp.m_Id, msg, wxEmptyString, true );
if( grid == tmp.m_Size )
gridMenu->Check( tmp.m_Id, true );
}

4
cvpcb/autosel.cpp
View File

@ -140,7 +140,7 @@ found in the default search paths." ),
BOOST_FOREACH( COMPONENT& component, m_components )
{
m_ListCmp->SetSelection( ii, true );
m_ListCmp->SetSelection( ii++, true );
if( !component.m_Module.IsEmpty() )
continue;
@ -169,7 +169,5 @@ any of the project footprint libraries." ),
this );
}
}
ii += 1;
}
}

9
cvpcb/class_DisplayFootprintsFrame.cpp
View File

@ -535,7 +535,8 @@ void PCB_SCREEN::ClearUndoORRedoList(UNDO_REDO_CONTAINER&, int )
{
}
/** Function IsGridVisible() , virtual
/**
* Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
bool DISPLAY_FOOTPRINTS_FRAME::IsGridVisible()
@ -543,7 +544,8 @@ bool DISPLAY_FOOTPRINTS_FRAME::IsGridVisible()
return m_DrawGrid;
}
/** Function SetGridVisibility() , virtual
/**
* Function SetGridVisibility() , virtual
* It may be overloaded by derived classes
* if you want to store/retrieve the grid visiblity in configuration.
* @param aVisible = true if the grid must be shown
@ -553,7 +555,8 @@ void DISPLAY_FOOTPRINTS_FRAME::SetGridVisibility(bool aVisible)
m_DrawGrid = aVisible;
}
/** Function GetGridColor() , virtual
/**
* Function GetGridColor() , virtual
* @return the color of the grid
*/
int DISPLAY_FOOTPRINTS_FRAME::GetGridColor()

3
cvpcb/class_components_listbox.cpp
View File

@ -97,7 +97,8 @@ void COMPONENTS_LISTBOX::SetSelection( unsigned index, bool State )
}
/** function OnChar
/**
* Function OnChar
* called on a key pressed
* Call default handler for some special keys,
* and for "ascii" keys, select the first component

3
cvpcb/class_footprints_listbox.cpp
View File

@ -280,7 +280,8 @@ FOOTPRINT* GetModuleDescrByName( const wxString& FootprintName,
}
/** function OnChar
/**
* Function OnChar
* called on a key pressed
* Call default handler for some special keys,
* and for "ascii" keys, select the first footprint

4
cvpcb/cvframe.cpp
View File

@ -355,8 +355,6 @@ void WinEDA_CvpcbFrame::ToFirstNA( wxCommandEvent& event )
ii++;
}
wxBell();
m_ListCmp->SetSelection( selection );
}
@ -384,8 +382,6 @@ void WinEDA_CvpcbFrame::ToPreviousNA( wxCommandEvent& event )
}
ii--;
}
wxBell();
m_ListCmp->SetSelection( selection );
}

1
cvpcb/cvpcb.cpp
View File

@ -15,6 +15,7 @@
#include "protos.h"
#include "cvstruct.h"
#include "colors_selection.h"
#include "cvpcb_id.h"
#include "build_version.h"

2
cvpcb/menucfg.cpp
View File

@ -1,5 +1,5 @@
/**
* @file menubar.cpp
* @file ./menucfg.cpp
* (Re)Create the CvPCB main MenuBar
*/
#include "fctsys.h"

232
demos/ecc83/ecc83-pp.cache.lib → demos/ecc83/ecc83-pp-cache.lib
View File

@ -1,116 +1,116 @@
EESchema-LIBRARY Version 27/8/2008-06:35:46
#
#
# C
#
DEF C C 0 10 N Y 1 F N
F0 "C" 50 100 50 H V L C
F1 "C" 50 -100 50 H V L C
$FPLIST
SM*
C?
C1-1
$ENDFPLIST
DRAW
P 2 0 1 8 -100 -30 100 -30 N
P 2 0 1 8 -100 30 100 30 N
X ~ 1 0 200 170 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW
ENDDEF
#
# CONN_2
#
DEF CONN_2 P 0 40 Y N 1 F N
F0 "P" -50 0 40 V V C C
F1 "CONN_2" 50 0 40 V V C C
DRAW
S -100 150 100 -150 0 1 0 N
X PM 2 -350 -100 250 R 60 60 1 1 P I
X P1 1 -350 100 250 R 60 60 1 1 P I
ENDDRAW
ENDDEF
#
# ECC81
#
DEF ECC81 U 0 0 Y Y 3 L N
F0 "U" 130 310 50 H V C C
F1 "ECC81" 350 -300 50 H V C C
F2 "VALVE-NOVAL_P" 270 -400 50 H I C C
ALIAS ECC83
DRAW
A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
P 3 0 1 0 -200 100 -200 -100 -200 -100 N
A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
P 2 2 1 6 -75 0 -125 0 N
P 2 1 0 0 0 200 0 300 N
A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
P 2 2 1 0 -200 0 -125 0 N
P 2 2 1 6 75 0 125 0 N
A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
P 2 0 1 0 200 100 200 -100 N
P 2 1 1 6 -75 0 -125 0 N
P 2 1 0 0 -100 -200 -100 -300 N
P 3 1 1 10 -100 200 110 200 110 200 N
P 2 2 0 0 -100 -200 -100 -300 N
P 3 2 1 10 -100 200 110 200 110 200 N
P 2 1 1 0 -200 0 -125 0 N
P 2 1 1 6 75 0 125 0 N
P 2 1 1 6 -25 0 25 0 N
P 2 2 1 6 -25 0 25 0 N
P 2 2 0 0 0 200 0 300 N
A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
X A 1 0 400 100 D 40 40 2 1 O
X A 6 0 400 100 D 40 40 1 1 O
X G 7 -300 0 100 R 40 40 1 1 I
X G 2 -300 0 100 R 40 40 2 1 I
X F1 4 -100 -450 200 U 40 40 3 1 W
X K 3 -100 -400 100 U 40 40 2 1 B
X K 8 -100 -400 100 U 40 40 1 1 B
X F2 9 0 -450 200 U 40 40 3 1 W
X F1 5 100 -450 200 U 40 40 3 1 W
ENDDRAW
ENDDEF
#
# GND
#
DEF ~GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 0 30 H I C C
F1 "GND" 0 -70 30 H I C C
DRAW
P 4 0 1 4 -50 0 0 -50 50 0 -50 0 N
X GND 1 0 0 0 U 30 30 1 1 W N
ENDDRAW
ENDDEF
#
# PWR_FLAG
#
DEF PWR_FLAG #FLG 0 0 N N 1 F P
F0 "#FLG" 0 270 30 H I C C
F1 "PWR_FLAG" 0 230 30 H V C C
DRAW
P 3 0 1 0 0 0 0 100 0 100 N
P 5 0 1 0 0 100 -100 150 0 200 100 150 0 100 N
X pwr 1 0 0 0 U 20 20 0 0 w
ENDDRAW
ENDDEF
#
# R
#
DEF R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C C
F1 "R" 0 0 50 V V C C
$FPLIST
R?
SM0603
SM0805
$ENDFPLIST
DRAW
S -40 150 40 -150 0 1 8 N
X ~ 1 0 250 100 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P
ENDDRAW
ENDDEF
#
#EndLibrary
EESchema-LIBRARY Version 2.3 Date: 02/12/2009 10:37:56
#
# C
#
DEF C C 0 10 N Y 1 F N
F0 "C" 50 100 50 H V L CNN
F1 "C" 50 -100 50 H V L CNN
$FPLIST
SM*
C?
C1-1
$ENDFPLIST
DRAW
P 2 0 1 10 -100 -30 100 -30 N
P 2 0 1 10 -100 30 100 30 N
X ~ 1 0 200 170 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW
ENDDEF
#
# CONN_2
#
DEF CONN_2 P 0 40 Y N 1 F N
F0 "P" -50 0 40 V V C CNN
F1 "CONN_2" 50 0 40 V V C CNN
DRAW
S -100 150 100 -150 0 1 0 N
X P1 1 -350 100 250 R 60 60 1 1 P I
X PM 2 -350 -100 250 R 60 60 1 1 P I
ENDDRAW
ENDDEF
#
# ECC81
#
DEF ECC81 U 0 0 Y Y 3 L N
F0 "U" 130 310 50 H V C CNN
F1 "ECC81" 350 -300 50 H V C CNN
F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
ALIAS ECC83
DRAW
P 2 1 0 0 -100 -200 -100 -300 N
P 2 1 0 0 0 200 0 300 N
P 2 2 0 0 -100 -200 -100 -300 N
P 2 2 0 0 0 200 0 300 N
A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
P 2 0 1 0 200 100 200 -100 N
P 3 0 1 0 -200 100 -200 -100 -200 -100 N
A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
P 2 1 1 0 -200 0 -125 0 N
P 2 1 1 6 -75 0 -125 0 N
P 2 1 1 6 -25 0 25 0 N
P 2 1 1 6 75 0 125 0 N
P 3 1 1 10 -100 200 110 200 110 200 N
X A 6 0 400 100 D 40 40 1 1 O
X G 7 -300 0 100 R 40 40 1 1 I
X K 8 -100 -400 100 U 40 40 1 1 B
A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
P 2 2 1 0 -200 0 -125 0 N
P 2 2 1 6 -75 0 -125 0 N
P 2 2 1 6 -25 0 25 0 N
P 2 2 1 6 75 0 125 0 N
P 3 2 1 10 -100 200 110 200 110 200 N
X A 1 0 400 100 D 40 40 2 1 O
X G 2 -300 0 100 R 40 40 2 1 I
X K 3 -100 -400 100 U 40 40 2 1 B
A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
X F1 4 -100 -450 200 U 40 40 3 1 W
X F1 5 100 -450 200 U 40 40 3 1 W
X F2 9 0 -450 200 U 40 40 3 1 W
ENDDRAW
ENDDEF
#
# GND
#
DEF ~GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 0 30 H I C CNN
F1 "GND" 0 -70 30 H I C CNN
DRAW
P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
X GND 1 0 0 0 U 30 30 1 1 W N
ENDDRAW
ENDDEF
#
# PWR_FLAG
#
DEF PWR_FLAG #FLG 0 0 N N 1 F P
F0 "#FLG" 0 270 30 H I C CNN
F1 "PWR_FLAG" 0 230 30 H V C CNN
DRAW
X pwr 1 0 0 0 U 20 20 0 0 w
P 3 0 1 0 0 0 0 100 0 100 N
P 5 0 1 0 0 100 -100 150 0 200 100 150 0 100 N
ENDDRAW
ENDDEF
#
# R
#
DEF R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C CNN
F1 "R" 0 0 50 V V C CNN
$FPLIST
R?
SM0603
SM0805
R?-*
$ENDFPLIST
DRAW
S -40 150 40 -150 0 1 12 N
X ~ 1 0 250 100 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P
ENDDRAW
ENDDEF
#
#End Library

242
demos/ecc83/ecc83-pp.pro
View File

@ -1,139 +1,103 @@
update=11/12/2006-20:12:28
last_client=cvpcb
[general]
version=1
RootSch=ecc83-pp.sch
BoardNm=ecc83-pp.brd
[common]
NetDir=
[pcbnew]
version=1
PadDrlX=760
PadDimH=1100
PadDimV=550
PadForm=1
PadMask=14745599
ViaDiam=450
ViaDril=250
Isol=60
Countlayer=2
Lpiste=340
RouteTo=15
RouteBo=0
TypeVia=3
Segm45=1
Racc45=1
Unite=0
SegFill=1
SegAffG=0
NewAffG=1
PadFill=1
PadAffG=1
PadSNum=1
ModAffC=0
ModAffT=0
PcbAffT=0
SgPcb45=1
TxtPcbV=800
TxtPcbH=600
TxtModV=600
TxtModH=600
TxtModW=120
HPGLnum=1
HPGdiam=15
HPGLSpd=20
HPGLrec=2
HPGLorg=0
GERBmin=15
VEgarde=100
DrawLar=150
EdgeLar=150
TxtLar=120
MSegLar=150
ForPlot=1
WpenSer=10
UserGrX=0,01
UserGrY=0,01
UserGrU=1
DivGrPc=1
TimeOut=600
MaxLnkS=3
ShowRat=0
ShowMRa=1
[pcbnew/libraries]
LibDir=
LibName1=supports
LibName2=valves
LibName3=connect
LibName4=discret
LibName5=pin_array
LibName6=divers
LibName7=libcms
LibName8=display
[eeschema]
version=1
LibDir=
NetFmt=1
HPGLSpd=20
HPGLDm=15
HPGLNum=1
offX_A4=0
offY_A4=0
offX_A3=0
offY_A3=0
offX_A2=0
offY_A2=0
offX_A1=0
offY_A1=0
offX_A0=0
offY_A0=0
offX_A=0
offY_A=0
offX_B=0
offY_B=0
offX_C=0
offY_C=0
offX_D=0
offY_D=0
offX_E=0
offY_E=0
RptD_X=0
RptD_Y=100
RptLab=1
PenMin=20
SimCmd=
UseNetN=0
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=conn
LibName4=valves
LibName5=linear
LibName6=regul
LibName7=74xx
LibName8=cmos4000
LibName9=adc-dac
LibName10=memory
LibName11=xilinx
LibName12=special
LibName13=microcontrollers
LibName14=microchip
LibName15=analog_switches
LibName16=motorola
LibName17=intel
LibName18=audio
LibName19=interface
LibName20=digital-audio
LibName21=philips
LibName22=display
LibName23=cypress
LibName24=siliconi
LibName25=contrib
[cvpcb]
version=1
NetITyp=0
NetIExt=.net
PkgIExt=.pkg
NetType=0
[cvpcb/libraries]
EquName1=devcms
update=03/12/2010 17:27:41
last_client=pcbnew
[general]
version=1
RootSch=ecc83-pp.sch
BoardNm=ecc83-pp.brd
[common]
NetDir=
[eeschema]
version=1
LibDir=
NetFmt=1
HPGLSpd=20
HPGLDm=15
HPGLNum=1
offX_A4=0
offY_A4=0
offX_A3=0
offY_A3=0
offX_A2=0
offY_A2=0
offX_A1=0
offY_A1=0
offX_A0=0
offY_A0=0
offX_A=0
offY_A=0
offX_B=0
offY_B=0
offX_C=0
offY_C=0
offX_D=0
offY_D=0
offX_E=0
offY_E=0
RptD_X=0
RptD_Y=100
RptLab=1
PenMin=20
SimCmd=
UseNetN=0
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=conn
LibName4=valves
LibName5=linear
LibName6=regul
LibName7=74xx
LibName8=cmos4000
LibName9=adc-dac
LibName10=memory
LibName11=xilinx
LibName12=special
LibName13=microcontrollers
LibName14=microchip
LibName15=analog_switches
LibName16=motorola
LibName17=intel
LibName18=audio
LibName19=interface
LibName20=digital-audio
LibName21=philips
LibName22=display
LibName23=cypress
LibName24=siliconi
LibName25=contrib
[cvpcb]
version=1
NetITyp=0
NetIExt=.net
PkgIExt=.pkg
NetType=0
[cvpcb/libraries]
EquName1=devcms
[pcbnew]
version=1
PadDrlX=760
PadDimH=1100
PadDimV=550
BoardThickness=630
SgPcb45=1
TxtPcbV=800
TxtPcbH=600
TxtModV=600
TxtModH=600
TxtModW=120
VEgarde=100
DrawLar=150
EdgeLar=150
TxtLar=120
MSegLar=150
LastNetListRead=
[pcbnew/libraries]
LibDir=
LibName1=supports
LibName2=valves
LibName3=connect
LibName4=discret
LibName5=pin_array
LibName6=divers
LibName7=libcms
LibName8=display

117
demos/ecc83/ecc83-pp_v2-cache.lib Normal file
View File

@ -0,0 +1,117 @@
EESchema-LIBRARY Version 2.3 Date: 04/12/2010 17:36:18
#
# C
#
DEF C C 0 10 N Y 1 F N
F0 "C" 50 100 50 H V L CNN
F1 "C" 50 -100 50 H V L CNN
$FPLIST
SM*
C?
C1-1
$ENDFPLIST
DRAW
P 2 0 1 10 -100 -30 100 -30 N
P 2 0 1 10 -100 30 100 30 N
X ~ 1 0 200 170 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW
ENDDEF
#
# CONN_2
#
DEF CONN_2 P 0 40 Y N 1 F N
F0 "P" -50 0 40 V V C CNN
F1 "CONN_2" 50 0 40 V V C CNN
DRAW
S -100 150 100 -150 0 1 0 N
X P1 1 -350 100 250 R 60 60 1 1 P I
X PM 2 -350 -100 250 R 60 60 1 1 P I
ENDDRAW
ENDDEF
#
# ECC81
#
DEF ECC81 U 0 0 Y Y 3 L N
F0 "U" 130 310 50 H V C CNN
F1 "ECC81" 350 -300 50 H V C CNN
F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
ALIAS ECC83
DRAW
P 2 1 0 0 -100 -200 -100 -300 N
P 2 1 0 0 0 200 0 300 N
P 2 2 0 0 -100 -200 -100 -300 N
P 2 2 0 0 0 200 0 300 N
A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
P 2 0 1 0 200 100 200 -100 N
P 3 0 1 0 -200 100 -200 -100 -200 -100 N
A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
P 2 1 1 0 -200 0 -125 0 N
P 2 1 1 6 -75 0 -125 0 N
P 2 1 1 6 -25 0 25 0 N
P 2 1 1 6 75 0 125 0 N
P 3 1 1 10 -100 200 110 200 110 200 N
X A 6 0 400 100 D 40 40 1 1 O
X G 7 -300 0 100 R 40 40 1 1 I
X K 8 -100 -400 100 U 40 40 1 1 B
A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
P 2 2 1 0 -200 0 -125 0 N
P 2 2 1 6 -75 0 -125 0 N
P 2 2 1 6 -25 0 25 0 N
P 2 2 1 6 75 0 125 0 N
P 3 2 1 10 -100 200 110 200 110 200 N
X A 1 0 400 100 D 40 40 2 1 O
X G 2 -300 0 100 R 40 40 2 1 I
X K 3 -100 -400 100 U 40 40 2 1 B
A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
X F1 4 -100 -450 200 U 40 40 3 1 W
X F1 5 100 -450 200 U 40 40 3 1 W
X F2 9 0 -450 200 U 40 40 3 1 W
ENDDRAW
ENDDEF
#
# GND
#
DEF ~GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 0 30 H I C CNN
F1 "GND" 0 -70 30 H I C CNN
DRAW
P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
X GND 1 0 0 0 U 30 30 1 1 W N
ENDDRAW
ENDDEF
#
# PWR_FLAG
#
DEF PWR_FLAG #FLG 0 0 N N 1 F P
F0 "#FLG" 0 270 30 H I C CNN
F1 "PWR_FLAG" 0 230 30 H V C CNN
DRAW
X pwr 1 0 0 0 U 20 20 0 0 w
P 3 0 1 0 0 0 0 100 0 100 N
P 5 0 1 0 0 100 -100 150 0 200 100 150 0 100 N
ENDDRAW
ENDDEF
#
# R
#
DEF R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C CNN
F1 "R" 0 0 50 V V C CNN
$FPLIST
R?
SM0603
SM0805
R?-*
SM1206
$ENDFPLIST
DRAW
S -40 150 40 -150 0 1 12 N
X ~ 1 0 250 100 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P
ENDDRAW
ENDDEF
#
#End Library

542
demos/ecc83/ecc83-pp_v2.sch
View File

@ -1,259 +1,283 @@
EESchema Schematic File Version 2
LIBS:power,device,valves,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib
EELAYER 23 0
EELAYER END
$Descr A4 11700 8267
Sheet 1 1
Title "ECC Push-Pull"
Date "11 dec 2006"
Rev "0.1"
Comp ""
Comment1 ""
Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
Wire Wire Line
6050 4450 6150 4450
Wire Wire Line
5750 3850 5750 4050
Connection ~ 4450 4500
Wire Wire Line
4450 5400 4450 4450
Wire Wire Line
4450 4450 4650 4450
Wire Wire Line
9850 6350 9950 6350
Wire Wire Line
9950 6350 9950 6150
Wire Wire Line
4150 5300 4150 5000
Wire Wire Line
6950 5150 6950 5000
Wire Wire Line
4150 4800 4450 4800
Connection ~ 4450 4800
Wire Wire Line
6950 4350 6950 4050
Connection ~ 6950 4250
Wire Wire Line
4850 4850 4850 5400
Wire Wire Line
6300 3900 6300 4000
Wire Wire Line
6950 3850 5750 3850
Connection ~ 6700 3850
Wire Wire Line
6700 4250 6950 4250
Wire Wire Line
6150 4450 6150 3900
Connection ~ 6150 3900
Wire Wire Line
6300 4500 6300 4900
Connection ~ 6300 4800
Wire Wire Line
6950 4800 6700 4800
Wire Wire Line
6700 4800 6700 5400
Wire Wire Line
10050 6150 10050 6350
Wire Wire Line
10050 6250 9850 6250
Connection ~ 10050 6250
Wire Wire Line
4100 5250 4150 5250
Connection ~ 4150 5250
Wire Wire Line
9850 6250 9850 6150
Wire Wire Line
6300 3900 4950 3900
Wire Wire Line
4950 3900 4950 4050
Wire Wire Line
5850 4850 5850 4900
Wire Wire Line
5850 4900 6300 4900
$Comp
L ECC83 U1
U 3 1 48B4F266
P 9950 5700
F 0 "U1" H 10080 6010 50 0000 C C
F 1 "ECC81_83" H 10300 5400 50 0000 C C
F 2 "VALVE-NOVAL_P" H 10220 5300 50 0001 C C
3 9950 5700
1 0 0 -1
$EndComp
$Comp
L ECC83 U1
U 2 1 48B4F263
P 4950 4450
F 0 "U1" H 5080 4760 50 0000 C C
F 1 "ECC83" H 5150 4100 50 0000 C C
F 2 "VALVE-NOVAL_P" H 5220 4050 50 0001 C C
2 4950 4450
1 0 0 -1
$EndComp
$Comp
L ECC83 U1
U 1 1 48B4F256
P 5750 4450
F 0 "U1" H 5880 4760 50 0000 C C
F 1 "ECC83" H 5500 4150 50 0000 C C
F 2 "VALVE-NOVAL_P" H 6020 4050 50 0001 C C
1 5750 4450
-1 0 0 -1
$EndComp
$Comp
L GND #PWR01
U 1 1 457DBAF8
P 6950 5150
F 0 "#PWR01" H 6950 5150 30 0001 C C
F 1 "GND" H 6950 5080 30 0001 C C
1 6950 5150
1 0 0 -1
$EndComp
$Comp
L GND #PWR02
U 1 1 457DBAF5
P 6700 5900
F 0 "#PWR02" H 6700 5900 30 0001 C C
F 1 "GND" H 6700 5830 30 0001 C C
1 6700 5900
1 0 0 -1
$EndComp
$Comp
L GND #PWR03
U 1 1 457DBAF1
P 4850 5900
F 0 "#PWR03" H 4850 5900 30 0001 C C
F 1 "GND" H 4850 5830 30 0001 C C
1 4850 5900
1 0 0 -1
$EndComp
$Comp
L GND #PWR04
U 1 1 457DBAEF
P 4450 5900
F 0 "#PWR04" H 4450 5900 30 0001 C C
F 1 "GND" H 4450 5830 30 0001 C C
1 4450 5900
1 0 0 -1
$EndComp
$Comp
L PWR_FLAG #FLG05
U 1 1 457DBAC0
P 4100 5250
F 0 "#FLG05" H 4100 5520 30 0001 C C
F 1 "PWR_FLAG" H 4100 5480 30 0000 C C
1 4100 5250
0 -1 -1 0
$EndComp
$Comp
L CONN_2 P4
U 1 1 456A8ACC
P 9950 6700
F 0 "P4" V 9900 6700 40 0000 C C
F 1 "CONN_2" V 10000 6700 40 0000 C C
1 9950 6700
0 1 1 0
$EndComp
$Comp
L C C1
U 1 1 4549F4BE
P 6700 4050
F 0 "C1" H 6750 4150 50 0000 L C
F 1 "10uF" H 6450 4150 50 0000 L C
1 6700 4050
1 0 0 -1
$EndComp
$Comp
L GND #PWR06
U 1 1 4549F4B9
P 4150 5300
F 0 "#PWR06" H 4150 5300 30 0001 C C
F 1 "GND" H 4150 5230 30 0001 C C
1 4150 5300
1 0 0 -1
$EndComp
$Comp
L GND #PWR07
U 1 1 4549F4B3
P 6950 4350
F 0 "#PWR07" H 6950 4350 30 0001 C C
F 1 "GND" H 6950 4280 30 0001 C C
1 6950 4350
1 0 0 -1
$EndComp
$Comp
L CONN_2 P3
U 1 1 4549F4A5
P 7300 3950
F 0 "P3" V 7250 3950 40 0000 C C
F 1 "POWER" V 7350 3950 40 0000 C C
1 7300 3950
1 0 0 -1
$EndComp
$Comp
L CONN_2 P2
U 1 1 4549F46C
P 7300 4900
F 0 "P2" V 7250 4900 40 0000 C C
F 1 "OUT" V 7350 4900 40 0000 C C
1 7300 4900
1 0 0 -1
$EndComp
$Comp
L CONN_2 P1
U 1 1 4549F464
P 3800 4900
F 0 "P1" V 3750 4900 40 0000 C C
F 1 "IN" V 3850 4900 40 0000 C C
1 3800 4900
-1 0 0 1
$EndComp
$Comp
L C C2
U 1 1 4549F3BE
P 6500 4800
F 0 "C2" H 6550 4900 50 0000 L C
F 1 "680nF" H 6550 4700 50 0000 L C
1 6500 4800
0 1 1 0
$EndComp
$Comp
L R R3
U 1 1 4549F3AD
P 6700 5650
F 0 "R3" V 6780 5650 50 0000 C C
F 1 "100K" V 6700 5650 50 0000 C C
1 6700 5650
1 0 0 -1
$EndComp
$Comp
L R R4
U 1 1 4549F3A2
P 4450 5650
F 0 "R4" V 4530 5650 50 0000 C C
F 1 "47K" V 4450 5650 50 0000 C C
1 4450 5650
1 0 0 -1
$EndComp
$Comp
L R R2
U 1 1 4549F39D
P 4850 5650
F 0 "R2" V 4930 5650 50 0000 C C
F 1 "1.5K" V 4850 5650 50 0000 C C
1 4850 5650
1 0 0 -1
$EndComp
$Comp
L R R1
U 1 1 4549F38A
P 6300 4250
F 0 "R1" V 6380 4250 50 0000 C C
F 1 "1.5K" V 6300 4250 50 0000 C C
1 6300 4250
1 0 0 -1
$EndComp
$EndSCHEMATC
EESchema Schematic File Version 2 date 04/12/2010 17:36:18
LIBS:power
LIBS:device
LIBS:valves
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:microcontrollers
LIBS:microchip
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:digital-audio
LIBS:philips
LIBS:display
LIBS:cypress
LIBS:siliconi
LIBS:contrib
EELAYER 23 0
EELAYER END
$Descr A4 11700 8267
Sheet 1 1
Title "ECC Push-Pull"
Date "11 dec 2006"
Rev "0.1"
Comp ""
Comment1 ""
Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
Wire Wire Line
6050 4450 6150 4450
Wire Wire Line
5750 3850 5750 4050
Connection ~ 4450 4500
Wire Wire Line
4450 5400 4450 4450
Wire Wire Line
4450 4450 4650 4450
Wire Wire Line
9850 6350 9950 6350
Wire Wire Line
9950 6350 9950 6150
Wire Wire Line
4150 5300 4150 5000
Wire Wire Line
6950 5150 6950 5000
Wire Wire Line
4150 4800 4450 4800
Connection ~ 4450 4800
Wire Wire Line
6950 4350 6950 4050
Connection ~ 6950 4250
Wire Wire Line
4850 4850 4850 5400
Wire Wire Line
6300 3900 6300 4000
Wire Wire Line
6950 3850 5750 3850
Connection ~ 6700 3850
Wire Wire Line
6700 4250 6950 4250
Wire Wire Line
6150 4450 6150 3900
Connection ~ 6150 3900
Wire Wire Line
6300 4500 6300 4900
Connection ~ 6300 4800
Wire Wire Line
6950 4800 6700 4800
Wire Wire Line
6700 4800 6700 5400
Wire Wire Line
10050 6150 10050 6350
Wire Wire Line
10050 6250 9850 6250
Connection ~ 10050 6250
Wire Wire Line
4100 5250 4150 5250
Connection ~ 4150 5250
Wire Wire Line
9850 6250 9850 6150
Wire Wire Line
6300 3900 4950 3900
Wire Wire Line
4950 3900 4950 4050
Wire Wire Line
5850 4850 5850 4900
Wire Wire Line
5850 4900 6300 4900
$Comp
L ECC83 U1
U 3 1 48B4F266
P 9950 5700
F 0 "U1" H 10080 6010 50 0000 C CNN
F 1 "ECC81_83" H 10300 5400 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 10220 5300 50 0001 C CNN
3 9950 5700
1 0 0 -1
$EndComp
$Comp
L ECC83 U1
U 2 1 48B4F263
P 4950 4450
F 0 "U1" H 5080 4760 50 0000 C CNN
F 1 "ECC83" H 5150 4100 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 5220 4050 50 0001 C CNN
2 4950 4450
1 0 0 -1
$EndComp
$Comp
L ECC83 U1
U 1 1 48B4F256
P 5750 4450
F 0 "U1" H 5880 4760 50 0000 C CNN
F 1 "ECC83" H 5500 4150 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 6020 4050 50 0001 C CNN
1 5750 4450
-1 0 0 -1
$EndComp
$Comp
L GND #PWR01
U 1 1 457DBAF8
P 6950 5150
F 0 "#PWR01" H 6950 5150 30 0001 C CNN
F 1 "GND" H 6950 5080 30 0001 C CNN
1 6950 5150
1 0 0 -1
$EndComp
$Comp
L GND #PWR02
U 1 1 457DBAF5
P 6700 5900
F 0 "#PWR02" H 6700 5900 30 0001 C CNN
F 1 "GND" H 6700 5830 30 0001 C CNN
1 6700 5900
1 0 0 -1
$EndComp
$Comp
L GND #PWR03
U 1 1 457DBAF1
P 4850 5900
F 0 "#PWR03" H 4850 5900 30 0001 C CNN
F 1 "GND" H 4850 5830 30 0001 C CNN
1 4850 5900
1 0 0 -1
$EndComp
$Comp
L GND #PWR04
U 1 1 457DBAEF
P 4450 5900
F 0 "#PWR04" H 4450 5900 30 0001 C CNN
F 1 "GND" H 4450 5830 30 0001 C CNN
1 4450 5900
1 0 0 -1
$EndComp
$Comp
L PWR_FLAG #FLG05
U 1 1 457DBAC0
P 4100 5250
F 0 "#FLG05" H 4100 5520 30 0001 C CNN
F 1 "PWR_FLAG" H 4100 5480 30 0000 C CNN
1 4100 5250
0 -1 -1 0
$EndComp
$Comp
L CONN_2 P4
U 1 1 456A8ACC
P 9950 6700
F 0 "P4" V 9900 6700 40 0000 C CNN
F 1 "CONN_2" V 10000 6700 40 0000 C CNN
1 9950 6700
0 1 1 0
$EndComp
$Comp
L C C1
U 1 1 4549F4BE
P 6700 4050
F 0 "C1" H 6750 4150 50 0000 L CNN
F 1 "10uF" H 6450 4150 50 0000 L CNN
1 6700 4050
1 0 0 -1
$EndComp
$Comp
L GND #PWR06
U 1 1 4549F4B9
P 4150 5300
F 0 "#PWR06" H 4150 5300 30 0001 C CNN
F 1 "GND" H 4150 5230 30 0001 C CNN
1 4150 5300
1 0 0 -1
$EndComp
$Comp
L GND #PWR07
U 1 1 4549F4B3
P 6950 4350
F 0 "#PWR07" H 6950 4350 30 0001 C CNN
F 1 "GND" H 6950 4280 30 0001 C CNN
1 6950 4350
1 0 0 -1
$EndComp
$Comp
L CONN_2 P3
U 1 1 4549F4A5
P 7300 3950
F 0 "P3" V 7250 3950 40 0000 C CNN
F 1 "POWER" V 7350 3950 40 0000 C CNN
1 7300 3950
1 0 0 -1
$EndComp
$Comp
L CONN_2 P2
U 1 1 4549F46C
P 7300 4900
F 0 "P2" V 7250 4900 40 0000 C CNN
F 1 "OUT" V 7350 4900 40 0000 C CNN
1 7300 4900
1 0 0 -1
$EndComp
$Comp
L CONN_2 P1
U 1 1 4549F464
P 3800 4900
F 0 "P1" V 3750 4900 40 0000 C CNN
F 1 "IN" V 3850 4900 40 0000 C CNN
1 3800 4900
-1 0 0 1
$EndComp
$Comp
L C C2
U 1 1 4549F3BE
P 6500 4800
F 0 "C2" H 6550 4900 50 0000 L CNN
F 1 "680nF" H 6550 4700 50 0000 L CNN
1 6500 4800
0 1 1 0
$EndComp
$Comp
L R R3
U 1 1 4549F3AD
P 6700 5650
F 0 "R3" V 6780 5650 50 0000 C CNN
F 1 "100K" V 6700 5650 50 0000 C CNN
1 6700 5650
1 0 0 -1
$EndComp
$Comp
L R R4
U 1 1 4549F3A2
P 4450 5650
F 0 "R4" V 4530 5650 50 0000 C CNN
F 1 "47K" V 4450 5650 50 0000 C CNN
1 4450 5650
1 0 0 -1
$EndComp
$Comp
L R R2
U 1 1 4549F39D
P 4850 5650
F 0 "R2" V 4930 5650 50 0000 C CNN
F 1 "1.5K" V 4850 5650 50 0000 C CNN
1 4850 5650
1 0 0 -1
$EndComp
$Comp
L R R1
U 1 1 4549F38A
P 6300 4250
F 0 "R1" V 6380 4250 50 0000 C CNN
F 1 "1.5K" V 6300 4250 50 0000 C CNN
1 6300 4250
1 0 0 -1
$EndComp
$EndSCHEMATC

967
demos/electric/electric.cache.lib → demos/electric/electric-cache.lib
View File

@ -1,484 +1,483 @@
EESchema-LIBRARY Version 4/1/2006-10:40:00
#
#
# A_1KVA
#
DEF A_1KVA EA 0 10 N Y 1 F N
F0 "EA" -90 200 40 H V C C
F1 "A_1KVA" 0 130 40 H V C C
DRAW
P 5 0 1 0 0 -30 -20 -50 20 -50 0 -30 0 -30 F
C 20 10 31 0 1 0 N
P 4 0 1 0 50 10 80 10 100 0 100 0 N
P 2 0 0 0 200 -200 200 -200 N
C -20 10 31 0 1 0 N
S -120 60 120 -60 0 1 0 N
P 4 0 1 0 -100 0 -80 10 -50 10 -50 10 N
X ~ 1 200 0 100 L 10 40 1 1 w
X ~ 2 -200 0 100 R 10 40 1 1 w
X ~ 3 0 -100 50 U 10 50 1 1 I
ENDDRAW
ENDDEF
#
# C_3x1.5mm2
#
DEF C_3x1.5mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C C
F1 "C_3x1.5mm2" 0 -100 40 H V C C
DRAW
C -30 50 10 0 1 0 F
P 3 0 1 0 -110 50 -30 -50 -30 -50 N
P 3 0 1 0 -30 50 50 -50 50 -50 N
P 3 0 1 0 -130 50 -90 50 -90 50 N
P 3 0 1 0 10 50 90 -50 90 -50 N
P 4 0 1 0 -100 0 100 0 100 0 100 0 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# C_3x2.5mm2
#
DEF C_3x2.5mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C C
F1 "C_3x2.5mm2" 0 -100 40 H V C C
DRAW
C -30 50 10 0 1 0 F
P 3 0 1 0 -110 50 -30 -50 -30 -50 N
P 3 0 1 0 -30 50 50 -50 50 -50 N
P 3 0 1 0 -130 50 -90 50 -90 50 N
P 3 0 1 0 10 50 90 -50 90 -50 N
P 4 0 1 0 -100 0 100 0 100 0 100 0 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# C_3x6mm2
#
DEF C_3x6mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C C
F1 "C_3x6mm2" 0 -100 40 H V C C
DRAW
C -30 50 10 0 1 0 F
P 3 0 1 0 -110 50 -30 -50 -30 -50 N
P 3 0 1 0 -30 50 50 -50 50 -50 N
P 3 0 1 0 -130 50 -90 50 -90 50 N
P 3 0 1 0 10 50 90 -50 90 -50 N
P 4 0 1 0 -100 0 100 0 100 0 100 0 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_06A
#
DEF D_06A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C C
F1 "D_06A" -100 -80 40 H V C C
DRAW
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_10A
#
DEF D_10A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C C
F1 "D_10A" -100 -80 40 H V C C
DRAW
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_16A
#
DEF D_16A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C C
F1 "D_16A" -100 -80 40 H V C C
DRAW
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_32A
#
DEF D_32A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C C
F1 "D_32A" -100 -80 40 H V C C
DRAW
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# G_Th_3KVA
#
DEF G_Th_3KVA EG 0 10 N Y 1 F N
F0 "EG" -160 120 40 H V C C
F1 "G_Th_3KVA" 0 -120 40 H V C C
DRAW
P 2 0 0 0 200 -200 200 -200 N
C 0 0 84 0 1 0 N
T 0 0 0 70 0 0 0 G
X ~ 1 200 0 118 L 10 40 1 1 w
ENDDRAW
ENDDEF
#
# I_25A_LUM
#
DEF I_25A_LUM EI 0 10 N Y 1 F N
F0 "EI" -160 120 40 H V C C
F1 "I_25A_LUM" 0 -100 40 H V C C
DRAW
P 3 0 1 0 30 20 -30 -20 -30 -20 N
P 4 0 1 0 -20 30 20 -30 20 -30 20 -30 N
C 0 0 36 0 1 0 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# J_40A_30mA
#
DEF J_40A_30mA EJ 0 10 N Y 1 F N
F0 "EJ" -210 180 40 H V C C
F1 "J_40A_30mA" -20 -120 40 H V C C
DRAW
P 5 0 0 0 120 20 120 -20 120 -20 120 -20 120 -20 N
P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N
P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N
P 3 0 1 0 -140 60 -140 -60 -140 -60 N
P 3 0 1 0 -60 0 100 100 100 100 N
P 2 0 0 0 200 -200 200 -200 N
A -120 60 20 1799 1 0 1 0 N -140 60 -100 60
P 3 0 1 0 -140 0 -60 0 -60 0 N
P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N
P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N
T 0 120 200 20 0 0 0 OFS
X ~ 1 250 0 130 L 10 40 1 1 W
X ~ 3 250 200 70 L 10 10 1 1 O
X ~ 2 -250 0 110 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# O_600VA
#
DEF O_600VA EO 0 10 N Y 1 F N
F0 "EO" -70 120 40 H V C C
F1 "O_600VA" -40 -150 40 H V C C
DRAW
P 3 0 1 0 -20 -40 -20 -80 -20 -80 N
P 3 0 1 0 -70 -50 -70 -70 -70 -70 N
S -110 40 120 -90 0 1 0 N
P 3 0 1 0 -40 -40 -40 -80 -40 -80 N
P 3 0 1 0 -60 -40 -60 -80 -60 -80 N
P 3 0 1 0 -90 -50 -90 -70 -90 -70 N
P 3 0 1 0 -30 -50 -30 -70 -30 -70 N
P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N
P 3 0 1 0 40 -40 40 -80 40 -80 N
P 3 0 1 0 -100 0 -50 0 -50 0 N
P 3 0 1 0 80 -40 80 -80 80 -80 N
P 3 0 1 0 -80 -40 -80 -80 -80 -80 N
P 3 0 1 0 -10 -50 -10 -70 -10 -70 N
P 3 0 1 0 60 -40 60 -80 60 -80 N
C -20 0 31 0 1 0 N
P 3 0 1 0 10 -50 10 -70 10 -70 N
P 3 0 1 0 20 -40 20 -80 20 -80 N
P 2 0 0 0 200 -200 200 -200 N
P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N
P 3 0 1 0 50 -50 50 -70 50 -70 N
P 3 0 1 0 70 -50 70 -70 70 -70 N
C 20 0 31 0 1 0 N
P 3 0 1 0 100 -40 100 -80 100 -80 N
P 3 0 1 0 -50 -50 -50 -70 -50 -70 N
P 3 0 1 0 50 0 100 0 100 0 N
P 3 0 1 0 30 -50 30 -70 30 -70 N
P 3 0 1 0 0 -40 0 -80 0 -80 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# O_900VA
#
DEF O_900VA EO 0 10 N Y 1 F N
F0 "EO" -70 120 40 H V C C
F1 "O_900VA" -40 -150 40 H V C C
DRAW
P 3 0 1 0 -20 -40 -20 -80 -20 -80 N
P 3 0 1 0 -70 -50 -70 -70 -70 -70 N
S -110 40 120 -90 0 1 0 N
P 3 0 1 0 -40 -40 -40 -80 -40 -80 N
P 3 0 1 0 -60 -40 -60 -80 -60 -80 N
P 3 0 1 0 -90 -50 -90 -70 -90 -70 N
P 3 0 1 0 -30 -50 -30 -70 -30 -70 N
P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N
P 3 0 1 0 40 -40 40 -80 40 -80 N
P 3 0 1 0 -100 0 -50 0 -50 0 N
P 3 0 1 0 80 -40 80 -80 80 -80 N
P 3 0 1 0 -80 -40 -80 -80 -80 -80 N
P 3 0 1 0 -10 -50 -10 -70 -10 -70 N
P 3 0 1 0 60 -40 60 -80 60 -80 N
C -20 0 31 0 1 0 N
P 3 0 1 0 10 -50 10 -70 10 -70 N
P 3 0 1 0 20 -40 20 -80 20 -80 N
P 2 0 0 0 200 -200 200 -200 N
P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N
P 3 0 1 0 50 -50 50 -70 50 -70 N
P 3 0 1 0 70 -50 70 -70 70 -70 N
C 20 0 31 0 1 0 N
P 3 0 1 0 100 -40 100 -80 100 -80 N
P 3 0 1 0 -50 -50 -50 -70 -50 -70 N
P 3 0 1 0 50 0 100 0 100 0 N
P 3 0 1 0 30 -50 30 -70 30 -70 N
P 3 0 1 0 0 -40 0 -80 0 -80 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# P_10A
#
DEF P_10A EP 0 10 N Y 1 F N
F0 "EP" -160 120 40 H V C C
F1 "P_10A" -80 -140 40 H V C C
DRAW
A 0 0 80 891 -891 0 0 0 N 1 80 1 -80
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
# Q_25A_2F2O
#
DEF Q_25A_2F2O EQ 0 10 N Y 1 F N
F0 "EQ" -160 120 40 H V C C
F1 "Q_25A_2F2O" 0 -140 40 H V C C
DRAW
P 3 0 0 0 20 100 20 60 20 60 N
P 3 0 1 0 -100 0 60 100 60 100 N
S -100 -30 100 -70 0 0 0 N
P 4 0 0 0 -100 -30 -100 -30 100 -70 100 -70 N
P 3 0 0 0 0 60 0 -60 0 -60 N
P 5 0 1 0 20 60 20 50 100 50 100 50 100 50 N
P 2 0 0 0 200 -200 200 -200 N
P 3 0 0 0 40 100 40 90 40 90 N
P 12 0 1 0 40 100 40 150 50 150 50 160 50 170 120 170 140 150 120 130 60 130 50 130 50 150 50 150 N
T 0 90 150 20 0 0 0 O+F
X ~ 4 200 -50 100 L 10 40 1 1 I
X ~ 3 200 0 120 L 10 40 1 1 U
X ~ 2 200 50 100 L 10 40 1 1 U
X ~ 5 200 150 60 L 10 40 1 1 U
X ~ 1 -200 0 100 R 10 40 1 1 U
ENDDRAW
ENDDEF
#
# Q_2A_12O_40KV
#
DEF Q_2A_12O_40KV EQ 0 10 N Y 1 F N
F0 "EQ" -160 120 40 H V C C
F1 "Q_2A_12O_40KV" 0 -730 40 H V C C
DRAW
P 3 0 1 0 0 -580 0 20 0 20 N
P 3 0 1 0 -100 -200 80 -170 80 -170 N
P 3 0 1 0 -100 -500 80 -470 80 -470 N
P 3 0 1 0 -100 -300 80 -270 80 -270 N
P 3 0 1 0 -100 -350 80 -320 80 -320 N
P 3 0 1 0 -100 -400 80 -370 80 -370 N
P 5 0 1 0 -100 0 80 30 80 30 80 30 80 30 N
P 3 0 1 0 -100 -150 80 -120 80 -120 N
P 3 0 1 0 -100 -450 80 -420 80 -420 N
P 3 0 1 0 -100 -100 80 -70 80 -70 N
P 6 0 1 0 -100 -50 80 -20 80 -20 80 -20 80 -20 80 -20 N
P 3 0 1 0 -100 -550 80 -520 80 -520 N
P 4 0 0 0 -100 -580 -100 -580 100 -620 100 -620 N
P 2 0 0 0 200 -200 200 -200 N
S -100 -580 100 -620 0 0 0 N
P 3 0 1 0 -100 -250 80 -220 80 -220 N
X ~ 25 200 -600 100 L 10 40 1 1 I
X ~ 24 200 -550 120 L 10 40 1 1 U
X ~ 22 200 -500 120 L 10 40 1 1 U
X ~ 20 200 -450 120 L 10 40 1 1 U
X ~ 18 200 -400 120 L 10 40 1 1 U
X ~ 16 200 -350 120 L 10 40 1 1 U
X ~ 14 200 -300 120 L 10 40 1 1 U
X ~ 12 200 -250 120 L 10 40 1 1 U
X ~ 10 200 -200 120 L 10 40 1 1 U
X ~ 8 200 -150 120 L 10 40 1 1 U
X ~ 6 200 -100 120 L 10 40 1 1 U
X ~ 4 200 -50 120 L 10 50 1 1 U
X ~ 2 200 0 120 L 10 40 1 1 U
X ~ 23 -200 -550 100 R 10 50 1 1 U
X ~ 21 -200 -500 100 R 10 50 1 1 U
X ~ 19 -200 -450 100 R 10 50 1 1 U
X ~ 17 -200 -400 100 R 10 50 1 1 U
X ~ 15 -200 -350 100 R 10 50 1 1 U
X ~ 13 -200 -300 100 R 10 50 1 1 U
X ~ 11 -200 -250 100 R 10 50 1 1 U
X ~ 9 -200 -200 100 R 10 50 1 1 U
X ~ 7 -200 -150 100 R 10 50 1 1 U
X ~ 5 -200 -100 100 R 10 50 1 1 U
X ~ 3 -200 -50 100 R 10 50 1 1 U
X ~ 3 -200 -50 100 R 10 50 1 1 U
X ~ 1 -200 0 100 R 10 40 1 1 U
ENDDRAW
ENDDEF
#
# R_16A_30mA
#
DEF R_16A_30mA ER 0 10 N Y 1 F N
F0 "ER" -210 180 40 H V C C
F1 "R_16A_30mA" 0 -200 40 H V C C
DRAW
P 3 0 0 0 20 -50 20 50 20 50 N
P 2 0 0 0 400 -200 400 -200 N
P 3 0 1 0 -60 0 100 100 100 100 N
P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N
C 20 -100 50 0 1 0 N
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 140 20 100 -20 100 -20 N
P 4 0 1 0 100 20 140 -20 140 -20 140 -20 N
P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N
P 3 0 1 0 -140 60 -140 -60 -140 -60 N
A -120 60 20 1799 1 0 1 0 N -140 60 -100 60
P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N
P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N
P 3 0 1 0 -140 0 -60 0 -60 0 N
T 0 20 -100 50 0 0 0 M
T 0 120 200 20 0 0 0 OF
X ~ 4 250 -100 180 L 10 50 1 1 I
X ~ 1 250 0 130 L 10 40 1 1 W
X ~ 3 250 200 70 L 10 10 1 1 O
X ~ 2 -250 0 110 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# S_63A
#
DEF S_63A ES 0 10 N Y 1 F N
F0 "ES" -210 180 40 H V C C
F1 "S_63A" 0 -110 40 H V C C
DRAW
P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N
P 3 0 1 0 -140 60 -140 -60 -140 -60 N
P 3 0 0 0 120 20 120 -20 120 -20 N
P 3 0 1 0 -140 60 -100 60 -100 60 N
P 2 0 0 0 200 -200 200 -200 N
P 2 0 0 0 400 -200 400 -200 N
P 3 0 1 0 -120 60 -120 80 -120 80 N
P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N
P 3 0 1 0 -60 0 100 100 100 100 N
P 3 0 1 0 -140 0 -60 0 -60 0 N
P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N
P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N
P 3 0 0 0 -150 0 -100 0 -100 0 N
T 0 120 200 20 0 0 0 OFS
X ~ 1 250 0 130 L 10 40 1 1 W
X ~ 3 250 200 70 L 10 10 1 1 O
X ~ 2 -250 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# V_A10A
#
DEF V_A10A EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C C
F1 "V_A10A" -60 -140 40 H V C C
DRAW
P 3 0 1 0 -100 0 -80 0 -80 0 N
C 0 0 84 0 1 0 N
P 2 0 0 0 200 -200 200 -200 N
T 0 0 0 70 0 0 0 A
X ~ 2 200 0 118 L 10 40 1 1 w
X ~ 1 -200 0 100 R 10 40 1 1 W
ENDDRAW
ENDDEF
#
# V_F50Hz
#
DEF V_F50Hz EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C C
F1 "V_F50Hz" -40 -140 40 H V C C
DRAW
P 2 0 0 0 200 -200 200 -200 N
C 0 0 84 0 1 0 N
T 0 0 0 50 0 0 0 Hz
X ~ 1 200 0 118 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
# V_U400V
#
DEF V_U400V EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C C
F1 "V_U400V" -60 -140 40 H V C C
DRAW
C 0 0 84 0 1 0 N
P 2 0 0 0 200 -200 200 -200 N
T 0 0 0 70 0 0 0 V
X ~ 1 200 0 118 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
# W_15KA
#
DEF W_15KA EW 0 10 N Y 1 F N
F0 "EW" -160 120 40 H V C C
F1 "W_15KA" -50 -210 40 H V C C
DRAW
P 7 0 1 0 -80 0 -40 0 -80 40 -80 0 -80 -40 -40 0 -40 0 F
P 8 0 1 0 80 0 40 0 80 40 80 -40 80 0 80 -40 40 0 40 0 F
P 2 0 0 0 200 -200 200 -200 N
S -10 -40 10 -60 0 1 0 N
S -120 60 120 -60 0 1 0 N
P 3 0 1 0 -100 0 -80 0 -80 0 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
X ~ 3 0 -100 50 U 10 50 1 1 O
ENDDRAW
ENDDEF
#
# Y_ELC
#
DEF Y_ELC EY 0 10 N Y 1 F N
F0 "EY" -10 120 40 H V C C
F1 "Y_ELC" 60 -120 40 H V C C
DRAW
P 3 0 0 0 -50 10 -50 -10 -50 -10 N
P 3 0 0 0 -30 30 -30 -30 -30 -30 N
P 3 0 0 0 -40 20 -40 -20 -40 -20 N
P 3 0 0 0 -10 50 -10 -50 -10 -50 N
P 4 0 0 0 -60 0 70 0 80 0 70 0 N
P 4 0 0 0 -20 40 -20 -40 -20 -40 -20 -40 N
P 4 0 0 0 0 60 0 60 0 -60 0 -60 N
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 118 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
#EndLibrary
EESchema-LIBRARY Version 2.3 Date: 09/02/2010 21:35:02
#
# A_1KVA
#
DEF A_1KVA EA 0 10 N Y 1 F N
F0 "EA" -90 200 40 H V C CNN
F1 "A_1KVA" 0 130 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -20 10 31 0 1 0 N
C 20 10 31 0 1 0 N
S -120 60 120 -60 0 1 0 N
P 4 0 1 0 -100 0 -80 10 -50 10 -50 10 N
P 4 0 1 0 50 10 80 10 100 0 100 0 N
P 5 0 1 0 0 -30 -20 -50 20 -50 0 -30 0 -30 F
X ~ 1 200 0 100 L 10 40 1 1 w
X ~ 2 -200 0 100 R 10 40 1 1 w
X ~ 3 0 -100 50 U 10 50 1 1 I
ENDDRAW
ENDDEF
#
# C_3x1.5mm2
#
DEF C_3x1.5mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C CNN
F1 "C_3x1.5mm2" 0 -100 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -30 50 10 0 1 0 F
P 3 0 1 0 -130 50 -90 50 -90 50 N
P 3 0 1 0 -110 50 -30 -50 -30 -50 N
P 3 0 1 0 -30 50 50 -50 50 -50 N
P 3 0 1 0 10 50 90 -50 90 -50 N
P 4 0 1 0 -100 0 100 0 100 0 100 0 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# C_3x2.5mm2
#
DEF C_3x2.5mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C CNN
F1 "C_3x2.5mm2" 0 -100 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -30 50 10 0 1 0 F
P 3 0 1 0 -130 50 -90 50 -90 50 N
P 3 0 1 0 -110 50 -30 -50 -30 -50 N
P 3 0 1 0 -30 50 50 -50 50 -50 N
P 3 0 1 0 10 50 90 -50 90 -50 N
P 4 0 1 0 -100 0 100 0 100 0 100 0 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# C_3x6mm2
#
DEF C_3x6mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C CNN
F1 "C_3x6mm2" 0 -100 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -30 50 10 0 1 0 F
P 3 0 1 0 -130 50 -90 50 -90 50 N
P 3 0 1 0 -110 50 -30 -50 -30 -50 N
P 3 0 1 0 -30 50 50 -50 50 -50 N
P 3 0 1 0 10 50 90 -50 90 -50 N
P 4 0 1 0 -100 0 100 0 100 0 100 0 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_06A
#
DEF D_06A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_06A" -100 -80 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_10A
#
DEF D_10A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_10A" -100 -80 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_16A
#
DEF D_16A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_16A" -100 -80 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# D_32A
#
DEF D_32A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_32A" -100 -80 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 3 0 1 0 60 20 100 -20 100 -20 N
P 3 0 1 0 100 20 60 -20 60 -20 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# G_Th_3KVA
#
DEF G_Th_3KVA EG 0 10 N Y 1 F N
F0 "EG" -160 120 40 H V C CNN
F1 "G_Th_3KVA" 0 -120 40 H V C CNN
DRAW
T 0 0 0 70 0 0 0 G Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
C 0 0 84 0 1 0 N
X ~ 1 200 0 118 L 10 40 1 1 w
ENDDRAW
ENDDEF
#
# I_25A_LUM
#
DEF I_25A_LUM EI 0 10 N Y 1 F N
F0 "EI" -160 120 40 H V C CNN
F1 "I_25A_LUM" 0 -100 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C 0 0 36 0 1 0 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 3 0 1 0 30 20 -30 -20 -30 -20 N
P 4 0 1 0 -20 30 20 -30 20 -30 20 -30 N
X ~ 1 200 0 120 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# J_40A_30mA
#
DEF J_40A_30mA EJ 0 10 N Y 1 F N
F0 "EJ" -210 180 40 H V C CNN
F1 "J_40A_30mA" -20 -120 40 H V C CNN
DRAW
T 0 120 200 20 0 0 0 OFS Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
P 5 0 0 0 120 20 120 -20 120 -20 120 -20 120 -20 N
A -120 60 20 1799 1 0 1 0 N -140 60 -100 60
P 3 0 1 0 -140 0 -60 0 -60 0 N
P 3 0 1 0 -140 60 -140 -60 -140 -60 N
P 3 0 1 0 -60 0 100 100 100 100 N
P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N
P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N
P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N
P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N
X ~ 1 250 0 130 L 10 40 1 1 W
X ~ 2 -250 0 110 R 10 40 1 1 w
X ~ 3 250 200 70 L 10 10 1 1 O
ENDDRAW
ENDDEF
#
# O_600VA
#
DEF O_600VA EO 0 10 N Y 1 F N
F0 "EO" -70 120 40 H V C CNN
F1 "O_600VA" -40 -150 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -20 0 31 0 1 0 N
C 20 0 31 0 1 0 N
S -110 40 120 -90 0 1 0 N
P 3 0 1 0 -100 0 -50 0 -50 0 N
P 3 0 1 0 -90 -50 -90 -70 -90 -70 N
P 3 0 1 0 -80 -40 -80 -80 -80 -80 N
P 3 0 1 0 -70 -50 -70 -70 -70 -70 N
P 3 0 1 0 -60 -40 -60 -80 -60 -80 N
P 3 0 1 0 -50 -50 -50 -70 -50 -70 N
P 3 0 1 0 -40 -40 -40 -80 -40 -80 N
P 3 0 1 0 -30 -50 -30 -70 -30 -70 N
P 3 0 1 0 -20 -40 -20 -80 -20 -80 N
P 3 0 1 0 -10 -50 -10 -70 -10 -70 N
P 3 0 1 0 0 -40 0 -80 0 -80 N
P 3 0 1 0 10 -50 10 -70 10 -70 N
P 3 0 1 0 20 -40 20 -80 20 -80 N
P 3 0 1 0 30 -50 30 -70 30 -70 N
P 3 0 1 0 40 -40 40 -80 40 -80 N
P 3 0 1 0 50 -50 50 -70 50 -70 N
P 3 0 1 0 50 0 100 0 100 0 N
P 3 0 1 0 60 -40 60 -80 60 -80 N
P 3 0 1 0 70 -50 70 -70 70 -70 N
P 3 0 1 0 80 -40 80 -80 80 -80 N
P 3 0 1 0 100 -40 100 -80 100 -80 N
P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N
P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# O_900VA
#
DEF O_900VA EO 0 10 N Y 1 F N
F0 "EO" -70 120 40 H V C CNN
F1 "O_900VA" -40 -150 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -20 0 31 0 1 0 N
C 20 0 31 0 1 0 N
S -110 40 120 -90 0 1 0 N
P 3 0 1 0 -100 0 -50 0 -50 0 N
P 3 0 1 0 -90 -50 -90 -70 -90 -70 N
P 3 0 1 0 -80 -40 -80 -80 -80 -80 N
P 3 0 1 0 -70 -50 -70 -70 -70 -70 N
P 3 0 1 0 -60 -40 -60 -80 -60 -80 N
P 3 0 1 0 -50 -50 -50 -70 -50 -70 N
P 3 0 1 0 -40 -40 -40 -80 -40 -80 N
P 3 0 1 0 -30 -50 -30 -70 -30 -70 N
P 3 0 1 0 -20 -40 -20 -80 -20 -80 N
P 3 0 1 0 -10 -50 -10 -70 -10 -70 N
P 3 0 1 0 0 -40 0 -80 0 -80 N
P 3 0 1 0 10 -50 10 -70 10 -70 N
P 3 0 1 0 20 -40 20 -80 20 -80 N
P 3 0 1 0 30 -50 30 -70 30 -70 N
P 3 0 1 0 40 -40 40 -80 40 -80 N
P 3 0 1 0 50 -50 50 -70 50 -70 N
P 3 0 1 0 50 0 100 0 100 0 N
P 3 0 1 0 60 -40 60 -80 60 -80 N
P 3 0 1 0 70 -50 70 -70 70 -70 N
P 3 0 1 0 80 -40 80 -80 80 -80 N
P 3 0 1 0 100 -40 100 -80 100 -80 N
P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N
P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
ENDDRAW
ENDDEF
#
# P_10A
#
DEF P_10A EP 0 10 N Y 1 F N
F0 "EP" -160 120 40 H V C CNN
F1 "P_10A" -80 -140 40 H V C CNN
DRAW
A 0 0 80 891 -891 0 0 0 N 1 80 1 -80
P 2 0 0 0 200 -200 200 -200 N
X ~ 1 200 0 120 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
# Q_25A_2F2O
#
DEF Q_25A_2F2O EQ 0 10 N Y 1 F N
F0 "EQ" -160 120 40 H V C CNN
F1 "Q_25A_2F2O" 0 -140 40 H V C CNN
DRAW
T 0 90 150 20 0 0 0 O+F Normal 1 C C
S -100 -30 100 -70 0 0 0 N
P 2 0 0 0 200 -200 200 -200 N
P 3 0 0 0 0 60 0 -60 0 -60 N
P 3 0 0 0 20 100 20 60 20 60 N
P 3 0 0 0 40 100 40 90 40 90 N
P 4 0 0 0 -100 -30 -100 -30 100 -70 100 -70 N
P 3 0 1 0 -100 0 60 100 60 100 N
P 5 0 1 0 20 60 20 50 100 50 100 50 100 50 N
P 12 0 1 0 40 100 40 150 50 150 50 160 50 170 120 170 140 150 120 130 60 130 50 130 50 150 50 150 N
X ~ 1 -200 0 100 R 10 40 1 1 U
X ~ 2 200 50 100 L 10 40 1 1 U
X ~ 3 200 0 120 L 10 40 1 1 U
X ~ 4 200 -50 100 L 10 40 1 1 I
X ~ 5 200 150 60 L 10 40 1 1 U
ENDDRAW
ENDDEF
#
# Q_2A_12O_40KV
#
DEF Q_2A_12O_40KV EQ 0 10 N Y 1 F N
F0 "EQ" -160 120 40 H V C CNN
F1 "Q_2A_12O_40KV" 0 -730 40 H V C CNN
DRAW
S -100 -580 100 -620 0 0 0 N
P 2 0 0 0 200 -200 200 -200 N
P 4 0 0 0 -100 -580 -100 -580 100 -620 100 -620 N
P 3 0 1 0 -100 -550 80 -520 80 -520 N
P 3 0 1 0 -100 -500 80 -470 80 -470 N
P 3 0 1 0 -100 -450 80 -420 80 -420 N
P 3 0 1 0 -100 -400 80 -370 80 -370 N
P 3 0 1 0 -100 -350 80 -320 80 -320 N
P 3 0 1 0 -100 -300 80 -270 80 -270 N
P 3 0 1 0 -100 -250 80 -220 80 -220 N
P 3 0 1 0 -100 -200 80 -170 80 -170 N
P 3 0 1 0 -100 -150 80 -120 80 -120 N
P 3 0 1 0 -100 -100 80 -70 80 -70 N
P 3 0 1 0 0 -580 0 20 0 20 N
P 5 0 1 0 -100 0 80 30 80 30 80 30 80 30 N
P 6 0 1 0 -100 -50 80 -20 80 -20 80 -20 80 -20 80 -20 N
X ~ 1 -200 0 100 R 10 40 1 1 U
X ~ 2 200 0 120 L 10 40 1 1 U
X ~ 3 -200 -50 100 R 10 50 1 1 U
X ~ 3 -200 -50 100 R 10 50 1 1 U
X ~ 4 200 -50 120 L 10 50 1 1 U
X ~ 5 -200 -100 100 R 10 50 1 1 U
X ~ 6 200 -100 120 L 10 40 1 1 U
X ~ 7 -200 -150 100 R 10 50 1 1 U
X ~ 8 200 -150 120 L 10 40 1 1 U
X ~ 9 -200 -200 100 R 10 50 1 1 U
X ~ 10 200 -200 120 L 10 40 1 1 U
X ~ 20 200 -450 120 L 10 40 1 1 U
X ~ 11 -200 -250 100 R 10 50 1 1 U
X ~ 21 -200 -500 100 R 10 50 1 1 U
X ~ 12 200 -250 120 L 10 40 1 1 U
X ~ 22 200 -500 120 L 10 40 1 1 U
X ~ 13 -200 -300 100 R 10 50 1 1 U
X ~ 23 -200 -550 100 R 10 50 1 1 U
X ~ 14 200 -300 120 L 10 40 1 1 U
X ~ 24 200 -550 120 L 10 40 1 1 U
X ~ 15 -200 -350 100 R 10 50 1 1 U
X ~ 25 200 -600 100 L 10 40 1 1 I
X ~ 16 200 -350 120 L 10 40 1 1 U
X ~ 17 -200 -400 100 R 10 50 1 1 U
X ~ 18 200 -400 120 L 10 40 1 1 U
X ~ 19 -200 -450 100 R 10 50 1 1 U
ENDDRAW
ENDDEF
#
# R_16A_30mA
#
DEF R_16A_30mA ER 0 10 N Y 1 F N
F0 "ER" -210 180 40 H V C CNN
F1 "R_16A_30mA" 0 -200 40 H V C CNN
DRAW
T 0 20 -100 50 0 0 0 M Normal 1 C C
T 0 120 200 20 0 0 0 OF Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
P 2 0 0 0 400 -200 400 -200 N
P 3 0 0 0 20 -50 20 50 20 50 N
A -120 60 20 1799 1 0 1 0 N -140 60 -100 60
C 20 -100 50 0 1 0 N
P 3 0 1 0 -140 0 -60 0 -60 0 N
P 3 0 1 0 -140 60 -140 -60 -140 -60 N
P 3 0 1 0 -60 0 100 100 100 100 N
P 3 0 1 0 140 20 100 -20 100 -20 N
P 4 0 1 0 100 20 140 -20 140 -20 140 -20 N
P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N
P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N
P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N
P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N
X ~ 1 250 0 130 L 10 40 1 1 W
X ~ 2 -250 0 110 R 10 40 1 1 w
X ~ 3 250 200 70 L 10 10 1 1 O
X ~ 4 250 -100 180 L 10 50 1 1 I
ENDDRAW
ENDDEF
#
# S_63A
#
DEF S_63A ES 0 10 N Y 1 F N
F0 "ES" -210 180 40 H V C CNN
F1 "S_63A" 0 -110 40 H V C CNN
DRAW
T 0 120 200 20 0 0 0 OFS Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
P 2 0 0 0 400 -200 400 -200 N
P 3 0 0 0 -150 0 -100 0 -100 0 N
P 3 0 0 0 120 20 120 -20 120 -20 N
P 3 0 1 0 -140 0 -60 0 -60 0 N
P 3 0 1 0 -140 60 -140 -60 -140 -60 N
P 3 0 1 0 -140 60 -100 60 -100 60 N
P 3 0 1 0 -120 60 -120 80 -120 80 N
P 3 0 1 0 -60 0 100 100 100 100 N
P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N
P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N
P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N
P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N
X ~ 1 250 0 130 L 10 40 1 1 W
X ~ 2 -250 0 100 R 10 40 1 1 w
X ~ 3 250 200 70 L 10 10 1 1 O
ENDDRAW
ENDDEF
#
# V_A10A
#
DEF V_A10A EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C CNN
F1 "V_A10A" -60 -140 40 H V C CNN
DRAW
T 0 0 0 70 0 0 0 A Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
C 0 0 84 0 1 0 N
P 3 0 1 0 -100 0 -80 0 -80 0 N
X ~ 1 -200 0 100 R 10 40 1 1 W
X ~ 2 200 0 118 L 10 40 1 1 w
ENDDRAW
ENDDEF
#
# V_F50Hz
#
DEF V_F50Hz EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C CNN
F1 "V_F50Hz" -40 -140 40 H V C CNN
DRAW
T 0 0 0 50 0 0 0 Hz Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
C 0 0 84 0 1 0 N
X ~ 1 200 0 118 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
# V_U400V
#
DEF V_U400V EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C CNN
F1 "V_U400V" -60 -140 40 H V C CNN
DRAW
T 0 0 0 70 0 0 0 V Normal 1 C C
P 2 0 0 0 200 -200 200 -200 N
C 0 0 84 0 1 0 N
X ~ 1 200 0 118 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
# W_15KA
#
DEF W_15KA EW 0 10 N Y 1 F N
F0 "EW" -160 120 40 H V C CNN
F1 "W_15KA" -50 -210 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
S -120 60 120 -60 0 1 0 N
S -10 -40 10 -60 0 1 0 N
P 3 0 1 0 -100 0 -80 0 -80 0 N
P 7 0 1 0 -80 0 -40 0 -80 40 -80 0 -80 -40 -40 0 -40 0 F
P 8 0 1 0 80 0 40 0 80 40 80 -40 80 0 80 -40 40 0 40 0 F
X ~ 1 200 0 100 L 10 40 1 1 W
X ~ 2 -200 0 100 R 10 40 1 1 w
X ~ 3 0 -100 50 U 10 50 1 1 O
ENDDRAW
ENDDEF
#
# Y_ELC
#
DEF Y_ELC EY 0 10 N Y 1 F N
F0 "EY" -10 120 40 H V C CNN
F1 "Y_ELC" 60 -120 40 H V C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 0 0 -50 10 -50 -10 -50 -10 N
P 3 0 0 0 -40 20 -40 -20 -40 -20 N
P 3 0 0 0 -30 30 -30 -30 -30 -30 N
P 3 0 0 0 -10 50 -10 -50 -10 -50 N
P 4 0 0 0 -60 0 70 0 80 0 70 0 N
P 4 0 0 0 -20 40 -20 -40 -20 -40 -20 -40 N
P 4 0 0 0 0 60 0 60 0 -60 0 -60 N
X ~ 1 200 0 118 L 10 40 1 1 W
ENDDRAW
ENDDEF
#
#End Library

2
demos/interf_u/interf_u-cache.lib
View File

@ -1,4 +1,4 @@
EESchema-LIBRARY Version 2.3 Date: 28/04/2010 09:06:34
EESchema-LIBRARY Version 2.3 Date: 19/08/2010 20:44:23
#
# 4003APG120
#

10173
demos/interf_u/interf_u.brd
View File

File diff suppressed because it is too large Load Diff

1299
demos/interf_u/interf_u.net
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More