Commit 539f4e1e authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Encapsulate DANGLING_END_ITEM class.

parent 68d752bb

eeschema/sch_bus_entry.cpp

+3 −5
Original line number Diff line number Diff line
@@ -205,12 +205,10 @@ void SCH_BUS_ENTRY::Rotate( wxPoint rotationPoint ) 


void SCH_BUS_ENTRY::GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList )

{

    DANGLING_END_ITEM item( ENTRY_END, this );

    item.m_Pos = m_Pos;



    DANGLING_END_ITEM item1( ENTRY_END, this );

    item1.m_Pos = m_End();

    DANGLING_END_ITEM item( ENTRY_END, this, m_Pos );

    aItemList.push_back( item );



    DANGLING_END_ITEM item1( ENTRY_END, this, m_End() );

    aItemList.push_back( item1 );

}

eeschema/sch_component.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1560,8 +1560,7 @@ void SCH_COMPONENT::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) 
        if( Pin->GetConvert() && m_convert && ( m_convert != Pin->GetConvert() ) )

            continue;



        DANGLING_END_ITEM item( PIN_END, Pin );

        item.m_Pos = GetPinPhysicalPosition( Pin );

        DANGLING_END_ITEM item( PIN_END, Pin, GetPinPhysicalPosition( Pin ) );

        aItemList.push_back( item );

    }

}

eeschema/sch_junction.cpp

+1 −2
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ void SCH_JUNCTION::Rotate( wxPoint rotationPoint ) 


void SCH_JUNCTION::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )

{

    DANGLING_END_ITEM item( JUNCTION_END, this );

    item.m_Pos = m_Pos;

    DANGLING_END_ITEM item( JUNCTION_END, this, m_Pos );

    aItemList.push_back( item );

}

eeschema/sch_line.cpp

+8 −8
Original line number Diff line number Diff line
@@ -356,12 +356,12 @@ void SCH_LINE::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) 


    if( ( GetLayer() == LAYER_BUS ) || ( GetLayer() == LAYER_WIRE ) )

    {

        DANGLING_END_ITEM item( (GetLayer() == LAYER_BUS) ? BUS_START_END : WIRE_START_END, this );

        item.m_Pos = m_Start;

        DANGLING_END_ITEM item1( (GetLayer() == LAYER_BUS) ? BUS_END_END : WIRE_END_END, this );

        item1.m_Pos = m_End;



        DANGLING_END_ITEM item( (GetLayer() == LAYER_BUS) ? BUS_START_END : WIRE_START_END, this,

                                m_Start );

        aItemList.push_back( item );



        DANGLING_END_ITEM item1( (GetLayer() == LAYER_BUS) ? BUS_END_END : WIRE_END_END, this,

                                 m_End );

        aItemList.push_back( item1 );

    }

}
@@ -378,13 +378,13 @@ bool SCH_LINE::IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemLi 
    {

        BOOST_FOREACH( DANGLING_END_ITEM item, aItemList )

        {

            if( item.m_Item == this )

            if( item.GetItem() == this )

                continue;



            if( m_Start == item.m_Pos )

            if( m_Start == item.GetPosition() )

                m_StartIsDangling = false;



            if( m_End == item.m_Pos )

            if( m_End == item.GetPosition() )

                m_EndIsDangling = false;



            if( (m_StartIsDangling == false) && (m_EndIsDangling == false) )

eeschema/sch_sheet_pin.cpp

+1 −2
Original line number Diff line number Diff line
@@ -516,8 +516,7 @@ void SCH_SHEET_PIN::CreateGraphicShape( std::vector <wxPoint>& aPoints, const wx 


void SCH_SHEET_PIN::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )

{

    DANGLING_END_ITEM item( SHEET_LABEL_END, this );

    item.m_Pos  = m_Pos;

    DANGLING_END_ITEM item( SHEET_LABEL_END, this, m_Pos );

    aItemList.push_back( item );

}