Encapsulate SCH_BUS_ENTRY class.

eeschema/busentry.cpp

@@ -74,16 +74,20 @@ void SCH_EDIT_FRAME::SetBusEntryShape( wxDC* DC, SCH_BUS_ENTRY* BusEntry, int en
 
     BusEntry->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode );
 
+    wxSize size = BusEntry->GetSize();
+
     switch( entry_shape )
     {
     case '\\':
         s_LastShape = '\\';
-        BusEntry->m_Size.y = 100;
+        size.y = 100;
+        BusEntry->SetSize( size );
         break;
 
     case '/':
         s_LastShape = '/';
-        BusEntry->m_Size.y = -100;
+        size.y = -100;
+        BusEntry->SetSize( size );
         break;
     }
 
@@ -97,7 +101,7 @@ int SCH_EDIT_FRAME::GetBusEntryShape( SCH_BUS_ENTRY* BusEntry )
 {
     int entry_shape = '\\';
 
-    if( BusEntry->m_Size.y < 0 )
+    if( BusEntry->GetSize().y < 0 )
         entry_shape = '/';
 
     return entry_shape;

eeschema/sch_bus_entry.cpp

-/***********************/
-/* class SCH_BUS_ENTRY */
-/***********************/
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
+ * Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>
+ * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * @file sch_bus_entry.cpp
+ *
+ */
 
 #include "fctsys.h"
 #include "gr_basic.h"
@@ -19,11 +45,11 @@
 SCH_BUS_ENTRY::SCH_BUS_ENTRY( const wxPoint& pos, int shape, int id ) :
     SCH_ITEM( NULL, SCH_BUS_ENTRY_T )
 {
-    m_Pos    = pos;
-    m_Size.x = 100;
-    m_Size.y = 100;
+    m_pos    = pos;
+    m_size.x = 100;
+    m_size.y = 100;
     m_Layer  = LAYER_WIRE;
-    m_Width  = 0;
+    m_width  = 0;
 
     if( id == BUS_TO_BUS )
     {
@@ -31,16 +57,16 @@ SCH_BUS_ENTRY::SCH_BUS_ENTRY( const wxPoint& pos, int shape, int id ) :
     }
 
     if( shape == '/' )
-        m_Size.y = -100;
+        m_size.y = -100;
 }
 
 
 SCH_BUS_ENTRY::SCH_BUS_ENTRY( const SCH_BUS_ENTRY& aBusEntry ) :
     SCH_ITEM( aBusEntry )
 {
-    m_Pos = aBusEntry.m_Pos;
-    m_Size = aBusEntry.m_Size;
-    m_Width = aBusEntry.m_Width;
+    m_pos = aBusEntry.m_pos;
+    m_size = aBusEntry.m_size;
+    m_width = aBusEntry.m_width;
 }
 
 
@@ -52,7 +78,7 @@ EDA_ITEM* SCH_BUS_ENTRY::doClone() const
 
 wxPoint SCH_BUS_ENTRY::m_End() const
 {
-    return wxPoint( m_Pos.x + m_Size.x, m_Pos.y + m_Size.y );
+    return wxPoint( m_pos.x + m_size.x, m_pos.y + m_size.y );
 }
 
 
@@ -62,9 +88,9 @@ void SCH_BUS_ENTRY::SwapData( SCH_ITEM* aItem )
                  wxT( "Cannot swap bus entry data with invalid item." ) );
 
     SCH_BUS_ENTRY* item = (SCH_BUS_ENTRY*)aItem;
-    EXCHG( m_Pos, item->m_Pos );
-    EXCHG( m_Size, item->m_Size );
-    EXCHG( m_Width, item->m_Width );
+    EXCHG( m_pos, item->m_pos );
+    EXCHG( m_size, item->m_size );
+    EXCHG( m_width, item->m_width );
 }
 
 
@@ -85,7 +111,7 @@ bool SCH_BUS_ENTRY::Save( FILE* aFile ) const
         success = false;
     }
     if( fprintf( aFile, "\t%-4d %-4d %-4d %-4d\n",
-                 m_Pos.x, m_Pos.y, m_End().x, m_End().y ) == EOF )
+                 m_pos.x, m_pos.y, m_End().x, m_End().y ) == EOF )
     {
         success = false;
     }
