see todays change_log.txt

eeschema/annotate.cpp

@@ -9,7 +9,7 @@
 
 /* fonctions exportees */
 int         ListeComposants( CmpListStruct* BaseListeCmp, SCH_SCREEN* screen, int NumSheet );
-int         AnnotTriComposant( CmpListStruct* Objet1, CmpListStruct* Objet2 );
+int         AnnotTriComposant( const void* o1, const void* o2 );
 void        BreakReference( CmpListStruct* BaseListeCmp, int NbOfCmp );
 
 /* fonctions locales */
@@ -236,8 +236,7 @@ int ListeComposants( CmpListStruct* BaseListeCmp, SCH_SCREEN* screen, int NumShe
     EDA_LibComponentStruct* Entry;
 
     DrawList = screen->EEDrawList;
-
-    while( DrawList )
+    for(  ; DrawList;   DrawList = DrawList->Pnext )
     {
         switch( DrawList->Type() )
         {
@@ -253,20 +252,25 @@ int ListeComposants( CmpListStruct* BaseListeCmp, SCH_SCREEN* screen, int NumShe
             Entry = FindLibPart( DrawLibItem->m_ChipName.GetData(), wxEmptyString, FIND_ROOT );
             if( Entry == NULL )
                 break;
+            
             if( BaseListeCmp == NULL )      /* Items counting only */
             {
-                NbrCmp++; break;
+                NbrCmp++; 
+                break;
             }
+            
             BaseListeCmp[NbrCmp].m_Cmp         = DrawLibItem;
             BaseListeCmp[NbrCmp].m_NbParts     = Entry->m_UnitCount;
             BaseListeCmp[NbrCmp].m_Unit        = DrawLibItem->m_Multi;
             BaseListeCmp[NbrCmp].m_PartsLocked = Entry->m_UnitSelectionLocked;
             BaseListeCmp[NbrCmp].m_Sheet       = NumSheet;
             BaseListeCmp[NbrCmp].m_IsNew       = FALSE;
-            BaseListeCmp[NbrCmp].m_Pos = DrawLibItem->m_Pos;
-            BaseListeCmp[NbrCmp].m_TimeStamp = DrawLibItem->m_TimeStamp;
+            BaseListeCmp[NbrCmp].m_Pos         = DrawLibItem->m_Pos;
+            BaseListeCmp[NbrCmp].m_TimeStamp   = DrawLibItem->m_TimeStamp;
+            
             if( DrawLibItem->m_Field[REFERENCE].m_Text.IsEmpty() )
                 DrawLibItem->m_Field[REFERENCE].m_Text = wxT( "DefRef?" );
+            
             strncpy( BaseListeCmp[NbrCmp].m_TextRef,
                      CONV_TO_UTF8( DrawLibItem->m_Field[REFERENCE].m_Text ), 32 );
 
@@ -274,6 +278,7 @@ int ListeComposants( CmpListStruct* BaseListeCmp, SCH_SCREEN* screen, int NumShe
 
             if( DrawLibItem->m_Field[VALUE].m_Text.IsEmpty() )
                 DrawLibItem->m_Field[VALUE].m_Text = wxT( "~" );
+            
             strncpy( BaseListeCmp[NbrCmp].m_TextValue,
                      CONV_TO_UTF8( DrawLibItem->m_Field[VALUE].m_Text ), 32 );
             NbrCmp++;
@@ -291,8 +296,6 @@ int ListeComposants( CmpListStruct* BaseListeCmp, SCH_SCREEN* screen, int NumShe
         default:
             break;
         }
-
-        DrawList = DrawList->Pnext;
     }
 
     return NbrCmp;
@@ -300,7 +303,7 @@ int ListeComposants( CmpListStruct* BaseListeCmp, SCH_SCREEN* screen, int NumShe
 
 
 /*****************************************************************/
-int AnnotTriComposant( CmpListStruct* Objet1, CmpListStruct* Objet2 )
+int AnnotTriComposant( const void* o1, const void* o2 )
 /****************************************************************/
 
 /* function used par qsort() for sorting the list
@@ -312,9 +315,11 @@ int AnnotTriComposant( CmpListStruct* Objet1, CmpListStruct* Objet2 )
  *                  if same sheet, by time stamp
  **/
 {
-    int ii;
+    CmpListStruct* Objet1 = (CmpListStruct*) o1; 
+    CmpListStruct* Objet2 = (CmpListStruct*) o2;
 
-    ii = strnicmp( Objet1->m_TextRef, Objet2->m_TextRef, 32 );
+    int ii = strnicmp( Objet1->m_TextRef, Objet2->m_TextRef, 32 );
+    
     if( SortByPosition == TRUE )
     {
         if( ii == 0 )
@@ -401,7 +406,8 @@ void BreakReference( CmpListStruct* BaseListeCmp, int NbOfCmp )
             BaseListeCmp[ii].m_IsNew = TRUE;
             if( !BaseListeCmp[ii].m_PartsLocked )
                 BaseListeCmp[ii].m_Unit = 0x7FFFFFFF;
-            Text[ll] = 0; continue;
+            Text[ll] = 0; 
+            continue;
         }
 
         if( isdigit( Text[ll] ) == 0 )
@@ -646,7 +652,8 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
     /* 2eme passe : Remplissage du tableau des caracteristiques */
     if( OneSheetOnly == 0 )
     {
-        ii = 0; screen = ScreenSch;
+        ii = 0; 
+        screen = ScreenSch;
         for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() )
         {
             ii += ListeComposants( ListeCmp + ii, screen, NumSheet );
@@ -658,9 +665,7 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
         ListeComposants( ListeCmp, screen, NumSheet );
     }
 
-    qsort( ListeCmp, NbOfCmp, sizeof(CmpListStruct),
-           ( int( * ) ( const void*, const void* ) )AnnotTriComposant );
-
+    qsort( ListeCmp, NbOfCmp, sizeof(CmpListStruct), AnnotTriComposant );
 
     /* Separation des Numeros de la reference: IC1 -> IC, et 1 dans .m_NumRef */
     BreakReference( ListeCmp, NbOfCmp );
@@ -669,13 +674,16 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
     error = 0;
     for( ii = 0; ii < NbOfCmp - 1; ii++ )
     {
-        msg.Empty(); Buff.Empty();
+        msg.Empty(); 
+        Buff.Empty();
+        
         if( ListeCmp[ii].m_IsNew )
         {
             if( ListeCmp[ii].m_NumRef >= 0 )
                 Buff << ListeCmp[ii].m_NumRef;
             else
                 Buff = wxT( "?" );
+            
             cmpref = CONV_FROM_UTF8( ListeCmp[ii].m_TextRef );
             msg.Printf( _( "item not annotated: %s%s" ), cmpref.GetData(), Buff.GetData() );
 
@@ -685,7 +693,8 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
                 msg << Buff;
             }
             DisplayError( NULL, msg );
-            error++; break;
+            error++; 
+            break;
         }
 
         if( MAX( ListeCmp[ii].m_NbParts, 1 ) < ListeCmp[ii].m_Unit  ) // Annotate error
@@ -702,24 +711,27 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
                          ListeCmp[ii].m_Unit, ListeCmp[ii].m_NbParts );
             msg << Buff;
             DisplayError( frame, msg );
-            error++; break;
+            error++; 
+            break;
         }
     }
 
     if( error )
         return error;
 
-    /* comptage des elements doubls (si tous sont annots) */
+    // count the duplicated elements (if all are annotated)
     for( ii = 0; (ii < NbOfCmp - 1) && (error < 4); ii++ )
     {
-        msg.Empty(); Buff.Empty();
+        msg.Empty(); 
+        Buff.Empty();
+        
         if( (stricmp( ListeCmp[ii].m_TextRef, ListeCmp[ii + 1].m_TextRef ) != 0)
            || ( ListeCmp[ii].m_NumRef != ListeCmp[ii + 1].m_NumRef ) )
             continue;
         /* Meme reference trouve */
 
         /* Il y a erreur si meme unite */
-        if( ListeCmp[ii].m_Unit == ListeCmp[ii + 1].m_Unit )
+        if( ListeCmp[ii].m_Unit == ListeCmp[ii+1].m_Unit )
         {
             if( ListeCmp[ii].m_NumRef >= 0 )
                 Buff << ListeCmp[ii].m_NumRef;
@@ -736,7 +748,8 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
                 msg << Buff;
             }
             DisplayError( frame, msg );
-            error++; continue;
+            error++; 
+            continue;
         }
 
         /* Il y a erreur si unites differentes mais nombre de parts differentes
@@ -771,9 +784,9 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool OneSheetOnly )
             nextcmpvalue = CONV_FROM_UTF8( ListeCmp[ii + 1].m_TextValue );
             msg.Printf( _( "Diff values for %s%d%c (%s) and %s%d%c (%s)" ),
                        cmpref.GetData(), ListeCmp[ii].m_NumRef, ListeCmp[ii].m_Unit + 'A' - 1,
-                       cmpvalue.GetData(),
-                       nextcmpref.GetData(
-                           ), ListeCmp[ii + 1].m_NumRef, ListeCmp[ii + 1].m_Unit + 'A' - 1,
+                       cmpvalue.GetData(), nextcmpref.GetData(), 
+                       ListeCmp[ii + 1].m_NumRef, 
+                       ListeCmp[ii + 1].m_Unit + 'A' - 1,
                        nextcmpvalue.GetData() );
 
             DisplayError( frame, msg );

eeschema/component_class.cpp

@@ -49,21 +49,21 @@ const wxString& ReturnDefaultFieldName( int aFieldNdx )
  *  for I18n
  */
 {
-    // avoid unnecessarily copying wxStrings.
+    // avoid unnecessarily copying wxStrings at runtime.
     static const wxString FieldDefaultNameList[] = {
-        _( "Ref" ),         /* Reference of part, i.e. "IC21" */
-        _( "Value" ),       /* Value of part, i.e. "3.3K" */
-        _( "Footprint" ),   /* Footprint, used by cvpcb or pcbnew, i.e. "16DIP300" */
-        _( "Sheet" ),       /* for components which are a schematic file, schematic file name, i.e. "cnt16.sch" */
-        _( "Field1" ),      /* User fields (1 to n) have an editable name*/
-        _( "Field2" ),
-        _( "Field3" ),
-        _( "Field4" ),
-        _( "Field5" ),
-        _( "Field6" ),
-        _( "Field7" ),
-        _( "Field8" ),
-        wxT( "badFieldNdx!" )       // error, and "sentinel" value
+        _( "Ref" ),             /* Reference of part, i.e. "IC21" */
+        _( "Value" ),           /* Value of part, i.e. "3.3K" */
+        _( "Footprint" ),       /* Footprint, used by cvpcb or pcbnew, i.e. "16DIP300" */
+        _( "Sheet" ),           /* for components which are a schematic file, schematic file name, i.e. "cnt16.sch" */
+        wxString(_( "Field" ))+wxT("1"),
+        wxString(_( "Field" ))+wxT("2"),
+        wxString(_( "Field" ))+wxT("3"),
+        wxString(_( "Field" ))+wxT("4"),
+        wxString(_( "Field" ))+wxT("5"),
+        wxString(_( "Field" ))+wxT("6"),
+        wxString(_( "Field" ))+wxT("7"),
+        wxString(_( "Field" ))+wxT("8"),
+        wxT( "badFieldNdx!" )               // error, and "sentinel" value
     };
     
     if( (unsigned) aFieldNdx > FIELD8 )     // catches < 0 also

eeschema/eelibs_draw_components.cpp

@@ -348,7 +348,7 @@ EDA_LibComponentStruct* FindLibPart( const wxChar* Name, const wxString& LibName
 {
     EDA_LibComponentStruct* Entry;
 
-    static EDA_LibComponentStruct DummyEntry( wxEmptyString );/* Used only to call PQFind. */
+    static EDA_LibComponentStruct DummyEntry( wxEmptyString );  /* Used only to call PQFind. */
 
     LibraryStruct* Lib = g_LibraryList;
 
@@ -357,24 +357,30 @@ EDA_LibComponentStruct* FindLibPart( const wxChar* Name, const wxString& LibName
 
     PQCompFunc( (PQCompFuncType) LibraryEntryCompare );
 
-    Entry = NULL; FindLibName.Empty();
+    Entry = NULL; 
+    FindLibName.Empty();
+    
     while( Lib )
     {
         if( !LibName.IsEmpty() )
         {
             if( Lib->m_Name != LibName )
             {
-                Lib = Lib->m_Pnext; continue;
+                Lib = Lib->m_Pnext; 
+                continue;
             }
         }
+        
         if( Lib == NULL )
             break;
+        
         Entry = (EDA_LibComponentStruct*) PQFind( Lib->m_Entries, &DummyEntry );
         if( Entry != NULL )
         {
             FindLibName = Lib->m_Name;
             break;
         }
+        
         Lib = Lib->m_Pnext;
     }
 
@@ -425,11 +431,13 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
         /* Elimination des elements non relatifs a l'unite */
         if( Multi && DEntry->m_Unit && (DEntry->m_Unit != Multi) )
             continue;
+        
         if( convert && DEntry->m_Convert && (DEntry->m_Convert != convert) )
             continue;
 
         if( DEntry->m_Flags & IS_MOVED )
             continue;                               // Element en deplacement non trace
+        
         SetHightColor = (DEntry->m_Selected & IS_SELECTED) ? HIGHT_LIGHT_FLAG : 0;
         LineWidth = MAX( DEntry->m_Width, g_DrawMinimunLineWidth );
 
@@ -494,10 +502,12 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
         {
             LibDrawCircle* Circle = (LibDrawCircle*) DEntry;
             CharColor = GETCOLOR( LAYER_DEVICE );
+            
             x1 = Pos.x + TransMat[0][0] * Circle->m_Pos.x +
                  TransMat[0][1] * Circle->m_Pos.y;
             y1 = Pos.y + TransMat[1][0] * Circle->m_Pos.x +
                  TransMat[1][1] * Circle->m_Pos.y;
+                 
             fill_option = Circle->m_Fill & (~g_PrintFillMask);
             if( Color < 0 )
             {
@@ -526,10 +536,12 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
             /* The text orientation may need to be flipped if the
              *  transformation matrix cuases xy axes to be flipped. */
             t1 = (TransMat[0][0] != 0) ^ (Text->m_Horiz != 0);
+            
             x1 = Pos.x + TransMat[0][0] * Text->m_Pos.x
                  + TransMat[0][1] * Text->m_Pos.y;
             y1 = Pos.y + TransMat[1][0] * Text->m_Pos.x
                  + TransMat[1][1] * Text->m_Pos.y;
+                 
             DrawGraphicText( panel, DC, wxPoint( x1, y1 ), CharColor, Text->m_Text,
                              t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT,
                              Text->m_Size,
@@ -579,6 +591,7 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
                    && !g_ShowAllPins )
                     break;
             }
+            
             /* Calcul de l'orientation reelle de la Pin */
             orient = Pin->ReturnPinDrawOrient( TransMat );
 

eeschema/netlist.h

@@ -36,7 +36,7 @@ typedef enum {
 /* Max pin number per component and footprint */
 #define MAXPIN 5000
 
-typedef enum {      /* Type des objets de Net */
+enum NetObjetType {      /* Type des objets de Net */
     NET_SEGMENT,
     NET_BUS,
     NET_JONCTION,
@@ -49,20 +49,21 @@ typedef enum {      /* Type des objets de Net */
     NET_PINLABEL,
     NET_PIN,
     NET_NOCONNECT
-} NetObjetType;
+};
+
 
-typedef enum {  /* Valeur du Flag de connection */
+enum  IsConnectType {  /* Valeur du Flag de connection */
     UNCONNECT,  /* Pin ou Label non connecte */
     NOCONNECT,  /* Pin volontairement non connectee (Symb. NoConnect utilise) */
     CONNECT     /* connexion normale */
-} IsConnectType;
+};
 
 
 /* Structure decrivant 1 element de connexion (pour netlist ) */
 class ObjetNetListStruct
 {
 public:
-    void*           m_Comp;             /* Pointeur sur la definition de l'objet */
+    EDA_BaseStruct* m_Comp;             /* Pointeur sur la definition de l'objet */
     void*           m_Link;             /* Pour SheetLabelStruct: Pointeur sur la feuille de hierarchie
                                          *  Pour les Pins: pointeur sur le composant */
     int             m_Flag;             /* flag pour calculs internes */
@@ -79,6 +80,11 @@ public:
     long            m_PinNum;       /* numero de pin( 4 octets -> 4 codes ascii) */
     const wxString* m_Label;        /* Tous types Labels:pointeur sur la wxString definissant le label */
     wxPoint         m_Start, m_End;
+
+#if defined(DEBUG)
+    void Show( std::ostream& out, int ndx );
+#endif
+    
 };