see my 2007-Sep-20 change_log.txt

change_log.txt

@@ -4,6 +4,14 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Sep-20 UPDATE   Dick Hollenbeck <dick@softplc.com>
+================================================================================
++ eeschema
+  * beautify, add debug Show() functions, changed ReturnFieldName()
+    to return "const wxString&" for speed, added GetFieldValue().
+  * tracking down questionable behavior (a bug?) in erc regarding pwr_flag, still looking
+
+
 2007-sept-20 UPDATE   Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 + all

common/base_screen.cpp

@@ -555,3 +555,29 @@ EDA_BaseStruct* BASE_SCREEN::GetItemFromRedoList()
     return item;
 }
 
+
+#if defined(DEBUG)
+/**
+ * Function Show
+ * is used to output the object tree, currently for debugging only.
+ * @param nestLevel An aid to prettier tree indenting, and is the level 
+ *          of nesting of this object within the overall tree.
+ * @param os The ostream& to output to.
+ */
+void BASE_SCREEN::Show( int nestLevel, std::ostream& os )
+{
+    EDA_BaseStruct* item = EEDrawList;
+    
+    // for now, make it look like XML, expand on this later.
+    NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() <<
+        ">\n";
+    
+    for(  ; item;  item = item->Next() )
+    {
+        item->Show( nestLevel+1, os );
+    }
+    
+    NestedSpace( nestLevel, os ) << "</" << GetClass().Lower().mb_str() << ">\n";
+}
+#endif
+    
\ No newline at end of file

common/base_struct.cpp

@@ -188,11 +188,14 @@ void EDA_BaseStruct::Show( int nestLevel, std::ostream& os )
     // for now, make it look like XML:
     NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() << ">\n";
 
+    /*
     EDA_BaseStruct* kid = m_Son;
     for( ; kid;  kid = kid->Pnext )
     {
         kid->Show( nestLevel+1, os );
     }
+    */
+    NestedSpace( nestLevel+1, os ) << "Need ::Show() override, shown class is using EDA_BaseStruct::Show()\n";
     
     NestedSpace( nestLevel, os ) << "</" << GetClass().Lower().mb_str() << ">\n";
 }

eeschema/class_screen.h

@@ -90,12 +90,12 @@ class SCH_SCREEN : public BASE_SCREEN
 public:
     SCH_SCREEN( int idtype, KICAD_T aType = SCREEN_STRUCT_TYPE );
     ~SCH_SCREEN();
+    
     virtual wxString GetClass() const
     {
         return wxT("SCH_SCREEN");
     }
 
-
     void            FreeDrawList(); // Free EESchema drawing list (does not delete the sub hierarchies)
 
     void Place( WinEDA_DrawFrame* frame, wxDC* DC ) { };

eeschema/cmpclass.cpp

@@ -143,6 +143,23 @@ wxString DrawMarkerStruct::GetComment()
 }
 
 
+#if defined(DEBUG)
+/**
+ * Function Show
+ * is used to output the object tree, currently for debugging only.
+ * @param nestLevel An aid to prettier tree indenting, and is the level 
+ *          of nesting of this object within the overall tree.
+ * @param os The ostream& to output to.
+ */
+void DrawMarkerStruct::Show( int nestLevel, std::ostream& os )
+{
+    // for now, make it look like XML:
+    NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() <<  m_Pos 
+        << "/>\n";
+}
+#endif
+
+
 /***************************/
 /* Class EDA_DrawLineStruct */
 /***************************/
@@ -201,6 +218,28 @@ bool EDA_DrawLineStruct::IsOneEndPointAt( const wxPoint& pos )
 }
 
 
