Skip to content

K
kicad-source-mirror
Commit 79c9be25 authored by stambaughw's avatar stambaughw
Browse files
Options

Replace PriorQue with boost::ptr_vector for component library entries. 

* Replaced WinEDAListBox buttons with wxStdDialogButtonSizer.
* Moved library draw entries GenCopy method to base class.
* Remove priorque.cpp and priorque.h from CMakeLists.txt.
* The usual code cleaning and uncrustification.
parent 27a0c73c
Hide whitespace changes
Inline Side-by-side
Showing with 684 additions and 1117 deletions
common/displlst.cpp
View file @ 79c9be25
/********************************/ /********************************/
/* MODULE displlst.cpp */ /* MODULE displlst.cpp */
/********************************/ /********************************/
#include "fctsys.h" #include "fctsys.h"
...@@ -40,17 +40,13 @@ END_EVENT_TABLE() ...@@ -40,17 +40,13 @@ END_EVENT_TABLE()
*/ */
WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title, WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
const wxChar** itemlist, const wxChar** itemlist, const wxString& reftext,
const wxString& reftext,
void(* movefct)(wxString& Text) , void(* movefct)(wxString& Text) ,
const wxColour& colour, wxPoint dialog_position ) : const wxColour& colour, wxPoint dialog_position ) :
wxDialog( parent, -1, title, dialog_position, wxDefaultSize, wxDialog( parent, -1, title, dialog_position, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | MAYBE_RESIZE_BORDER wxDEFAULT_DIALOG_STYLE | MAYBE_RESIZE_BORDER )
)
{ {
wxSize size;
const wxChar** names; const wxChar** names;
int ii;
m_ItemList = itemlist; m_ItemList = itemlist;
m_Parent = parent; m_Parent = parent;
...@@ -58,34 +54,12 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title, ...@@ -58,34 +54,12 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
m_WinMsg = NULL; m_WinMsg = NULL;
SetReturnCode( -1 ); SetReturnCode( -1 );
if( itemlist ) wxBoxSizer* GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
for( names = m_ItemList, ii = 0; *names != NULL; names++ )
ii++;
else
ii = 30;
wxBoxSizer* GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
SetSizer( GeneralBoxSizer ); SetSizer( GeneralBoxSizer );
wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL ); m_List = new wxListBox( this, ID_LISTBOX_LIST, wxDefaultPosition,
wxSize( 300, 200 ), 0, NULL,
GeneralBoxSizer->Add( MainBoxSizer, 0, wxGROW | wxEXPAND | wxALL, 1 );
wxBoxSizer* LeftBoxSizer = new wxBoxSizer( wxVERTICAL );
MainBoxSizer->Add( LeftBoxSizer, 0, wxGROW | wxALL, 5 );
wxBoxSizer* RightBoxSizer = new wxBoxSizer( wxVERTICAL );
MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
size.x = 200;
size.y = 350;
m_List = new wxListBox( this,
ID_LISTBOX_LIST,
wxDefaultPosition, size,
0, NULL,
wxLB_NEEDED_SB | wxLB_SINGLE | wxLB_HSCROLL ); wxLB_NEEDED_SB | wxLB_SINGLE | wxLB_HSCROLL );
if( colour != wxNullColour ) if( colour != wxNullColour )
...@@ -93,38 +67,33 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title, ...@@ -93,38 +67,33 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
m_List->SetBackgroundColour( colour ); m_List->SetBackgroundColour( colour );
m_List->SetForegroundColour( *wxBLACK ); m_List->SetForegroundColour( *wxBLACK );
} }
LeftBoxSizer->Add( m_List, 0, wxGROW | wxALL, 5 );
GeneralBoxSizer->Add( m_List, 0, wxGROW | wxALL, 5 );
if( itemlist ) if( itemlist )
for( names = m_ItemList, ii = 0; *names != NULL; names++, ii++ ) {
{ for( names = m_ItemList; *names != NULL; names++ )
m_List->Append( *names ); m_List->Append( *names );
} }
wxButton* butt = new wxButton( this, wxID_OK, _( "OK" ) );
RightBoxSizer->Add( butt, 0, wxGROW | wxALL, 5 );
butt->SetDefault();
butt = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
RightBoxSizer->Add( butt, 0, wxGROW | wxALL, 5 );
if( m_MoveFct ) if( m_MoveFct )
{ {
size.x = -1; m_WinMsg = new wxTextCtrl( this, -1, wxEmptyString,
size.y = 60; wxDefaultPosition, wxSize( -1, 60 ),
m_WinMsg = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition, wxTE_READONLY | wxTE_MULTILINE );
size, wxTE_READONLY | wxTE_MULTILINE );
GeneralBoxSizer->Add( m_WinMsg, 0, wxGROW | wxALL, 5 ); GeneralBoxSizer->Add( m_WinMsg, 0, wxGROW | wxALL, 5 );
} }
wxSizer* buttonSizer = CreateButtonSizer( wxOK | wxCANCEL );
if( buttonSizer )
GeneralBoxSizer->Add( buttonSizer, 0, wxGROW | wxALL, 5 );
GetSizer()->Fit( this ); GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
if( dialog_position == wxDefaultPosition ) // Put the window on the parent centre if( dialog_position == wxDefaultPosition )
{ {
Centre(); Centre();
} }
......
eeschema/CMakeLists.txt
View file @ 79c9be25
...@@ -101,7 +101,6 @@ set(EESCHEMA_SRCS ...@@ -101,7 +101,6 @@ set(EESCHEMA_SRCS
plothpgl.cpp plothpgl.cpp
plotps.cpp plotps.cpp
plotdxf.cpp plotdxf.cpp
priorque.cpp
read_from_file_schematic_items_descriptions.cpp read_from_file_schematic_items_descriptions.cpp
savelib.cpp savelib.cpp
save_schemas.cpp save_schemas.cpp
......
eeschema/block_libedit.cpp
View file @ 79c9be25
...@@ -512,7 +512,7 @@ void CopyMarkedItems( EDA_LibComponentStruct* LibEntry, wxPoint offset ) ...@@ -512,7 +512,7 @@ void CopyMarkedItems( EDA_LibComponentStruct* LibEntry, wxPoint offset )
if( item->m_Selected == 0 ) if( item->m_Selected == 0 )
continue; continue;
item->m_Selected = 0; item->m_Selected = 0;
LibEDA_BaseStruct* newitem = CopyDrawEntryStruct( item ); LibEDA_BaseStruct* newitem = item->GenCopy();
newitem->m_Selected = IS_SELECTED; newitem->m_Selected = IS_SELECTED;
newitem->SetNext( LibEntry->m_Drawings ); newitem->SetNext( LibEntry->m_Drawings );
LibEntry->m_Drawings = newitem; LibEntry->m_Drawings = newitem;
......
eeschema/class_BodyItem_Text.cpp
View file @ 79c9be25
...@@ -168,7 +168,7 @@ bool LibDrawText::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[ ...@@ -168,7 +168,7 @@ bool LibDrawText::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[
} }
LibDrawText* LibDrawText::GenCopy() LibEDA_BaseStruct* LibDrawText::DoGenCopy()
{ {
LibDrawText* newitem = new LibDrawText(NULL); LibDrawText* newitem = new LibDrawText(NULL);
...@@ -185,7 +185,7 @@ LibDrawText* LibDrawText::GenCopy() ...@@ -185,7 +185,7 @@ LibDrawText* LibDrawText::GenCopy()
newitem->m_Bold = m_Bold; newitem->m_Bold = m_Bold;
newitem->m_HJustify = m_HJustify; newitem->m_HJustify = m_HJustify;
newitem->m_VJustify = m_VJustify; newitem->m_VJustify = m_VJustify;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
...@@ -247,4 +247,3 @@ void LibDrawText::DisplayInfo( WinEDA_DrawFrame* frame ) ...@@ -247,4 +247,3 @@ void LibDrawText::DisplayInfo( WinEDA_DrawFrame* frame )
frame->MsgPanel->Affiche_1_Parametre( 20, _( "Line width" ), msg, BLUE ); frame->MsgPanel->Affiche_1_Parametre( 20, _( "Line width" ), msg, BLUE );
} }
eeschema/class_libentry.cpp
View file @ 79c9be25
...@@ -179,13 +179,13 @@ bool LibCmpEntry::operator==( const wxChar* name ) const ...@@ -179,13 +179,13 @@ bool LibCmpEntry::operator==( const wxChar* name ) const
} }
bool operator<( LibCmpEntry& item1, LibCmpEntry& item2 ) bool operator<( const LibCmpEntry& item1, const LibCmpEntry& item2 )
{ {
return item1.m_Name.m_Text.CmpNoCase( item2.m_Name.m_Text ) == -1; return item1.m_Name.m_Text.CmpNoCase( item2.m_Name.m_Text ) < 0;
} }
int LibraryEntryCompare( LibCmpEntry* LE1, LibCmpEntry* LE2 ) int LibraryEntryCompare( const LibCmpEntry* LE1, const LibCmpEntry* LE2 )
{ {
return LE1->m_Name.m_Text.CmpNoCase( LE2->m_Name.m_Text ); return LE1->m_Name.m_Text.CmpNoCase( LE2->m_Name.m_Text );
} }
......
eeschema/class_libentry.h
View file @ 79c9be25
...@@ -16,13 +16,15 @@ ...@@ -16,13 +16,15 @@
/* Types for components in libraries /* Types for components in libraries
* components can be a true component or an alias of a true component. * components can be a true component or an alias of a true component.
*/ */
enum LibrEntryType { enum LibrEntryType
{
ROOT, /* This is a true component standard EDA_LibComponentStruct */ ROOT, /* This is a true component standard EDA_LibComponentStruct */
ALIAS /* This is an alias of a true component */ ALIAS /* This is an alias of a true component */
}; };
/* values for member .m_Options */ /* values for member .m_Options */
enum LibrEntryOptions { enum LibrEntryOptions
{
ENTRY_NORMAL, // Libentry is a standard component (real or alias) ENTRY_NORMAL, // Libentry is a standard component (real or alias)
ENTRY_POWER // Libentry is a power symbol ENTRY_POWER // Libentry is a power symbol
}; };
...@@ -31,7 +33,7 @@ enum LibrEntryOptions { ...@@ -31,7 +33,7 @@ enum LibrEntryOptions {
/** /**
* Base class to describe library components and aliases. * Base class to describe library components and aliases.
* *
* This class is not to be used directly. * This class is not to be used directly.
*/ */
class LibCmpEntry : public EDA_BaseStruct class LibCmpEntry : public EDA_BaseStruct
{ {
...@@ -76,9 +78,10 @@ public: ...@@ -76,9 +78,10 @@ public:
typedef boost::ptr_vector< LibCmpEntry > LIB_ENTRY_LIST; typedef boost::ptr_vector< LibCmpEntry > LIB_ENTRY_LIST;
extern bool operator<( LibCmpEntry& item1, LibCmpEntry& item2 ); extern bool operator<( const LibCmpEntry& item1, const LibCmpEntry& item2 );
extern int LibraryEntryCompare( LibCmpEntry* LE1, LibCmpEntry* LE2 ); extern int LibraryEntryCompare( const LibCmpEntry* LE1,
const LibCmpEntry* LE2 );
/** /**
...@@ -173,7 +176,7 @@ public: ...@@ -173,7 +176,7 @@ public:
* *
* @todo Alias objects should really be defined as children of a component * @todo Alias objects should really be defined as children of a component
* object not as children of a library object. This would greatly * object not as children of a library object. This would greatly
* simply searching for components in libraries. * simplify searching for components in libraries.
*/ */
class EDA_LibCmpAliasStruct : public LibCmpEntry class EDA_LibCmpAliasStruct : public LibCmpEntry
{ {
......
eeschema/class_libentry_fields.cpp
View file @ 79c9be25
...@@ -347,13 +347,13 @@ bool LibDrawField::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat ...@@ -347,13 +347,13 @@ bool LibDrawField::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat
} }
// Creation et Duplication d'un field // Creation et Duplication d'un field
LibDrawField* LibDrawField::GenCopy() LibEDA_BaseStruct* LibDrawField::DoGenCopy()
{ {
LibDrawField* newfield = new LibDrawField( m_FieldId ); LibDrawField* newfield = new LibDrawField( m_FieldId );
Copy( newfield ); Copy( newfield );
return newfield; return (LibEDA_BaseStruct*) newfield;
} }
......
eeschema/class_libentry_fields.h
View file @ 79c9be25
...@@ -58,8 +58,6 @@ public: ...@@ -58,8 +58,6 @@ public:
virtual bool Save( FILE* aFile ) const; virtual bool Save( FILE* aFile ) const;
virtual bool Load( char* line, wxString& errorMsg ); virtual bool Load( char* line, wxString& errorMsg );
LibDrawField* GenCopy();
/** Function Copy /** Function Copy
* copy parameters of this to Target. Pointers are not copied * copy parameters of this to Target. Pointers are not copied
* @param aTarget = the LibDrawField to set with "this" values * @param aTarget = the LibDrawField to set with "this" values
...@@ -104,6 +102,9 @@ public: ...@@ -104,6 +102,9 @@ public:
m_VJustify = field.m_VJustify; m_VJustify = field.m_VJustify;
m_Parent = field.m_Parent; m_Parent = field.m_Parent;
} }
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
#endif // CLASS_LIBENTRY_FIELDS_H #endif // CLASS_LIBENTRY_FIELDS_H
eeschema/class_library.cpp
View file @ 79c9be25
...@@ -16,11 +16,7 @@ ...@@ -16,11 +16,7 @@
#include "protos.h" #include "protos.h"
#include "class_library.h" #include "class_library.h"
#include <boost/foreach.hpp>
void FreeLibraryEntry( LibCmpEntry* Entry )
{
SAFE_DELETE( Entry );
}
bool operator==( const LibraryStruct& lib, const wxChar* name ) bool operator==( const LibraryStruct& lib, const wxChar* name )
...@@ -38,16 +34,14 @@ bool operator!=( const LibraryStruct& lib, const wxChar* name ) ...@@ -38,16 +34,14 @@ bool operator!=( const LibraryStruct& lib, const wxChar* name )
LibraryStruct::LibraryStruct( int type, const wxString& name, LibraryStruct::LibraryStruct( int type, const wxString& name,
const wxString& fullname ) const wxString& fullname )
{ {
m_Type = type; /* type indicator */ m_Type = type; /* type indicator */
m_Name = name; /* Name of library loaded. */ m_Name = name; /* Name of library loaded. */
m_FullFileName = fullname; /* File name (with path) of library loaded. */ m_FullFileName = fullname; /* File name (with path) of library loaded. */
m_NumOfParts = 0; /* Number of parts this library has. */
m_Pnext = NULL; /* Point to next library in chain. */ m_Pnext = NULL; /* Point to next library in chain. */
m_Entries = NULL; m_IsModified = false; /* flag indicateur d'edition */
m_Modified = FALSE; /* flag indicateur d'edition */
m_TimeStamp = 0; m_TimeStamp = 0;
m_Flags = 0; m_Flags = 0;
m_IsLibCache = FALSE; m_IsLibCache = false;
m_DateTime = wxDateTime::Now(); m_DateTime = wxDateTime::Now();
} }
...@@ -63,19 +57,18 @@ LibraryStruct::LibraryStruct( const wxChar* fileName ) ...@@ -63,19 +57,18 @@ LibraryStruct::LibraryStruct( const wxChar* fileName )
LibraryStruct::~LibraryStruct() LibraryStruct::~LibraryStruct()
{ {
if( m_Entries )
PQFreeFunc( m_Entries, ( void( * ) ( void* ) )FreeLibraryEntry );
} }
void LibraryStruct::GetEntryNames( wxArrayString& names, bool sort ) void LibraryStruct::GetEntryNames( wxArrayString& names, bool sort,
bool makeUpperCase )
{ {
LibCmpEntry* entry = ( LibCmpEntry* ) PQFirst( &m_Entries, false ); BOOST_FOREACH( LibCmpEntry& entry, m_Entries )
while( entry != NULL )
{ {
names.Add( entry->m_Name.m_Text ); if( makeUpperCase )
entry = ( LibCmpEntry* ) PQNext( m_Entries, entry, NULL ); names.Add( entry.m_Name.m_Text.MakeUpper() );
else
names.Add( entry.m_Name.m_Text );
} }
if( sort ) if( sort )
...@@ -88,32 +81,30 @@ void LibraryStruct::SearchEntryNames( wxArrayString& names, ...@@ -88,32 +81,30 @@ void LibraryStruct::SearchEntryNames( wxArrayString& names,
const wxString& keySearch, const wxString& keySearch,
bool sort ) bool sort )
{ {
LibCmpEntry* Entry; BOOST_FOREACH( LibCmpEntry& entry, m_Entries )
Entry = (LibCmpEntry*) PQFirst( &m_Entries, false );
while( Entry )
{ {
if( !keySearch.IsEmpty() && KeyWordOk( keySearch, Entry->m_KeyWord ) ) if( !keySearch.IsEmpty() && KeyWordOk( keySearch, entry.m_KeyWord ) )
names.Add( Entry->m_Name.m_Text ); names.Add( entry.m_Name.m_Text );
if( !nameSearch.IsEmpty() && WildCompareString( nameSearch, if( !nameSearch.IsEmpty() && WildCompareString( nameSearch,
Entry->m_Name.m_Text, entry.m_Name.m_Text,
false ) ) false ) )
names.Add( Entry->m_Name.m_Text ); names.Add( entry.m_Name.m_Text );
Entry = (LibCmpEntry*) PQNext( m_Entries, Entry, NULL );
} }
if( sort )
names.Sort();
} }
LibCmpEntry* LibraryStruct::FindEntry( const wxChar* name ) LibCmpEntry* LibraryStruct::FindEntry( const wxChar* name )
{ {
static LibCmpEntry tmp( ALIAS, wxEmptyString ); BOOST_FOREACH( LibCmpEntry& entry, m_Entries )
tmp.m_Name.m_Text = name; {
if( entry.m_Name.m_Text.CmpNoCase( name ) == 0 )
PQCompFunc( ( PQCompFuncType ) LibraryEntryCompare ); return &entry;
}
return ( LibCmpEntry* ) PQFind( m_Entries, &tmp ); return NULL;
} }
...@@ -121,22 +112,14 @@ LibCmpEntry* LibraryStruct::FindEntry( const wxChar* name, LibrEntryType type ) ...@@ -121,22 +112,14 @@ LibCmpEntry* LibraryStruct::FindEntry( const wxChar* name, LibrEntryType type )
{ {
LibCmpEntry* entry = FindEntry( name ); LibCmpEntry* entry = FindEntry( name );
if( entry != NULL && entry->Type != ROOT && type == ROOT ) if( entry && entry->Type != ROOT && type == ROOT )
{ {
EDA_LibCmpAliasStruct* alias = ( EDA_LibCmpAliasStruct* ) entry; EDA_LibCmpAliasStruct* alias = ( EDA_LibCmpAliasStruct* ) entry;
const wxChar* rootname = alias->m_RootName.GetData();
PQCompFunc( (PQCompFuncType) LibraryEntryCompare ); entry = FindEntry( alias->m_RootName );
entry = (LibCmpEntry*) PQFirst( &m_Entries, false );
while( entry ) if( entry && entry->Type != ROOT )
{ return NULL;
if( entry->m_Name.m_Text.CmpNoCase( rootname ) == 0
&& entry->Type == ROOT )
break;
entry = (LibCmpEntry*) PQNext( m_Entries, entry, NULL );
}
} }
return entry; return entry;
...@@ -154,12 +137,10 @@ EDA_LibComponentStruct* LibraryStruct::AddComponent( EDA_LibComponentStruct* cmp ...@@ -154,12 +137,10 @@ EDA_LibComponentStruct* LibraryStruct::AddComponent( EDA_LibComponentStruct* cmp
return NULL; return NULL;
newCmp->m_AliasList.Clear(); newCmp->m_AliasList.Clear();
PQCompFunc( (PQCompFuncType) LibraryEntryCompare ); m_Entries.push_back( (LibCmpEntry*) newCmp );
PQInsert( &m_Entries, (void*) newCmp ); m_IsModified = true;
m_NumOfParts++;
m_Modified = 1;
for( unsigned ii = 0; ii < cmp->m_AliasList.GetCount(); ii += ALIAS_NEXT ) for( unsigned ii = 0; ii < cmp->m_AliasList.GetCount(); ii += ALIAS_NEXT )
{ {
wxString aliasname = cmp->m_AliasList[ii + ALIAS_NAME]; wxString aliasname = cmp->m_AliasList[ii + ALIAS_NAME];
newCmp->m_AliasList.Add( aliasname ); newCmp->m_AliasList.Add( aliasname );
...@@ -167,15 +148,30 @@ EDA_LibComponentStruct* LibraryStruct::AddComponent( EDA_LibComponentStruct* cmp ...@@ -167,15 +148,30 @@ EDA_LibComponentStruct* LibraryStruct::AddComponent( EDA_LibComponentStruct* cmp
Alias->m_Doc = cmp->m_AliasList[ii + ALIAS_DOC]; Alias->m_Doc = cmp->m_AliasList[ii + ALIAS_DOC];
Alias->m_KeyWord = cmp->m_AliasList[ii + ALIAS_KEYWORD]; Alias->m_KeyWord = cmp->m_AliasList[ii + ALIAS_KEYWORD];
Alias->m_DocFile = cmp->m_AliasList[ii + ALIAS_DOC_FILENAME]; Alias->m_DocFile = cmp->m_AliasList[ii + ALIAS_DOC_FILENAME];
m_Entries.push_back( (LibCmpEntry *) Alias );
PQInsert( &m_Entries, (void*) Alias );
m_NumOfParts++;
} }
m_Entries.sort();
return newCmp; return newCmp;
} }
void LibraryStruct::RemoveEntry( const wxString& name )
{
LIB_ENTRY_LIST::iterator i;
for( i = m_Entries.begin(); i < m_Entries.end(); i++ )
{
if( i->m_Name.m_Text.CmpNoCase( name ) == 0 )
{
m_Entries.erase( i );
return;
}
}
}
void LibraryStruct::RemoveEntry( LibCmpEntry* entry ) void LibraryStruct::RemoveEntry( LibCmpEntry* entry )
{ {
wxASSERT( entry != NULL ); wxASSERT( entry != NULL );
...@@ -183,8 +179,7 @@ void LibraryStruct::RemoveEntry( LibCmpEntry* entry ) ...@@ -183,8 +179,7 @@ void LibraryStruct::RemoveEntry( LibCmpEntry* entry )
EDA_LibComponentStruct* Root; EDA_LibComponentStruct* Root;
EDA_LibCmpAliasStruct* Alias; EDA_LibCmpAliasStruct* Alias;
PQCompFunc( (PQCompFuncType) LibraryEntryCompare ); m_IsModified = true;
m_Modified = 1;
if( entry->Type == ALIAS ) if( entry->Type == ALIAS )
{ {
...@@ -213,35 +208,25 @@ alias list in library <%s>" ), ...@@ -213,35 +208,25 @@ alias list in library <%s>" ),
Root->m_AliasList.RemoveAt( index ); Root->m_AliasList.RemoveAt( index );
} }
/* Effacement memoire pour cet alias */ RemoveEntry( Alias->m_Name.m_Text );
PQDelete( &m_Entries, (void*) Alias );
SAFE_DELETE( Alias );
if( m_NumOfParts > 0 )
m_NumOfParts--;
return; return;
} }
Root = ( EDA_LibComponentStruct* ) entry; Root = ( EDA_LibComponentStruct* ) entry;
/* Entry is a component with no aliases so removal is simple */ /* Entry is a component with no aliases so removal is simple. */
if( Root->m_AliasList.GetCount() == 0 ) if( Root->m_AliasList.GetCount() == 0 )
{ {
PQDelete( &m_Entries, (void*) Root ); RemoveEntry( Root->m_Name.m_Text );
SAFE_DELETE( Root );
if( m_NumOfParts > 0 )
m_NumOfParts--;
return; return;
} }
/* Entry is a component with alias /* Entry is a component with one or more alias. */
* We must change the first alias to a "root" component, and for all the
* aliases we must change the root component (which is deleted) by the
* first alias */
wxString AliasName = Root->m_AliasList[0]; wxString AliasName = Root->m_AliasList[0];
/* The root component is not really deleted, it is renamed with the first /* The root component is not really deleted, it is renamed with the first
* alias name */ * alias name. */
Alias = (EDA_LibCmpAliasStruct*) FindEntry( AliasName, ALIAS ); Alias = (EDA_LibCmpAliasStruct*) FindEntry( AliasName, ALIAS );
if( Alias == NULL || Alias->Type == ROOT ) if( Alias == NULL || Alias->Type == ROOT )
...@@ -251,41 +236,32 @@ library <%s>" ), ...@@ -251,41 +236,32 @@ library <%s>" ),
( const wxChar* ) AliasName, ( const wxChar* ) AliasName,
( const wxChar* ) Root->m_Name.m_Text, ( const wxChar* ) Root->m_Name.m_Text,
( const wxChar* ) m_Name ); ( const wxChar* ) m_Name );
return;
} }
else
{
if( m_NumOfParts > 0 )
m_NumOfParts--;
/* remove the root component from library */
PQDelete( &m_Entries, Root );
/* remove the first alias from library*/ /* Remove the first alias name from the component alias list. */
PQDelete( &m_Entries, Alias ); Root->m_AliasList.RemoveAt( 0 );
/* remove the first alias name from alias list: */ /* Rename the component to the name of the first alias. */
Root->m_AliasList.RemoveAt( 0 ); Root->m_Doc = Alias->m_Doc;
/* change the old name. New name for "root" is the name of the first Root->m_KeyWord = Alias->m_KeyWord;
* alias */
entry->m_Name.m_Text = AliasName;
entry->m_Doc = Alias->m_Doc;
entry->m_KeyWord = Alias->m_KeyWord;
FreeLibraryEntry( ( LibCmpEntry* ) Alias ); /* Remove the first alias from library. */
RemoveEntry( AliasName );
/* root component (renamed) placed in library */ Root->m_Name.m_Text = AliasName;
PQInsert( &m_Entries, entry );
}
/* Change the "RootName", for other aliases */ /* Change the "RootName" for all other aliases */
for( unsigned ii = 0; ii < Root->m_AliasList.GetCount(); ii++ ) for( size_t ii = 0; ii < Root->m_AliasList.GetCount(); ii++ )
{ {
AliasName = Root->m_AliasList[ii]; Alias = (EDA_LibCmpAliasStruct*) FindEntry( Root->m_AliasList[ii],
Alias = (EDA_LibCmpAliasStruct*) FindEntry( AliasName, ALIAS ); ALIAS );
if( Alias == NULL ) /* Should not occur if library was saved by the library editor.
* However, it is possible if the library was edited by hand or
* some other program or a there is a bug in the library editor. */
if( Alias == NULL || Alias->Type != ALIAS )
{ {
// Should not occurs. If happens, this is an error (or bug)
wxLogWarning( wxT( "Alias <%s> for component <%s> not found in \ wxLogWarning( wxT( "Alias <%s> for component <%s> not found in \
library <%s>." ), library <%s>." ),
( const wxChar* ) AliasName, ( const wxChar* ) AliasName,
...@@ -293,41 +269,31 @@ library <%s>." ), ...@@ -293,41 +269,31 @@ library <%s>." ),
( const wxChar* ) m_Name ); ( const wxChar* ) m_Name );
continue; continue;
} }
if( Alias->Type != ALIAS )
{
// Should not occurs. If happens, this is an error (or bug)
wxLogWarning( wxT( "Entry <%s> for component <%s> in library \
<%s> is not an alias." ),
( const wxChar* ) AliasName,
( const wxChar* ) Root->m_Name.m_Text,
( const wxChar* ) m_Name );
continue;
}
Alias->m_RootName = entry->m_Name.m_Text; Alias->m_RootName = Root->m_Name.m_Text;
} }
} }
LibCmpEntry* LibraryStruct::GetNextEntry( const wxChar* name ) LibCmpEntry* LibraryStruct::GetNextEntry( const wxChar* name )
{ {
PQCompFunc( (PQCompFuncType) LibraryEntryCompare ); size_t i;
LibCmpEntry* entry = NULL;
LibCmpEntry* entry = (LibCmpEntry*) PQFirst( &m_Entries, false ); for( i = 0; i < m_Entries.size(); i++ )
while( entry )
{ {
if( entry->m_Name.m_Text.CmpNoCase( name ) == 0 ) if( m_Entries[i].m_Name.m_Text.CmpNoCase( name ) == 0 )
{ {
entry = (LibCmpEntry*) PQNext( m_Entries, entry, NULL ); if( i < m_Entries.size() - 1 )
break; {
entry = &m_Entries[ i + 1 ];
break;
}
} }
entry = (LibCmpEntry*) PQNext( m_Entries, entry, NULL );
} }
if( entry == NULL ) if( entry == NULL )
entry = (LibCmpEntry*) PQFirst( &m_Entries, false ); entry = &m_Entries.front();
return entry; return entry;
} }
...@@ -335,45 +301,18 @@ LibCmpEntry* LibraryStruct::GetNextEntry( const wxChar* name ) ...@@ -335,45 +301,18 @@ LibCmpEntry* LibraryStruct::GetNextEntry( const wxChar* name )
LibCmpEntry* LibraryStruct::GetPreviousEntry( const wxChar* name ) LibCmpEntry* LibraryStruct::GetPreviousEntry( const wxChar* name )
{ {
LibCmpEntry* previousEntry = NULL; size_t i;
LibCmpEntry* entry = NULL;
PQCompFunc( (PQCompFuncType) LibraryEntryCompare );
LibCmpEntry* entry = (LibCmpEntry*) PQFirst( &m_Entries, false );
while( entry ) for( i = 0; i < m_Entries.size(); i++ )
{ {
if( entry->m_Name.m_Text.CmpNoCase( name ) == 0 ) if( m_Entries[i].m_Name.m_Text.CmpNoCase( name ) == 0 && entry )
{ break;
if( previousEntry )
break;
}
previousEntry = entry; entry = &m_Entries[i];
entry = (LibCmpEntry*) PQNext( m_Entries, entry, NULL );
} }
return previousEntry; return entry;
}
bool LibraryStruct::WriteHeader( FILE* file )
{
char BufLine[1024];
bool succes = false;
DateAndTime( BufLine );
if( fprintf( file, "%s %d.%d Date: %s\n", LIBFILE_IDENT,
LIB_VERSION_MAJOR, LIB_VERSION_MINOR, BufLine ) < 0 )
succes = false;
#if 0
if( ( fprintf( file, "$HEADER\n" ) < 0 )
|| ( fprintf( file, "TimeStamp %8.8lX\n", m_TimeStamp ) < 0 )
|| ( fprintf( file, "Parts %d\n", m_NumOfParts ) != 2 )
|| ( fprintf( file, "$ENDHEADER\n" ) != 1 ) )
succes = false;
#endif
return succes;
} }
...@@ -399,8 +338,6 @@ bool LibraryStruct::Load( wxString& errMsg ) ...@@ -399,8 +338,6 @@ bool LibraryStruct::Load( wxString& errMsg )
return false; return false;
} }
m_NumOfParts = 0;
if( GetLine( f, Line, &LineNum, sizeof( Line ) ) == NULL ) if( GetLine( f, Line, &LineNum, sizeof( Line ) ) == NULL )
{ {
errMsg = _( "file is empty!" ); errMsg = _( "file is empty!" );
...@@ -413,9 +350,6 @@ bool LibraryStruct::Load( wxString& errMsg ) ...@@ -413,9 +350,6 @@ bool LibraryStruct::Load( wxString& errMsg )
return false; return false;
} }
PQInit( &m_Entries );
PQCompFunc( (PQCompFuncType) LibraryEntryCompare );
/* There is no header if this is a symbol library. */ /* There is no header if this is a symbol library. */
if( m_Type == LIBRARY_TYPE_EESCHEMA ) if( m_Type == LIBRARY_TYPE_EESCHEMA )
m_Header = CONV_FROM_UTF8( Line ); m_Header = CONV_FROM_UTF8( Line );
...@@ -425,7 +359,7 @@ bool LibraryStruct::Load( wxString& errMsg ) ...@@ -425,7 +359,7 @@ bool LibraryStruct::Load( wxString& errMsg )
if( m_Type == LIBRARY_TYPE_EESCHEMA if( m_Type == LIBRARY_TYPE_EESCHEMA
&& strnicmp( Line, "$HEADER", 7 ) == 0 ) && strnicmp( Line, "$HEADER", 7 ) == 0 )
{ {
if( !ReadHeader( f, &LineNum ) ) if( !LoadHeader( f, &LineNum ) )
{ {
errMsg = _( "header read error" ); errMsg = _( "header read error" );
return false; return false;
...@@ -442,9 +376,8 @@ bool LibraryStruct::Load( wxString& errMsg ) ...@@ -442,9 +376,8 @@ bool LibraryStruct::Load( wxString& errMsg )
if( LibEntry->Load( f, Line, &LineNum, msg ) ) if( LibEntry->Load( f, Line, &LineNum, msg ) )
{ {
/* If we are here, this part is O.k. - put it in: */ /* If we are here, this part is O.k. - put it in: */
m_NumOfParts += 1; m_Entries.push_back( LibEntry );
PQInsert( &m_Entries, LibEntry ); LoadAliases( LibEntry );
InsertAliases( &m_Entries, LibEntry );
} }
else else
{ {
...@@ -457,14 +390,15 @@ bool LibraryStruct::Load( wxString& errMsg ) ...@@ -457,14 +390,15 @@ bool LibraryStruct::Load( wxString& errMsg )
} }
} }
m_Entries.sort();
return true; return true;
} }
void LibraryStruct::InsertAliases( PriorQue** PQ, void LibraryStruct::LoadAliases( EDA_LibComponentStruct* component )
EDA_LibComponentStruct* component )
{ {
wxASSERT( component != NULL && PQ != NULL ); wxASSERT( component != NULL );
EDA_LibCmpAliasStruct* AliasEntry; EDA_LibCmpAliasStruct* AliasEntry;
unsigned ii; unsigned ii;
...@@ -474,13 +408,12 @@ void LibraryStruct::InsertAliases( PriorQue** PQ, ...@@ -474,13 +408,12 @@ void LibraryStruct::InsertAliases( PriorQue** PQ,
AliasEntry = AliasEntry =
new EDA_LibCmpAliasStruct( component->m_AliasList[ii], new EDA_LibCmpAliasStruct( component->m_AliasList[ii],
component->m_Name.m_Text ); component->m_Name.m_Text );
PQInsert( PQ, AliasEntry ); m_Entries.push_back( AliasEntry );
m_NumOfParts += 1;
} }
} }
bool LibraryStruct::ReadHeader( FILE* libfile, int* LineNum ) bool LibraryStruct::LoadHeader( FILE* libfile, int* LineNum )
{ {
char Line[1024], * text, * data; char Line[1024], * text, * data;
...@@ -498,7 +431,93 @@ bool LibraryStruct::ReadHeader( FILE* libfile, int* LineNum ) ...@@ -498,7 +431,93 @@ bool LibraryStruct::ReadHeader( FILE* libfile, int* LineNum )
} }
bool LibraryStruct::SaveLibrary( const wxString& FullFileName ) bool LibraryStruct::LoadDocs( wxString& errMsg )
{
int LineNum = 0;
char Line[1024], * Name, * Text;
LibCmpEntry* Entry;
FILE* f;
wxString msg;
wxFileName fn;
fn = m_FullFileName;
fn.SetExt( DOC_EXT );
f = wxFopen( fn.GetFullPath(), wxT( "rt" ) );
if( f == NULL )
{
errMsg.Printf( _( "Could not open component document libray file\n<%s>." ),
(const wxChar*) fn.GetFullPath() );
return false;
}
if( GetLine( f, Line, &LineNum, sizeof(Line) ) == NULL )
{
errMsg.Printf( _( "Component document libray file <%s> is empty." ),
(const wxChar*) fn.GetFullPath() );
fclose( f );
return false;
}
if( strnicmp( Line, DOCFILE_IDENT, 10 ) != 0 )
{
errMsg.Printf( _( "File <%s> is not a valid component library \
document file." ),
(const wxChar*) fn.GetFullPath() );
fclose( f );
return false;
}
while( GetLine( f, Line, &LineNum, sizeof(Line) ) )
{
if( strncmp( Line, "$CMP", 4 ) != 0 )
{
errMsg.Printf( wxT( "$CMP command expected in line %d, aborted." ),
LineNum );
fclose( f );
return false;
}
/* Read one $CMP/$ENDCMP part entry from library: */
Name = strtok( Line + 5, "\n\r" );
wxString cmpname = CONV_FROM_UTF8( Name );
Entry = FindEntry( cmpname, ALIAS );
while( GetLine( f, Line, &LineNum, sizeof(Line) ) )
{
if( strncmp( Line, "$ENDCMP", 7 ) == 0 )
break;
Text = strtok( Line + 2, "\n\r" );
switch( Line[0] )
{
case 'D':
if( Entry )
Entry->m_Doc = CONV_FROM_UTF8( Text );
break;
case 'K':
if( Entry )
Entry->m_KeyWord = CONV_FROM_UTF8( Text );
break;
case 'F':
if( Entry )
Entry->m_DocFile = CONV_FROM_UTF8( Text );
break;
}
}
}
fclose( f );
return true;
}
bool LibraryStruct::Save( const wxString& FullFileName )
{ {
FILE* libfile, *docfile; FILE* libfile, *docfile;
wxString msg; wxString msg;
...@@ -538,7 +557,6 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName ) ...@@ -538,7 +557,6 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName )
} }
} }
libfile = wxFopen( libFileName.GetFullPath(), wxT( "wt" ) ); libfile = wxFopen( libFileName.GetFullPath(), wxT( "wt" ) );
if( libfile == NULL ) if( libfile == NULL )
...@@ -557,11 +575,11 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName ) ...@@ -557,11 +575,11 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName )
DisplayError( NULL, msg ); DisplayError( NULL, msg );
} }
m_Modified = 0; m_IsModified = false;
/* Creation de l'entete de la librairie */ /* Creation de l'entete de la librairie */
m_TimeStamp = GetTimeStamp(); m_TimeStamp = GetTimeStamp();
WriteHeader( libfile ); SaveHeader( libfile );
/* Sauvegarde des composant: */ /* Sauvegarde des composant: */
char Line[256]; char Line[256];
...@@ -570,24 +588,20 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName ) ...@@ -570,24 +588,20 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName )
bool success = true; bool success = true;
LibCmpEntry* entry = ( LibCmpEntry* ) PQFirst( &m_Entries, false ); BOOST_FOREACH( LibCmpEntry& entry, m_Entries )
while( entry != NULL )
{ {
if ( entry->Type == ROOT ) if ( entry.Type == ROOT )
{ {
EDA_LibComponentStruct* component = EDA_LibComponentStruct* component =
( EDA_LibComponentStruct* ) entry; ( EDA_LibComponentStruct* ) &entry;
if ( ! component->Save( libfile ) ) if ( ! component->Save( libfile ) )
success = false; success = false;
} }
if ( docfile ) if ( docfile )
{ {
if ( ! entry->SaveDoc( docfile ) ) if ( ! entry.SaveDoc( docfile ) )
success = false; success = false;
} }
entry = ( LibCmpEntry* ) PQNext( m_Entries, entry, NULL );
} }
fprintf( libfile, "#\n#End Library\n" ); fprintf( libfile, "#\n#End Library\n" );
...@@ -599,6 +613,26 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName ) ...@@ -599,6 +613,26 @@ bool LibraryStruct::SaveLibrary( const wxString& FullFileName )
} }
bool LibraryStruct::SaveHeader( FILE* file )
{
char BufLine[1024];
bool succes = false;
DateAndTime( BufLine );
if( fprintf( file, "%s %d.%d Date: %s\n", LIBFILE_IDENT,
LIB_VERSION_MAJOR, LIB_VERSION_MINOR, BufLine ) < 0 )
succes = false;
#if 0
if( ( fprintf( file, "$HEADER\n" ) < 0 )
|| ( fprintf( file, "TimeStamp %8.8lX\n", m_TimeStamp ) < 0 )
|| ( fprintf( file, "Parts %d\n", m_Entries.size() ) != 2 )
|| ( fprintf( file, "$ENDHEADER\n" ) != 1 ) )
succes = false;
#endif
return succes;
}
wxString LibraryStruct::GetName() wxString LibraryStruct::GetName()
{ {
return m_Name; return m_Name;
......
eeschema/class_library.h
View file @ 79c9be25
...@@ -9,9 +9,12 @@ ...@@ -9,9 +9,12 @@
#include "class_libentry.h" #include "class_libentry.h"
/******************************/ /**
/* Class to handle a library */ * Component library object.
/******************************/ *
* Component libraries are used to load, save, search, and otherwise manipulate
* component library files.
*/
class LibraryStruct class LibraryStruct
{ {
...@@ -20,10 +23,7 @@ public: ...@@ -20,10 +23,7 @@ public:
wxString m_Name; /* Library file name (without path). */ wxString m_Name; /* Library file name (without path). */
wxString m_FullFileName; /* Full File Name (with path) of library. */ wxString m_FullFileName; /* Full File Name (with path) of library. */
wxString m_Header; /* first line of loaded library. */ wxString m_Header; /* first line of loaded library. */
int m_NumOfParts; /* Number of parts this library has. */
LibraryStruct* m_Pnext; /* Point on next lib in chain. */ LibraryStruct* m_Pnext; /* Point on next lib in chain. */
int m_Modified; /* flag indicateur d'edition */
int m_Size; // Size in bytes (for statistics)
unsigned long m_TimeStamp; // Signature temporelle unsigned long m_TimeStamp; // Signature temporelle
int m_Flags; // variable used in some functions int m_Flags; // variable used in some functions
bool m_IsLibCache; /* False for the "standard" libraries, bool m_IsLibCache; /* False for the "standard" libraries,
...@@ -46,14 +46,26 @@ public: ...@@ -46,14 +46,26 @@ public:
* *
* @return bool - true if success writing else false. * @return bool - true if success writing else false.
*/ */
bool SaveLibrary( const wxString& aFullFileName ); bool Save( const wxString& aFullFileName );
bool ReadHeader( FILE* file, int* LineNum );
/**
* Load library from file.
*
* @param errMsg - Error message if load fails.
*
* @return bool - True if load was successful otherwise false.
*/
bool Load( wxString& errMsg ); bool Load( wxString& errMsg );
void InsertAliases( PriorQue** PQ, EDA_LibComponentStruct* component );
bool LoadDocs( wxString& errMsg );
private: private:
bool WriteHeader( FILE* file ); bool SaveHeader( FILE* file );
bool LoadHeader( FILE* file, int* LineNum );
void LoadAliases( EDA_LibComponentStruct* component );
void RemoveEntry( const wxString& name );
public: public:
LibraryStruct( const wxChar* fileName = NULL ); LibraryStruct( const wxChar* fileName = NULL );
...@@ -65,7 +77,22 @@ public: ...@@ -65,7 +77,22 @@ public:
*/ */
bool IsEmpty() bool IsEmpty()
{ {
return m_Entries == NULL; return m_Entries.empty();
}
/**
* Get the number of entries in the library.
*
* @return The number of component and alias entries.
*/
int GetCount()
{
return m_Entries.size();
}
bool IsModified()
{
return m_IsModified;
} }
/** /**
...@@ -73,8 +100,10 @@ public: ...@@ -73,8 +100,10 @@ public:
* *
* @param names - String array to place entry names into. * @param names - String array to place entry names into.
* @param sort - Sort names if true. * @param sort - Sort names if true.
* @param makeUpperCase - Force entry names to upper case.
*/ */
void GetEntryNames( wxArrayString& names, bool sort = true ); void GetEntryNames( wxArrayString& names, bool sort = true,
bool makeUpperCase = true );
/** /**
* Load string array with entry names matching name and/or key word. * Load string array with entry names matching name and/or key word.
...@@ -150,7 +179,7 @@ public: ...@@ -150,7 +179,7 @@ public:
*/ */
LibCmpEntry* GetFirstEntry() LibCmpEntry* GetFirstEntry()
{ {
return (LibCmpEntry*) PQFirst( &m_Entries, false ); return &m_Entries.front();
} }
/** /**
...@@ -180,23 +209,19 @@ public: ...@@ -180,23 +209,19 @@ public:
*/ */
LibCmpEntry* GetPreviousEntry( const wxChar* name ); LibCmpEntry* GetPreviousEntry( const wxChar* name );
bool Save( const wxString& saveAsFile );
wxString GetName(); wxString GetName();
protected: protected:
wxFileName m_fileName; /* Library file name. */ wxFileName m_fileName; /* Library file name. */
wxDateTime m_DateTime; /* Library save time and date. */ wxDateTime m_DateTime; /* Library save time and date. */
wxString m_Version; /* Library save version. */ wxString m_Version; /* Library save version. */
PriorQue* m_Entries; /* Parts themselves are saved here. */ LIB_ENTRY_LIST m_Entries; /* Parts themselves are saved here. */
bool m_IsModified; /* Library modification status. */
friend class EDA_LibComponentStruct; friend class EDA_LibComponentStruct;
}; };
extern void FreeLibraryEntry( LibCmpEntry* Entry );
/** /**
* Case insensitive library name comparison. * Case insensitive library name comparison.
*/ */
......
eeschema/class_pin.cpp
View file @ 79c9be25
...@@ -73,7 +73,8 @@ bool LibDrawPin::HitTest( const wxPoint& aRefPos ) ...@@ -73,7 +73,8 @@ bool LibDrawPin::HitTest( const wxPoint& aRefPos )
* @param aThreshold = max distance to a segment * @param aThreshold = max distance to a segment
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
bool LibDrawPin::HitTest( wxPoint aRefPos, int aThreshold, const int aTransMat[2][2] ) bool LibDrawPin::HitTest( wxPoint aRefPos, int aThreshold,
const int aTransMat[2][2] )
{ {
wxPoint pinPos = TransformCoordinate( aTransMat, m_Pos ); wxPoint pinPos = TransformCoordinate( aTransMat, m_Pos );
wxPoint pinEnd = TransformCoordinate( aTransMat, ReturnPinEndPoint() ); wxPoint pinEnd = TransformCoordinate( aTransMat, ReturnPinEndPoint() );
...@@ -286,7 +287,6 @@ int LibDrawPin::GetPenSize( ) ...@@ -286,7 +287,6 @@ int LibDrawPin::GetPenSize( )
} }
/**********************************************************************************************/
void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel,
wxDC* aDC, wxDC* aDC,
const wxPoint& aOffset, const wxPoint& aOffset,
...@@ -294,10 +294,9 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, ...@@ -294,10 +294,9 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel,
int aDrawMode, int aDrawMode,
void* aData, void* aData,
const int aTransformMatrix[2][2] ) const int aTransformMatrix[2][2] )
/**********************************************************************************************/
{ {
// Invisibles pins are only drawn on request. // Invisible pins are only drawn on request. In libedit they are drawn
// But in libedit they are drawn in g_InvisibleItemColor because we must see them // in g_InvisibleItemColor because we must see them.
WinEDA_SchematicFrame* frame = WinEDA_SchematicFrame* frame =
(WinEDA_SchematicFrame*) wxGetApp().GetTopWindow(); (WinEDA_SchematicFrame*) wxGetApp().GetTopWindow();
...@@ -312,7 +311,7 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, ...@@ -312,7 +311,7 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel,
EDA_LibComponentStruct* Entry = ( (DrawPinPrms*) aData )->m_Entry; EDA_LibComponentStruct* Entry = ( (DrawPinPrms*) aData )->m_Entry;
bool DrawPinText = ( (DrawPinPrms*) aData )->m_DrawPinText; bool DrawPinText = ( (DrawPinPrms*) aData )->m_DrawPinText;
/* Calculate Pin orient takin in account the component orientation */ /* Calculate pin orient taking in account the component orientation. */
int orient = ReturnPinDrawOrient( aTransformMatrix ); int orient = ReturnPinDrawOrient( aTransformMatrix );
/* Calculate the pin position */ /* Calculate the pin position */
...@@ -500,7 +499,7 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, ...@@ -500,7 +499,7 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel,
* If PinText == NULL nothing is printed. If PinNum = 0 no number is printed. * If PinText == NULL nothing is printed. If PinNum = 0 no number is printed.
* Current Zoom factor is taken into account. * Current Zoom factor is taken into account.
* If TextInside then the text is been put inside,otherwise all is drawn outside. * If TextInside then the text is been put inside,otherwise all is drawn outside.
* Pin Name: substring beteween '~' is negated * Pin Name: substring beteween '~' is negated
*****************************************************************************/ *****************************************************************************/
void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
wxDC* DC, wxDC* DC,
...@@ -592,7 +591,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -592,7 +591,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
{ {
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( (x1 + pin_pos.x) / 2, wxPoint( (x1 + pin_pos.x) / 2,
y1 - TXTMARGE ), NumColor, y1 - TXTMARGE ), NumColor,
StringPinNum, StringPinNum,
TEXT_ORIENT_HORIZ, PinNumSize, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
...@@ -655,8 +654,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -655,8 +654,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
if( DrawPinName ) if( DrawPinName )
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
DrawGraphicText( panel, DC, wxPoint( x, DrawGraphicText( panel, DC, wxPoint( x, y1 - TXTMARGE ),
y1 - TXTMARGE ),
NameColor, m_PinName, NameColor, m_PinName,
TEXT_ORIENT_HORIZ, PinNameSize, TEXT_ORIENT_HORIZ, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
...@@ -666,8 +664,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -666,8 +664,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
if( DrawPinNum ) if( DrawPinNum )
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
DrawGraphicText( panel, DC, wxPoint( x, DrawGraphicText( panel, DC, wxPoint( x, y1 + TXTMARGE ),
y1 + TXTMARGE ),
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_HORIZ, PinNumSize, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
...@@ -680,8 +677,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -680,8 +677,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
if( DrawPinName ) if( DrawPinName )
{ {
y = (y1 + pin_pos.y) / 2; y = (y1 + pin_pos.y) / 2;
DrawGraphicText( panel, DC, wxPoint( x1 - TXTMARGE, DrawGraphicText( panel, DC, wxPoint( x1 - TXTMARGE, y ),
y ),
NameColor, m_PinName, NameColor, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
...@@ -692,8 +688,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -692,8 +688,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
if( DrawPinNum ) if( DrawPinNum )
{ {
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( x1 + TXTMARGE, wxPoint( x1 + TXTMARGE, (y1 + pin_pos.y) / 2 ),
(y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
...@@ -706,16 +701,16 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -706,16 +701,16 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
/***************************************************************************** /*****************************************************************************
* Plot pin number and pin text info, given the pin line coordinates. * * Plot pin number and pin text info, given the pin line coordinates. *
* Same as DrawPinTexts((), but output is the plotter * Same as DrawPinTexts((), but output is the plotter
* The line must be vertical or horizontal. * * The line must be vertical or horizontal. *
* If PinNext == NULL nothing is printed. * * If PinNext == NULL nothing is printed. *
* Current Zoom factor is taken into account. * * Current Zoom factor is taken into account. *
* If TextInside then the text is been put inside (moving from x1, y1 in * * If TextInside then the text is been put inside (moving from x1, y1 in *
* the opposite direction to x2,y2), otherwise all is drawn outside. * * the opposite direction to x2,y2), otherwise all is drawn outside. *
*****************************************************************************/ *****************************************************************************/
void LibDrawPin::PlotPinTexts( PLOTTER *plotter, void LibDrawPin::PlotPinTexts( PLOTTER *plotter,
wxPoint& pin_pos, wxPoint& pin_pos,
int orient, int orient,
int TextInside, int TextInside,
bool DrawPinNum, bool DrawPinNum,
...@@ -764,32 +759,33 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter, ...@@ -764,32 +759,33 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter,
{ {
x = x1 + TextInside; x = x1 + TextInside;
plotter->text( wxPoint( x, y1 ), NameColor, plotter->text( wxPoint( x, y1 ), NameColor,
m_PinName, m_PinName,
TEXT_ORIENT_HORIZ, TEXT_ORIENT_HORIZ,
PinNameSize, PinNameSize,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
aWidth, false, false ); aWidth, false, false );
} }
else // orient == PIN_LEFT else // orient == PIN_LEFT
{ {
x = x1 - TextInside; x = x1 - TextInside;
if( DrawPinName ) if( DrawPinName )
plotter->text( wxPoint( x, y1 ), plotter->text( wxPoint( x, y1 ),
NameColor, m_PinName, TEXT_ORIENT_HORIZ, NameColor, m_PinName, TEXT_ORIENT_HORIZ,
PinNameSize, PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
aWidth, false, false ); aWidth, false, false );
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
plotter->text( wxPoint( (x1 + pin_pos.x) / 2, y1 - TXTMARGE ), plotter->text( wxPoint( (x1 + pin_pos.x) / 2,
NumColor, StringPinNum, y1 - TXTMARGE ),
TEXT_ORIENT_HORIZ, PinNumSize, NumColor, StringPinNum,
GR_TEXT_HJUSTIFY_CENTER, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_VJUSTIFY_BOTTOM, GR_TEXT_HJUSTIFY_CENTER,
aWidth, false, false ); GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, false, false );
} }
} }
} }
...@@ -801,20 +797,20 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter, ...@@ -801,20 +797,20 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter,
if( DrawPinName ) if( DrawPinName )
plotter->text( wxPoint( x1, y ), NameColor, plotter->text( wxPoint( x1, y ), NameColor,
m_PinName, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
aWidth, false, false ); aWidth, false, false );
if( DrawPinNum ) if( DrawPinNum )
{ {
plotter->text( wxPoint( x1 - TXTMARGE, plotter->text( wxPoint( x1 - TXTMARGE,
(y1 + pin_pos.y) / 2 ), (y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, false, false ); aWidth, false, false );
} }
} }
else /* PIN_UP */ else /* PIN_UP */
...@@ -823,20 +819,20 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter, ...@@ -823,20 +819,20 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter,
if( DrawPinName ) if( DrawPinName )
plotter->text( wxPoint( x1, y ), NameColor, plotter->text( wxPoint( x1, y ), NameColor,
m_PinName, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
aWidth, false, false ); aWidth, false, false );
if( DrawPinNum ) if( DrawPinNum )
{ {
plotter->text( wxPoint( x1 - TXTMARGE, plotter->text( wxPoint( x1 - TXTMARGE,
(y1 + pin_pos.y) / 2 ), (y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, false, false ); aWidth, false, false );
} }
} }
} }
...@@ -850,21 +846,21 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter, ...@@ -850,21 +846,21 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter,
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
plotter->text( wxPoint( x, y1 - TXTMARGE ), plotter->text( wxPoint( x, y1 - TXTMARGE ),
NameColor, m_PinName, NameColor, m_PinName,
TEXT_ORIENT_HORIZ, PinNameSize, TEXT_ORIENT_HORIZ, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, false, false ); aWidth, false, false );
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
plotter->text( wxPoint( x, y1 + TXTMARGE ), plotter->text( wxPoint( x, y1 + TXTMARGE ),
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_HORIZ, PinNumSize, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_TOP, GR_TEXT_VJUSTIFY_TOP,
aWidth, false, false ); aWidth, false, false );
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
...@@ -873,21 +869,21 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter, ...@@ -873,21 +869,21 @@ void LibDrawPin::PlotPinTexts( PLOTTER *plotter,
{ {
y = (y1 + pin_pos.y) / 2; y = (y1 + pin_pos.y) / 2;
plotter->text( wxPoint( x1 - TXTMARGE, y ), plotter->text( wxPoint( x1 - TXTMARGE, y ),
NameColor, m_PinName, NameColor, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, false, false ); aWidth, false, false );
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
plotter->text( wxPoint( x1 + TXTMARGE, (y1 + pin_pos.y) / 2 ), plotter->text( wxPoint( x1 + TXTMARGE, (y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_TOP, GR_TEXT_VJUSTIFY_TOP,
aWidth, false, false ); aWidth, false, false );
} }
} }
} }
...@@ -1018,7 +1014,7 @@ void LibDrawPin::SetPinNumFromString( wxString& buffer ) ...@@ -1018,7 +1014,7 @@ void LibDrawPin::SetPinNumFromString( wxString& buffer )
/*************************************/ /*************************************/
LibDrawPin* LibDrawPin::GenCopy() LibEDA_BaseStruct* LibDrawPin::DoGenCopy()
/*************************************/ /*************************************/
{ {
LibDrawPin* newpin = new LibDrawPin( GetParent() ); LibDrawPin* newpin = new LibDrawPin( GetParent() );
...@@ -1043,7 +1039,7 @@ LibDrawPin* LibDrawPin::GenCopy() ...@@ -1043,7 +1039,7 @@ LibDrawPin* LibDrawPin::GenCopy()
newpin->m_PinName = m_PinName; newpin->m_PinName = m_PinName;
return newpin; return (LibEDA_BaseStruct*) newpin;
} }
......
eeschema/classes_body_items.cpp
View file @ 79c9be25
...@@ -218,7 +218,7 @@ bool LibDrawArc::HitTest( wxPoint aRefPoint, int aThreshold, const int aTransMat ...@@ -218,7 +218,7 @@ bool LibDrawArc::HitTest( wxPoint aRefPoint, int aThreshold, const int aTransMat
} }
LibDrawArc* LibDrawArc::GenCopy() LibEDA_BaseStruct* LibDrawArc::DoGenCopy()
{ {
LibDrawArc* newitem = new LibDrawArc( GetParent() ); LibDrawArc* newitem = new LibDrawArc( GetParent() );
...@@ -233,7 +233,7 @@ LibDrawArc* LibDrawArc::GenCopy() ...@@ -233,7 +233,7 @@ LibDrawArc* LibDrawArc::GenCopy()
newitem->m_Convert = m_Convert; newitem->m_Convert = m_Convert;
newitem->m_Flags = m_Flags; newitem->m_Flags = m_Flags;
newitem->m_Fill = m_Fill; newitem->m_Fill = m_Fill;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
...@@ -477,7 +477,7 @@ bool LibDrawCircle::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMa ...@@ -477,7 +477,7 @@ bool LibDrawCircle::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMa
} }
LibDrawCircle* LibDrawCircle::GenCopy() LibEDA_BaseStruct* LibDrawCircle::DoGenCopy()
{ {
LibDrawCircle* newitem = new LibDrawCircle( GetParent() ); LibDrawCircle* newitem = new LibDrawCircle( GetParent() );
...@@ -488,7 +488,7 @@ LibDrawCircle* LibDrawCircle::GenCopy() ...@@ -488,7 +488,7 @@ LibDrawCircle* LibDrawCircle::GenCopy()
newitem->m_Convert = m_Convert; newitem->m_Convert = m_Convert;
newitem->m_Flags = m_Flags; newitem->m_Flags = m_Flags;
newitem->m_Fill = m_Fill; newitem->m_Fill = m_Fill;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
...@@ -619,7 +619,7 @@ bool LibDrawSquare::Load( char* line, wxString& errorMsg ) ...@@ -619,7 +619,7 @@ bool LibDrawSquare::Load( char* line, wxString& errorMsg )
} }
LibDrawSquare* LibDrawSquare::GenCopy() LibEDA_BaseStruct* LibDrawSquare::DoGenCopy()
{ {
LibDrawSquare* newitem = new LibDrawSquare( GetParent() ); LibDrawSquare* newitem = new LibDrawSquare( GetParent() );
...@@ -630,7 +630,7 @@ LibDrawSquare* LibDrawSquare::GenCopy() ...@@ -630,7 +630,7 @@ LibDrawSquare* LibDrawSquare::GenCopy()
newitem->m_Convert = m_Convert; newitem->m_Convert = m_Convert;
newitem->m_Flags = m_Flags; newitem->m_Flags = m_Flags;
newitem->m_Fill = m_Fill; newitem->m_Fill = m_Fill;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
...@@ -788,7 +788,7 @@ bool LibDrawSegment::Load( char* line, wxString& errorMsg ) ...@@ -788,7 +788,7 @@ bool LibDrawSegment::Load( char* line, wxString& errorMsg )
} }
LibDrawSegment* LibDrawSegment::GenCopy() LibEDA_BaseStruct* LibDrawSegment::DoGenCopy()
{ {
LibDrawSegment* newitem = new LibDrawSegment( GetParent() ); LibDrawSegment* newitem = new LibDrawSegment( GetParent() );
...@@ -798,7 +798,7 @@ LibDrawSegment* LibDrawSegment::GenCopy() ...@@ -798,7 +798,7 @@ LibDrawSegment* LibDrawSegment::GenCopy()
newitem->m_Unit = m_Unit; newitem->m_Unit = m_Unit;
newitem->m_Convert = m_Convert; newitem->m_Convert = m_Convert;
newitem->m_Flags = m_Flags; newitem->m_Flags = m_Flags;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
...@@ -976,7 +976,7 @@ bool LibDrawPolyline::Load( char* line, wxString& errorMsg ) ...@@ -976,7 +976,7 @@ bool LibDrawPolyline::Load( char* line, wxString& errorMsg )
} }
LibDrawPolyline* LibDrawPolyline::GenCopy() LibEDA_BaseStruct* LibDrawPolyline::DoGenCopy()
{ {
LibDrawPolyline* newitem = new LibDrawPolyline( GetParent() ); LibDrawPolyline* newitem = new LibDrawPolyline( GetParent() );
...@@ -986,7 +986,7 @@ LibDrawPolyline* LibDrawPolyline::GenCopy() ...@@ -986,7 +986,7 @@ LibDrawPolyline* LibDrawPolyline::GenCopy()
newitem->m_Convert = m_Convert; newitem->m_Convert = m_Convert;
newitem->m_Flags = m_Flags; newitem->m_Flags = m_Flags;
newitem->m_Fill = m_Fill; newitem->m_Fill = m_Fill;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
...@@ -1238,7 +1238,7 @@ bool LibDrawBezier::Load( char* line, wxString& errorMsg ) ...@@ -1238,7 +1238,7 @@ bool LibDrawBezier::Load( char* line, wxString& errorMsg )
} }
LibDrawBezier* LibDrawBezier::GenCopy() LibEDA_BaseStruct* LibDrawBezier::DoGenCopy()
{ {
LibDrawBezier* newitem = new LibDrawBezier(GetParent()); LibDrawBezier* newitem = new LibDrawBezier(GetParent());
...@@ -1248,7 +1248,7 @@ LibDrawBezier* LibDrawBezier::GenCopy() ...@@ -1248,7 +1248,7 @@ LibDrawBezier* LibDrawBezier::GenCopy()
newitem->m_Convert = m_Convert; newitem->m_Convert = m_Convert;
newitem->m_Flags = m_Flags; newitem->m_Flags = m_Flags;
newitem->m_Fill = m_Fill; newitem->m_Fill = m_Fill;
return newitem; return (LibEDA_BaseStruct*) newitem;
} }
/** Function GetPenSize /** Function GetPenSize
......
eeschema/classes_body_items.h
View file @ 79c9be25
/****************************************************************/ /****************************************************************/
/* Headers fo library definition and lib component definitions */ /* Headers for library definition and lib component definitions */
/****************************************************************/ /****************************************************************/
/* Definitions of graphic items used to create shapes in component libraries. /* Definitions of graphic items used to create shapes in component libraries.
...@@ -92,7 +92,7 @@ public: ...@@ -92,7 +92,7 @@ public:
}; };
/****************************************************************************/ /****************************************************************************/
/* Classes for handle the body items of a compoment: pins add graphic items */ /* Classes for handle the body items of a component: pins add graphic items */
/****************************************************************************/ /****************************************************************************/
...@@ -103,7 +103,7 @@ public: ...@@ -103,7 +103,7 @@ public:
class LibEDA_BaseStruct : public EDA_BaseStruct class LibEDA_BaseStruct : public EDA_BaseStruct
{ {
public: public:
int m_Unit; /* Unit identification (for multi part per parkage) int m_Unit; /* Unit identification (for multi part per package)
* 0 if the item is common to all units */ * 0 if the item is common to all units */
int m_Convert; /* Shape identification (for parts which have a convert int m_Convert; /* Shape identification (for parts which have a convert
* shape) 0 if the item is common to all shapes */ * shape) 0 if the item is common to all shapes */
...@@ -130,12 +130,12 @@ public: ...@@ -130,12 +130,12 @@ public:
* @param aColor = -1 to use the normal body item color, or use this color * @param aColor = -1 to use the normal body item color, or use this color
* if >= 0 * if >= 0
* @param aDrawMode = GR_OR, GR_XOR, ... * @param aDrawMode = GR_OR, GR_XOR, ...
* @param aData = value or pointer used to pass others parametres, * @param aData = value or pointer used to pass others parameters,
* depending on body items. used for some items to force * depending on body items. used for some items to force
* to force no fill mode ( has meaning only for items what * to force no fill mode ( has meaning only for items what
* can be filled ). used in printing or moving objects mode * can be filled ). used in printing or moving objects mode
* or to pass refernce to the lib component for pins * or to pass reference to the lib component for pins
* @param aTransformMatrix = Transform Matrix (rotaion, mirror ..) * @param aTransformMatrix = Transform Matrix (rotation, mirror ..)
*/ */
virtual void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, virtual void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC,
const wxPoint &aOffset, int aColor, int aDrawMode, const wxPoint &aOffset, int aColor, int aDrawMode,
...@@ -172,13 +172,15 @@ public: ...@@ -172,13 +172,15 @@ public:
return false; // derived classes should override this function return false; // derived classes should override this function
} }
/** Function HitTest (overlayed) /** Function HitTest (overlaid)
* @return true if the point aPosRef is near this object * @return true if the point aPosRef is near this object
* @param aPosRef = a wxPoint to test * @param aPosRef = a wxPoint to test
* @param aThreshold = max distance to this object (usually the half thickness of a line) * @param aThreshold = max distance to this object (usually the half
* thickness of a line)
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ) = 0; virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] ) = 0;
/** Function GetBoundingBox /** Function GetBoundingBox
* @return the boundary box for this, in library coordinates * @return the boundary box for this, in library coordinates
...@@ -189,6 +191,19 @@ public: ...@@ -189,6 +191,19 @@ public:
} }
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
/**
* Make a copy of this draw item.
*
* Classes derived from LibEDA_BaseStruct must implement DoGenCopy().
* This is just a placeholder for the derived class.
*
* @return Copy of this draw item.
*/
LibEDA_BaseStruct* GenCopy() { return DoGenCopy(); }
protected:
virtual LibEDA_BaseStruct* DoGenCopy() = 0;
}; };
...@@ -198,22 +213,25 @@ public: ...@@ -198,22 +213,25 @@ public:
class LibDrawPin : public LibEDA_BaseStruct class LibDrawPin : public LibEDA_BaseStruct
{ {
public: public:
int m_PinLen; /* Pin lenght */ int m_PinLen; /* Pin length */
int m_Orient; /* Pin orientation (Up, Down, Left, Right) */ int m_Orient; /* Pin orientation (Up, Down, Left, Right) */
int m_PinShape; /* Bitwise ORed: Pin shape (see enum DrawPinShape) */ int m_PinShape; /* Bitwise ORed: Pin shape (see enum DrawPinShape) */
int m_PinType; /* Electrical pin properties */ int m_PinType; /* Electrical pin properties */
int m_Attributs; /* bit 0 != 0: pin invisible */ int m_Attributs; /* bit 0 != 0: pin invisible */
long m_PinNum; /* Pin number: 4 Ascii code like "12" or "anod" long m_PinNum; /* Pin number: 4 ASCII code like "12" or "anod"
* or "G6" "12" is stored as "12\0\0" ans does not * or "G6" "12" is stored as "12\0\0" ans does not
* depend on endian type*/ * depend on endian type*/
wxString m_PinName; wxString m_PinName;
int m_PinNumSize; int m_PinNumSize;
int m_PinNameSize; /* Pin num and Pin name sizes */ int m_PinNameSize; /* Pin num and Pin name sizes */
// (Currently Unused) Pin num and Pin name text opt: italic/normal/bold, 0 = default: /* (Currently Unused) Pin num and Pin name text options: italic/normal
char m_PinNumShapeOpt, m_PinNameShapeOpt; * /bold, 0 = default */
// (Currently Unused) Pin num and Pin name text opt position, 0 = default: char m_PinNumShapeOpt;
char m_PinNumPositionOpt, m_PinNamePositionOpt; char m_PinNameShapeOpt;
// (Currently Unused) Pin num and Pin name text opt position, 0 = default:
char m_PinNumPositionOpt;
char m_PinNamePositionOpt;
wxPoint m_Pos; /* Position or centre (Arc and Circle) or start wxPoint m_Pos; /* Position or centre (Arc and Circle) or start
* point (segments) */ * point (segments) */
...@@ -254,32 +272,35 @@ public: ...@@ -254,32 +272,35 @@ public:
/** Function HitTest /** Function HitTest
* @return true if the point aPosRef is near this object * @return true if the point aPosRef is near this object
* @param aPosRef = a wxPoint to test * @param aPosRef = a wxPoint to test
* @param aThreshold = max distance to this object (usually the half thickness of a line) * @param aThreshold = max distance to this object (usually the half
* thickness of a line)
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
LibDrawPin* GenCopy();
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
virtual EDA_Rect GetBoundingBox(); virtual EDA_Rect GetBoundingBox();
wxPoint ReturnPinEndPoint(); wxPoint ReturnPinEndPoint();
int ReturnPinDrawOrient( const int TransMat[2][2] ); int ReturnPinDrawOrient( const int TransMat[2][2] );
/** Function ReturnPinStringNum /** Function ReturnPinStringNum
* fill a buffer with pin num as a wxString * fill a buffer with pin num as a wxString
* Pin num is coded as a long or 4 ascii chars * Pin num is coded as a long or 4 ASCII chars
* Used to print/draw the pin num * Used to print/draw the pin num
* @param aStringBuffer = the wxString to store the pin num as an unicode string * @param aStringBuffer = the wxString to store the pin num as an unicode
* string
*/ */
void ReturnPinStringNum( wxString& aStringBuffer ) const; void ReturnPinStringNum( wxString& aStringBuffer ) const;
/** Function ReturnPinStringNum (static function) /** Function ReturnPinStringNum (static function)
* Pin num is coded as a long or 4 ascii chars * Pin num is coded as a long or 4 ascii chars
* @param aPinNum = a long containing a pin num * @param aPinNum = a long containing a pin num
* @return aStringBuffer = the wxString to store the pin num as an unicode string * @return aStringBuffer = the wxString to store the pin num as an
* unicode string
*/ */
static wxString ReturnPinStringNum( long aPinNum ); static wxString ReturnPinStringNum( long aPinNum );
void SetPinNumFromString( wxString& buffer ); void SetPinNumFromString( wxString& buffer );
...@@ -301,12 +322,15 @@ public: ...@@ -301,12 +322,15 @@ public:
int TextInside, bool DrawPinNum, int TextInside, bool DrawPinNum,
bool DrawPinName, int Color, int DrawMode ); bool DrawPinName, int Color, int DrawMode );
void PlotPinTexts( PLOTTER *plotter, void PlotPinTexts( PLOTTER *plotter,
wxPoint& pin_pos, wxPoint& pin_pos,
int orient, int orient,
int TextInside, int TextInside,
bool DrawPinNum, bool DrawPinNum,
bool DrawPinNameint, bool DrawPinNameint,
int aWidth); int aWidth);
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
...@@ -355,12 +379,12 @@ public: ...@@ -355,12 +379,12 @@ public:
/** Function HitTest /** Function HitTest
* @return true if the point aPosRef is near this object * @return true if the point aPosRef is near this object
* @param aPosRef = a wxPoint to test * @param aPosRef = a wxPoint to test
* @param aThreshold = max distance to this object (usually the half thickness of a line) * @param aThreshold = max distance to this object (usually the half
* thickness of a line)
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
LibDrawArc* GenCopy();
void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset, void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset,
int aColor, int aDrawMode, void* aData, int aColor, int aDrawMode, void* aData,
...@@ -373,6 +397,8 @@ public: ...@@ -373,6 +397,8 @@ public:
*/ */
virtual int GetPenSize( ); virtual int GetPenSize( );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
...@@ -417,12 +443,12 @@ public: ...@@ -417,12 +443,12 @@ public:
/** Function HitTest /** Function HitTest
* @return true if the point aPosRef is near this object * @return true if the point aPosRef is near this object
* @param aPosRef = a wxPoint to test * @param aPosRef = a wxPoint to test
* @param aThreshold = max distance to this object (usually the half thickness of a line) * @param aThreshold = max distance to this object (usually the half
* thickness of a line)
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
LibDrawCircle* GenCopy();
/** Function GetPenSize /** Function GetPenSize
* @return the size of the "pen" that be used to draw or plot this item * @return the size of the "pen" that be used to draw or plot this item
...@@ -435,6 +461,9 @@ public: ...@@ -435,6 +461,9 @@ public:
virtual EDA_Rect GetBoundingBox(); virtual EDA_Rect GetBoundingBox();
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
...@@ -479,7 +508,8 @@ public: ...@@ -479,7 +508,8 @@ public:
* @param aThreshold = max distance to a segment * @param aThreshold = max distance to a segment
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
/** /**
* Function HitTest (overlayed) * Function HitTest (overlayed)
...@@ -493,8 +523,6 @@ public: ...@@ -493,8 +523,6 @@ public:
return TextHitTest( refArea ); return TextHitTest( refArea );
} }
LibDrawText* GenCopy();
/** Function GetPenSize /** Function GetPenSize
* @return the size of the "pen" that be used to draw or plot this item * @return the size of the "pen" that be used to draw or plot this item
*/ */
...@@ -505,6 +533,9 @@ public: ...@@ -505,6 +533,9 @@ public:
const int aTransformMatrix[2][2] ); const int aTransformMatrix[2][2] );
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
...@@ -548,12 +579,12 @@ public: ...@@ -548,12 +579,12 @@ public:
/** Function HitTest /** Function HitTest
* @return true if the point aPosRef is near this object * @return true if the point aPosRef is near this object
* @param aPosRef = a wxPoint to test * @param aPosRef = a wxPoint to test
* @param aThreshold = max distance to this object (usually the half thickness of a line) * @param aThreshold = max distance to this object (usually the half
* thickness of a line)
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
LibDrawSquare* GenCopy();
/** Function GetPenSize /** Function GetPenSize
* @return the size of the "pen" that be used to draw or plot this item * @return the size of the "pen" that be used to draw or plot this item
...@@ -566,6 +597,9 @@ public: ...@@ -566,6 +597,9 @@ public:
virtual EDA_Rect GetBoundingBox(); virtual EDA_Rect GetBoundingBox();
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
/**********************************/ /**********************************/
...@@ -609,12 +643,12 @@ public: ...@@ -609,12 +643,12 @@ public:
/** Function HitTest /** Function HitTest
* @return true if the point aPosRef is near this object * @return true if the point aPosRef is near this object
* @param aPosRef = a wxPoint to test * @param aPosRef = a wxPoint to test
* @param aThreshold = max distance to this object (usually the half thickness of a line) * @param aThreshold = max distance to this object (usually the half
* thickness of a line)
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
LibDrawSegment* GenCopy();
/** Function GetPenSize /** Function GetPenSize
* @return the size of the "pen" that be used to draw or plot this item * @return the size of the "pen" that be used to draw or plot this item
...@@ -626,6 +660,9 @@ public: ...@@ -626,6 +660,9 @@ public:
const int aTransformMatrix[2][2] ); const int aTransformMatrix[2][2] );
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
...@@ -658,8 +695,7 @@ public: ...@@ -658,8 +695,7 @@ public:
virtual bool Save( FILE* aFile ) const; virtual bool Save( FILE* aFile ) const;
virtual bool Load( char* line, wxString& errorMsg ); virtual bool Load( char* line, wxString& errorMsg );
LibDrawPolyline* GenCopy(); void AddPoint( const wxPoint& point );
void AddPoint( const wxPoint& point );
/** Function GetCornerCount /** Function GetCornerCount
* @return the number of corners * @return the number of corners
...@@ -680,7 +716,8 @@ public: ...@@ -680,7 +716,8 @@ public:
* @param aThreshold = max distance to a segment * @param aThreshold = max distance to a segment
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
/** Function GetBoundingBox /** Function GetBoundingBox
* @return the boundary box for this, in library coordinates * @return the boundary box for this, in library coordinates
...@@ -697,6 +734,9 @@ public: ...@@ -697,6 +734,9 @@ public:
const int aTransformMatrix[2][2] ); const int aTransformMatrix[2][2] );
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
/**********************************************************/ /**********************************************************/
...@@ -729,7 +769,6 @@ public: ...@@ -729,7 +769,6 @@ public:
virtual bool Save( FILE* aFile ) const; virtual bool Save( FILE* aFile ) const;
virtual bool Load( char* line, wxString& errorMsg ); virtual bool Load( char* line, wxString& errorMsg );
LibDrawBezier* GenCopy();
void AddPoint( const wxPoint& point ); void AddPoint( const wxPoint& point );
/** Function GetCornerCount /** Function GetCornerCount
...@@ -751,7 +790,8 @@ public: ...@@ -751,7 +790,8 @@ public:
* @param aThreshold = max distance to a segment * @param aThreshold = max distance to a segment
* @param aTransMat = the transform matrix * @param aTransMat = the transform matrix
*/ */
virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ); virtual bool HitTest( wxPoint aPosRef, int aThreshold,
const int aTransMat[2][2] );
/** Function GetBoundingBox /** Function GetBoundingBox
* @return the boundary box for this, in library coordinates * @return the boundary box for this, in library coordinates
...@@ -764,10 +804,13 @@ public: ...@@ -764,10 +804,13 @@ public:
virtual int GetPenSize( ); virtual int GetPenSize( );
void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset, void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset,
int aColor, int aDrawMode, void* aData, int aColor, int aDrawMode, void* aData,
const int aTransformMatrix[2][2] ); const int aTransformMatrix[2][2] );
virtual void DisplayInfo( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
protected:
virtual LibEDA_BaseStruct* DoGenCopy();
}; };
#endif // CLASSES_BODY_ITEMS_H #endif // CLASSES_BODY_ITEMS_H
eeschema/database.cpp
View file @ 79c9be25
...@@ -77,13 +77,22 @@ wxString DataBaseGetName( WinEDA_DrawFrame* frame, wxString& Keys, ...@@ -77,13 +77,22 @@ wxString DataBaseGetName( WinEDA_DrawFrame* frame, wxString& Keys,
void DisplayCmpDoc( wxString& Name ) void DisplayCmpDoc( wxString& Name )
{ {
LibCmpEntry* CmpEntry; LibCmpEntry* CmpEntry = NULL;
LibraryStruct* Lib = g_LibraryList;
CmpEntry = FindLibPart( Name, wxEmptyString, ALIAS ); while( Lib != NULL && CmpEntry == NULL )
{
CmpEntry = Lib->FindEntry( Name );
Lib = Lib->m_Pnext;
}
if( CmpEntry == NULL ) if( CmpEntry == NULL )
return; return;
wxLogDebug( wxT( "Selected component <%s>, m_Doc: <%s>, m_KeyWord: <%s>." ),
(const wxChar*) Name, (const wxChar*) CmpEntry->m_Doc,
(const wxChar*) CmpEntry->m_KeyWord );
Name = wxT( "Description: " ) + CmpEntry->m_Doc; Name = wxT( "Description: " ) + CmpEntry->m_Doc;
Name += wxT( "\nKey Words: " ) + CmpEntry->m_KeyWord; Name += wxT( "\nKey Words: " ) + CmpEntry->m_KeyWord;
} }
eeschema/edit_component_in_lib.cpp
View file @ 79c9be25
...@@ -452,7 +452,7 @@ bool DIALOG_EDIT_COMPONENT_IN_LIBRARY::ChangeNbUnitsPerPackage( int MaxUnit ) ...@@ -452,7 +452,7 @@ bool DIALOG_EDIT_COMPONENT_IN_LIBRARY::ChangeNbUnitsPerPackage( int MaxUnit )
{ {
for( ii = OldNumUnits + 1; ii <= MaxUnit; ii++ ) for( ii = OldNumUnits + 1; ii <= MaxUnit; ii++ )
{ {
NextDrawItem = CopyDrawEntryStruct( DrawItem ); NextDrawItem = DrawItem->GenCopy();
NextDrawItem->SetNext( CurrentLibEntry->m_Drawings ); NextDrawItem->SetNext( CurrentLibEntry->m_Drawings );
CurrentLibEntry->m_Drawings = NextDrawItem; CurrentLibEntry->m_Drawings = NextDrawItem;
NextDrawItem->m_Unit = ii; NextDrawItem->m_Unit = ii;
...@@ -499,7 +499,7 @@ bool DIALOG_EDIT_COMPONENT_IN_LIBRARY::SetUnsetConvert() ...@@ -499,7 +499,7 @@ bool DIALOG_EDIT_COMPONENT_IN_LIBRARY::SetUnsetConvert()
g_AsDeMorgan = 0; return FALSE; g_AsDeMorgan = 0; return FALSE;
} }
} }
NextDrawItem = CopyDrawEntryStruct( DrawItem ); NextDrawItem = DrawItem->GenCopy();
NextDrawItem->SetNext( CurrentLibEntry->m_Drawings ); NextDrawItem->SetNext( CurrentLibEntry->m_Drawings );
CurrentLibEntry->m_Drawings = NextDrawItem; CurrentLibEntry->m_Drawings = NextDrawItem;
NextDrawItem->m_Convert = 2; NextDrawItem->m_Convert = 2;
......
eeschema/eelibs_read_libraryfiles.cpp
View file @ 79c9be25
...@@ -18,15 +18,15 @@ ...@@ -18,15 +18,15 @@
#include "dialog_load_error.h" #include "dialog_load_error.h"
/****************************************************************************/ /**
* Function LoadLibraryName
/** Function LoadLibraryName *
* Routine to load the given library name. FullLibName should hold full path * Routine to load the given library name. FullLibName should hold full path
* of file name to open, while LibName should hold only its name. * of file name to open, while LibName should hold only its name.
* If library already exists, it is NOT reloaded. * If library already exists, it is NOT reloaded.
*
* @return : new lib or NULL * @return : new lib or NULL
*/ */
/****************************************************************************/
LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame, LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
const wxString& FullLibName, const wxString& FullLibName,
const wxString& LibName ) const wxString& LibName )
...@@ -60,9 +60,7 @@ LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame, ...@@ -60,9 +60,7 @@ LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
tmplib->m_Pnext = NewLib; tmplib->m_Pnext = NewLib;
} }
fn = FullLibName; NewLib->LoadDocs( errMsg );
fn.SetExt( DOC_EXT );
LoadDocLib( frame, fn.GetFullPath(), NewLib->m_Name );
} }
else else
{ {
...@@ -79,7 +77,9 @@ library <%s>" ), ...@@ -79,7 +77,9 @@ library <%s>" ),
} }
/** Function LoadLibraries /**
* Function LoadLibraries
*
* Clear all already loaded libraries and load all librairies * Clear all already loaded libraries and load all librairies
* given in frame->m_ComponentLibFiles * given in frame->m_ComponentLibFiles
*/ */
...@@ -200,12 +200,11 @@ void LoadLibraries( WinEDA_SchematicFrame* frame ) ...@@ -200,12 +200,11 @@ void LoadLibraries( WinEDA_SchematicFrame* frame )
} }
/**************************************************************/ /**
* Function FreeCmpLibrary
/** Function FreeCmpLibrary *
* Routine to remove and free a library from the current loaded libraries. * Routine to remove and free a library from the current loaded libraries.
*/ */
/**************************************************************/
void FreeCmpLibrary( wxWindow* frame, const wxString& LibName ) void FreeCmpLibrary( wxWindow* frame, const wxString& LibName )
{ {
int NumOfLibs = NumOfLibraries(); int NumOfLibs = NumOfLibraries();
...@@ -247,7 +246,9 @@ void FreeCmpLibrary( wxWindow* frame, const wxString& LibName ) ...@@ -247,7 +246,9 @@ void FreeCmpLibrary( wxWindow* frame, const wxString& LibName )
} }
/** Function LibraryEntryCompare /**
* Function LibraryEntryCompare
*
* Routine to compare two EDA_LibComponentStruct for the PriorQue module. * Routine to compare two EDA_LibComponentStruct for the PriorQue module.
* Comparison (insensitive case) is based on Part name. * Comparison (insensitive case) is based on Part name.
*/ */
...@@ -259,8 +260,8 @@ int LibraryEntryCompare( EDA_LibComponentStruct* LE1, ...@@ -259,8 +260,8 @@ int LibraryEntryCompare( EDA_LibComponentStruct* LE1,
/***************************************************************************** /*****************************************************************************
* Routine to find the library given its name. * * Routine to find the library given its name.
*****************************************************************************/ *****************************************************************************/
LibraryStruct* FindLibrary( const wxString& Name ) LibraryStruct* FindLibrary( const wxString& Name )
{ {
LibraryStruct* Lib = g_LibraryList; LibraryStruct* Lib = g_LibraryList;
...@@ -277,8 +278,8 @@ LibraryStruct* FindLibrary( const wxString& Name ) ...@@ -277,8 +278,8 @@ LibraryStruct* FindLibrary( const wxString& Name )
/***************************************************************************** /*****************************************************************************
* Routine to find the number of libraries currently loaded. * * Routine to find the number of libraries currently loaded.
*****************************************************************************/ *****************************************************************************/
int NumOfLibraries() int NumOfLibraries()
{ {
int ii; int ii;
...@@ -289,83 +290,3 @@ int NumOfLibraries() ...@@ -289,83 +290,3 @@ int NumOfLibraries()
return ii; return ii;
} }
/*******************************************************/
/* Routines de lecture des Documentation de composants */
/*******************************************************/
/* Routine to load a library from given open file.*/
int LoadDocLib( WinEDA_DrawFrame* frame, const wxString& FullDocLibName,
const wxString& Libname )
{
int LineNum = 0;
char Line[1024], * Name, * Text;
LibCmpEntry* Entry;
FILE* f;
wxString msg;
f = wxFopen( FullDocLibName, wxT( "rt" ) );
if( f == NULL )
return 0;
if( GetLine( f, Line, &LineNum, sizeof(Line) ) == NULL )
{
/* pas de lignes utiles */
fclose( f );
return 0;
}
if( strnicmp( Line, DOCFILE_IDENT, 10 ) != 0 )
{
DisplayError( frame, wxT( "File is NOT EESCHEMA doclib!" ) );
fclose( f );
return 0;
}
while( GetLine( f, Line, &LineNum, sizeof(Line) ) )
{
if( strncmp( Line, "$CMP", 4 ) != 0 )
{
msg.Printf( wxT( "$CMP command expected in line %d, aborted." ),
LineNum );
DisplayError( frame, msg );
fclose( f );
return 0;
}
/* Read one $CMP/$ENDCMP part entry from library: */
Name = strtok( Line + 5, "\n\r" );
wxString cmpname;
cmpname = CONV_FROM_UTF8( Name );
Entry = FindLibPart( cmpname, Libname, ALIAS );
while( GetLine( f, Line, &LineNum, sizeof(Line) ) )
{
if( strncmp( Line, "$ENDCMP", 7 ) == 0 )
break;
Text = strtok( Line + 2, "\n\r" );
switch( Line[0] )
{
case 'D':
if( Entry )
Entry->m_Doc = CONV_FROM_UTF8( Text );
break;
case 'K':
if( Entry )
Entry->m_KeyWord = CONV_FROM_UTF8( Text );
break;
case 'F':
if( Entry )
Entry->m_DocFile = CONV_FROM_UTF8( Text );
break;
}
}
}
fclose( f );
return 1;
}
eeschema/getpart.cpp
View file @ 79c9be25
/*************************************************/ /*************************************************/
/* Module to handle Get & Place Library Part */ /* Module to handle Get & Place Library Part */
/*************************************************/ /*************************************************/
#include "fctsys.h" #include "fctsys.h"
...@@ -24,9 +24,7 @@ static int OldTransMat[2][2]; ...@@ -24,9 +24,7 @@ static int OldTransMat[2][2];
static wxPoint OldPos; static wxPoint OldPos;
/*******************************************************/
wxString SelectFromLibBrowser( WinEDA_DrawFrame* parent ) wxString SelectFromLibBrowser( WinEDA_DrawFrame* parent )
/*******************************************************/
{ {
wxString name; wxString name;
WinEDA_ViewlibFrame* Viewer; WinEDA_ViewlibFrame* Viewer;
...@@ -56,17 +54,16 @@ wxString SelectFromLibBrowser( WinEDA_DrawFrame* parent ) ...@@ -56,17 +54,16 @@ wxString SelectFromLibBrowser( WinEDA_DrawFrame* parent )
} }
/**************************************************************************/
SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
const wxString& libname,
wxArrayString& HistoryList,
bool UseLibBrowser )
/**************************************************************************/
/* load from a library and place a component /*
* load from a library and place a component
* if libname != "", search in lib "libname" * if libname != "", search in lib "libname"
* else search in all loaded libs * else search in all loaded libs
*/ */
SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
const wxString& libname,
wxArrayString& HistoryList,
bool UseLibBrowser )
{ {
int ii, CmpCount = 0; int ii, CmpCount = 0;
EDA_LibComponentStruct* Entry = NULL; EDA_LibComponentStruct* Entry = NULL;
...@@ -85,7 +82,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC, ...@@ -85,7 +82,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
{ {
if( Library->GetName().CmpNoCase( libname ) == 0 ) if( Library->GetName().CmpNoCase( libname ) == 0 )
{ {
CmpCount = Library->m_NumOfParts; CmpCount = Library->GetCount();
break; break;
} }
Library = Library->m_Pnext; Library = Library->m_Pnext;
...@@ -96,7 +93,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC, ...@@ -96,7 +93,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
LibraryStruct* lib = g_LibraryList; LibraryStruct* lib = g_LibraryList;
while( lib ) while( lib )
{ {
CmpCount += lib->m_NumOfParts; CmpCount += lib->GetCount();
lib = lib->m_Pnext; lib = lib->m_Pnext;
} }
} }
...@@ -204,13 +201,15 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC, ...@@ -204,13 +201,15 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
Component->SetRef( GetSheet(), msg ); Component->SetRef( GetSheet(), msg );
/* Init champ Reference */ /* Init champ Reference */
Component->GetField( REFERENCE )->m_Pos = Entry->m_Prefix.m_Pos + Component->m_Pos; Component->GetField( REFERENCE )->m_Pos =
Entry->m_Prefix.m_Pos + Component->m_Pos;
Component->GetField( REFERENCE )->ImportValues( Entry->m_Prefix ); Component->GetField( REFERENCE )->ImportValues( Entry->m_Prefix );
Component->m_PrefixString = Entry->m_Prefix.m_Text; Component->m_PrefixString = Entry->m_Prefix.m_Text;
/* Init des autres champs si predefinis dans la librairie */ /* Init des autres champs si predefinis dans la librairie */
LibDrawField* EntryField; LibDrawField* EntryField;
for( EntryField = Entry->m_Fields; EntryField != NULL; EntryField = EntryField->Next() ) for( EntryField = Entry->m_Fields; EntryField != NULL;
EntryField = EntryField->Next() )
{ {
if( EntryField->m_Text.IsEmpty() && EntryField->m_Name.IsEmpty() ) if( EntryField->m_Text.IsEmpty() && EntryField->m_Name.IsEmpty() )
continue; continue;
...@@ -224,7 +223,8 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC, ...@@ -224,7 +223,8 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
while( ii >= Component->GetFieldCount() ) while( ii >= Component->GetFieldCount() )
{ {
int field_id = Component->GetFieldCount(); int field_id = Component->GetFieldCount();
SCH_CMP_FIELD field( wxPoint( 0, 0 ), field_id, Component, ReturnDefaultFieldName( ii ) ); SCH_CMP_FIELD field( wxPoint( 0, 0 ), field_id, Component,
ReturnDefaultFieldName( ii ) );
Component->AddField( field ); Component->AddField( field );
} }
} }
...@@ -271,14 +271,12 @@ static void ShowWhileMoving( WinEDA_DrawPanel* panel, wxDC* DC, bool erase ) ...@@ -271,14 +271,12 @@ static void ShowWhileMoving( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
} }
/**************************************************************************/ /*
void WinEDA_SchematicFrame::CmpRotationMiroir( * Routine permettant les rotations et les miroirs d'un composant
SCH_COMPONENT* DrawComponent, wxDC* DC, int type_rotate )
/**************************************************************************/
/* Routine permettant les rotations et les miroirs d'un composant
* Si DC = NULL : pas de redessin * Si DC = NULL : pas de redessin
*/ */
void WinEDA_SchematicFrame::CmpRotationMiroir( SCH_COMPONENT* DrawComponent,
wxDC* DC, int type_rotate )
{ {
if( DrawComponent == NULL ) if( DrawComponent == NULL )
return; return;
...@@ -288,7 +286,7 @@ void WinEDA_SchematicFrame::CmpRotationMiroir( ...@@ -288,7 +286,7 @@ void WinEDA_SchematicFrame::CmpRotationMiroir(
{ {
DrawPanel->CursorOff( DC ); DrawPanel->CursorOff( DC );
if( DrawComponent->m_Flags ) if( DrawComponent->m_Flags )
DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) ); DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint( 0, 0 ) );
else else
{ {
DrawPanel->PostDirtyRect( DrawComponent->GetBoundingBox() ); DrawPanel->PostDirtyRect( DrawComponent->GetBoundingBox() );
...@@ -303,8 +301,7 @@ void WinEDA_SchematicFrame::CmpRotationMiroir( ...@@ -303,8 +301,7 @@ void WinEDA_SchematicFrame::CmpRotationMiroir(
if( DrawComponent->m_Flags ) if( DrawComponent->m_Flags )
DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) ); DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) );
else else
DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
0 ),
GR_DEFAULT_DRAWMODE ); GR_DEFAULT_DRAWMODE );
DrawPanel->CursorOn( DC ); DrawPanel->CursorOn( DC );
} }
...@@ -314,12 +311,10 @@ void WinEDA_SchematicFrame::CmpRotationMiroir( ...@@ -314,12 +311,10 @@ void WinEDA_SchematicFrame::CmpRotationMiroir(
} }
/************************************************************/ /*
static void ExitPlaceCmp( WinEDA_DrawPanel* Panel, wxDC* DC ) * Routine de sortie de la fonction de placement de composant
/************************************************************/
/* Routine de sortie de la fonction de placement de composant
*/ */
static void ExitPlaceCmp( WinEDA_DrawPanel* Panel, wxDC* DC )
{ {
SCH_SCREEN* screen = (SCH_SCREEN*) Panel->GetScreen(); SCH_SCREEN* screen = (SCH_SCREEN*) Panel->GetScreen();
...@@ -339,18 +334,17 @@ static void ExitPlaceCmp( WinEDA_DrawPanel* Panel, wxDC* DC ) ...@@ -339,18 +334,17 @@ static void ExitPlaceCmp( WinEDA_DrawPanel* Panel, wxDC* DC )
} }
Panel->Refresh( TRUE ); Panel->Refresh( TRUE );
Panel->ManageCurseur = NULL; Panel->ManageCurseur = NULL;
Panel->ForceCloseManageCurseur = NULL; Panel->ForceCloseManageCurseur = NULL;
screen->SetCurItem( NULL ); screen->SetCurItem( NULL );
} }
/************************************************************************/ /*
* Selection de l'unite dans les boitiers a multiples Parts
*/
void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent, void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent,
int unit, wxDC* DC ) int unit, wxDC* DC )
/************************************************************************/
/* Selection de l'unite dans les boitiers a multiples Parts */
{ {
int m_UnitCount; int m_UnitCount;
EDA_LibComponentStruct* LibEntry; EDA_LibComponentStruct* LibEntry;
...@@ -377,7 +371,7 @@ void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent, ...@@ -377,7 +371,7 @@ void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent,
/* Efface le trace precedent */ /* Efface le trace precedent */
if( DrawComponent->m_Flags ) if( DrawComponent->m_Flags )
DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) ); DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint( 0, 0 ) );
else else
DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode ); DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode );
...@@ -387,19 +381,18 @@ void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent, ...@@ -387,19 +381,18 @@ void WinEDA_SchematicFrame::SelPartUnit( SCH_COMPONENT* DrawComponent,
/* Redessine le composant dans la nouvelle position */ /* Redessine le composant dans la nouvelle position */
if( DrawComponent->m_Flags ) if( DrawComponent->m_Flags )
DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) ); DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint( 0, 0 ) );
else else
DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE ); DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
GR_DEFAULT_DRAWMODE );
TestDanglingEnds( GetScreen()->EEDrawList, DC ); TestDanglingEnds( GetScreen()->EEDrawList, DC );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
/************************************************************************/
void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent, void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent,
wxDC* DC ) wxDC* DC )
/************************************************************************/
{ {
int ii; int ii;
EDA_LibComponentStruct* LibEntry; EDA_LibComponentStruct* LibEntry;
...@@ -414,12 +407,13 @@ void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent, ...@@ -414,12 +407,13 @@ void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent,
if( ( ii = LookForConvertPart( LibEntry ) ) < 2 ) if( ( ii = LookForConvertPart( LibEntry ) ) < 2 )
{ {
DisplayError( this, wxT( "No Convert found" ), 10 ); return; DisplayError( this, wxT( "No convert found" ) );
return;
} }
/* Efface le trace precedent */ /* Efface le trace precedent */
if( DrawComponent->m_Flags ) if( DrawComponent->m_Flags )
DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) ); DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint( 0, 0 ) );
else else
DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode ); DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode );
...@@ -429,26 +423,25 @@ void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent, ...@@ -429,26 +423,25 @@ void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent,
/* Redessine le composant dans la nouvelle position */ /* Redessine le composant dans la nouvelle position */
if( DrawComponent->m_Flags & IS_MOVED ) if( DrawComponent->m_Flags & IS_MOVED )
DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint(0,0) ); DrawStructsInGhost( DrawPanel, DC, DrawComponent, wxPoint( 0, 0 ) );
else else
DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE ); DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
GR_DEFAULT_DRAWMODE );
TestDanglingEnds( GetScreen()->EEDrawList, DC ); TestDanglingEnds( GetScreen()->EEDrawList, DC );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
/**********************************************************/ /*
int LookForConvertPart( EDA_LibComponentStruct* LibEntry ) * Retourne la plus grande valeur trouvee dans la liste des elements
/**********************************************************/
/* Retourne la plus grande valeur trouvee dans la liste des elements
* "drawings" du composant LibEntry, pour le membre .Convert * "drawings" du composant LibEntry, pour le membre .Convert
* Si il n'y a pas de representation type "convert", la valeur * Si il n'y a pas de representation type "convert", la valeur
* retournee est 0 ou 1 * retournee est 0 ou 1
* Si il y a une representation type "convert", * Si il y a une representation type "convert",
* la valeur retournee est > 1 (typiquement 2) * la valeur retournee est > 1 (typiquement 2)
*/ */
int LookForConvertPart( EDA_LibComponentStruct* LibEntry )
{ {
int ii; int ii;
LibEDA_BaseStruct* DrawLibEntry; LibEDA_BaseStruct* DrawLibEntry;
...@@ -466,10 +459,8 @@ int LookForConvertPart( EDA_LibComponentStruct* LibEntry ) ...@@ -466,10 +459,8 @@ int LookForConvertPart( EDA_LibComponentStruct* LibEntry )
} }
/***********************************************************************************/
void WinEDA_SchematicFrame::StartMovePart( SCH_COMPONENT* Component, void WinEDA_SchematicFrame::StartMovePart( SCH_COMPONENT* Component,
wxDC* DC ) wxDC* DC )
/***********************************************************************************/
{ {
if( Component == NULL ) if( Component == NULL )
return; return;
......
eeschema/lib_export.cpp
View file @ 79c9be25
...@@ -127,7 +127,7 @@ void WinEDA_LibeditFrame::OnExportPart( wxCommandEvent& event ) ...@@ -127,7 +127,7 @@ void WinEDA_LibeditFrame::OnExportPart( wxCommandEvent& event )
/* Sauvegarde du composant: */ /* Sauvegarde du composant: */
CurrentLib = NewLib; CurrentLib = NewLib;
SaveOnePartInMemory(); SaveOnePartInMemory();
bool success = NewLib->SaveLibrary( fn.GetFullPath() ); bool success = NewLib->Save( fn.GetFullPath() );
if( success ) if( success )
{ {
......
eeschema/libcmp.h
View file @ 79c9be25
/*****************************************************************/ /*****************************************************************/
/* Headers for library definition and lib component definitions */ /* Headers for library definition and lib component definitions */
/*****************************************************************/ /*****************************************************************/
#ifndef LIBCMP_H #ifndef LIBCMP_H
#define LIBCMP_H #define LIBCMP_H
#include "priorque.h"
#define LIB_VERSION_MAJOR 2 #define LIB_VERSION_MAJOR 2
#define LIB_VERSION_MINOR 3 #define LIB_VERSION_MINOR 3
...@@ -14,7 +13,7 @@ ...@@ -14,7 +13,7 @@
#define DOC_EXT wxT( "dcm" ) /* Ext. of documentation files */ #define DOC_EXT wxT( "dcm" ) /* Ext. of documentation files */
//Offsets used in editing library component, for handle aliad dats //Offsets used in editing library component, for handle alias data
#define ALIAS_NAME 0 #define ALIAS_NAME 0
#define ALIAS_DOC 1 #define ALIAS_DOC 1
#define ALIAS_KEYWORD 2 #define ALIAS_KEYWORD 2
......
eeschema/libedit.cpp
View file @ 79c9be25
/****************************/ /****************************/
/* EESchema - libedit.cpp */ /* EESchema - libedit.cpp */
/****************************/ /****************************/
/* Routines de maintenanace des librairies: /* Routines de maintenanace des librairies:
...@@ -86,7 +86,7 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPart() ...@@ -86,7 +86,7 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPart()
if( g_ScreenLib->IsModify() ) if( g_ScreenLib->IsModify() )
{ {
if( !IsOK( this, _( "Current Part not saved.\nContinue?" ) ) ) if( !IsOK( this, _( "Current part not saved.\nContinue?" ) ) )
return FALSE; return FALSE;
} }
...@@ -115,7 +115,8 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPart() ...@@ -115,7 +115,8 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPart()
if( LibEntry == NULL ) if( LibEntry == NULL )
{ {
msg = _( "Component \"" ); msg << CmpName << _( "\" not found." ); msg = _( "Component \"" );
msg << CmpName << _( "\" not found." );
DisplayError( this, msg ); DisplayError( this, msg );
return FALSE; return FALSE;
} }
...@@ -144,7 +145,7 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPartAux( LibCmpEntry* LibEntry, ...@@ -144,7 +145,7 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPartAux( LibCmpEntry* LibEntry,
{ {
wxString msg, cmpName, rootName; wxString msg, cmpName, rootName;
if( (LibEntry == NULL) || (Library == NULL) ) if( ( LibEntry == NULL ) || ( Library == NULL ) )
return false; return false;
if( LibEntry->m_Name.m_Text.IsEmpty() ) if( LibEntry->m_Name.m_Text.IsEmpty() )
...@@ -263,33 +264,33 @@ void WinEDA_LibeditFrame::SaveActiveLibrary() ...@@ -263,33 +264,33 @@ void WinEDA_LibeditFrame::SaveActiveLibrary()
if( CurrentLib == NULL ) if( CurrentLib == NULL )
{ {
DisplayError( this, wxT( "No Library specified" ) ); DisplayError( this, wxT( "No library specified" ) );
return; return;
} }
fn = wxFileName( CurrentLib->m_FullFileName ); fn = wxFileName( CurrentLib->m_FullFileName );
msg = _( "Modify Library File \"" ) + fn.GetFullPath() + _( "\"?" ); msg = _( "Modify library file \"" ) + fn.GetFullPath() + _( "\"?" );
if( !IsOK( this, msg ) ) if( !IsOK( this, msg ) )
return; return;
bool success = CurrentLib->SaveLibrary( fn.GetFullPath() ); bool success = CurrentLib->Save( fn.GetFullPath() );
MsgPanel->EraseMsgBox(); MsgPanel->EraseMsgBox();
if( !success ) if( !success )
{ {
msg = _( "Error while saving Library File \"" ) + fn.GetFullPath() + msg = _( "Error while saving library file \"" ) + fn.GetFullPath() +
_( "\"." ); _( "\"." );
Affiche_1_Parametre( this, 1, wxT( " *** ERROR : **" ), msg, BLUE ); Affiche_1_Parametre( this, 1, wxT( " *** ERROR : **" ), msg, BLUE );
DisplayError( this, msg ); DisplayError( this, msg );
} }
else else
{ {
msg = _( "Library File \"" ) + fn.GetFullName() + wxT( "\" Ok" ); msg = _( "Library file \"" ) + fn.GetFullName() + wxT( "\" Ok" );
fn.SetExt( DOC_EXT ); fn.SetExt( DOC_EXT );
wxString msg1 = _( "Document File \"" ) + fn.GetFullPath() + wxString msg1 = _( "Document file \"" ) + fn.GetFullPath() +
wxT( "\" Ok" ); wxT( "\" Ok" );
Affiche_1_Parametre( this, 1, msg, msg1, BLUE ); Affiche_1_Parametre( this, 1, msg, msg1, BLUE );
} }
...@@ -476,7 +477,7 @@ void WinEDA_LibeditFrame::SaveOnePartInMemory() ...@@ -476,7 +477,7 @@ void WinEDA_LibeditFrame::SaveOnePartInMemory()
if( CurrentLib == NULL ) if( CurrentLib == NULL )
{ {
DisplayError( this, _( "No Library specified." ) ); DisplayError( this, _( "No library specified." ) );
return; return;
} }
......
eeschema/libframe.cpp
View file @ 79c9be25
/****************************/ /****************************/
/* EESchema - libframe.cpp */ /* EESchema - libframe.cpp */
/****************************/ /****************************/
/* Gestion de la frame d'edition des composants en librairie /* Gestion de la frame d'edition des composants en librairie
...@@ -200,7 +200,7 @@ void WinEDA_LibeditFrame::OnCloseWindow( wxCloseEvent& Event ) ...@@ -200,7 +200,7 @@ void WinEDA_LibeditFrame::OnCloseWindow( wxCloseEvent& Event )
for( Lib = g_LibraryList; Lib != NULL; Lib = Lib->m_Pnext ) for( Lib = g_LibraryList; Lib != NULL; Lib = Lib->m_Pnext )
{ {
if( Lib->m_Modified ) if( Lib->IsModified() )
{ {
wxString msg; wxString msg;
msg.Printf( _( "Library \"%s\" was modified!\nDiscard changes?" ), msg.Printf( _( "Library \"%s\" was modified!\nDiscard changes?" ),
...@@ -352,7 +352,7 @@ int WinEDA_LibeditFrame::BestZoom() ...@@ -352,7 +352,7 @@ int WinEDA_LibeditFrame::BestZoom()
} }
size = DrawPanel->GetClientSize(); size = DrawPanel->GetClientSize();
size -= wxSize(100,100); // reserve 100 mils margin size -= wxSize( 100, 100 ); // reserve 100 mils margin
ii = abs( dx / size.x ); ii = abs( dx / size.x );
jj = abs( dy / size.y ); jj = abs( dy / size.y );
...@@ -659,7 +659,8 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -659,7 +659,8 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_LIBEDIT_DELETE_ITEM_BUTT: case ID_LIBEDIT_DELETE_ITEM_BUTT:
if( CurrentLibEntry == NULL ) if( CurrentLibEntry == NULL )
{ {
wxBell(); break; wxBell();
break;
} }
SetToolID( id, wxCURSOR_BULLSEYE, _( "Delete item" ) ); SetToolID( id, wxCURSOR_BULLSEYE, _( "Delete item" ) );
break; break;
......
eeschema/pinedit.cpp
View file @ 79c9be25
...@@ -68,13 +68,16 @@ void WinEDA_PinPropertiesFrame::PinPropertiesAccept( wxCommandEvent& event ) ...@@ -68,13 +68,16 @@ void WinEDA_PinPropertiesFrame::PinPropertiesAccept( wxCommandEvent& event )
LastPinNoDraw = m_NoDraw->GetValue(); LastPinNoDraw = m_NoDraw->GetValue();
msg = m_PinSizeCtrl->GetValue(); msg = m_PinSizeCtrl->GetValue();
LastPinSize = ReturnValueFromString( g_UnitMetric, msg, m_Parent->m_InternalUnits ); LastPinSize = ReturnValueFromString( g_UnitMetric, msg,
m_Parent->m_InternalUnits );
msg = m_PinNameSizeCtrl->GetValue(); msg = m_PinNameSizeCtrl->GetValue();
LastPinNameSize = ReturnValueFromString( g_UnitMetric, msg, m_Parent->m_InternalUnits ); LastPinNameSize = ReturnValueFromString( g_UnitMetric, msg,
m_Parent->m_InternalUnits );
msg = m_PinNumSizeCtrl->GetValue(); msg = m_PinNumSizeCtrl->GetValue();
LastPinNumSize = ReturnValueFromString( g_UnitMetric, msg, m_Parent->m_InternalUnits ); LastPinNumSize = ReturnValueFromString( g_UnitMetric, msg,
m_Parent->m_InternalUnits );
if( CurrentDrawItem ) // Set Pin Name & Num if( CurrentDrawItem ) // Set Pin Name & Num
{ {
...@@ -82,7 +85,8 @@ void WinEDA_PinPropertiesFrame::PinPropertiesAccept( wxCommandEvent& event ) ...@@ -82,7 +85,8 @@ void WinEDA_PinPropertiesFrame::PinPropertiesAccept( wxCommandEvent& event )
m_Parent->SaveCopyInUndoList( CurrentLibEntry ); m_Parent->SaveCopyInUndoList( CurrentLibEntry );
SetPinName( m_PinNameCtrl->GetValue(), LastPinNameSize ); SetPinName( m_PinNameCtrl->GetValue(), LastPinNameSize );
msg = m_PinNumCtrl->GetValue(); if( msg.IsEmpty() ) msg = m_PinNumCtrl->GetValue();
if( msg.IsEmpty() )
msg = wxT( "~" ); msg = wxT( "~" );
SetPinNum( msg, LastPinNumSize ); SetPinNum( msg, LastPinNumSize );
NewSizePin( LastPinSize ); NewSizePin( LastPinSize );
...@@ -126,10 +130,10 @@ void WinEDA_LibeditFrame::InitEditOnePin() ...@@ -126,10 +130,10 @@ void WinEDA_LibeditFrame::InitEditOnePin()
continue; continue;
if( Pin == CurrentPin ) if( Pin == CurrentPin )
continue; continue;
if( (Pin->m_Pos == CurrentPin->m_Pos) if( ( Pin->m_Pos == CurrentPin->m_Pos )
&& (Pin->m_Orient == CurrentPin->m_Orient) && ( Pin->m_Orient == CurrentPin->m_Orient )
&& ( !(CurrentPin->m_Flags & IS_NEW) ) && ( !( CurrentPin->m_Flags & IS_NEW ) )
&& (g_EditPinByPinIsOn == false) // This is set by the tool of the main toolbar && ( g_EditPinByPinIsOn == false ) // This is set by the tool of the main toolbar
) )
Pin->m_Flags |= IS_LINKED | IN_EDIT; Pin->m_Flags |= IS_LINKED | IN_EDIT;
else else
...@@ -150,7 +154,8 @@ static void AbortPinMove( WinEDA_DrawPanel* Panel, wxDC* DC ) ...@@ -150,7 +154,8 @@ static void AbortPinMove( WinEDA_DrawPanel* Panel, wxDC* DC )
LibDrawPin* CurrentPin = (LibDrawPin*) CurrentDrawItem; LibDrawPin* CurrentPin = (LibDrawPin*) CurrentDrawItem;
if( CurrentPin && ( CurrentPin->m_Flags & IS_NEW ) ) if( CurrentPin && ( CurrentPin->m_Flags & IS_NEW ) )
DeleteOneLibraryDrawStruct( Panel, DC, CurrentLibEntry, CurrentPin, true ); DeleteOneLibraryDrawStruct( Panel, DC, CurrentLibEntry,
CurrentPin, true );
/* clear edit flags */ /* clear edit flags */
LibEDA_BaseStruct* item = CurrentLibEntry->m_Drawings; LibEDA_BaseStruct* item = CurrentLibEntry->m_Drawings;
...@@ -235,8 +240,8 @@ void WinEDA_LibeditFrame::PlacePin( wxDC* DC ) ...@@ -235,8 +240,8 @@ void WinEDA_LibeditFrame::PlacePin( wxDC* DC )
} }
DrawPanel->CursorOff( DC ); DrawPanel->CursorOff( DC );
DrawLibraryDrawStruct( DrawPanel, DC, CurrentLibEntry, wxPoint(0, 0), CurrentPin, DrawLibraryDrawStruct( DrawPanel, DC, CurrentLibEntry, wxPoint( 0, 0 ),
GR_DEFAULT_DRAWMODE ); CurrentPin, GR_DEFAULT_DRAWMODE );
DrawPanel->CursorOn( DC ); DrawPanel->CursorOn( DC );
CurrentDrawItem = NULL; CurrentDrawItem = NULL;
...@@ -294,8 +299,9 @@ void WinEDA_LibeditFrame::StartMovePin( wxDC* DC ) ...@@ -294,8 +299,9 @@ void WinEDA_LibeditFrame::StartMovePin( wxDC* DC )
continue; continue;
if( Pin == CurrentPin ) if( Pin == CurrentPin )
continue; continue;
if( (Pin->m_Pos == CurrentPin->m_Pos) && (Pin->m_Orient == CurrentPin->m_Orient) if( ( Pin->m_Pos == CurrentPin->m_Pos )
&& (g_EditPinByPinIsOn == false ) ) && ( Pin->m_Orient == CurrentPin->m_Orient )
&& ( g_EditPinByPinIsOn == false ) )
Pin->m_Flags |= IS_LINKED | IS_MOVED; Pin->m_Flags |= IS_LINKED | IS_MOVED;
} }
...@@ -318,7 +324,7 @@ void WinEDA_LibeditFrame::StartMovePin( wxDC* DC ) ...@@ -318,7 +324,7 @@ void WinEDA_LibeditFrame::StartMovePin( wxDC* DC )
/******************************************************************************/ /******************************************************************************/
/* Routine de deplacement de la Pin courante selon position du curseur souris */ /* Routine de deplacement de la Pin courante selon position du curseur souris */
/* Routine normalement appelee par la routine de gestion du curseur */ /* Routine normalement appelee par la routine de gestion du curseur */
/******************************************************************************/ /******************************************************************************/
static void DrawMovePin( WinEDA_DrawPanel* panel, wxDC* DC, bool erase ) static void DrawMovePin( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
{ {
...@@ -326,17 +332,18 @@ static void DrawMovePin( WinEDA_DrawPanel* panel, wxDC* DC, bool erase ) ...@@ -326,17 +332,18 @@ static void DrawMovePin( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
wxPoint pinpos = CurrentPin->m_Pos; wxPoint pinpos = CurrentPin->m_Pos;
/* Erase pin in old position */ /* Erase pin in old position */
if( erase || (CurrentPin->m_Flags & IS_NEW) ) if( erase || ( CurrentPin->m_Flags & IS_NEW ) )
{ {
CurrentPin->m_Pos = PinPreviousPos; CurrentPin->m_Pos = PinPreviousPos;
DrawLibraryDrawStruct( panel, DC, CurrentLibEntry, wxPoint(0, 0), DrawLibraryDrawStruct( panel, DC, CurrentLibEntry, wxPoint(0, 0),
CurrentPin, g_XorMode ); CurrentPin, g_XorMode );
} }
/* Redraw pin in new position */ /* Redraw pin in new position */
CurrentPin->m_Pos.x = panel->GetScreen()->m_Curseur.x; CurrentPin->m_Pos.x = panel->GetScreen()->m_Curseur.x;
CurrentPin->m_Pos.y = -panel->GetScreen()->m_Curseur.y; CurrentPin->m_Pos.y = -panel->GetScreen()->m_Curseur.y;
DrawLibraryDrawStruct( panel, DC, CurrentLibEntry, wxPoint(0, 0), CurrentPin, g_XorMode ); DrawLibraryDrawStruct( panel, DC, CurrentLibEntry, wxPoint( 0, 0 ),
CurrentPin, g_XorMode );
PinPreviousPos = CurrentPin->m_Pos; PinPreviousPos = CurrentPin->m_Pos;
...@@ -481,7 +488,7 @@ void WinEDA_PinPropertiesFrame::SetPinNum( const wxString& newnum, int newsize ) ...@@ -481,7 +488,7 @@ void WinEDA_PinPropertiesFrame::SetPinNum( const wxString& newnum, int newsize )
{ {
if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE ) if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
continue; continue;
if( (Pin->m_Flags & IS_LINKED) == 0 ) if( ( Pin->m_Flags & IS_LINKED ) == 0 )
continue; continue;
if( Pin->m_Unit != CurrentPin->m_Unit ) if( Pin->m_Unit != CurrentPin->m_Unit )
continue; continue;
...@@ -659,14 +666,15 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw, ...@@ -659,14 +666,15 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw,
continue; continue;
if( Pin == CurrentPin ) if( Pin == CurrentPin )
continue; continue;
if( CurrentPin->m_Convert && (CurrentPin->m_Convert != Pin->m_Convert) ) if( CurrentPin->m_Convert
&& (CurrentPin->m_Convert != Pin->m_Convert) )
continue; continue;
if( CurrentPin->m_Pos != Pin->m_Pos ) if( CurrentPin->m_Pos != Pin->m_Pos )
continue; continue;
if( Pin->m_Orient != CurrentPin->m_Orient ) if( Pin->m_Orient != CurrentPin->m_Orient )
continue; continue;
DeleteOneLibraryDrawStruct( m_Parent->DrawPanel, NULL, DeleteOneLibraryDrawStruct( m_Parent->DrawPanel, NULL,
CurrentLibEntry, Pin, 0 ); CurrentLibEntry, Pin, 0 );
} }
} }
} // end if unit } // end if unit
...@@ -683,7 +691,8 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw, ...@@ -683,7 +691,8 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw,
DrawItem = CurrentLibEntry->m_Drawings; DrawItem = CurrentLibEntry->m_Drawings;
for( ; DrawItem != NULL; ) for( ; DrawItem != NULL; )
{ {
Pin = (LibDrawPin*) DrawItem; DrawItem = DrawItem->Next(); Pin = (LibDrawPin*) DrawItem;
DrawItem = DrawItem->Next();
if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE ) if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
continue; continue;
if( Pin->m_Flags == 0 ) if( Pin->m_Flags == 0 )
...@@ -697,7 +706,7 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw, ...@@ -697,7 +706,7 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw,
if( Pin->m_Orient != CurrentPin->m_Orient ) if( Pin->m_Orient != CurrentPin->m_Orient )
continue; continue;
DeleteOneLibraryDrawStruct( m_Parent->DrawPanel, NULL, DeleteOneLibraryDrawStruct( m_Parent->DrawPanel, NULL,
CurrentLibEntry, Pin, 0 ); CurrentLibEntry, Pin, 0 );
} }
} }
} // end if convert } // end if convert
...@@ -787,7 +796,7 @@ static void CreateImagePins( LibDrawPin* Pin ) ...@@ -787,7 +796,7 @@ static void CreateImagePins( LibDrawPin* Pin )
/* Creation de la pin " convert " pour la part courante */ /* Creation de la pin " convert " pour la part courante */
if( CreateConv == true ) if( CreateConv == true )
{ {
NewPin = Pin->GenCopy(); NewPin = (LibDrawPin*) Pin->GenCopy();
if( Pin->m_Convert > 1 ) if( Pin->m_Convert > 1 )
NewPin->m_Convert = 1; NewPin->m_Convert = 1;
else else
...@@ -804,7 +813,7 @@ static void CreateImagePins( LibDrawPin* Pin ) ...@@ -804,7 +813,7 @@ static void CreateImagePins( LibDrawPin* Pin )
continue; /* Pin commune a toutes les unites */ continue; /* Pin commune a toutes les unites */
/* Creation pour la representation "normale" */ /* Creation pour la representation "normale" */
NewPin = Pin->GenCopy(); NewPin = (LibDrawPin*) Pin->GenCopy();
if( CurrentConvert != 0 ) if( CurrentConvert != 0 )
NewPin->m_Convert = 1; NewPin->m_Convert = 1;
NewPin->m_Unit = ii; NewPin->m_Unit = ii;
...@@ -815,7 +824,7 @@ static void CreateImagePins( LibDrawPin* Pin ) ...@@ -815,7 +824,7 @@ static void CreateImagePins( LibDrawPin* Pin )
if( CreateConv == false ) if( CreateConv == false )
continue; continue;
NewPin = Pin->GenCopy(); NewPin = (LibDrawPin*)Pin->GenCopy();
NewPin->m_Convert = 2; NewPin->m_Convert = 2;
if( Pin->m_Unit != 0 ) if( Pin->m_Unit != 0 )
NewPin->m_Unit = ii; NewPin->m_Unit = ii;
...@@ -838,7 +847,7 @@ void WinEDA_LibeditFrame::GlobalSetPins( wxDC* DC, ...@@ -838,7 +847,7 @@ void WinEDA_LibeditFrame::GlobalSetPins( wxDC* DC,
*/ */
{ {
LibDrawPin* Pin; LibDrawPin* Pin;
bool selected = (MasterPin->m_Selected & IS_SELECTED) != 0; bool selected = ( MasterPin->m_Selected & IS_SELECTED ) != 0;
if( (CurrentLibEntry == NULL) || (MasterPin == NULL) ) if( (CurrentLibEntry == NULL) || (MasterPin == NULL) )
return; return;
...@@ -852,14 +861,15 @@ void WinEDA_LibeditFrame::GlobalSetPins( wxDC* DC, ...@@ -852,14 +861,15 @@ void WinEDA_LibeditFrame::GlobalSetPins( wxDC* DC,
{ {
if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE ) if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
continue; continue;
if( (Pin->m_Convert) && (Pin->m_Convert != CurrentConvert) ) if( ( Pin->m_Convert ) && ( Pin->m_Convert != CurrentConvert ) )
continue; continue;
// Is it the "selected mode" ? // Is it the "selected mode" ?
if( selected && (Pin->m_Selected & IS_SELECTED) == 0 ) if( selected && (Pin->m_Selected & IS_SELECTED) == 0 )
continue; continue;
DrawLibraryDrawStruct( DrawPanel, DC, CurrentLibEntry, wxPoint(0, 0), Pin, g_XorMode ); DrawLibraryDrawStruct( DrawPanel, DC, CurrentLibEntry,
wxPoint( 0, 0 ), Pin, g_XorMode );
switch( id ) switch( id )
{ {
...@@ -897,13 +907,15 @@ void WinEDA_LibeditFrame::RepeatPinItem( wxDC* DC, LibDrawPin* SourcePin ) ...@@ -897,13 +907,15 @@ void WinEDA_LibeditFrame::RepeatPinItem( wxDC* DC, LibDrawPin* SourcePin )
if( SourcePin->Type() != COMPONENT_PIN_DRAW_TYPE ) if( SourcePin->Type() != COMPONENT_PIN_DRAW_TYPE )
return; return;
Pin = SourcePin->GenCopy(); Pin = (LibDrawPin*)SourcePin->GenCopy();
Pin->SetNext( CurrentLibEntry->m_Drawings ); Pin->SetNext( CurrentLibEntry->m_Drawings );
CurrentLibEntry->m_Drawings = Pin; CurrentLibEntry->m_Drawings = Pin;
Pin->m_Flags = IS_NEW; Pin->m_Flags = IS_NEW;
Pin->m_Pos.x += g_RepeatStep.x; ox = Pin->m_Pos.x; Pin->m_Pos.x += g_RepeatStep.x;
Pin->m_Pos.y += -g_RepeatStep.y; oy = Pin->m_Pos.y; // ici axe Y comme en math ox = Pin->m_Pos.x;
Pin->m_Pos.y += -g_RepeatStep.y;
oy = Pin->m_Pos.y; // ici axe Y comme en math
/*** Increment du numero de label ***/ /*** Increment du numero de label ***/
IncrementLabelMember( Pin->m_PinName ); IncrementLabelMember( Pin->m_PinName );
...@@ -924,7 +936,7 @@ void WinEDA_LibeditFrame::RepeatPinItem( wxDC* DC, LibDrawPin* SourcePin ) ...@@ -924,7 +936,7 @@ void WinEDA_LibeditFrame::RepeatPinItem( wxDC* DC, LibDrawPin* SourcePin )
PlacePin( DC ); PlacePin( DC );
GetScreen()->m_Curseur = savepos; GetScreen()->m_Curseur = savepos;
// DrawPanel->MouseToCursorSchema(); // DrawPanel->MouseToCursorSchema();
DrawPanel->CursorOn( DC ); DrawPanel->CursorOn( DC );
Pin->DisplayInfo( this ); Pin->DisplayInfo( this );
......
eeschema/priorque.cpp deleted 100644 → 0
View file @ 27a0c73c
/*****************************************************************************
* PriorQue.c - implement priority queue, using regular binary trees *
* (that guarantees only average time of NlogN...) and with the following *
* operations: *
* 1. PQInit(&PQ) - initialize the queue, must be called before usage. *
* 2. PQEmpty(PQ) - returns TRUE iff PQ is empty. *
* 3. PQCompFunc(&CompFunc) - sets (a pointer to) the function that is *
* used to compere two items in the queue. the function should get two *
* item pointers, and should return >1, 0, <1 as comparison result for *
* greater than, equal, or less than respectively. *
* 4. PQFirst(&PQ, Delete) - returns the first element of the priority *
* queue, and delete it from queue if delete is TRUE. *
* 5. PQInsert(&PQ, NewItem) - insert NewItem into the queue *
* (NewItem is a pointer to it), using the comparison function CompFunc. *
* 6. PQDelete(&PQ, OldItem) - Delete old item from the queue *
* again using the comparison function CompFunc. *
* 7. PQFind(PQ, OldItem) - Find old item in queue, again using the *
* comparison function CompFunc. *
* 8. PQNext(PQ, CmpItem, NULL) - returns the smallest item which is bigger *
* than given item CmpItem. PQ is not modified. Return NULL if none. *
* 9. PQPrint(PQ, &PrintFunc) - print the queue in order using the given *
* printing function PrintFunc. *
*10. PQFree(&PQ, FreeItems) - Free the queue. The items are also freed if *
* FreeItems is TRUE. *
* *
* Written by Gershon Elber, Dec 88 *
*****************************************************************************/
#include <stdio.h>
#include <string.h>
#include "priorque.h"
/* Definition des fonction MyFree() ( free() ) et MyMalloc() (malloc() */
void * MyMalloc( size_t );
void MyFree(void*);
#define SIGN(x) ((x) > 0 ? 1 : ((x) < 0 ? -1 : 0))
#define PQ_NEW_NODE(PQ) { \
PQ = (PriorQue *) MyMalloc(sizeof(PriorQue)); \
(PQ) -> Right = (PQ) -> Left = NULL; \
(PQ) -> Data = NULL; }
#define PQ_FREE_NODE(PQ) { MyFree((char *) (PQ)); PQ = NULL; }
static PQCompFuncType CompFunc; // = (PQCompFuncType) strcmp;
/******************************************************************************
* PQEmpty - initialize the queue... *
******************************************************************************/
void PQInit(PriorQue **PQ)
{
*PQ = NULL;
}
/******************************************************************************
* PQEmpty - returns TRUE iff PQ priority queue is empty. *
******************************************************************************/
int PQEmpty(PriorQue *PQ)
{
return PQ == NULL;
}
/******************************************************************************
* PQCompFunc - sets (a pointer to) the function that is used to compere two *
* items in the queue. The function should get two item pointers, and should *
* return >1, 0, <1 as comparison result for greater than, equal, or less than *
* respectively. *
******************************************************************************/
void PQCompFunc(PQCompFuncType NewCompFunc)
{
CompFunc = NewCompFunc;
}
/******************************************************************************
* PQFirst - returns the first element of the priority queue, and delete it *
* from queue if Delete is TRUE. return NULL if empty queue *
******************************************************************************/
void * PQFirst(PriorQue **PQ, int Delete)
{
void * Data;
PriorQue *Ptemp = (*PQ);
if (*PQ == NULL) return NULL;
while (Ptemp -> Right != NULL)
Ptemp = Ptemp -> Right; /* Find smallest item. */
Data = Ptemp -> Data;
if (Delete) PQDelete(PQ, Data);
return Data;
}
/******************************************************************************
* PQInsert - insert new item into the queue (NewItem is a pointer to it), *
* using given compare function CompFunc. CompFunc should return >1, 0, <1 *
* as two item comparison result for greater than, equal, or less than *
* respectively. *
* Insert is always as a leaf of the tree. *
* Return pointer to old data if was replaced or NULL if the item is new. *
******************************************************************************/
void * PQInsert(PriorQue **PQ, void * NewItem)
{
int Compare;
void * Data;
if ((*PQ) == NULL) {
PQ_NEW_NODE(*PQ);
(*PQ) -> Data = NewItem;
return NULL;
}
else {
Compare = (*CompFunc)(NewItem, (*PQ) -> Data);
Compare = SIGN(Compare);
switch (Compare) {
case -1:
return PQInsert(&((*PQ) -> Right), NewItem);
case 0:
Data = (*PQ) -> Data;
(*PQ) -> Data = NewItem;
return Data;
case 1:
return PQInsert(&((*PQ) -> Left), NewItem);
}
}
return NULL; /* Makes warning silent. */
}
/******************************************************************************
* PQDelete - Delete old item from the queue, again using the comparison *
* function CompFunc. *
* Returns pointer to Deleted item if was fould and deleted, NULL otherwise. *
******************************************************************************/
void * PQDelete(PriorQue **PQ, void * OldItem)
{
int Compare;
PriorQue *Ptemp;
void * Data;
void * OldData;
if ((*PQ) == NULL) return NULL;
else
{
Compare = (*CompFunc)(OldItem, (*PQ) -> Data);
Compare = SIGN(Compare);
switch (Compare)
{
case -1:
return PQDelete(&((*PQ) -> Right), OldItem);
case 0:
OldData = (*PQ) -> Data; /* The returned deleted item. */
if ((*PQ) -> Right == NULL && (*PQ) -> Left == NULL)
{
/* Thats easy - we delete a leaf: */
Data = (*PQ) -> Data;
PQ_FREE_NODE(*PQ); /* Note *PQ is also set to NULL here. */
}
else if ((*PQ) -> Right != NULL)
{
/* replace this node by the biggest in the Right branch: */
/* move once to the Right and then Left all the time... */
Ptemp = (*PQ) -> Right;
if (Ptemp -> Left != NULL)
{
while (Ptemp -> Left -> Left != NULL)
Ptemp = Ptemp -> Left;
Data = Ptemp -> Left -> Data;/*Save the data pointer.*/
PQDelete(&(Ptemp -> Left), Data); /* Delete recurs. */
(*PQ) -> Data = Data; /* And put that data instead...*/
}
else
{
Data = Ptemp -> Data; /* Save the data pointer. */
PQDelete(&((*PQ) -> Right), Data); /* Delete recurs. */
(*PQ) -> Data = Data; /* And put that data instead...*/
}
}
else /* Left != NULL. */
{
/* replace this node by the biggest in the Left branch: */
/* move once to the Left and then Right all the time... */
Ptemp = (*PQ) -> Left;
if (Ptemp -> Right != NULL)
{
while (Ptemp -> Right -> Right != NULL)
Ptemp = Ptemp -> Right;
Data = Ptemp -> Right -> Data; /* Save data pointer. */
PQDelete(&(Ptemp -> Right), Data); /*Delete recurs. */
(*PQ) -> Data = Data; /* And put that data instead...*/
}
else
{
Data = Ptemp -> Data; /* Save the data pointer. */
PQDelete(&((*PQ) -> Left), Data); /* Delete recurs. */
(*PQ) -> Data = Data; /* And put that data instead...*/
}
}
return OldData;
case 1:
return PQDelete(&((*PQ) -> Left), OldItem);
}
}
return NULL; /* Makes warning silent. */
}
/******************************************************************************
* PQFind - Find old item from the queue, again using the comparison *
* function CompFunc. *
* Returns pointer to item if was fould, NULL otherwise. *
******************************************************************************/
void * PQFind(PriorQue *PQ, void * OldItem)
{
int Compare;
if (PQ == NULL) {
return NULL;
}
else {
Compare = (*CompFunc)(OldItem, PQ -> Data);
Compare = SIGN(Compare);
switch (Compare) {
case -1:
return PQFind(PQ -> Right, OldItem);
case 0:
return PQ -> Data;
case 1:
return PQFind(PQ -> Left, OldItem);
}
}
return NULL; /* Makes warning silent. */
}
/******************************************************************************
* PQNext - returns the smallest item which is bigger than given item CmpItem. *
* PQ is not modified. Return NULL if none was found. *
* BiggerThan will allways hold the smallest Item bigger than current one. *
******************************************************************************/
void * PQNext(PriorQue *PQ, void * CmpItem, void * BiggerThan)
{
int Compare;
PriorQue *Ptemp;
if (PQ == NULL)
return BiggerThan;
else {
Compare = (*CompFunc)(CmpItem, PQ -> Data);
Compare = SIGN(Compare);
switch (Compare) {
case -1:
return PQNext(PQ -> Right, CmpItem, PQ -> Data);
case 0:
/* Found it - if its right tree is not empty, returns its */
/* smallest, else returns BiggerThan... */
if (PQ -> Left != NULL) {
Ptemp = PQ -> Left;
while (Ptemp -> Right != NULL) Ptemp = Ptemp -> Right;
return Ptemp -> Data;
}
else
return BiggerThan;
case 1:
return PQNext(PQ -> Left, CmpItem, BiggerThan);
}
}
return NULL; /* Makes warning silent. */
}
/******************************************************************************
* PQPrint - print the queue in order using the given printing functionq *
* PrintFunc. *
******************************************************************************/
void PQPrint(PriorQue *PQ, void (*PrintFunc)(void *))
{
if (PQ == NULL) return;
PQPrint(PQ -> Right, PrintFunc);
(*PrintFunc)(PQ -> Data);
PQPrint(PQ -> Left, PrintFunc);
}
/******************************************************************************
* PQFree - Free the queue. The items are also freed if FreeItems is TRUE. *
******************************************************************************/
void PQFree(PriorQue *PQ, int FreeItem)
{
if (PQ == NULL) return;
PQFree(PQ -> Right, FreeItem);
PQFree(PQ -> Left, FreeItem);
if (FreeItem) MyFree((char *) PQ -> Data);
MyFree((char *) PQ);
}
/******************************************************************************
* PQFreeFunc - Free queue. Items are also freed by calling FreeFunc on them. *
******************************************************************************/
void PQFreeFunc(PriorQue *PQ, void (*FreeFunc)(void *))
{
if (PQ == NULL) return;
PQFreeFunc(PQ -> Right, FreeFunc);
PQFreeFunc(PQ -> Left, FreeFunc);
(FreeFunc)(PQ -> Data);
MyFree((char *) PQ);
}
eeschema/priorque.h deleted 100644 → 0
View file @ 27a0c73c
/*****************************************************************************
* Definitions, visible to others, of Priority Queue module: *
*****************************************************************************/
#ifndef PRIOR_Q_GH
#define PRIOR_Q_GH
typedef struct PriorQue
{
struct PriorQue *Right, *Left; /* Pointers to two sons of this node. */
void * Data; /* Pointers to the data itself. */
} PriorQue;
typedef int (*PQCompFuncType)( void *, void *); /* Comparison function. */
/* And global function prototypes: */
void PQInit(PriorQue **PQ);
int PQEmpty(PriorQue *PQ);
void PQCompFunc(PQCompFuncType NewCompFunc);
void * PQFirst(PriorQue **PQ, int Delete);
void * PQInsert(PriorQue **PQ, void * NewItem);
void * PQDelete(PriorQue **PQ, void * NewItem);
void * PQFind(PriorQue *PQ, void * OldItem);
void * PQNext(PriorQue *PQ, void * CmpItem, void * BiggerThan);
void PQPrint(PriorQue *PQ, void (*PrintFunc)());
void PQFree(PriorQue *PQ, int FreeItems);
void PQFreeFunc(PriorQue *PQ, void (*FreeFunc)(void *));
#endif /* PRIOR_Q_GH */
eeschema/protos.h
View file @ 79c9be25
...@@ -91,9 +91,6 @@ wxPoint TransformCoordinate( const int aTransformMatrix[2][2], ...@@ -91,9 +91,6 @@ wxPoint TransformCoordinate( const int aTransformMatrix[2][2],
const wxPoint& aPosition ); const wxPoint& aPosition );
LibraryStruct* FindLibrary( const wxString& Name ); LibraryStruct* FindLibrary( const wxString& Name );
int LoadDocLib( WinEDA_DrawFrame* frame,
const wxString& FullDocLibName,
const wxString& Libname );
LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame, LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
const wxString& FullLibName, const wxString& FullLibName,
const wxString& LibName ); const wxString& LibName );
...@@ -236,18 +233,6 @@ bool Read_Hotkey_Config( WinEDA_DrawFrame* frame, bool verbose ); ...@@ -236,18 +233,6 @@ bool Read_Hotkey_Config( WinEDA_DrawFrame* frame, bool verbose );
/* SAVELIB.CPP */ /* SAVELIB.CPP */
/**************/ /**************/
LibEDA_BaseStruct* CopyDrawEntryStruct( LibEDA_BaseStruct* DrawItem );
/* Routine de Duplication d'une structure DrawLibItem d'une partlib
* Parametres d'entree:
* DrawEntry = pointeur sur la structure a dupliquer
* La structure nouvelle est creee, mais n'est pas inseree dans le
* chainage
* Retourne:
* Pointeur sur la structure creee (ou NULL si impossible)
*/
EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry ); EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry );
/* Routine de copie d'une partlib /* Routine de copie d'une partlib
......
eeschema/savelib.cpp
View file @ 79c9be25
/****************************/ /****************************/
/* EESchema - eesavlib.cpp */ /* EESchema - eesavlib.cpp */
/****************************/ /****************************/
/* Functions to save schematic libraries and library components (::Save() /* Functions to save schematic libraries and library components (::Save()
...@@ -19,61 +19,6 @@ ...@@ -19,61 +19,6 @@
#include "protos.h" #include "protos.h"
/** Function CopyDrawEntryStruct
* Duplicate a DrawLibItem
* the new item is only created, it is not put in the current component linked
* list
* @param DrawEntry = DrawLibItem * item to duplicate
* @return a pointer to the new item
* A better way to duplicate a DrawLibItem is to have a virtual GenCopy() in
* LibEDA_BaseStruct class (ToDo).
*/
LibEDA_BaseStruct* CopyDrawEntryStruct( LibEDA_BaseStruct* DrawItem )
{
wxString msg;
LibEDA_BaseStruct* NewDrawItem = NULL;
switch( DrawItem->Type() )
{
case COMPONENT_ARC_DRAW_TYPE:
NewDrawItem = ( (LibDrawArc*) DrawItem )->GenCopy();
break;
case COMPONENT_CIRCLE_DRAW_TYPE:
NewDrawItem = ( (LibDrawCircle*) DrawItem )->GenCopy();
break;
case COMPONENT_RECT_DRAW_TYPE:
NewDrawItem = ( (LibDrawSquare*) DrawItem )->GenCopy();
break;
case COMPONENT_PIN_DRAW_TYPE:
NewDrawItem = ( (LibDrawPin*) DrawItem )->GenCopy();
break;
case COMPONENT_GRAPHIC_TEXT_DRAW_TYPE:
NewDrawItem = ( (LibDrawText*) DrawItem )->GenCopy();
break;
case COMPONENT_POLYLINE_DRAW_TYPE:
NewDrawItem = ( (LibDrawPolyline*) DrawItem )->GenCopy();
break;
case COMPONENT_BEZIER_DRAW_TYPE:
NewDrawItem = ( (LibDrawBezier*) DrawItem )->GenCopy();
break;
default:
msg.Printf( wxT( "CopyDrawLibEntryStruct: unknown Draw Type %d" ),
DrawItem->Type() );
wxLogError( msg );
break;
}
return NewDrawItem;
}
/* /*
* Routine de copie d'une partlib * Routine de copie d'une partlib
* Parametres d'entree: pointeur sur la structure de depart * Parametres d'entree: pointeur sur la structure de depart
...@@ -118,7 +63,7 @@ EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry ) ...@@ -118,7 +63,7 @@ EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry )
for( OldField = OldEntry->m_Fields; OldField != NULL; for( OldField = OldEntry->m_Fields; OldField != NULL;
OldField = OldField->Next() ) OldField = OldField->Next() )
{ {
NewField = OldField->GenCopy(); NewField = (LibDrawField*) OldField->GenCopy();
NewStruct->m_Fields.PushBack( NewField ); NewStruct->m_Fields.PushBack( NewField );
} }
...@@ -130,7 +75,8 @@ EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry ) ...@@ -130,7 +75,8 @@ EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry )
if( ( OldDrawings->m_Flags & IS_NEW ) != 0 ) if( ( OldDrawings->m_Flags & IS_NEW ) != 0 )
continue; continue;
NewDrawings = CopyDrawEntryStruct( OldDrawings ); NewDrawings = OldDrawings->GenCopy();
if( NewDrawings ) if( NewDrawings )
{ {
if( LastItem == NULL ) if( LastItem == NULL )
...@@ -141,7 +87,7 @@ EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry ) ...@@ -141,7 +87,7 @@ EDA_LibComponentStruct* CopyLibEntryStruct( EDA_LibComponentStruct* OldEntry )
LastItem = NewDrawings; LastItem = NewDrawings;
NewDrawings->SetNext( NULL ); NewDrawings->SetNext( NULL );
} }
else // Should never occur, just in case... else // Should never occur, just in case...
{ // CopyDrawEntryStruct() was not able to duplicate the type { // CopyDrawEntryStruct() was not able to duplicate the type
// of OldDrawings // of OldDrawings
// occurs when an unexpected type is encountered // occurs when an unexpected type is encountered
......
eeschema/selpart.cpp
View file @ 79c9be25
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
/* EESchema - selpart.cpp */ /* EESchema - selpart.cpp */
/**************************/ /**************************/
/* Routine de selection d'un composant en librairie
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
...@@ -16,32 +13,24 @@ ...@@ -16,32 +13,24 @@
#include "protos.h" #include "protos.h"
/* Routines locales */
/* Variables locales */
/***************************************************************/
LibraryStruct* SelectLibraryFromList( WinEDA_DrawFrame* frame ) LibraryStruct* SelectLibraryFromList( WinEDA_DrawFrame* frame )
/***************************************************************/
{ {
int ii, NumOfLibs = NumOfLibraries();
LibraryStruct* Lib = NULL;
static wxString OldLibName; static wxString OldLibName;
wxString LibName; wxString LibName, msg;
int count = NumOfLibraries();
LibraryStruct* Lib = NULL;
if( NumOfLibs == 0 ) if( count == 0 )
{ {
DisplayError( frame, _( "No libraries are loaded" ) ); DisplayError( frame, _( "No libraries are loaded" ) );
return NULL; return NULL;
} }
WinEDAListBox ListBox( frame, _( "Select Lib" ), msg.Printf( _( " Select 1 of %d libraries." ), count );
NULL, OldLibName, NULL,
wxColour( 255, 255, 255 ) ); // Library browser background color
wxArrayString libNamesList; wxArrayString libNamesList;
LibraryStruct* libcache = NULL; LibraryStruct* libcache = NULL;
for( LibraryStruct* Lib = g_LibraryList; Lib != NULL; Lib = Lib->m_Pnext ) for( LibraryStruct* Lib = g_LibraryList; Lib != NULL; Lib = Lib->m_Pnext )
{ {
if( Lib->m_IsLibCache ) if( Lib->m_IsLibCache )
...@@ -56,17 +45,20 @@ LibraryStruct* SelectLibraryFromList( WinEDA_DrawFrame* frame ) ...@@ -56,17 +45,20 @@ LibraryStruct* SelectLibraryFromList( WinEDA_DrawFrame* frame )
if( libcache ) if( libcache )
libNamesList.Add( libcache->m_Name ); libNamesList.Add( libcache->m_Name );
ListBox.InsertItems( libNamesList ); wxSingleChoiceDialog dlg( frame, msg, _( "Select Library" ), libNamesList );
int index = libNamesList.Index( OldLibName );
ListBox.MoveMouseToOrigin(); if( index != wxNOT_FOUND )
dlg.SetSelection( index );
ii = ListBox.ShowModal(); if( dlg.ShowModal() == wxID_CANCEL || dlg.GetStringSelection().IsEmpty() )
return NULL;
if( ii >= 0 ) /* Recherche de la librairie */ Lib = FindLibrary( dlg.GetStringSelection() );
{
Lib = FindLibrary( libNamesList[ii] ); if( Lib != NULL )
} OldLibName = dlg.GetStringSelection();
return Lib; return Lib;
} }
...@@ -77,7 +69,6 @@ int DisplayComponentsNamesInLib( WinEDA_DrawFrame* frame, ...@@ -77,7 +69,6 @@ int DisplayComponentsNamesInLib( WinEDA_DrawFrame* frame,
wxString& Buffer, wxString& OldName ) wxString& Buffer, wxString& OldName )
{ {
size_t i; size_t i;
wxString msg;
wxArrayString nameList; wxArrayString nameList;
const wxChar** ListNames; const wxChar** ListNames;
...@@ -92,14 +83,11 @@ int DisplayComponentsNamesInLib( WinEDA_DrawFrame* frame, ...@@ -92,14 +83,11 @@ int DisplayComponentsNamesInLib( WinEDA_DrawFrame* frame,
ListNames = (const wxChar**) MyZMalloc( ( nameList.GetCount() + 1 ) * ListNames = (const wxChar**) MyZMalloc( ( nameList.GetCount() + 1 ) *
sizeof( wxChar* ) ); sizeof( wxChar* ) );
msg.Printf( _( "Select 1 of %d components from library <%s>" ),
nameList.GetCount(), (const wxChar*) Library->m_Name );
for( i = 0; i < nameList.GetCount(); i++ ) for( i = 0; i < nameList.GetCount(); i++ )
ListNames[i] = (const wxChar*) nameList[i]; ListNames[i] = (const wxChar*) nameList[i];
WinEDAListBox dlg( frame, msg, ListNames, OldName, DisplayCmpDoc, WinEDAListBox dlg( frame, _( "Select Component" ), ListNames, OldName,
wxColour( 255, 255, 255 ) ); DisplayCmpDoc, wxColour( 255, 255, 255 ) );
dlg.MoveMouseToOrigin(); dlg.MoveMouseToOrigin();
...@@ -117,10 +105,8 @@ int DisplayComponentsNamesInLib( WinEDA_DrawFrame* frame, ...@@ -117,10 +105,8 @@ int DisplayComponentsNamesInLib( WinEDA_DrawFrame* frame,
} }
/************************************************************/ int GetNameOfPartToLoad( WinEDA_DrawFrame* frame, LibraryStruct* Library,
int GetNameOfPartToLoad( WinEDA_DrawFrame* frame, wxString& BufName )
LibraryStruct* Library, wxString& BufName )
/************************************************************/
{ {
int ii; int ii;
static wxString OldCmpName; static wxString OldCmpName;
......
eeschema/symbedit.cpp
View file @ 79c9be25
/*************************************************/ /*************************************************/
/* Functions to Load from file and save to file */ /* Functions to Load from file and save to file */
/* the graphic shapes used to draw a component */ /* the graphic shapes used to draw a component */
/* When using the import/export symbol options */ /* When using the import/export symbol options */
/* files are the *.sym files */ /* files are the *.sym files */
/*************************************************/ /*************************************************/
...@@ -109,7 +109,7 @@ void WinEDA_LibeditFrame::LoadOneSymbol( void ) ...@@ -109,7 +109,7 @@ void WinEDA_LibeditFrame::LoadOneSymbol( void )
return; return;
} }
if( Lib->m_NumOfParts > 1 ) if( Lib->GetCount() > 1 )
DisplayError( this, _( "Warning: more than 1 part in Symbol File" ) ); DisplayError( this, _( "Warning: more than 1 part in Symbol File" ) );
Component = (EDA_LibComponentStruct*) Lib->GetFirstEntry(); Component = (EDA_LibComponentStruct*) Lib->GetFirstEntry();
...@@ -240,10 +240,10 @@ void WinEDA_LibeditFrame::SaveOneSymbol() ...@@ -240,10 +240,10 @@ void WinEDA_LibeditFrame::SaveOneSymbol()
for( ; DrawEntry != NULL; DrawEntry = DrawEntry->Next() ) for( ; DrawEntry != NULL; DrawEntry = DrawEntry->Next() )
{ {
/* Elimination des elements non relatifs a l'unite */ /* Elimination des elements non relatifs a l'unite */
if( Unit && DrawEntry->m_Unit && (DrawEntry->m_Unit != Unit) ) if( Unit && DrawEntry->m_Unit && ( DrawEntry->m_Unit != Unit ) )
continue; continue;
if( convert && DrawEntry->m_Convert if( convert && DrawEntry->m_Convert
&& (DrawEntry->m_Convert != convert) ) && ( DrawEntry->m_Convert != convert ) )
continue; continue;
DrawEntry->Save( ExportFile ); DrawEntry->Save( ExportFile );
...@@ -401,10 +401,10 @@ static bool CompareSymbols( LibEDA_BaseStruct* DEntryRef, ...@@ -401,10 +401,10 @@ static bool CompareSymbols( LibEDA_BaseStruct* DEntryRef,
/***************************************************************************/ /***************************************************************************/
/* Routine de placement du point d'ancrage ( reference des coordonnes pour */ /* Routine de placement du point d'ancrage ( reference des coordonnes pour */
/* le trace) du composant courant */ /* le trace) du composant courant */
/* Toutes les coord apparaissant dans les structures sont modifiees */ /* Toutes les coord apparaissant dans les structures sont modifiees */
/* pour repositionner le point repere par le curseur souris au point */ /* pour repositionner le point repere par le curseur souris au point */
/* d'ancrage ( coord 0,0 ). */ /* d'ancrage ( coord 0,0 ). */
/***************************************************************************/ /***************************************************************************/
void WinEDA_LibeditFrame::PlaceAncre() void WinEDA_LibeditFrame::PlaceAncre()
{ {
......
eeschema/viewlib_frame.cpp
View file @ 79c9be25
...@@ -111,7 +111,8 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, ...@@ -111,7 +111,8 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father,
m_LibList = m_LibList =
new wxListBox( m_LibListWindow, ID_LIBVIEW_LIB_LIST, new wxListBox( m_LibListWindow, ID_LIBVIEW_LIB_LIST,
wxPoint( 0, 0 ), wxPoint( 0, 0 ),
m_LibListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0), m_LibListWindow->GetClientSize() -
wxSize( EXTRA_BORDER_SIZE * 2, 0 ),
0, NULL, wxLB_HSCROLL ); 0, NULL, wxLB_HSCROLL );
} }
else else
...@@ -135,7 +136,8 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, ...@@ -135,7 +136,8 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father,
m_CmpListWindow->SetExtraBorderSize( EXTRA_BORDER_SIZE ); m_CmpListWindow->SetExtraBorderSize( EXTRA_BORDER_SIZE );
m_CmpList = new wxListBox( m_CmpListWindow, ID_LIBVIEW_CMP_LIST, m_CmpList = new wxListBox( m_CmpListWindow, ID_LIBVIEW_CMP_LIST,
wxPoint( 0, 0 ), wxPoint( 0, 0 ),
m_CmpListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0), m_CmpListWindow->GetClientSize() -
wxSize( EXTRA_BORDER_SIZE * 2, 0 ),
0, NULL, wxLB_HSCROLL ); 0, NULL, wxLB_HSCROLL );
if( m_LibList ) if( m_LibList )
...@@ -231,7 +233,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv ) ...@@ -231,7 +233,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv )
if( m_VToolBar ) if( m_VToolBar )
{ {
Vtoolbar_size = m_VToolBar->GetSize(); Vtoolbar_size = m_VToolBar->GetSize();
m_VToolBar->SetSize( clientsize.x - maintoolbar_size.y, 0, -1, clientsize.y ); m_VToolBar->SetSize( clientsize.x - maintoolbar_size.y, 0, -1,
clientsize.y );
} }
if( MsgPanel ) if( MsgPanel )
...@@ -242,7 +245,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv ) ...@@ -242,7 +245,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv )
if( DrawPanel ) if( DrawPanel )
{ {
DrawPanel->SetSize( m_LibListSize.x + m_CmpListSize.x, 0, DrawPanel->SetSize( m_LibListSize.x + m_CmpListSize.x, 0,
clientsize.x - Vtoolbar_size.x - m_LibListSize.x - m_CmpListSize.x, clientsize.x - Vtoolbar_size.x -
m_LibListSize.x - m_CmpListSize.x,
clientsize.y ); clientsize.y );
} }
...@@ -250,7 +254,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv ) ...@@ -250,7 +254,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv )
{ {
m_LibListSize.y = clientsize.y - 2; m_LibListSize.y = clientsize.y - 2;
m_LibListWindow->SetSize( m_LibListSize ); m_LibListWindow->SetSize( m_LibListSize );
m_LibList->SetSize( m_LibListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0) ); m_LibList->SetSize( m_LibListWindow->GetClientSize() -
wxSize( EXTRA_BORDER_SIZE * 2, 0 ) );
} }
if( m_CmpList && m_CmpListWindow ) if( m_CmpList && m_CmpListWindow )
...@@ -258,7 +263,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv ) ...@@ -258,7 +263,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv )
m_CmpListSize.y = clientsize.y - 2; m_CmpListSize.y = clientsize.y - 2;
m_CmpListWindow->SetSize( m_CmpListSize ); m_CmpListWindow->SetSize( m_CmpListSize );
m_CmpListWindow->SetPosition( wxPoint( m_LibListSize.x, 0 ) ); m_CmpListWindow->SetPosition( wxPoint( m_LibListSize.x, 0 ) );
m_CmpList->SetSize( m_CmpListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0) ); m_CmpList->SetSize( m_CmpListWindow->GetClientSize() -
wxSize( EXTRA_BORDER_SIZE * 2, 0 ) );
} }
SizeEv.Skip(); SizeEv.Skip();
...@@ -285,7 +291,8 @@ int WinEDA_ViewlibFrame::BestZoom() ...@@ -285,7 +291,8 @@ int WinEDA_ViewlibFrame::BestZoom()
return bestzoom; return bestzoom;
} }
EDA_Rect BoundaryBox = CurrentLibEntry->GetBoundaryBox( g_ViewUnit, g_ViewConvert ); EDA_Rect BoundaryBox = CurrentLibEntry->GetBoundaryBox( g_ViewUnit,
g_ViewConvert );
itemsize = BoundaryBox.GetSize(); itemsize = BoundaryBox.GetSize();
size = DrawPanel->GetClientSize(); size = DrawPanel->GetClientSize();
...@@ -331,12 +338,12 @@ void WinEDA_ViewlibFrame::ReCreateListLib() ...@@ -331,12 +338,12 @@ void WinEDA_ViewlibFrame::ReCreateListLib()
if ( libcache ) if ( libcache )
libNamesList.Add( libcache->m_Name ); libNamesList.Add( libcache->m_Name );
m_LibList->Append(libNamesList); m_LibList->Append( libNamesList );
// Search for a previous selection: // Search for a previous selection:
for ( unsigned ii = 0; ii < m_LibList->GetCount(); ii++ ) for ( unsigned ii = 0; ii < m_LibList->GetCount(); ii++ )
{ {
if( g_CurrentViewLibraryName.Cmp( m_LibList->GetString(ii) ) == 0 ) if( g_CurrentViewLibraryName.Cmp( m_LibList->GetString( ii ) ) == 0 )
{ {
m_LibList->SetSelection( ii, TRUE ); m_LibList->SetSelection( ii, TRUE );
found = TRUE; found = TRUE;
...@@ -344,7 +351,8 @@ void WinEDA_ViewlibFrame::ReCreateListLib() ...@@ -344,7 +351,8 @@ void WinEDA_ViewlibFrame::ReCreateListLib()
} }
} }
/* If not found, clear current library selection because it can be deleted after a config change /* If not found, clear current library selection because it can be
* deleted after a config change.
*/ */
if( !found ) if( !found )
{ {
...@@ -364,7 +372,7 @@ void WinEDA_ViewlibFrame::ReCreateListCmp() ...@@ -364,7 +372,7 @@ void WinEDA_ViewlibFrame::ReCreateListCmp()
if( m_CmpList == NULL ) if( m_CmpList == NULL )
return; return;
LibraryStruct* Library = FindLibrary( g_CurrentViewLibraryName.GetData() ); LibraryStruct* Library = FindLibrary( g_CurrentViewLibraryName );
wxArrayString nameList; wxArrayString nameList;
m_CmpList->Clear(); m_CmpList->Clear();
...@@ -378,9 +386,7 @@ void WinEDA_ViewlibFrame::ReCreateListCmp() ...@@ -378,9 +386,7 @@ void WinEDA_ViewlibFrame::ReCreateListCmp()
} }
/********************************************************************/
void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event ) void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event )
/********************************************************************/
{ {
int ii = m_LibList->GetSelection(); int ii = m_LibList->GetSelection();
...@@ -398,9 +404,7 @@ void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event ) ...@@ -398,9 +404,7 @@ void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event )
} }
/****************************************************************/
void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event ) void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event )
/****************************************************************/
{ {
int ii = m_CmpList->GetSelection(); int ii = m_CmpList->GetSelection();
...@@ -418,12 +422,11 @@ void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event ) ...@@ -418,12 +422,11 @@ void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event )
} }
/****************************************************************************/
void WinEDA_ViewlibFrame::ExportToSchematicLibraryPart( wxCommandEvent& event )
/****************************************************************************/
/* Export the current component to schematic and close the library browser /*
* Export the current component to schematic and close the library browser
*/ */
void WinEDA_ViewlibFrame::ExportToSchematicLibraryPart( wxCommandEvent& event )
{ {
int ii = m_CmpList->GetSelection(); int ii = m_CmpList->GetSelection();
......
eeschema/viewlibs.cpp
View file @ 79c9be25
...@@ -17,18 +17,12 @@ ...@@ -17,18 +17,12 @@
#include "id.h" #include "id.h"
#define NEXT_PART 1 #define NEXT_PART 1
#define NEW_PART 0 #define NEW_PART 0
#define PREVIOUS_PART -1 #define PREVIOUS_PART -1
/* Routines locales */
/* Variables locales */
/*************************************************************************/
void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event ) void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event )
/*************************************************************************/
{ {
wxString msg; wxString msg;
EDA_LibComponentStruct* LibEntry; EDA_LibComponentStruct* LibEntry;
...@@ -63,7 +57,7 @@ void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -63,7 +57,7 @@ void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event )
ALIAS ); ALIAS );
if( LibEntry && ( !LibEntry->m_DocFile.IsEmpty() ) ) if( LibEntry && ( !LibEntry->m_DocFile.IsEmpty() ) )
GetAssociatedDocument( this, LibEntry->m_DocFile, GetAssociatedDocument( this, LibEntry->m_DocFile,
& wxGetApp().GetLibraryPathList()); &wxGetApp().GetLibraryPathList() );
break; break;
case ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT: case ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT:
...@@ -96,26 +90,20 @@ void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -96,26 +90,20 @@ void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event )
} }
/*************************************************************************/
void WinEDA_ViewlibFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) void WinEDA_ViewlibFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
/*************************************************************************/
{ {
} }
/********************************************************************************/
bool WinEDA_ViewlibFrame::OnRightClick( const wxPoint& MousePos, bool WinEDA_ViewlibFrame::OnRightClick( const wxPoint& MousePos,
wxMenu* PopMenu ) wxMenu* PopMenu )
/********************************************************************************/
{ {
return true; return true;
} }
/**********************************************/
void WinEDA_ViewlibFrame::DisplayLibInfos()
/**********************************************/
/* Affiche en Ligne d'info la librairie en cours de visualisation */ /* Affiche en Ligne d'info la librairie en cours de visualisation */
void WinEDA_ViewlibFrame::DisplayLibInfos()
{ {
wxString msg; wxString msg;
LibraryStruct* Lib; LibraryStruct* Lib;
...@@ -136,7 +124,7 @@ void WinEDA_ViewlibFrame::DisplayLibInfos() ...@@ -136,7 +124,7 @@ void WinEDA_ViewlibFrame::DisplayLibInfos()
/*****************************************/ /*****************************************/
/* Routine to Select Current library */ /* Routine to Select Current library */
/*****************************************/ /*****************************************/
void WinEDA_ViewlibFrame::SelectCurrentLibrary() void WinEDA_ViewlibFrame::SelectCurrentLibrary()
{ {
...@@ -162,10 +150,10 @@ void WinEDA_ViewlibFrame::SelectCurrentLibrary() ...@@ -162,10 +150,10 @@ void WinEDA_ViewlibFrame::SelectCurrentLibrary()
} }
/**************************************************************/ /*
* Routine to select and view library Part (NEW, NEXT or PREVIOUS)
*/
void WinEDA_ViewlibFrame::SelectAndViewLibraryPart( int option ) void WinEDA_ViewlibFrame::SelectAndViewLibraryPart( int option )
/**************************************************************/
/* Routine to select and view library Part (NEW, NEXT or PREVIOUS) */
{ {
LibraryStruct* Lib; LibraryStruct* Lib;
...@@ -209,15 +197,14 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag ) ...@@ -209,15 +197,14 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag )
wxString CmpName; wxString CmpName;
wxClientDC dc( DrawPanel ); wxClientDC dc( DrawPanel );
DrawPanel->PrepareGraphicContext( &dc ); DrawPanel->PrepareGraphicContext( &dc );
if( Lib ) if( Lib )
NumOfParts = Lib->m_NumOfParts; NumOfParts = Lib->GetCount();
if( NumOfParts == 0 ) if( NumOfParts == 0 )
{ {
DisplayError( this, wxT( "No Library or Library is empty!" ) ); DisplayError( this, wxT( "No library or library is empty!" ) );
return; return;
} }
...@@ -226,9 +213,7 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag ) ...@@ -226,9 +213,7 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag )
if( Flag == NEW_PART ) if( Flag == NEW_PART )
{ {
DisplayComponentsNamesInLib( this, DisplayComponentsNamesInLib( this, Lib, CmpName,
Lib,
CmpName,
g_CurrentViewComponentName ); g_CurrentViewComponentName );
} }
...@@ -269,7 +254,7 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag ) ...@@ -269,7 +254,7 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag )
/*****************************************************************************/ /*****************************************************************************/
/* Routine d'affichage du composant selectionne */ /* Routine d'affichage du composant selectionne */
/* Si Le composant est un alias, le composant ROOT est recherche et affiche */ /* Si Le composant est un alias, le composant ROOT est recherche et affiche */
/*****************************************************************************/ /*****************************************************************************/
void WinEDA_ViewlibFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg ) void WinEDA_ViewlibFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment