Commit f723c540 authored by charras's avatar charras
Browse files

code cleaning. Some comments translated into English. 

Added: Zones unfill in polygon mode
parent afd39b3d

common/trigo.cpp

+14 −14
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY ) 
         * de piste soit horizontal dans le nouveau repere */

        int angle;



        angle = (int) ( atan2( (float) segY, (float) segX ) * 1800 / M_PI);

        angle = (int) ( atan2( (double) segY, (double) segX ) * 1800 / M_PI);

        cXrot = pointX; cYrot = pointY;



        RotatePoint( &cXrot, &cYrot, angle );   /* Rotation du point a tester */
@@ -224,7 +224,7 @@ void RotatePoint( int* pX, int* pY, int angle ) 
 *  pour une rotation de centre 0, 0, et d'angle angle ( en 1/10 degre)

 */

{

    float fpx, fpy;

    double fpx, fpy;

    int   tmp;



    while( angle < 0 )

eeschema/cleanup.cpp

+4 −3
Original line number Diff line number Diff line
@@ -256,9 +256,10 @@ static int TstAlignSegment( EDA_DrawLineStruct* RefSegm, 
    }

    else

    {

        if( atan2( RefSegm->m_Start.x - RefSegm->m_End.x, RefSegm->m_Start.y -

                   RefSegm->m_End.y ) ==

           atan2( TstSegm->m_Start.x - TstSegm->m_End.x, TstSegm->m_Start.y - TstSegm->m_End.y ) )

        if( atan2( (double)(RefSegm->m_Start.x - RefSegm->m_End.x),

                    (double)(RefSegm->m_Start.y - RefSegm->m_End.y) ) ==

           atan2( (double)(TstSegm->m_Start.x - TstSegm->m_End.x),

                (double)(TstSegm->m_Start.y - TstSegm->m_End.y) ) )

        {

            RefSegm->m_End = TstSegm->m_End;

            return 1;

eeschema/locate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ LibEDA_BaseStruct* LocateDrawItem( SCH_SCREEN* Screen, 
                break;

            dx = px - Arc->m_Pos.x;

            dy = py + Arc->m_Pos.y;

            ii = (int) sqrt( dx * dx + dy * dy );

            ii = (int) sqrt( ((double)dx * dx) + ((double)dy * dy) );

            if( abs( ii - Arc->m_Rayon ) <= seuil )

                return DrawItem;

        }
@@ -1015,7 +1015,7 @@ int distance( int dx, int dy, int spot_cX, int spot_cY, int seuil ) 
         *  de piste soit horizontal dans le nouveau repere */

        int angle;



        angle = (int) ( atan2( (float) segY, (float) segX ) * 1800 / M_PI);

        angle = (int) ( atan2( (double) segY, (double) segX ) * 1800 / M_PI);

        cXrot = pointX; cYrot = pointY;

        RotatePoint( &cXrot, &cYrot, angle );   /* Rotation du point a tester */

        RotatePoint( &segX, &segY, angle );     /* Rotation du segment */

eeschema/symbdraw.cpp

+5 −5
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static void SymbolDisplayDraw( WinEDA_DrawPanel* panel, wxDC* DC, bool erase ) 
    case COMPONENT_CIRCLE_DRAW_TYPE:

        dx = ( (LibDrawCircle*) CurrentDrawItem )->m_Pos.x - mx;

        dy = ( (LibDrawCircle*) CurrentDrawItem )->m_Pos.y + my;

        ( (LibDrawCircle*) CurrentDrawItem )->m_Rayon = (int) sqrt( (dx * dx) + (dy * dy) );

        ( (LibDrawCircle*) CurrentDrawItem )->m_Rayon = (int) sqrt( ((double)dx * dx) + ((double)dy * dy) );

        ( (LibDrawCircle*) CurrentDrawItem )->m_Fill  = FlSymbol_Fill;

        break;
@@ -745,7 +745,7 @@ static void ComputeArc( LibDrawArc* DrawItem, wxPoint ArcCentre ) 
    /* calcul de cX et cY pour que l'arc passe par ArcStartX,Y et ArcEndX,Y */

    dx    = ArcEndX - ArcStartX; dy = ArcEndY - ArcStartY;

    cX   -= ArcStartX; cY -= ArcStartY;

    angle = (int) (atan2( dy, dx ) * 1800 / M_PI);

    angle = (int) (atan2( (double)dy, (double)dx ) * 1800 / M_PI);

    RotatePoint( &dx, &dy, angle );  /* Le segment dx, dy est horizontal */

                                     /* -> dx = longueur, dy = 0 */

    RotatePoint( &cX, &cY, angle );
@@ -759,14 +759,14 @@ static void ComputeArc( LibDrawArc* DrawItem, wxPoint ArcCentre ) 
    dx = ArcStartX - DrawItem->m_Pos.x;

    dy = ArcStartY - DrawItem->m_Pos.y;



    DrawItem->m_Rayon = (int) sqrt( (dx * dx) + (dy * dy) );

    DrawItem->m_Rayon = (int) sqrt( ((double)dx * dx) + ((double)dy * dy) );



    DrawItem->t1 = (int) (atan2( dy, dx ) * 1800 / M_PI);

    DrawItem->t1 = (int) (atan2( (double)dy, (double)dx ) * 1800 / M_PI);



    dx = ArcEndX - DrawItem->m_Pos.x;

    dy = ArcEndY - DrawItem->m_Pos.y;



    DrawItem->t2 = (int) (atan2( dy, dx ) * 1800 / M_PI);

    DrawItem->t2 = (int) (atan2( (double)dy, (double)dx ) * 1800 / M_PI);



    DrawItem->m_ArcStart.x = ArcStartX;

    DrawItem->m_ArcStart.y = ArcStartY;

gerbview/locate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int distance( int seuil ) 
         *  de piste soit horizontal dans le nouveau repere */

        int angle;



        angle = (int) ( atan2( (float) segY, (float) segX ) * 1800 / M_PI);

        angle = (int) ( atan2( (double) segY, (double) segX ) * 1800 / M_PI);

        cXrot = pointX; cYrot = pointY;

        RotatePoint( &cXrot, &cYrot, angle );   /* Rotation du point a tester */

        RotatePoint( &segX, &segY, angle );     /* Rotation du segment */