gerberview & pcbnew fixes

change_log.txt

@@ -4,6 +4,21 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Sep-25 UPDATE   Dick Hollenbeck <dick@softplc.com>
+================================================================================
++ pcbnew
+  * got rid of reference to global display options DisplayOpt.DisplayZones from 
+    collectors.cpp so collectors.cpp can continue to be used in multiple future 
+    (non-display related) general contexts.  
+  * Moved TYPEZONE to end of AllBoardItems, added GENERAL_COLLECTOR::AllButZones to
+    provide support of DisplayOpt.DisplayZones.
+  * Added aHotKeyCode to PcbGeneralLocateAndDisplay()
++ gerbview
+  * viewer was getting stuck in a loop when loading a bad gerber file.  Fixed 
+    the bug, but line 223 through 225 of readgerb.cpp need review.
+  * beautified a few files with uncrustify, (any I had to look at).    
+
+  
 2007-sept-25 UPDATE   Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 + pcbnew:

include/class_collector.h

@@ -112,11 +112,11 @@ public:
     /**
      * Function Remove
      * removes the  item at item_position (first position is 0);
-     * @param item_position index.
+     * @param ndx The index into the list.
      */
-    void Remove( unsigned int item_position )
+    void Remove( int ndx )
     {
-        m_List.erase( m_List.begin() + item_position );
+        m_List.erase( m_List.begin() + (unsigned) ndx );
     }
 
     /**

include/wxstruct.h

@@ -400,8 +400,12 @@ public:
      * a popup menu is shown which allows the user to pick which item he/she is 
      * interested in.  Once an item is chosen, then it is make the "current item"
      * and the status window is updated to reflect this.
+     *
+     * @param aHotKeyCode The hotkey which relates to the caller and determines the
+     *  type of search to be performed.  If zero, then the mouse tools will be 
+     *  tested instead.
      */
-    BOARD_ITEM*     PcbGeneralLocateAndDisplay();
+    BOARD_ITEM*     PcbGeneralLocateAndDisplay( int aHotKeyCode = 0 );
     
     BOARD_ITEM*     Locate( int typeloc, int LayerSearch );
     void            ProcessItemSelection( wxCommandEvent& event );

pcbnew/collectors.cpp

@@ -38,10 +38,10 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {
     TYPECOTATION,
     TYPEVIA,
     TYPETRACK,
-    TYPEZONE,
     TYPEPAD,
     TYPETEXTEMODULE,
     TYPEMODULE,
+    TYPEZONE,
     EOT
 };    
 
@@ -52,13 +52,24 @@ const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {
     TYPECOTATION,
     TYPEVIA,
     TYPETRACK,
-//    TYPEPAD,              TYPEPAD and TYPETEXTEMODULE are handled in a subsearch
-//    TYPETEXTEMODULE,
     TYPEMODULE,
     EOT
 };
 
 
