Commit 3c97a45f authored by charras's avatar charras
Browse files

code cleaning, and some minor bugs solved

parent 07a39a03

eeschema/netform.cpp

+5 −7
Original line number Diff line number Diff line
@@ -862,18 +862,16 @@ static void WriteGENERICListOfNets( FILE* f, ObjetNetListStruct* ObjNet ) 
            NetcodeName += wxT( "\"" );

            if( !NetName.IsEmpty() )

            {

                NetcodeName += NetName;

                if( g_TabObjNet[jj].m_Type != NET_PINLABEL )

                {

                    // usual net name, add in the sheet path

                    NetcodeName = g_TabObjNet[jj].m_SheetList.PathHumanReadable()

                                  + NetcodeName;



                    //NetcodeName << wxT("_") <<

                    //		g_TabObjNet[jj].m_SheetList.PathHumanReadable();

                    // usual net name, prefix it by the sheet path

                    NetcodeName += g_TabObjNet[jj].m_SheetList.PathHumanReadable();

                }

                NetcodeName += NetName;

            }

            NetcodeName += wxT( "\"" );

            // Add the netname without prefix, in cases we need only the "short" netname

            NetcodeName += wxT( " \"" ) + NetName + wxT( "\"" );

            LastNetCode  = NetCode;

        }

include/macros.h

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 
#define CONV_FROM_UTF8( utf8string ) (utf8string)

#endif



/* violation of C++ standard, cannot use min() and max(), i.e. in lowercase

 #ifndef min

 #define min(x, y)		((x) > (y) ? (y) : (x))

 #endif

 #ifndef max

 #define max(x, y)		((x) > (y) ? (x) : (y))

 #endif

 */



#ifndef MIN

#define MIN( x, y )       ( (x) > (y) ? (y) : (x) )

libs.win

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ SYSWXLIB = `$(WXWIN)/wx-config --libs gl`\ 
CC = gcc



.cpp.o:

	gcc -c -Wall $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $(EXTRACPPFLAGS) -o $@ $*.cpp

	g++ -c -Wall $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $(EXTRACPPFLAGS) -o $@ $*.cpp



# Settings for Cyginw/Mingw32

# Some versions of windres cannot cope with the --preprocessor

pcbnew/class_pad.h

+8 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ public: 


    int     m_physical_connexion;   // variable used in rastnest computations

                                    // handle block number in track connection



    int     m_zone_connexion;   	// variable used in rastnest computations

protected:

    int     m_ZoneSubnet;   	    // variable used in rastnest computations

                                    // handle block number in zone connection



public:
@@ -131,6 +131,12 @@ public: 
    int GetNet() const { return m_NetCode; }

    void SetNet( int aNetCode ) { m_NetCode = aNetCode; }



    /**

     * Function GetZoneSubNet

     * @return int - the sub net code in zone connections.

     */

    int GetZoneSubNet() const { return m_ZoneSubnet; }

    void SetZoneSubNet( int aSubNetCode ) { m_ZoneSubnet = aSubNetCode; }



    /**

     * Function Display_Infos

pcbnew/class_track.cpp

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ TRACK::TRACK( BOARD_ITEM* StructFather, KICAD_T idtype ) : 
    start   = end = NULL;

    SetNet( 0 );

    SetSubNet( 0 );

    SetZoneSubNet( 0 );

    SetDrillDefault();

    m_Param = 0;

}