Commit d5064b98 authored by Cirilo Bernardo's avatar Cirilo Bernardo Committed by jean-pierre charras
Browse files

Export VRML and IDF maintenance. 

Fix minor bug in eeschema (opening a relative path does not work) (patch from HennerZeller).
parent 1c5a997f

eeschema/eeschema.cpp

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ bool EDA_APP::OnInit() 
            // wxSetWorkingDirectory does not like empty paths

            wxSetWorkingDirectory( filename.GetPath() );



        if( frame->LoadOneEEProject( filename.GetFullPath(), false ) )

        if( frame->LoadOneEEProject( filename.GetFullName(), false ) )

            frame->GetCanvas()->Refresh( true );

    }

    else

pcbnew/exporters/export_vrml.cpp

+43 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
 *

 * 3. Export Graphics to Layer objects (see 3d_draw.cpp for clues) to ensure that custom

 *      tracks/fills/logos are rendered.

 *  module->TransformGraphicShapesWithClearanceToPolygonSet

 *

 * For mechanical correctness, we should use the following settings with arcs:

 * 1. max. deviation:  the number of edges should be determined by the max.
@@ -925,7 +926,8 @@ static void export_vrml_text_module( TEXTE_MODULE* module ) 
}





static void export_vrml_edge_module( MODEL_VRML& aModel, EDGE_MODULE* aOutline )

static void export_vrml_edge_module( MODEL_VRML& aModel, EDGE_MODULE* aOutline,

                                     double aOrientation )

{

    LAYER_NUM layer = aOutline->GetLayer();

    double  x   = aOutline->GetStart().x * aModel.scale + aModel.tx;
@@ -936,6 +938,10 @@ static void export_vrml_edge_module( MODEL_VRML& aModel, EDGE_MODULE* aOutline ) 


    switch( aOutline->GetShape() )

    {

    case S_SEGMENT:

        export_vrml_line( aModel, layer, x, y, xf, yf, w );

        break;



    case S_ARC:

        export_vrml_arc( aModel, layer, x, y, xf, yf, w, aOutline->GetAngle() / 10 );

        break;
@@ -944,8 +950,41 @@ static void export_vrml_edge_module( MODEL_VRML& aModel, EDGE_MODULE* aOutline ) 
        export_vrml_circle( aModel, layer, x, y, xf, yf, w );

        break;



    case S_POLYGON:

        {

            VRML_LAYER* vl;



            if( !VRMLEXPORT::GetLayer( aModel, layer, &vl ) )

                break;



            int nvert = aOutline->GetPolyPoints().size();

            int i = 0;



            if( nvert < 3 ) break;



            int seg = vl->NewContour();



            if( seg < 0 )

                break;



            while( i < nvert )

            {

                CPolyPt corner( aOutline->GetPolyPoints()[i] );

                RotatePoint( &corner.x, &corner.y, aOrientation );

                corner.x += aOutline->GetPosition().x;

                corner.y += aOutline->GetPosition().y;



                x = corner.x * aModel.scale + aModel.tx;

                y = - ( corner.y * aModel.scale + aModel.ty );

                vl->AddVertex( seg, x, y );



                ++i;

            }

            vl->EnsureWinding( seg, false );

        }

        break;



    default:

        export_vrml_line( aModel, layer, x, y, xf, yf, w );

        break;

    }

}
@@ -1134,7 +1173,8 @@ static void export_vrml_module( MODEL_VRML& aModel, BOARD* aPcb, MODULE* aModule 
            break;



        case PCB_MODULE_EDGE_T:

            export_vrml_edge_module( aModel, dynamic_cast<EDGE_MODULE*>( item ) );

            export_vrml_edge_module( aModel, dynamic_cast<EDGE_MODULE*>( item ),

                                     aModule->GetOrientation() );

            break;



        default:

utils/idftools/idf_cylinder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int main( int argc, char **argv ) 


        tstr.clear();

        tstr.str( line );

        if( (tstr >> extraZ) && extraZ > 0.0 )

        if( (tstr >> extraZ) && extraZ >= 0.0 )

            ok = true;

    }