MenuText() tweaks, beautification

change_log.txt

@@ -26,10 +26,16 @@ email address.
 2007-Oct-10 UPDATE   Dick Hollenbeck <dick@softplc.com>
 ================================================================================
 + pcbnew
-  * prevent OnRightClick() from calling PcbGeneralLocateAndDisplay() when creating
-    a new track.
+  * bug fix: prevent OnRightClick() from calling PcbGeneralLocateAndDisplay() 
+    when creating a new track.
   * bug fix: popup menu was not handling Mires, because the collector was not 
     being asked to find them.
+  * added TRACK::ShowWidth() and call it from BOARD_ITEM::MenuText().  There was
+    not enough information in Selection Clarification at a busy junction to 
+    make a reasonable choice.
+  * SEGVIA::MenuText() shows via width, rather than net_code.
+  * Beautified ratsnets.cpp, I would like to understand it better.  It would help
+    if the comments were in English.
 + all
   * Changed English UI text "Mire" to "Target" according to this post:
     http://tech.groups.yahoo.com/group/kicad-users/message/1380

common/common.cpp

@@ -438,12 +438,10 @@ void valeur_param( int valeur, wxString& buf_texte )
 {
     if( g_UnitMetric )
     {
-        buf_texte.Printf( wxT( "%3.3f " ), (float) valeur * 0.00254 );
-        buf_texte << wxT( "mm" );
+        buf_texte.Printf( wxT( "%3.3f mm" ), valeur * 0.00254 );
     }
     else
     {
-        buf_texte.Printf( wxT( "%2.4f " ), (float) valeur * 0.0001 );
-        buf_texte << wxT( "\" " );
+        buf_texte.Printf( wxT( "%2.4f \"" ), valeur * 0.0001 );
     }
 }

include/wxstruct.h

@@ -1369,7 +1369,7 @@ private:
 
 /**
  * Struct MsgItem
- * is used privately by WinEDA_MsgPanel as the item type its vector.
+ * is used privately by WinEDA_MsgPanel as the item type of its vector.
  * These items are the pairs of text strings shown in the MsgPanel.
  */
 struct MsgItem

pcbnew/class_board_item.cpp

@@ -124,8 +124,8 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
         break;
 
     case TYPETRACK:
-        text << _( "Track" ) << wxT( " " );
-        net = aPcb->FindNet( ( (TRACK*) item )->m_NetCode );
+        text << _( "Track" ) << wxT( " " ) << ((TRACK*)item)->ShowWidth();
+        net = aPcb->FindNet( ((TRACK*)item)->m_NetCode );
         if( net )
         {
             text << wxT( " [" ) << net->m_Netname << wxT( "]" );
@@ -151,7 +151,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
     case TYPEVIA:
         {
             SEGVIA* via = (SEGVIA*) item;
-            text << _( "Via" ) << wxT( " " ) << via->m_NetCode;
+            text << _( "Via" ) << wxT( " " ) << via->ShowWidth();
             
             int shape = via->Shape(); 
             if( shape == VIA_ENTERREE )

pcbnew/class_track.cpp

@@ -35,6 +35,26 @@ TRACK::TRACK( BOARD_ITEM* StructFather, KICAD_T idtype ) :
 }
 
 
+wxString TRACK::ShowWidth()
+{
+    wxString msg;
+    
+#if 0    
+    double   value = To_User_Unit( g_UnitMetric, m_Width, PCB_INTERNAL_UNIT );
+    
+    if( g_UnitMetric == INCHES )  // Affichage en mils
+        msg.Printf( wxT( "%.1f" ), value * 1000 );
+    else
+        msg.Printf( wxT( "%.3f" ), value );
+#else
+
+    valeur_param( m_Width, msg );
+
+#endif
+    
+    return msg;
+}
+
 
 SEGZONE::SEGZONE( BOARD_ITEM* StructFather ) :
     TRACK( StructFather, TYPEZONE )

pcbnew/class_track.h

@@ -119,6 +119,12 @@ public:
     void    Display_Infos( WinEDA_DrawFrame* frame );
 
     
+    /**
+     * Function ShowWidth
+     * returns the width of the track in displayable user units.
+     */
+    wxString  ShowWidth();
+    
     /**
      * Function Visit
      * is re-implemented here because TRACKs and SEGVIAs are in the same list

pcbnew/onleftclick.cpp

@@ -132,12 +132,7 @@ void WinEDA_PcbFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
         break;
 
     case ID_PCB_SHOW_1_RATSNEST_BUTT:
-#if 0        
-        DrawStruct = m_Pcb->FindPadOrModule( GetScreen()->RefPos(true), 
-                            GetScreen()->m_Active_Layer );
-#else
         DrawStruct = PcbGeneralLocateAndDisplay();
-#endif
         Show_1_Ratsnest( DrawStruct, DC );
         
         if( DrawStruct )