@@ -116,8 +142,8 @@ bool SCH_BUS_ENTRY::Load( LINE_READER& aLine, wxString& aErrorMsg )
     if( Name1[0] == 'B' )
         m_Layer = LAYER_BUS;
 
-    if( !aLine.ReadLine() || sscanf( (char*) aLine, "%d %d %d %d ", &m_Pos.x, &m_Pos.y,
-                                      &m_Size.x, &m_Size.y ) != 4 )
+    if( !aLine.ReadLine() || sscanf( (char*) aLine, "%d %d %d %d ", &m_pos.x, &m_pos.y,
+                                      &m_size.x, &m_size.y ) != 4 )
     {
         aErrorMsg.Printf( wxT( "Eeschema file bus entry load error at line %d" ),
                           aLine.LineNumber() );
@@ -125,8 +151,8 @@ bool SCH_BUS_ENTRY::Load( LINE_READER& aLine, wxString& aErrorMsg )
         return false;
     }
 
-    m_Size.x -= m_Pos.x;
-    m_Size.y -= m_Pos.y;
+    m_size.x -= m_pos.x;
+    m_size.y -= m_pos.y;
 
     return true;
 }
@@ -136,11 +162,11 @@ EDA_RECT SCH_BUS_ENTRY::GetBoundingBox() const
 {
     EDA_RECT box;
 
-    box.SetOrigin( m_Pos );
+    box.SetOrigin( m_pos );
     box.SetEnd( m_End() );
 
     box.Normalize();
-    int width = ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width;
+    int width = ( m_width == 0 ) ? g_DrawDefaultLineThickness : m_width;
     box.Inflate( width / 2 );
 
     return box;
@@ -149,9 +175,9 @@ EDA_RECT SCH_BUS_ENTRY::GetBoundingBox() const
 
 int SCH_BUS_ENTRY::GetPenSize() const
 {
-    int pensize = ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width;
+    int pensize = ( m_width == 0 ) ? g_DrawDefaultLineThickness : m_width;
 
-    if( m_Layer == LAYER_BUS && m_Width == 0 )
+    if( m_Layer == LAYER_BUS && m_width == 0 )
     {
         pensize = wxRound( g_DrawDefaultLineThickness * BUS_WIDTH_EXPAND );
         pensize = MAX( pensize, 3 );
@@ -173,39 +199,39 @@ void SCH_BUS_ENTRY::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOff
 
     GRSetDrawMode( aDC, aDrawMode );
 
-    GRLine( &aPanel->m_ClipBox, aDC, m_Pos.x + aOffset.x, m_Pos.y + aOffset.y,
+    GRLine( &aPanel->m_ClipBox, aDC, m_pos.x + aOffset.x, m_pos.y + aOffset.y,
             m_End().x + aOffset.x, m_End().y + aOffset.y, GetPenSize(), color );
 }
 
 
 void SCH_BUS_ENTRY::Mirror_X( int aXaxis_position )
 {
-    m_Pos.y -= aXaxis_position;
-    NEGATE(  m_Pos.y );
-    m_Pos.y += aXaxis_position;
-    NEGATE(  m_Size.y );
+    m_pos.y -= aXaxis_position;
+    NEGATE(  m_pos.y );
+    m_pos.y += aXaxis_position;
+    NEGATE(  m_size.y );
 }
 
 
 void SCH_BUS_ENTRY::Mirror_Y( int aYaxis_position )
 {
-    m_Pos.x -= aYaxis_position;
-    NEGATE(  m_Pos.x );
-    m_Pos.x += aYaxis_position;
-    NEGATE(  m_Size.x );
+    m_pos.x -= aYaxis_position;
+    NEGATE(  m_pos.x );
+    m_pos.x += aYaxis_position;
+    NEGATE(  m_size.x );
 }
 
 
 void SCH_BUS_ENTRY::Rotate( wxPoint rotationPoint )
 {
-    RotatePoint( &m_Pos, rotationPoint, 900 );
-    RotatePoint( &m_Size.x, &m_Size.y, 900 );
+    RotatePoint( &m_pos, rotationPoint, 900 );
+    RotatePoint( &m_size.x, &m_size.y, 900 );
 }
 
 
 void SCH_BUS_ENTRY::GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList )
 {
-    DANGLING_END_ITEM item( ENTRY_END, this, m_Pos );
+    DANGLING_END_ITEM item( ENTRY_END, this, m_pos );
     aItemList.push_back( item );
 
     DANGLING_END_ITEM item1( ENTRY_END, this, m_End() );
@@ -219,7 +245,7 @@ bool SCH_BUS_ENTRY::IsSelectStateChanged( const wxRect& aRect )
 
     // If either end of the bus entry is inside the selection rectangle, the entire
     // bus entry is selected.  Bus entries have a fixed length and angle.
-    if( aRect.Contains( m_Pos ) || aRect.Contains( m_End() ) )
+    if( aRect.Contains( m_pos ) || aRect.Contains( m_End() ) )
         m_Flags |= SELECTED;
     else
         m_Flags &= ~SELECTED;
@@ -230,7 +256,7 @@ bool SCH_BUS_ENTRY::IsSelectStateChanged( const wxRect& aRect )
 
 void SCH_BUS_ENTRY::GetConnectionPoints( vector< wxPoint >& aPoints ) const
 {
-    aPoints.push_back( m_Pos );
+    aPoints.push_back( m_pos );
     aPoints.push_back( m_End() );
 }
 
@@ -246,7 +272,7 @@ wxString SCH_BUS_ENTRY::GetSelectMenuText() const
 
 bool SCH_BUS_ENTRY::doHitTest( const wxPoint& aPoint, int aAccuracy ) const
 {
-    return TestSegmentHit( aPoint, m_Pos, m_End(), aAccuracy );
+    return TestSegmentHit( aPoint, m_pos, m_End(), aAccuracy );
 }
 
 
@@ -267,6 +293,6 @@ void SCH_BUS_ENTRY::doPlot( PLOTTER* aPlotter )
 {
     aPlotter->set_current_line_width( GetPenSize() );
     aPlotter->set_color( ReturnLayerColor( GetLayer() ) );
-    aPlotter->move_to( m_Pos );
+    aPlotter->move_to( m_pos );
     aPlotter->finish_to( m_End() );
 }

eeschema/sch_bus_entry.h

@@ -46,11 +46,9 @@
  */
 class SCH_BUS_ENTRY : public SCH_ITEM
 {
-    wxPoint m_Pos;
-
-public:
-    int     m_Width;
-    wxSize  m_Size;
+    wxPoint m_pos;
+    int     m_width;
+    wxSize  m_size;
 
 public:
     SCH_BUS_ENTRY( const wxPoint& pos = wxPoint( 0, 0 ), int shape = '\\', int id = WIRE_TO_BUS );
@@ -66,6 +64,14 @@ public:
 
     wxPoint m_End() const;
 
+    int GetWidth() const { return m_width; }
+
+    void SetWidth( int aWidth ) { m_width = aWidth; }
+
+    wxSize GetSize() const { return m_size; }
+
+    void SetSize( const wxSize& aSize ) { m_size = aSize; }
+
     virtual void SwapData( SCH_ITEM* aItem );
 
     virtual void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
@@ -113,7 +119,7 @@ public:
      */
     virtual void Move( const wxPoint& aMoveVector )
     {
-        m_Pos += aMoveVector;
+        m_pos += aMoveVector;
     }
 
     /**
@@ -131,6 +137,9 @@ public:
 
     virtual bool IsSelectStateChanged( const wxRect& aRect );
 
+    /**
+     * @copydoc SCH_ITEM::IsConnectable()
+     */
     virtual bool IsConnectable() const { return true; }
 
     virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
@@ -144,8 +153,8 @@ private:
     virtual bool doHitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const;
     virtual EDA_ITEM* doClone() const;
     virtual void doPlot( PLOTTER* aPlotter );
-    virtual wxPoint doGetPosition() const { return m_Pos; }
-    virtual void doSetPosition( const wxPoint& aPosition ) { m_Pos = aPosition; }
+    virtual wxPoint doGetPosition() const { return m_pos; }
+    virtual void doSetPosition( const wxPoint& aPosition ) { m_pos = aPosition; }
 };