+#if defined(DEBUG)
+/**
+ * Function Show
+ * is used to output the object tree, currently for debugging only.
+ * @param nestLevel An aid to prettier tree indenting, and is the level 
+ *          of nesting of this object within the overall tree.
+ * @param os The ostream& to output to.
+ */
+void EDA_DrawLineStruct::Show( int nestLevel, std::ostream& os )
+{
+    NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() << 
+        " layer=\""             << m_Layer      << '"' <<
+        " width=\""             << m_Width      << '"' <<
+        " startIsDangling=\""   << m_StartIsDangling  << '"' << 
+        " endIsDangling=\""     << m_EndIsDangling  << '"' << ">" <<  
+        " <start"               << m_Start      << "/>" <<
+        " <end"                 << m_End        << "/>" <<
+        "</" << GetClass().Lower().mb_str() << ">\n";
+}
+#endif
+
+
 /****************************/
 /* Class DrawPolylineStruct */
 /****************************/

eeschema/component_class.h

@@ -15,7 +15,7 @@
 
 /* Definition de la representation du composant */
 #define NUMBER_OF_FIELDS 12 /* Nombre de champs de texte affectes au composant */
-typedef enum {
+enum  NumFieldType {
     REFERENCE = 0,          /* Champ Reference of part, i.e. "IC21" */
     VALUE,                  /* Champ Value of part, i.e. "3.3K" */
     FOOTPRINT,              /* Champ Name Module PCB, i.e. "16DIP300" */
@@ -28,7 +28,7 @@ typedef enum {
     FIELD6,
     FIELD7,
     FIELD8
-} NumFieldType;
+};
 
 
 /* Class to manage component fields.
@@ -46,9 +46,10 @@ public:
 public:
     PartTextStruct( const wxPoint& pos = wxPoint( 0, 0 ), const wxString& text = wxEmptyString );
     ~PartTextStruct();
+    
     virtual wxString GetClass() const
     {
-        return wxT( "PartTextStruct" );
+        return wxT( "PartText" );
     }
 
 
@@ -77,10 +78,18 @@ public:
 public:
     DrawPartStruct( KICAD_T struct_type, const wxPoint &pos );
     ~DrawPartStruct();
+    
     virtual wxString GetClass() const
     {
-        return wxT( "DrawPartStruct" );
+        return wxT( "DrawPart" );
     }
+
+    
+    /**
+     * Function GetReference
+     * returns a reference to the Reference
+     */
+    const wxString& GetReference() { return m_Field[REFERENCE].m_Text; }
 };
 
 
@@ -101,18 +110,29 @@ public:
     
     virtual wxString GetClass() const
     {
-        return wxT( "EDA_SchComponentStruct" );
+        return wxT( "EDA_SchComponent" );
     }
 
 
-    EDA_SchComponentStruct* GenCopy( void );
+    EDA_SchComponentStruct* GenCopy();
     void                    SetRotationMiroir( int type );
     int                     GetRotationMiroir();
     wxPoint                 GetScreenCoord( const wxPoint& coord );
     void                    Display_Infos( WinEDA_DrawFrame* frame );
     void                    ClearAnnotation();
     EDA_Rect                GetBoundaryBox();
-    wxString                ReturnFieldName( int FieldNumber );
+
+    const wxString&         ReturnFieldName( int aFieldNdx ) const;
+    
+
+    /**
+     * Function GetFieldValue
+     * returns a reference to the field value.
+     * @param aFieldNdx An index into the array of fields, 0 - FIELD8
+     * @return const wxString& - the field value or wxEmptyString
+     */
+    const wxString&         GetFieldValue( int aFieldNdx ) const;
+
     
     virtual void            Draw( WinEDA_DrawPanel* panel,
                                   wxDC* DC,
@@ -122,6 +142,17 @@ public:
     void                    SwapData( EDA_SchComponentStruct* copyitem );
 
     virtual void            Place( WinEDA_DrawFrame* frame, wxDC* DC );
+    
+#if defined(DEBUG)    
+    /**
+     * Function Show
+     * is used to output the object tree, currently for debugging only.
+     * @param nestLevel An aid to prettier tree indenting, and is the level 
+     *          of nesting of this object within the overall tree.
+     * @param os The ostream& to output to.
+     */
+    void Show( int nestLevel, std::ostream& os );
+#endif    
 };
 
 

