Commit 1c9433fb authored by Miguel Angel Ajo's avatar Miguel Angel Ajo
Browse files

merged divertion

parents a8e4f8b0 99b90d2f

3d-viewer/3d_draw.cpp

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List() 
            {

                CPolyPt* endcorner = &polysList[ic];



                if( begincorner->utility == 0 )

                if( begincorner->m_utility == 0 )

                {

                    // Draw only basic outlines, not extra segments

                    dummysegment.m_Start.x = begincorner->x;
@@ -318,7 +318,7 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List() 
                if( (endcorner->end_contour) || (ic == imax) )

                {

                    // the last corner of a filled area is found: draw it

                    if( endcorner->utility == 0 )

                    if( endcorner->m_utility == 0 )

                    {

                        // Draw only basic outlines, not extra segments

                        dummysegment.m_Start.x = endcorner->x;

eeschema/lib_arc.cpp

+6 −6
Original line number Diff line number Diff line
@@ -561,15 +561,15 @@ void LIB_ARC::BeginEdit( int aEditMode, const wxPoint aPosition ) 
        // Drag either the start, end point or the outline

        if( HitTestPoints( m_ArcStart, aPosition, MINIMUM_SELECTION_DISTANCE ) )

        {

            m_editSelectPoint = START;

            m_editSelectPoint = ARC_STATUS_START;

        }

        else if( HitTestPoints( m_ArcEnd, aPosition, MINIMUM_SELECTION_DISTANCE ) )

        {

            m_editSelectPoint = END;

            m_editSelectPoint = ARC_STATUS_END;

        }

        else

        {

            m_editSelectPoint = OUTLINE;

            m_editSelectPoint = ARC_STATUS_OUTLINE;

        }



        m_editState = 0;
@@ -619,12 +619,12 @@ void LIB_ARC::calcEdit( const wxPoint& aPosition ) 
        wxPoint newCenterPoint, startPos, endPos;



        // Choose the point of the arc to be adjusted

        if( m_editSelectPoint == START )

        if( m_editSelectPoint == ARC_STATUS_START )

        {

            startPos = aPosition;

            endPos   = m_ArcEnd;

        }

        else if( m_editSelectPoint == END )

        else if( m_editSelectPoint == ARC_STATUS_END )

        {

            endPos   = aPosition;

            startPos = m_ArcStart;
@@ -658,7 +658,7 @@ void LIB_ARC::calcEdit( const wxPoint& aPosition ) 
                newCenterPoint = m_Pos;

        }



        if( m_editSelectPoint == START || m_editSelectPoint == END )

        if( m_editSelectPoint == ARC_STATUS_START || m_editSelectPoint == ARC_STATUS_END )

        {

            // Compute the new center point when the start/end points are modified

            wxPoint middlePoint = wxPoint( (startPos.x + endPos.x) / 2,

eeschema/lib_arc.h

+5 −5
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ class TRANSFORM; 


class LIB_ARC : public LIB_ITEM

{

    enum SELECT_T

    enum SELECT_T               // When creating an arc: status of arc

    {

        START,

        END,

        OUTLINE,

        ARC_STATUS_START,

        ARC_STATUS_END,

        ARC_STATUS_OUTLINE,

    };



    int      m_Radius;

    int      m_t1;              /* First radius angle of the arc in 0.1 degrees. */

    int      m_t1;              // First radius angle of the arc in 0.1 degrees.

    int      m_t2;              /* Second radius angle of the arc in 0.1 degrees. */

    wxPoint  m_ArcStart;

    wxPoint  m_ArcEnd;          /* Arc end position. */

pcb_calculator/bitmaps/Thumbs.db

deleted100644 → 0
−36 KiB

File deleted.

View file

pcbnew/autorouter/solve.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1302,12 +1302,12 @@ static void AddNewTrace( PCB_EDIT_FRAME* pcbframe, wxDC* DC ) 
        g_CurrentTrackList.PushBack( newTrack );

    }



    g_FirstTrackSegment->start = pcbframe->GetBoard()->GetPad( g_FirstTrackSegment, START );

    g_FirstTrackSegment->start = pcbframe->GetBoard()->GetPad( g_FirstTrackSegment, FLG_START );



    if( g_FirstTrackSegment->start )

        g_FirstTrackSegment->SetState( BEGIN_ONPAD, ON );



    g_CurrentTrackSegment->end = pcbframe->GetBoard()->GetPad( g_CurrentTrackSegment, END );

    g_CurrentTrackSegment->end = pcbframe->GetBoard()->GetPad( g_CurrentTrackSegment, FLG_END );



    if( g_CurrentTrackSegment->end )

        g_CurrentTrackSegment->SetState( END_ONPAD, ON );