Commit 033d6917 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

fixed recent minor bug in Cvpcb (footprint name error when read from netlist)

parents 97ede2a6 1b831ccc

cvpcb/readschematicnetlist.cpp

+5 −18
Original line number Original line Diff line number Diff line
@@ -90,7 +90,6 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() 
{

{

    char       alim[1024];

    char       alim[1024];

    int        idx, jj, k, l;

    int        idx, jj, k, l;

    char*      LibName;

    char       cbuffer[BUFFER_CHAR_SIZE];      /* temporary storage */

    char       cbuffer[BUFFER_CHAR_SIZE];      /* temporary storage */

    char* ptchar;

    char* ptchar;

    COMPONENT* Cmp;

    COMPONENT* Cmp;
@@ -193,10 +192,8 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() 
        while( Line[idx] == ' ' )

        while( Line[idx] == ' ' )

            idx++;

            idx++;





        /* idx points the component value */

        /* idx points the component value.

        LibName = Line + idx;

         * Read value */



        /* Read value */

        ptchar = strstr( &Line[idx], " " );  // Search end of value field (space)

        ptchar = strstr( &Line[idx], " " );  // Search end of value field (space)

        if( ptchar == 0 )

        if( ptchar == 0 )

        {

        {
@@ -215,6 +212,8 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() 
            cbuffer[jj++] = Line[idx];

            cbuffer[jj++] = Line[idx];

        }

        }

        cbuffer[jj] = 0;

        cbuffer[jj] = 0;

        // Copy footprint name:

        if( m_isEESchemaNetlist && (strnicmp( cbuffer, "$noname", 7 ) != 0) )

            Cmp->m_Module = CONV_FROM_UTF8(cbuffer);

            Cmp->m_Module = CONV_FROM_UTF8(cbuffer);





        if( (Line[++idx] == '(') && (Line[k - 1] == ')' ) )

        if( (Line[++idx] == '(') && (Line[k - 1] == ')' ) )
@@ -261,18 +260,6 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() 




        m_components.push_back( Cmp );

        m_components.push_back( Cmp );





        if(  m_isEESchemaNetlist )   /* copy footprint name: */

        {

            if( strnicmp( LibName, "$noname", 7 ) != 0 )

            {

                while( *LibName > ' ' )

                {

                    Cmp->m_Module.Append( *LibName );

                    LibName++;

                }

            }

        }



        ReadPinConnection( netlistReader, Cmp );

        ReadPinConnection( netlistReader, Cmp );

    }

    }