+const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
+    TYPETEXTE, 
+    TYPEDRAWSEGMENT, 
+    TYPECOTATION,
+    TYPEVIA,
+    TYPETRACK,
+    TYPEPAD,
+    TYPETEXTEMODULE,
+    TYPEMODULE,
+    EOT
+};
+    
+
 const KICAD_T GENERAL_COLLECTOR::ModuleItems[] = {
     TYPEMODULE,
     EOT
@@ -95,7 +106,6 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
 {
     BOARD_ITEM* item = (BOARD_ITEM*) testItem;
     MODULE*     module = NULL;
-	bool skip_item = false;
 
 #if 0   // debugging
     static int breakhere = 0;
@@ -173,7 +183,6 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
     case TYPETRACK:
         break;
     case TYPEZONE:
-		if( ! DisplayOpt.DisplayZones ) skip_item = true;
         break;
     case TYPETEXTE: 
         break;
@@ -183,20 +192,18 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
         break;
         
     case TYPETEXTEMODULE:
+        module = (MODULE*) item->GetParent();
+        
+        if( m_Guide->IgnoreMTextsMarkedNoShow() && ((TEXTE_MODULE*)item)->m_NoShow )
+            goto exit;
+        
+        if( module )
         {
-            module = (MODULE*) item->GetParent();
-            
-            if( m_Guide->IgnoreMTextsMarkedNoShow() && ((TEXTE_MODULE*)item)->m_NoShow )
+            if( m_Guide->IgnoreMTextsOnCopper() && module->GetLayer()==LAYER_CUIVRE_N )
                 goto exit;
             
-            if( module )
-            {
-                if( m_Guide->IgnoreMTextsOnCopper() && module->GetLayer()==LAYER_CUIVRE_N )
-                    goto exit;
-                
-                if( m_Guide->IgnoreMTextsOnCmp() && module->GetLayer()==LAYER_CMP_N )
-                    goto exit;
-            }
+            if( m_Guide->IgnoreMTextsOnCmp() && module->GetLayer()==LAYER_CMP_N )
+                goto exit;
         }
         break;
         
@@ -234,7 +241,7 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
                 {
                     if( item->HitTest( m_RefPos ) )
                     {
-                        if ( ! skip_item ) Append( item );
+                        Append( item );
                         goto exit;
                     }
                 }
@@ -261,7 +268,7 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
                 {
                     if( item->HitTest( m_RefPos ) )
                     {
-                        if ( ! skip_item ) Append2nd( item );
+                        Append2nd( item );
                         goto exit;
                     }
                 }

pcbnew/collectors.h

@@ -146,6 +146,7 @@ public:
      * @return bool - ture if should ignore MODULEs on component layer.
      */
     virtual     bool IgnoreModulesOnCmp() const = 0;
+
     
     /**
      * Function UseHitTesting
@@ -201,6 +202,12 @@ public:
     static const KICAD_T AllBoardItems[];
 
 
+    /**
+     * A scan list for all editable board items, except zones
+     */
+    static const KICAD_T AllButZones[];
+    
+    
     /** 
      * A scan list for all primary board items, omitting items which are subordinate to
      * a MODULE, such as D_PAD and TEXTEMODULE.

pcbnew/controle.cpp

@@ -153,9 +153,9 @@ static BOARD_ITEM* AllAreModulesAndReturnSmallestIfSo( GENERAL_COLLECTOR* aColle
 }
 
 
-/*************************************************************/
-BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay()
-/*************************************************************/
+/****************************************************************************/
+BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode )
+/****************************************************************************/
 {
     BOARD_ITEM* item;
 
@@ -166,7 +166,11 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay()
 
     const KICAD_T* scanList;
 
-    if( m_ID_current_state == 0 )
+    if( aHotKeyCode )
+    {
+        // switch here
+    }
+    else if( m_ID_current_state == 0 )
     {
         switch( m_HTOOL_current_state )
         {
@@ -175,7 +179,9 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay()
             break;
 
         default:
-            scanList = GENERAL_COLLECTOR::AllBoardItems;
+            scanList = DisplayOpt.DisplayZones ? 
+                GENERAL_COLLECTOR::AllBoardItems : 
+                GENERAL_COLLECTOR::AllButZones;
             break;
         }
     }
@@ -196,26 +202,32 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay()
             break;
 
         default:
-            scanList = GENERAL_COLLECTOR::AllBoardItems;
+            scanList = DisplayOpt.DisplayZones ? 
+                GENERAL_COLLECTOR::AllBoardItems : 
+                GENERAL_COLLECTOR::AllButZones;
         }
     }
 
     m_Collector->Collect( m_Pcb, scanList, GetScreen()->RefPos( true ), guide );
 
-    /* debugging: print out the collected items, showing their priority order too.
-     * for( unsigned i=0; i<m_Collector->GetCount();  ++i )
-     * (*m_Collector)[i]->Show( 0, std::cout );
-     */
+#if 0    
+    // debugging: print out the collected items, showing their priority order too.
+    for( unsigned i=0; i<m_Collector->GetCount();  ++i )
+        (*m_Collector)[i]->Show( 0, std::cout );
+#endif    
 
     /* Remove redundancies: most of time, zones are found twice,
      * because zones are filled twice ( once by by horizontal and once by vertical segments )
      */
     unsigned long timestampzone = 0;
-    for( unsigned int ii = 0; ii < m_Collector->GetCount(); ii++ )
+    
+    int limit = m_Collector->GetCount();
+    for( int ii = 0;  ii < limit; ii++ )
     {
         item = (*m_Collector)[ii];
         if( item->Type() != TYPEZONE )
             continue;
+        
         /* Found a TYPE ZONE */
         if( item->m_TimeStamp == timestampzone )    // Remove it, redundant, zone already found
         {
@@ -282,14 +294,6 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay()
     }
 
     return item;
-
-/* old way:
- *
- * item = Locate( CURSEUR_OFF_GRILLE, GetScreen()->m_Active_Layer );
- * if( item == NULL )
- *     item = Locate( CURSEUR_OFF_GRILLE, -1 );
- * return item;
- */
 }