eeschema/load_one_schematic_file.cpp

@@ -272,8 +272,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
             if( !Failed )
             {
                 PolylineStruct->Pnext = screen->EEDrawList;
-                screen->EEDrawList    = (EDA_BaseStruct*)
-                                        PolylineStruct;
+                screen->EEDrawList    = (EDA_BaseStruct*) PolylineStruct;
             }
             break;
 
@@ -441,6 +440,10 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
 
     screen->EEDrawList = Phead;
 
+#if defined(DEBUG)
+    screen->Show( 0, std::cout );
+#endif
+    
     fclose( f );
 
     TestDanglingEnds( screen->EEDrawList, NULL );

eeschema/netlist.h

-	/**********************************************/
-	/* Module de calcul de la Netliste: netlist.h */
-	/**********************************************/
+/**********************************************/
+/* Module de calcul de la Netliste: netlist.h */
+/**********************************************/
 
 #ifndef _NETLIST_H_
 #define _NETLIST_H_
@@ -15,8 +15,7 @@
 
 
 /* Indicateurs de type de netliste generee */
-typedef enum
-	{
+typedef enum {
     NET_TYPE_NOT_INIT = 0,
     NET_TYPE_PCBNEW,
     NET_TYPE_ORCADPCB2,
@@ -31,7 +30,7 @@ typedef enum
     NET_TYPE_CUSTOM7,
     NET_TYPE_CUSTOM8,
     NET_TYPE_MAX
-   	} TypeNetForm ;
+} TypeNetForm;
 
 
 /* Max pin number per component and footprint */
@@ -58,34 +57,36 @@ typedef enum {	/* Valeur du Flag de connection */
     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 */
-	void * m_Link;			/* Pour SheetLabelStruct: Pointeur sur la feuille de hierarchie
-							Pour les Pins: pointeur sur le composant */
+    void*           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 */
-	SCH_SCREEN * m_Screen;	/* Ecran d'appartenance */
+    SCH_SCREEN*     m_Screen;           /* Ecran d'appartenance */
     NetObjetType    m_Type;
     int             m_ElectricalType;   /* Pour Pins et sheet labels: type electrique */
     int             m_NetCode;          /* pour elements simples */
     int             m_BusNetCode;       /* pour connexions type bus */
     int             m_Member;           /* pour les labels type BUSWIRE ( labels de bus eclate )
-						numero de membre */
+                                         *  numero de membre */
     IsConnectType   m_FlagOfConnection;
     int             m_SheetNumber;  /* Sheet number for this item */
     int             m_NumInclude;   /* Numero de sous schema correpondant a la sheet (Gestion des GLabels et Pin Sheet)*/
     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 */
+    const wxString* m_Label;        /* Tous types Labels:pointeur sur la wxString definissant le label */
     wxPoint         m_Start, m_End;
 };
 
+
 /* Structure decrivant 1 composant de la schematique (pour annotation ) */
 struct CmpListStruct
 {
 public:
-	EDA_SchComponentStruct * m_Cmp;	/* Pointeur sur le composant */
+    EDA_SchComponentStruct* m_Cmp;              /* Pointeur sur le composant */
     int                     m_NbParts;          /* Nombre de parts par boitier */
     bool                    m_PartsLocked;      // For multi part components: True if the part cannot be changed
     int                     m_Unit;             /* Numero de part */
@@ -102,11 +103,11 @@ public:
 
 /* Global Variables */
 eda_global int g_NbrObjNet;
-eda_global ObjetNetListStruct *g_TabObjNet;
+eda_global ObjetNetListStruct* g_TabObjNet;
 
 /* Prototypes: */
-void WriteNetList(WinEDA_SchematicFrame * frame, const wxString & FileNameNL, bool use_netnames);
-void FreeTabNetList(ObjetNetListStruct * TabNetItems, int NbrNetItems);
+void    WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL, bool use_netnames );
+void    FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );
 
 
 #endif

eeschema/program.h

