Commit fc0864be authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Schematic component library object code cleaning and refactoring. 

* Break classes_body_item.cpp(.h) into more reasonable size bites.
* Rename classes_body_item.cpp(.h) to lib_draw_item.cpp(.h)
* Fix some unsatisfied header file dependencies.
* Add stubs to component library draw item base classe to handle editing
  internally.
* Lots of code cleaning.
parent 443534e7

bitmap2component/bitmap2component.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ void ArmBoolEng( Bool_Engine* aBooleng, bool aConvertHoles ) 
     *    Another scaling with Grid is applied on top of it to create space in the integer number for

     *    Another scaling with Grid is applied on top of it to create space in the integer number for

     *    even smaller numbers.

     *    even smaller numbers.

     */

     */

    int GRID = (int) 10000 / DGRID;       // initial value = 10000 in kbool example

    int GRID = (int) ( 10000 / DGRID );    // initial value = 10000 in kbool example





    // But we use 10000/DGRID because the scalling is made

    // But we use 10000/DGRID because the scalling is made

    // by DGRID on integer pcbnew units and

    // by DGRID on integer pcbnew units and

eeschema/CMakeLists.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ set(EESCHEMA_SRCS 
    class_schematic_items.cpp

    class_schematic_items.cpp

    class_sch_screen.cpp

    class_sch_screen.cpp

    class_text-label.cpp

    class_text-label.cpp

    classes_body_items.cpp

    cleanup.cpp

    cleanup.cpp

    cmp_library_keywords.cpp

    cmp_library_keywords.cpp

    cmp_library_lexer.cpp

    cmp_library_lexer.cpp
@@ -97,7 +96,13 @@ set(EESCHEMA_SRCS 
    libedit_onrightclick.cpp

    libedit_onrightclick.cpp

    libedit_plot_component.cpp

    libedit_plot_component.cpp

    libedit_undo_redo.cpp

    libedit_undo_redo.cpp

    lib_arc.cpp

    lib_bezier.cpp

    lib_circle.cpp

    lib_draw_item.cpp

    lib_export.cpp

    lib_export.cpp

    lib_polyline.cpp

    lib_rectangle.cpp

    libfield.cpp

    libfield.cpp

    load_one_schematic_file.cpp

    load_one_schematic_file.cpp

    locate.cpp

    locate.cpp

eeschema/bus-wire-junction.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "confirm.h"

#include "confirm.h"





#include "program.h"

#include "program.h"

#include "classes_body_items.h"

#include "lib_draw_item.h"

#include "class_pin.h"

#include "class_pin.h"

#include "general.h"

#include "general.h"

#include "protos.h"

#include "protos.h"

eeschema/class_BodyItem_Text.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "trigo.h"

#include "trigo.h"





#include "program.h"

#include "program.h"

#include "classes_body_items.h"

#include "lib_draw_item.h"

#include "general.h"

#include "general.h"

#include "protos.h"

#include "protos.h"

eeschema/class_libentry.cpp

+7 −5
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include "fctsys.h"

#include "fctsys.h"

#include "common.h"

#include "common.h"

#include "kicad_string.h"

#include "kicad_string.h"

#include "confirm.h"

#include "class_drawpanel.h"

#include "class_drawpanel.h"

#include "plot_common.h"

#include "plot_common.h"

#include "gr_basic.h"

#include "gr_basic.h"
@@ -16,6 +15,11 @@ 
#include "class_library.h"

#include "class_library.h"

#include "class_libentry.h"

#include "class_libentry.h"

#include "class_pin.h"

#include "class_pin.h"

#include "lib_arc.h"

#include "lib_bezier.h"

#include "lib_circle.h"

#include "lib_polyline.h"

#include "lib_rectangle.h"





#include <boost/foreach.hpp>

#include <boost/foreach.hpp>
@@ -986,8 +990,7 @@ EDA_Rect LIB_COMPONENT::GetBoundaryBox( int aUnit, int aConvert ) 
        if( item.m_Convert > 0 && ( ( aConvert > 0 ) && ( aConvert != item.m_Convert ) ) )

        if( item.m_Convert > 0 && ( ( aConvert > 0 ) && ( aConvert != item.m_Convert ) ) )

            continue;

            continue;





        if ( ( item.Type() == COMPONENT_FIELD_DRAW_TYPE )

        if ( ( item.Type() == COMPONENT_FIELD_DRAW_TYPE ) && !( ( LIB_FIELD& ) item ).IsVisible() )

            && !( ( LIB_FIELD& ) item ).IsVisible() )

            continue;

            continue;





        bBox.Merge( item.GetBoundingBox() );

        bBox.Merge( item.GetBoundingBox() );
@@ -1198,8 +1201,7 @@ void LIB_COMPONENT::ClearStatus() 
}

}









int LIB_COMPONENT::SelectItems( EDA_Rect& aRect, int aUnit, int aConvert,

int LIB_COMPONENT::SelectItems( EDA_Rect& aRect, int aUnit, int aConvert, bool aEditPinByPin )

                                bool aEditPinByPin )

{

{

    int itemCount = 0;

    int itemCount = 0;