Commit b4b57a96 authored by charras's avatar charras
Browse files

Added: handling multiple user paths in library path list in Cvpcb. Other minor changes

parent 6039a5f7

3d-viewer/3d_read_mesh.cpp

+8 −8
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ int S3D_MASTER:: ReadData() 
{

    char       line[1024], * text;

    wxFileName fn;

    wxString   tmp;

    wxString   FullFilename;

    FILE*      file;

    int        LineNum = 0;
@@ -34,23 +34,23 @@ int S3D_MASTER:: ReadData() 
        return 1;

    }



    fn = m_Shape3DName;



    if( !fn.FileExists() )

    if( wxFileName::FileExists(m_Shape3DName) )

        FullFilename = m_Shape3DName;

    else

    {

        tmp = wxGetApp().FindLibraryPath( fn );

        fn = m_Shape3DName;

        FullFilename = wxGetApp().FindLibraryPath( fn );



        if( !tmp )

        if( FullFilename.IsEmpty() )

        {

            wxLogDebug( _( "3D part library <%s> could not be found." ),

                        fn.GetFullPath().c_str() );

            return -1;

        }



        fn = tmp;

    }



    file = wxFopen( fn.GetFullPath(), wxT( "rt" ) );

    file = wxFopen( FullFilename, wxT( "rt" ) );



    if( file == NULL )

    {

AUTHORS.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
* under GNU General Public License (see copyright.txt)



== Main Author

Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

Maitre de Conferences

IUT1 GEII2

Universite Joseph Fourier (U.J.F.)
@@ -24,7 +24,7 @@ Wayne Stambaugh <stambaughw@verizon.net> 
See also CHANGELOG.txt for contributors.



== Document Writers

Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

Igor Plyatov <plyatov@gmail.com>



== Translators

common/about_kicad.cpp

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "appl_wxstruct.h"





#define BUILD_VERSION wxT("(20090414-unstable)")

#define BUILD_VERSION wxT("(20090421-unstable)")



wxString g_BuildVersion
@@ -138,7 +138,7 @@ void InitKiCadAbout( wxAboutDialogInfo& info ) 
	info.AddDeveloper( SetMsg( wxT( "Wayne Stambaugh <stambaughw@verizon.net>" ) ) );



	/* Add document writers*/

	info.AddDocWriter( wxT( "Jean-Pierre Charras <jean-pierre.charras@inpg.fr>" ) );

	info.AddDocWriter( wxT( "Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) );

	info.AddDocWriter( SetMsg( wxT( "Igor Plyatov <plyatov@gmail.com>" ) ) );



	/* Add translators */

common/eda_doc.cpp

+5 −0
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ bool GetAssociatedDocument( wxFrame* aFrame, 
    /* Compute the full file name */

    if( wxIsAbsolutePath( aDocName ) || aPaths == NULL)

        fullfilename = aDocName;

    /* If the file exists, this is a trivial case: return the filename "as this"

     * the name can be an absolute path, or a relative path like ./filename or ../<filename>

    */

    else if( wxFileName::FileExists( aDocName ) )

        fullfilename = aDocName;

    else

    {

        fullfilename = aPaths->FindValidPath( aDocName );

cvpcb/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ set(CVPCB_SRCS 
    class_cvpcb.cpp

    cvframe.cpp

    cvpcb.cpp

#   dialog_cvpcb_config.cpp

    dialog_cvpcb_config.cpp

    dialog_cvpcb_config_fbp.cpp

    dialog_display_options.cpp

    displayframe.cpp

    genequiv.cpp