@@ -75,9 +75,10 @@ public:
 public:
     EDA_DrawLineStruct( const wxPoint& pos, int layer );
     ~EDA_DrawLineStruct() { }
+    
     virtual wxString GetClass() const
     {
-        return wxT( "EDA_DrawLineStruct" );
+        return wxT( "EDA_DrawLine" );
     }
 
 
@@ -92,6 +93,17 @@ public:
 
     virtual void Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int draw_mode,
                        int Color = -1 );
+    
+#if defined(DEBUG)    
+    /**
+     * Function Show
+     * is used to output the object tree, currently for debugging only.
+     * @param nestLevel An aid to prettier tree indenting, and is the level 
+     *          of nesting of this object within the overall tree.
+     * @param os The ostream& to output to.
+     */
+    void Show( int nestLevel, std::ostream& os );
+#endif    
 };
 
 
@@ -108,7 +120,7 @@ public:
     ~DrawMarkerStruct();
     virtual wxString GetClass() const
     {
-        return wxT( "DrawMarkerStruct" );
+        return wxT( "DrawMarker" );
     }
 
 
@@ -116,6 +128,16 @@ public:
     wxString            GetComment();
     virtual void        Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
                               int draw_mode, int Color = -1 );
+#if defined(DEBUG)    
+    /**
+     * Function Show
+     * is used to output the object tree, currently for debugging only.
+     * @param nestLevel An aid to prettier tree indenting, and is the level 
+     *          of nesting of this object within the overall tree.
+     * @param os The ostream& to output to.
+     */
+    void Show( int nestLevel, std::ostream& os );
+#endif    
 };
 
 
@@ -129,7 +151,7 @@ public:
     ~DrawNoConnectStruct() { }
     virtual wxString GetClass() const
     {
-        return wxT( "DrawNoConnectStruct" );
+        return wxT( "DrawNoConnect" );
     }
 
 
@@ -154,9 +176,10 @@ public:
 public:
     DrawBusEntryStruct( const wxPoint& pos, int shape, int id );
     ~DrawBusEntryStruct() { }
+    
     virtual wxString GetClass() const
     {
-        return wxT( "DrawBusEntryStruct" );
+        return wxT( "DrawBusEntry" );
     }
 
 
@@ -177,9 +200,10 @@ public:
 public:
     DrawPolylineStruct( int layer );
     ~DrawPolylineStruct();
+    
     virtual wxString GetClass() const
     {
-        return wxT( "DrawPolylineStruct" );
+        return wxT( "DrawPolyline" );
     }
 
 
@@ -197,9 +221,10 @@ public:
 public:
     DrawJunctionStruct( const wxPoint& pos );
     ~DrawJunctionStruct() { }
+    
     virtual wxString GetClass() const
     {
-        return wxT( "DrawJunctionStruct" );
+        return wxT( "DrawJunction" );
     }
 
 
@@ -209,8 +234,7 @@ public:
 };
 
 
-class DrawTextStruct      : public EDA_BaseStruct
-    , public EDA_TextStruct
+class DrawTextStruct : public EDA_BaseStruct, public EDA_TextStruct
 {
 public:
     int  m_Layer;
@@ -224,7 +248,7 @@ public:
 
     virtual wxString GetClass() const
     {
-        return wxT( "DrawTextStruct" );
+        return wxT( "DrawText" );
     }
 
 
@@ -248,7 +272,7 @@ public:
 
     virtual wxString GetClass() const
     {
-        return wxT( "DrawLabelStruct" );
+        return wxT( "DrawLabel" );
     }
 };
 
@@ -264,7 +288,7 @@ public:
 
     virtual wxString GetClass() const
     {
-        return wxT( "DrawGlobalLabelStruct" );
+        return wxT( "DrawGlobalLabel" );
     }
 };
 

eeschema/protos.h

@@ -8,7 +8,7 @@ LibEDA_BaseStruct * LocatePin(const wxPoint & RefPos,
 			int Unit, int Convert, EDA_SchComponentStruct * DrawItem = NULL);
 		/* Routine de localisation d'une PIN de la PartLib pointee par Entry */
 
