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

Schematic object plot code refactoring and CMake required version changes. 

* Change the minimum required CMake version to 2.6.4 for all build platforms
  except Windows and OSX.
* Move all schematic plot code from plot.cpp into the appropriate schematic
  objects.
* Create SCH_SCREEN plot method to plot all objects in the schematic
  screen.
* Delete plot.cpp and remove it from the CMakeList file.
parent 3ea0c106

CMakeLists.txt

+5 −3
Original line number Original line Diff line number Diff line 
project(kicad)

project(kicad)





# test the minimum Cmake version requirement (could be different under unix or Windows

# The minimum CMake version requirement could be different under unix, OSX,  or Windows

if(WIN32)

if(WIN32)

    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)

    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)   # win32 and win64

elseif(APPLE)

    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)   # OSX

else(WIN32)

else(WIN32)

    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)

    cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)   # Linux, Unix, and everything else.

endif(WIN32)

endif(WIN32)





# Path to local CMake modules.

# Path to local CMake modules.

common/sch_item_struct.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -127,3 +127,9 @@ bool SCH_ITEM::operator < ( const SCH_ITEM& aItem ) const 
    wxCHECK_MSG( false, this->Type() < aItem.Type(),

    wxCHECK_MSG( false, this->Type() < aItem.Type(),

                 wxT( "Less than operator not defined for " ) + GetClass() );

                 wxT( "Less than operator not defined for " ) + GetClass() );

}

}





void SCH_ITEM::doPlot( PLOTTER* aPlotter )

{

    wxFAIL_MSG( wxT( "doPlot() method not implemented for class " ) + GetClass() );

}

eeschema/CMakeLists.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,6 @@ set(EESCHEMA_SRCS 
    onrightclick.cpp

    onrightclick.cpp

    operations_on_items_lists.cpp

    operations_on_items_lists.cpp

    pinedit.cpp

    pinedit.cpp

    plot.cpp

    sch_bus_entry.cpp

    sch_bus_entry.cpp

    sch_collectors.cpp

    sch_collectors.cpp

    sch_component.cpp

    sch_component.cpp

eeschema/dialogs/dialog_plot_schematic_DXF.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -242,7 +242,7 @@ void DIALOG_PLOT_SCHEMATIC_DXF::PlotOneSheetDXF( const wxString& FileName, 
        m_Parent->PlotWorkSheet( plotter, screen );

        m_Parent->PlotWorkSheet( plotter, screen );

    }

    }





    PlotDrawlist( plotter, screen->GetDrawItems() );

    screen->Plot( plotter );





    /* fin */

    /* fin */

    plotter->end_plot();

    plotter->end_plot();

eeschema/dialogs/dialog_plot_schematic_HPGL.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -392,7 +392,7 @@ void DIALOG_PLOT_SCHEMATIC_HPGL::Plot_1_Page_HPGL( const wxString& FileName, 
    if( m_plot_Sheet_Ref )

    if( m_plot_Sheet_Ref )

        m_Parent->PlotWorkSheet( plotter, screen );

        m_Parent->PlotWorkSheet( plotter, screen );





    PlotDrawlist( plotter, screen->GetDrawItems() );

    screen->Plot( plotter );





    plotter->end_plot();

    plotter->end_plot();

    delete plotter;

    delete plotter;