-wxString ReturnDefaultFieldName(int FieldNumber);
+const wxString& ReturnDefaultFieldName( int aFieldNdx );
 
 
 /***************/

include/drawpanel_wxstruct.h

@@ -215,7 +215,7 @@ private:
     char            m_FlagRefreshReq;       /* indique que l'ecran doit redessine */
     char            m_FlagModified;         // indique modif du PCB,utilise pour eviter une sortie sans sauvegarde
     char            m_FlagSave;             // indique sauvegarde auto faite
-    EDA_BaseStruct* m_CurrentItem;          ///< Current selected object
+    EDA_BaseStruct* m_CurrentItem;          ///< Currently selected object
 
     /* Valeurs du pas de grille et du zoom */
 public:
@@ -260,17 +260,12 @@ public:
     /**
      * Function SetCurItem
      * sets the currently selected object, m_CurrentItem.  
-     * This is intentionally not inlined so we can set breakpoints on the 
-     * activity easier in base_screen.cpp.
      * @param current Any object derived from EDA_BaseStruct
      */
-    void            SetCurItem( EDA_BaseStruct* current )
-    {
-        m_CurrentItem = current; 
-    }
-    
+    void SetCurItem( EDA_BaseStruct* current ) {  m_CurrentItem = current; }
     EDA_BaseStruct* GetCurItem() const {  return m_CurrentItem; }
 
+    
     /* fonctions relatives au zoom */
     int     GetZoom();                /* retourne le coeff de zoom */
     void    SetZoom( int coeff );           /* ajuste le coeff de zoom a coeff */
@@ -313,6 +308,18 @@ public:
     {
         return wxT( "BASE_SCREEN" );
     }
+    
+#if defined(DEBUG)
+    /**
+     * Function Show
+     * is used to output the object tree, currently for debugging only.
+     * @param nestLevel An aid to prettier tree indenting, and is the level 
+     *          of nesting of this object within the overall tree.
+     * @param os The ostream& to output to.
+     */
+    void Show( int nestLevel, std::ostream& os );
+#endif
+    
 };
 
 

pcbnew/controle.cpp

@@ -441,10 +441,10 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay()
     {
         wxMenu  itemMenu;
 
-        int limit = MIN( MAX_ITEMS_IN_PICKER, m_Collector->GetCount() );
-
         itemMenu.SetTitle( _("Selection Clarification") );  // does this work? not under Linux!
         
+        int limit = MIN( MAX_ITEMS_IN_PICKER, m_Collector->GetCount() );
+
         for( int i=0;  i<limit;  ++i )
         {
             wxString        text;

pcbnew/onrightclick.cpp

@@ -124,6 +124,7 @@ void WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
     DrawPanel->CursorOff( &dc );
     DrawPanel->m_CanStartBlock = -1;    // Avoid to start a block coomand when clicking on menu
 
+    
     // If command in progress: Put the Cancel command (if needed) and End command
     if( m_ID_current_state )
     {
@@ -161,13 +162,11 @@ void WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
     }
 
     /* Select a proper item */
-    if( (item == NULL) || (item->m_Flags == 0) )
+    if( !item  || !item->m_Flags )
     {
         item = PcbGeneralLocateAndDisplay();
-		SetCurItem(item);
     }
 
-	item = GetCurItem();
     if( item )
         flags = item->m_Flags;
     else
@@ -183,10 +182,18 @@ void WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
             if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOPLACE )
             {
                 aPopMenu->AppendSeparator();
+                
+                if( !((MODULE*)item)->IsLocked() )
+                {
                     ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FIXE_MODULE, _( "Lock Module" ),
                                   Locked_xpm );
+                }
+                else
+                {
                     ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FREE_MODULE, _( "Unlock Module" ),
                                   Unlocked_xpm );
+                }
+                
                 if( !flags )
                     aPopMenu->Append( ID_POPUP_PCB_AUTOPLACE_CURRENT_MODULE,
                                     _( "Auto place Module" ) );