Upstream merge.

.bzrignore

-common/netlist_keywords.*
-common/netlist_lexer.h
-common/pcb_plot_params_lexer.h
-common/fp_lib_table_keywords.*
-include/fp_lib_table_lexer.h
-include/netlist_lexer.h
-eeschema/cmp_library_lexer.h
-eeschema/cmp_library_keywords.*
-eeschema/template_fieldnames_keywords.*
-eeschema/template_fieldnames_lexer.h
-pcbnew/dialogs/dialog_freeroute_exchange_help_html.h
-pcbnew/pcb_plot_params_keywords.cpp
-pcbnew/pcb_plot_params_lexer.h
-Makefile
-CMakeFiles
-CMakeCache.txt
-auto_renamed_to_cpp
-Testing
-version.h
-config.h
-install_manifest.txt
-Documentation/doxygen
-*.cmake
-*.bak
-common/pcb_plot_params_keywords.cpp
-include/pcb_plot_params_lexer.h
-pcbnew/specctra_keywords.cpp
-pcbnew/specctra_lexer.h
-pcb_calculator/pcb_calculator_datafile_keywords.cpp
-pcb_calculator/pcb_calculator_datafile_lexer.h
-new/html
-new/sch_lib_table_keywords.cpp
-new/sch_lib_table_lexer.h
-new/sweet_keywords.cpp
-new/sweet_lexer.h
-bitmaps_png/png*
-bitmaps_png/tmp
-common/pcb_keywords.cpp
-include/pcb_lexer.h
+include/boost
+downloads-by-cmake
+common/netlist_keywords.*
+common/netlist_lexer.h
+common/pcb_plot_params_lexer.h
+common/fp_lib_table_keywords.*
+include/fp_lib_table_lexer.h
+include/netlist_lexer.h
+eeschema/cmp_library_lexer.h
+eeschema/cmp_library_keywords.*
+eeschema/template_fieldnames_keywords.*
+eeschema/template_fieldnames_lexer.h
+pcbnew/dialogs/dialog_freeroute_exchange_help_html.h
+pcbnew/pcb_plot_params_keywords.cpp
+pcbnew/pcb_plot_params_lexer.h
+Makefile
+CMakeCache.txt
+auto_renamed_to_cpp
+Testing
+version.h
+config.h
+install_manifest.txt
+Documentation/doxygen
+*.bak
+common/pcb_plot_params_keywords.cpp
+include/pcb_plot_params_lexer.h
+pcbnew/specctra_keywords.cpp
+pcbnew/specctra_lexer.h
+pcb_calculator/pcb_calculator_datafile_keywords.cpp
+pcb_calculator/pcb_calculator_datafile_lexer.h
+new/html
+new/sch_lib_table_keywords.cpp
+new/sch_lib_table_lexer.h
+new/sweet_keywords.cpp
+new/sweet_lexer.h
+bitmaps_png/png*
+bitmaps_png/tmp
+common/pcb_keywords.cpp
+include/pcb_lexer.h

3d-viewer/3d_aux.cpp

@@ -60,15 +60,15 @@ void S3D_MASTER::Set_Object_Coords( std::vector< S3D_VERTEX >& aVertices )
         aVertices[ii].y *= m_MatScale.y;
         aVertices[ii].z *= m_MatScale.z;
 
-        /* adjust rotation */
+        // adjust rotation 
         if( m_MatRotation.x )
-            RotatePoint( &aVertices[ii].y, &aVertices[ii].z, (int) (m_MatRotation.x * 10) );
+            RotatePoint( &aVertices[ii].y, &aVertices[ii].z, m_MatRotation.x * 10 );
 
         if( m_MatRotation.y )
-            RotatePoint( &aVertices[ii].z, &aVertices[ii].x, (int) (m_MatRotation.y * 10) );
+            RotatePoint( &aVertices[ii].z, &aVertices[ii].x, m_MatRotation.y * 10 );
 
         if( m_MatRotation.z )
-            RotatePoint( &aVertices[ii].x, &aVertices[ii].y, (int) (m_MatRotation.z * 10) );
+            RotatePoint( &aVertices[ii].x, &aVertices[ii].y, m_MatRotation.z * 10 );
 
         /* adjust offset position (offset is given in UNIT 3D (0.1 inch) */
 #define SCALE_3D_CONV ((IU_PER_MILS * 1000) / UNITS3D_TO_UNITSPCB)

3d-viewer/3d_canvas.h

@@ -30,15 +30,8 @@
 #ifndef _3D_CANVAS_H_
 #define _3D_CANVAS_H_
 
-#include <wxBasePcbFrame.h>         // for m_auimanager member.
-#include <layers_id_colors_and_visibility.h>    // Layers id definitions
-#include <PolyLine.h>               // for CPolyPt
-
-#if !wxUSE_GLCANVAS
-#error Please set wxUSE_GLCANVAS to 1 in setup.h.
-#endif
-
 #include <wx/glcanvas.h>
+#include <wxBasePcbFrame.h>         // for m_auimanager member.
 
 #ifdef __WXMAC__
 #  ifdef __DARWIN__
@@ -53,10 +46,6 @@
 #include <3d_struct.h>
 
 class BOARD_DESIGN_SETTINGS;
-class TRACK;
-class TEXTE_PCB;
-class DRAWSEGMENT;
-class ZONE_CONTAINER;
 class EDA_3D_FRAME;
 class S3D_VERTEX;
 class SEGVIA;
@@ -100,7 +89,8 @@ public:
 
     /**
      * Function CreateDrawGL_List
-     * creates the OpenGL draw list items.
+     * Prepares the parameters of the OpenGL draw list
+     * creates the OpenGL draw list items (board, grid ...
      */
     GLuint CreateDrawGL_List();
     void   InitGL();
@@ -111,47 +101,16 @@ public:
         m_draw3dOffset.y = aPosY;
     }
 
-    void   DrawGrid( double aGriSizeMM );
-
-    /**
-     * Function Draw3D_Track
-     * @param aTrack = the aTrack to draw
-    */
-    void   Draw3D_Track( TRACK* aTrack );
-
     /**
-     * Function Draw3D_Via
-     * draws 3D via as a cylinder and filled circles.
+     * Function BuildBoard3DView
+     * Called by CreateDrawGL_List()
+     * Fills the OpenGL draw list with board items draw list.
      */
-    void   Draw3D_Via( SEGVIA* via );
+    void   BuildBoard3DView();
 
-    /**
-     * Function Draw3D_DrawSegment
-     * draws a 3D segment (line, arc or circle).
-     */
-    void   Draw3D_DrawSegment( DRAWSEGMENT* segment );
-
-    /**
-     * Function Draw3D_Zone
-     * draw all solid areas in aZone
-     * @param aZone = the zone to draw
-    */
-    void Draw3D_Zone( ZONE_CONTAINER* aZone );
-
-    /**
-     * Function Draw3D_DrawText
-     * draws 3D segments to create text objects.
-     * When DrawGraphicText is called to draw a text to an OpenGL DC
-     * it calls Draw3dTextSegm to each segment to draw.
-     * 2 parameters used by Draw3D_FilledSegment are not handled by DrawGraphicText
-     * but are used in Draw3D_FilledSegment().
-     * they are 2 local variables. This is an ugly, but trivial code.
-     * Using DrawGraphicText to draw all texts ensure texts have the same shape
-     * in all contexts
-     */
-    void   Draw3D_DrawText( TEXTE_PCB* text );
-
-    //int Get3DLayerEnable(int act_layer);
+    void   DrawGrid( double aGriSizeMM );
+    void   Draw3DViaHole( SEGVIA * aVia );
+    void   Draw3DPadHole( D_PAD * aPad );
 
     DECLARE_EVENT_TABLE()
 };

3d-viewer/3d_draw_basic_functions.cpp

@@ -70,7 +70,7 @@ static inline void SetNormalZneg()
  * from Z position = aZpos to aZpos + aHeight
  * Used to create the vertical sides of 3D horizontal shapes with thickness.
  */
-static void Draw3D_VerticalPolygonalCylinder( const std::vector<CPolyPt>& aPolysList,
+static void Draw3D_VerticalPolygonalCylinder( const CPOLYGONS_LIST& aPolysList,
                                               int aHeight, int aZpos,
                                               bool aInside, double aBiuTo3DUnits )
 {
@@ -96,23 +96,23 @@ static void Draw3D_VerticalPolygonalCylinder( const std::vector<CPolyPt>& aPolys
 
     // Draw the vertical polygonal side
     int startContour = 0;
-    for( unsigned ii = 0; ii < aPolysList.size(); ii++ )
+    for( unsigned ii = 0; ii < aPolysList.GetCornersCount(); ii++ )
     {
         unsigned jj = ii + 1;
 
-        if( aPolysList[ii].end_contour || jj >= aPolysList.size() )
+        if( aPolysList.IsEndContour( ii ) || jj >= aPolysList.GetCornersCount() )
         {
             jj = startContour;
             startContour = ii + 1;
         }
 
         // Build the 4 vertices of each GL_QUAD
-        coords[0].x = aPolysList[ii].x;
-        coords[0].y = -aPolysList[ii].y;
+        coords[0].x = aPolysList.GetX( ii );
+        coords[0].y = -aPolysList.GetY( ii );
         coords[1].x = coords[0].x;
         coords[1].y = coords[0].y;              // only z change
-        coords[2].x = aPolysList[jj].x;
-        coords[2].y = -aPolysList[jj].y;
+        coords[2].x = aPolysList.GetX( jj );
+        coords[2].y = -aPolysList.GetY( jj );
         coords[3].x = coords[2].x;
         coords[3].y = coords[2].y;              // only z change
 
@@ -142,7 +142,7 @@ void SetGLColor( EDA_COLOR_T color )
  *  The top side is located at aZpos + aThickness / 2
  *  The bottom side is located at aZpos - aThickness / 2
  */
-void Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysList,
+void Draw3D_SolidHorizontalPolyPolygons( const CPOLYGONS_LIST& aPolysList,
                                          int aZpos, int aThickness, double aBiuTo3DUnits )
 {
     GLUtesselator* tess = gluNewTess();
@@ -164,13 +164,13 @@ void Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysList,
     // gluTessProperty(tess, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_ODD);
 
     // Draw solid areas contained in this list
-    std::vector<CPolyPt> polylist = aPolysList;    // temporary copy for gluTessVertex
+    CPOLYGONS_LIST polylist = aPolysList;    // temporary copy for gluTessVertex
 
     for( int side = 0; side < 2; side++ )
     {
         int startContour = 1;
 
-        for( unsigned ii = 0; ii < polylist.size(); ii++ )
+        for( unsigned ii = 0; ii < polylist.GetCornersCount(); ii++ )
         {
             if( startContour == 1 )
             {
@@ -179,15 +179,15 @@ void Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysList,
                 startContour = 0;
             }
 
-            v_data[0]   = polylist[ii].x * aBiuTo3DUnits;
-            v_data[1]   = -polylist[ii].y * aBiuTo3DUnits;
+            v_data[0]   = polylist.GetX( ii ) * aBiuTo3DUnits;
+            v_data[1]   = -polylist.GetY( ii ) * aBiuTo3DUnits;
             // gluTessVertex store pointers on data, not data, so do not store
             // different corners values in a temporary variable
             // but send pointer on each CPolyPt value in polylist
             // before calling gluDeleteTess
             gluTessVertex( tess, v_data, &polylist[ii] );
 
-            if( polylist[ii].end_contour == 1 )
+            if( polylist.IsEndContour( ii ) )
             {
                 gluTessEndContour( tess );
                 gluTessEndPolygon( tess );
@@ -220,11 +220,11 @@ void Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysList,
  * The first polygon is the main polygon, others are holes
  * See Draw3D_SolidHorizontalPolyPolygons for more info
  */
-void Draw3D_SolidHorizontalPolygonWithHoles( const std::vector<CPolyPt>& aPolysList,
+void Draw3D_SolidHorizontalPolygonWithHoles( const CPOLYGONS_LIST& aPolysList,
                                              int aZpos, int aThickness,
                                              double aBiuTo3DUnits )
 {
-    std::vector<CPolyPt> polygon;
+    CPOLYGONS_LIST polygon;
 
     ConvertPolysListWithHolesToOnePolygon( aPolysList, polygon );
     Draw3D_SolidHorizontalPolyPolygons( polygon, aZpos, aThickness, aBiuTo3DUnits );
@@ -241,7 +241,7 @@ void Draw3D_ZaxisCylinder( wxPoint aCenterPos, int aRadius,
                            int aZpos, double aBiuTo3DUnits )
 {
     const int slice = SEGM_PER_CIRCLE;
-    std::vector <CPolyPt> outer_cornerBuffer;
+    CPOLYGONS_LIST outer_cornerBuffer;
 
     TransformCircleToPolygon( outer_cornerBuffer, aCenterPos,
                               aRadius + (aThickness / 2), slice );
@@ -249,7 +249,7 @@ void Draw3D_ZaxisCylinder( wxPoint aCenterPos, int aRadius,
     std::vector<S3D_VERTEX> coords;
     coords.resize( 4 );
 
-    std::vector <CPolyPt> inner_cornerBuffer;
+    CPOLYGONS_LIST inner_cornerBuffer;
     if( aThickness )    // build the the vertical inner polygon (hole)
         TransformCircleToPolygon( inner_cornerBuffer, aCenterPos,
                                   aRadius - (aThickness / 2), slice );
@@ -269,9 +269,8 @@ void Draw3D_ZaxisCylinder( wxPoint aCenterPos, int aRadius,
     {
         // draw top (front) and bottom (back) horizontal sides (rings)
         SetNormalZpos();
-        outer_cornerBuffer.insert( outer_cornerBuffer.end(),
-                             inner_cornerBuffer.begin(), inner_cornerBuffer.end() );
-        std::vector<CPolyPt> polygon;
+        outer_cornerBuffer.Append( inner_cornerBuffer );
+        CPOLYGONS_LIST polygon;
 
         ConvertPolysListWithHolesToOnePolygon( outer_cornerBuffer, polygon );
         // draw top (front) horizontal ring
@@ -303,7 +302,7 @@ void Draw3D_ZaxisOblongCylinder( wxPoint aAxis1Pos, wxPoint aAxis2Pos,
     const int slice = SEGM_PER_CIRCLE;
 
     // Build the points to approximate oblong cylinder by segments
-    std::vector <CPolyPt> outer_cornerBuffer;
+    CPOLYGONS_LIST outer_cornerBuffer;
 
     int segm_width = (aRadius * 2) + aThickness;
     TransformRoundedEndsSegmentToPolygon( outer_cornerBuffer, aAxis1Pos,
@@ -316,7 +315,7 @@ void Draw3D_ZaxisOblongCylinder( wxPoint aAxis1Pos, wxPoint aAxis2Pos,
 
     if( aThickness )
     {
-        std::vector <CPolyPt> inner_cornerBuffer;
+        CPOLYGONS_LIST inner_cornerBuffer;
         segm_width = aRadius * 2;
         TransformRoundedEndsSegmentToPolygon( inner_cornerBuffer, aAxis1Pos,
                                               aAxis2Pos, slice, segm_width );
@@ -328,11 +327,9 @@ void Draw3D_ZaxisOblongCylinder( wxPoint aAxis1Pos, wxPoint aAxis2Pos,
 
         // Build the horizontal full polygon shape
         // (outer polygon shape - inner polygon shape)
-        outer_cornerBuffer.insert( outer_cornerBuffer.end(),
-                                   inner_cornerBuffer.begin(),
-                                   inner_cornerBuffer.end() );
+        outer_cornerBuffer.Append( inner_cornerBuffer );
 
-        std::vector<CPolyPt> polygon;
+        CPOLYGONS_LIST polygon;
         ConvertPolysListWithHolesToOnePolygon( outer_cornerBuffer, polygon );
 
         // draw top (front) horizontal side (ring)
@@ -360,7 +357,7 @@ void Draw3D_ZaxisOblongCylinder( wxPoint aAxis1Pos, wxPoint aAxis2Pos,
 void Draw3D_SolidSegment( const wxPoint& aStart, const wxPoint& aEnd,
                           int aWidth, int aThickness, int aZpos, double aBiuTo3DUnits )
 {
-    std::vector <CPolyPt>   cornerBuffer;
+    CPOLYGONS_LIST   cornerBuffer;
     const int               slice = SEGM_PER_CIRCLE;
 
     TransformRoundedEndsSegmentToPolygon( cornerBuffer, aStart, aEnd, slice, aWidth );
@@ -370,17 +367,16 @@ void Draw3D_SolidSegment( const wxPoint& aStart, const wxPoint& aEnd,
 
 
 void Draw3D_ArcSegment( const wxPoint&  aCenterPos, const wxPoint& aStartPoint,
-                        int aArcAngle, int aWidth, int aThickness,
+                        double aArcAngle, int aWidth, int aThickness,
                         int aZpos, double aBiuTo3DUnits )
 {
     const int   slice = SEGM_PER_CIRCLE;
 
-    std::vector <CPolyPt> cornerBuffer;
+    CPOLYGONS_LIST cornerBuffer;
     TransformArcToPolygon( cornerBuffer, aCenterPos, aStartPoint, aArcAngle,
-                            slice, aWidth );
+                           slice, aWidth );
 
     Draw3D_SolidHorizontalPolyPolygons( cornerBuffer, aZpos, aThickness, aBiuTo3DUnits );
-
 }
 
 

3d-viewer/3d_draw_basic_functions.h

@@ -41,7 +41,7 @@
  *  The top side is located at aZpos + aThickness / 2
  *  The bottom side is located at aZpos - aThickness / 2
  */
-void    Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysList,
+void    Draw3D_SolidHorizontalPolyPolygons( const CPOLYGONS_LIST& aPolysList,
                                             int aZpos, int aThickness, double aBiuTo3DUnits );
 
 /** draw the solid polygon found in aPolysList
@@ -55,7 +55,7 @@ void    Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysLi
  *  The top side is located at aZpos + aThickness / 2
  *  The bottom side is located at aZpos - aThickness / 2
  */
-void    Draw3D_SolidHorizontalPolygonWithHoles( const std::vector<CPolyPt>& aPolysList,
+void    Draw3D_SolidHorizontalPolygonWithHoles( const CPOLYGONS_LIST& aPolysList,
                                                 int aZpos, int aThickness, double aBiuTo3DUnits );
 
 /** draw a thick segment using 3D primitives, in a XY plane
@@ -85,7 +85,7 @@ void    Draw3D_SolidSegment( const wxPoint& aStart, const wxPoint& aEnd,
  * @param aBiuTo3DUnits = board internal units to 3D units scaling value
  */
 void Draw3D_ArcSegment( const wxPoint&  aCenterPos, const wxPoint& aStartPoint,
-                        int aArcAngle, int aWidth, int aThickness,
+                        double aArcAngle, int aWidth, int aThickness,
                         int aZpos, double aBiuTo3DUnits );
 
 

3d-viewer/3d_frame.cpp

@@ -51,10 +51,12 @@ static const wxString   keyShowAxis( wxT( "ShowAxis" ) );
 static const wxString   keyShowZones( wxT( "ShowZones" ) );
 static const wxString   keyShowFootprints( wxT( "ShowFootprints" ) );
 static const wxString   keyShowCopperThickness( wxT( "ShowCopperThickness" ) );
-static const wxString   keyShowCommetsLayer( wxT( "ShowCommetsLayer" ) );
-static const wxString   keyShowDrawingsLayer( wxT( "ShowDrawingsLayer" ) );
-static const wxString   keyShowEco1Layer( wxT( "ShowEco1Layer" ) );
-static const wxString   keyShowEco2Layer( wxT( "ShowEco2Layer" ) );
+static const wxString   keyShowAdhesiveLayers( wxT( "ShowAdhesiveLayers" ) );
+static const wxString   keyShowSilkScreenLayers( wxT( "ShowSilkScreenLayers" ) );
+static const wxString   keyShowSolderMaskLayers( wxT( "ShowSolderMasLayers" ) );
+static const wxString   keyShowSolderPasteLayers( wxT( "ShowSolderPasteLayers" ) );
+static const wxString   keyShowCommentsLayer( wxT( "ShowCommentsLayers" ) );
+static const wxString   keyShowEcoLayers( wxT( "ShowEcoLayers" ) );
 
 BEGIN_EVENT_TABLE( EDA_3D_FRAME, wxFrame )
 EVT_ACTIVATE( EDA_3D_FRAME::OnActivate )
@@ -62,6 +64,7 @@ EVT_ACTIVATE( EDA_3D_FRAME::OnActivate )
 EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, EDA_3D_FRAME::Process_Zoom )
 EVT_TOOL_RANGE( ID_START_COMMAND_3D, ID_END_COMMAND_3D,
                 EDA_3D_FRAME::Process_Special_Functions )
+EVT_TOOL( ID_TOOL_SET_VISIBLE_ITEMS, EDA_3D_FRAME::Process_Special_Functions )
 EVT_MENU( wxID_EXIT, EDA_3D_FRAME::Exit3DFrame )
 EVT_MENU( ID_MENU_SCREENCOPY_PNG, EDA_3D_FRAME::Process_Special_Functions )
 EVT_MENU( ID_MENU_SCREENCOPY_JPEG, EDA_3D_FRAME::Process_Special_Functions )
@@ -97,7 +100,7 @@ END_EVENT_TABLE() EDA_3D_FRAME::EDA_3D_FRAME( PCB_BASE_FRAME*   parent,
     CreateStatusBar( 5 );
     SetStatusWidths( 5, dims );
 
-    ReCreateMenuBar();
+    CreateMenuBar();
     ReCreateHToolbar();
 
     // ReCreateAuxiliaryToolbar();
@@ -170,12 +173,13 @@ void EDA_3D_FRAME::GetSettings()
                       &prms.m_DrawFlags[prms.FL_USE_COPPER_THICKNESS],
                       false );
         config->Read( keyShowZones, &prms.m_DrawFlags[prms.FL_ZONE], true );
-        config->Read( keyShowCommetsLayer, &prms.m_DrawFlags[prms.FL_COMMENTS], true );
-        config->Read( keyShowDrawingsLayer, &prms.m_DrawFlags[prms.FL_DRAWINGS], true );
-        config->Read( keyShowEco1Layer, &prms.m_DrawFlags[prms.FL_ECO1], true );
-        config->Read( keyShowEco2Layer, &prms.m_DrawFlags[prms.FL_ECO2], true );
+        config->Read( keyShowAdhesiveLayers, &prms.m_DrawFlags[prms.FL_ADHESIVE], true );
+        config->Read( keyShowSilkScreenLayers, &prms.m_DrawFlags[prms.FL_SILKSCREEN], true );
+        config->Read( keyShowSolderMaskLayers, &prms.m_DrawFlags[prms.FL_SOLDERMASK], true );
+        config->Read( keyShowSolderPasteLayers, &prms.m_DrawFlags[prms.FL_SOLDERPASTE], true );
+        config->Read( keyShowCommentsLayer, &prms.m_DrawFlags[prms.FL_COMMENTS], true );
+        config->Read( keyShowEcoLayers, &prms.m_DrawFlags[prms.FL_ECO], true );
     }
-
 }
 
 
@@ -195,10 +199,12 @@ void EDA_3D_FRAME::SaveSettings()
     config->Write( keyShowFootprints, prms.m_DrawFlags[prms.FL_MODULE] );
     config->Write( keyShowCopperThickness, prms.m_DrawFlags[prms.FL_USE_COPPER_THICKNESS] );
     config->Write( keyShowZones, prms.m_DrawFlags[prms.FL_ZONE] );
-    config->Write( keyShowCommetsLayer, prms.m_DrawFlags[prms.FL_COMMENTS] );
-    config->Write( keyShowDrawingsLayer, prms.m_DrawFlags[prms.FL_DRAWINGS] );
-    config->Write( keyShowEco1Layer, prms.m_DrawFlags[prms.FL_ECO1] );
-    config->Write( keyShowEco2Layer, prms.m_DrawFlags[prms.FL_ECO2] );
+    config->Write( keyShowAdhesiveLayers, prms.m_DrawFlags[prms.FL_ADHESIVE] );
+    config->Write( keyShowSilkScreenLayers, prms.m_DrawFlags[prms.FL_SILKSCREEN] );
+    config->Write( keyShowSolderMaskLayers, prms.m_DrawFlags[prms.FL_SOLDERMASK] );
+    config->Write( keyShowSolderPasteLayers, prms.m_DrawFlags[prms.FL_SOLDERPASTE] );
+    config->Write( keyShowCommentsLayer, prms.m_DrawFlags[prms.FL_COMMENTS] );
+    config->Write( keyShowEcoLayers, prms.m_DrawFlags[prms.FL_ECO] );
 
     if( IsIconized() )
         return;
@@ -286,6 +292,10 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event )
 
     switch( id )
     {
+    case ID_TOOL_SET_VISIBLE_ITEMS:
+        Install_3D_ViewOptionDialog( event );
+        break;
+
     case ID_RELOAD3D_BOARD:
         NewDisplay();
         return;
@@ -365,23 +375,33 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event )
         NewDisplay();
         return;
 
-    case ID_MENU3D_COMMENTS_ONOFF:
-        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] = isChecked;
+    case ID_MENU3D_ADHESIVE_ONOFF:
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE] = isChecked;
         NewDisplay();
         return;
 
-    case ID_MENU3D_DRAWINGS_ONOFF:
-        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_DRAWINGS] = isChecked;
+    case ID_MENU3D_SILKSCREEN_ONOFF:
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN] = isChecked;
         NewDisplay();
         return;
 
-    case ID_MENU3D_ECO1_ONOFF:
-        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO1] = isChecked;
+    case ID_MENU3D_SOLDER_MASK_ONOFF:
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK] = isChecked;
+        NewDisplay();
+        return;
+
+    case ID_MENU3D_SOLDER_PASTE_ONOFF:
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE] = isChecked;
+        NewDisplay();
+        return;
+
+    case ID_MENU3D_COMMENTS_ONOFF:
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] = isChecked;
         NewDisplay();
         return;
 
-    case ID_MENU3D_ECO2_ONOFF:
-        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO2] = isChecked;
+    case ID_MENU3D_ECO_ONOFF:
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO] = isChecked;
         NewDisplay();
         return;
 

3d-viewer/3d_toolbar.cpp

@@ -63,6 +63,12 @@ void EDA_3D_FRAME::ReCreateHToolbar()
 #endif
 
     m_HToolBar->AddSeparator();
+
+    m_HToolBar->AddTool( ID_TOOL_SET_VISIBLE_ITEMS, wxEmptyString,
+                         KiBitmap( read_setup_xpm ),
+                         _( "Set display options, and some layers visibility" ) );
+    m_HToolBar->AddSeparator();
+
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ),
                          _( "Zoom in" ) );
 
@@ -130,15 +136,8 @@ void EDA_3D_FRAME::ReCreateVToolbar()
 }
 
 
-void EDA_3D_FRAME::ReCreateMenuBar()
+void EDA_3D_FRAME::CreateMenuBar()
 {
-    bool full_options = true;
-
-    // If called from the display frame of CvPcb, only some options are relevant
-    if( Parent()->GetName() == wxT( "CmpFrame" ) ) {
-        full_options = false;
-    }
-
     wxMenuBar* menuBar   = new wxMenuBar;
     wxMenu*    fileMenu  = new wxMenu;
     wxMenu*    prefsMenu = new wxMenu;
@@ -153,6 +152,7 @@ void EDA_3D_FRAME::ReCreateMenuBar()
     fileMenu->AppendSeparator();
     fileMenu->Append( ID_TOOL_SCREENCOPY_TOCLIBBOARD, _( "Copy 3D Image to Clipboard" ) );
 #endif
+
     fileMenu->AppendSeparator();
     fileMenu->Append( wxID_EXIT, _( "&Exit" ) );
 
@@ -166,54 +166,86 @@ void EDA_3D_FRAME::ReCreateMenuBar()
             _( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK );
     item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_AXIS]);
 
+    // Creates grid menu
+    wxMenu * gridlistMenu = new wxMenu;
+    item = AddMenuItem( prefsMenu, gridlistMenu, ID_MENU3D_GRID,
+           _( "3D Grid" ), KiBitmap( grid_xpm ) );
+    gridlistMenu->Append( ID_MENU3D_GRID_NOGRID, _( "No 3D Grid" ), wxEmptyString, true );
+    gridlistMenu->Check( ID_MENU3D_GRID_NOGRID, true );
 
-    if( full_options )
-    {
-        item = AddMenuItem( prefsMenu, ID_MENU3D_USE_COPPER_THICKNESS,
-               _( "Show Copper Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS]);
-
-        item = AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF,
-               _( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE]);
-
-        item = AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF,
-               _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE]);
-
-        // Creates grid menu
-        wxMenu * gridlistMenu = new wxMenu;
-        item = AddMenuItem( prefsMenu, gridlistMenu, ID_MENU3D_GRID,
-               _( "3D Grid" ), KiBitmap( grid_xpm ) );
-        gridlistMenu->Append( ID_MENU3D_GRID_NOGRID, _( "No 3D Grid" ), wxEmptyString, true );
-        gridlistMenu->Check( ID_MENU3D_GRID_NOGRID, true );
-
-        gridlistMenu->Append( ID_MENU3D_GRID_10_MM, _( "3D Grid 10 mm" ), wxEmptyString, true );
-        gridlistMenu->Append( ID_MENU3D_GRID_5_MM, _( "3D Grid 5 mm" ), wxEmptyString, true );
-        gridlistMenu->Append( ID_MENU3D_GRID_2P5_MM, _( "3D Grid 2.5 mm" ), wxEmptyString, true );
-        gridlistMenu->Append( ID_MENU3D_GRID_1_MM, _( "3D Grid 1 mm" ), wxEmptyString, true );
-
-        item = AddMenuItem( prefsMenu, ID_MENU3D_COMMENTS_ONOFF,
-               _( "Show &Comments Layer" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS]);
-
-        item = AddMenuItem( prefsMenu, ID_MENU3D_DRAWINGS_ONOFF,
-               _( "Show &Drawings Layer" ), KiBitmap( add_polygon_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_DRAWINGS]);
-
-        item = AddMenuItem( prefsMenu, ID_MENU3D_ECO1_ONOFF,
-               _( "Show Eco&1 Layer" ), KiBitmap( tools_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO1]);
-
-        item = AddMenuItem( prefsMenu, ID_MENU3D_ECO2_ONOFF,
-               _( "Show Eco&2 Layer" ), KiBitmap( tools_xpm ), wxITEM_CHECK );
-        item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO2]);
+    gridlistMenu->Append( ID_MENU3D_GRID_10_MM, _( "3D Grid 10 mm" ), wxEmptyString, true );
+    gridlistMenu->Append( ID_MENU3D_GRID_5_MM, _( "3D Grid 5 mm" ), wxEmptyString, true );
+    gridlistMenu->Append( ID_MENU3D_GRID_2P5_MM, _( "3D Grid 2.5 mm" ), wxEmptyString, true );
+    gridlistMenu->Append( ID_MENU3D_GRID_1_MM, _( "3D Grid 1 mm" ), wxEmptyString, true );
 
-    }
+    item = AddMenuItem( prefsMenu, ID_MENU3D_USE_COPPER_THICKNESS,
+           _( "Show Copper Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF,
+           _( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK );
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF,
+           _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK );
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_ADHESIVE_ONOFF,
+           _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE]);
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_SILKSCREEN_ONOFF,
+           _( "Show &Silkscreen Layer" ), KiBitmap( add_text_xpm ), wxITEM_CHECK );
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_SOLDER_MASK_ONOFF,
+           _( "Show Solder &Mask Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK );
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_SOLDER_PASTE_ONOFF,
+           _( "Show Solder &Paste Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK );
+
+    item = AddMenuItem( prefsMenu, ID_MENU3D_COMMENTS_ONOFF,
+           _( "Show &Comments and Drawings Layer" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK );
 
+    item = AddMenuItem( prefsMenu, ID_MENU3D_ECO_ONOFF,
+           _( "Show &Eco Layers" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK );
+
+    SetMenuBarOptionsState();
     SetMenuBar( menuBar );
 }
 
+void EDA_3D_FRAME::SetMenuBarOptionsState()
+{
+    wxMenuBar* menuBar = GetMenuBar();
+
+    if( menuBar == NULL )
+        return;
+
+    wxMenuItem* item;
+    // Set the state of toggle menus according to the current display options
+    item = menuBar->FindItem( ID_MENU3D_USE_COPPER_THICKNESS );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS]);
+
+    item = menuBar->FindItem( ID_MENU3D_MODULE_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE]);
+
+    item = menuBar->FindItem( ID_MENU3D_ZONE_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE]);
+
+    item = menuBar->FindItem( ID_MENU3D_ADHESIVE_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE]);
+
+    item = menuBar->FindItem( ID_MENU3D_SILKSCREEN_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN]);
+
+    item = menuBar->FindItem( ID_MENU3D_SOLDER_MASK_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK]);
+
+    item = menuBar->FindItem( ID_MENU3D_SOLDER_PASTE_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE]);
+
+    item = menuBar->FindItem( ID_MENU3D_COMMENTS_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS]);
+
+    item = menuBar->FindItem( ID_MENU3D_ECO_ONOFF );
+    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO]);
+}
 
 void EDA_3D_FRAME::SetToolbars()
 {

3d-viewer/3d_viewer.h

@@ -31,8 +31,6 @@
 #define __3D_VIEWER_H__
 
 #include <wxBasePcbFrame.h>         // for m_auimanager member.
-#include <layers_id_colors_and_visibility.h>    // Layers id definitions
-#include <PolyLine.h>               // fot CPolyPt
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
@@ -117,9 +115,12 @@ private:
     void On3DGridSelection( wxCommandEvent& event );
     void Process_Zoom( wxCommandEvent& event );
     void OnActivate( wxActivateEvent& event );
+    void Install_3D_ViewOptionDialog( wxCommandEvent& event );
 
     // initialisation
-    void ReCreateMenuBar();
+    void CreateMenuBar();
+    void SetMenuBarOptionsState();  // Set the state of toggle menus according
+                                    // to the current display options
     void ReCreateHToolbar();
     void ReCreateVToolbar();
     void SetToolbars();

3d-viewer/3d_viewer_id.h

-/**
- * @file 3d_viewer_id.h
- */
-
-/**
- * Command IDs for the 3D viewer.
- *
- * Please add IDs that are unique to the 3D viewer here and not in the global
- * id.h file.  This will prevent the entire project from being rebuilt when
- * adding new commands to the 3D viewer.
- */
-
- #include <id.h>        // Generic Id.
-
-enum id_3dview_frm
-{
-    ID_START_COMMAND_3D = ID_END_LIST,
-    ID_ROTATE3D_X_NEG,
-    ID_ROTATE3D_X_POS,
-    ID_ROTATE3D_Y_NEG,
-    ID_ROTATE3D_Y_POS,
-    ID_ROTATE3D_Z_NEG,
-    ID_ROTATE3D_Z_POS,
-    ID_RELOAD3D_BOARD,
-    ID_TOOL_SCREENCOPY_TOCLIBBOARD,
-    ID_MOVE3D_LEFT,
-    ID_MOVE3D_RIGHT,
-    ID_MOVE3D_UP,
-    ID_MOVE3D_DOWN,
-    ID_ORTHO,
-    ID_MENU3D_BGCOLOR_SELECTION,
-    ID_MENU3D_USE_COPPER_THICKNESS,
-    ID_MENU3D_AXIS_ONOFF,
-    ID_MENU3D_MODULE_ONOFF,
-    ID_MENU3D_ZONE_ONOFF,
-    ID_MENU3D_DRAWINGS_ONOFF,
-    ID_MENU3D_COMMENTS_ONOFF,
-    ID_MENU3D_ECO1_ONOFF,
-    ID_MENU3D_ECO2_ONOFF,
-    ID_END_COMMAND_3D,
-
-    ID_MENU3D_GRID,
-    ID_MENU3D_GRID_NOGRID,
-    ID_MENU3D_GRID_10_MM,
-    ID_MENU3D_GRID_5_MM,
-    ID_MENU3D_GRID_2P5_MM,
-    ID_MENU3D_GRID_1_MM,
-    ID_MENU3D_GRID_END,
-
-    ID_MENU_SCREENCOPY_PNG,
-    ID_MENU_SCREENCOPY_JPEG,
-    ID_MENU_SCREENCOPY_TOCLIBBOARD,
-
-    ID_POPUP_3D_VIEW_START,
-    ID_POPUP_ZOOMIN,
-    ID_POPUP_ZOOMOUT,
-    ID_POPUP_VIEW_XPOS,
-    ID_POPUP_VIEW_XNEG,
-    ID_POPUP_VIEW_YPOS,
-    ID_POPUP_VIEW_YNEG,
-    ID_POPUP_VIEW_ZPOS,
-    ID_POPUP_VIEW_ZNEG,
-    ID_POPUP_MOVE3D_LEFT,
-    ID_POPUP_MOVE3D_RIGHT,
-    ID_POPUP_MOVE3D_UP,
-    ID_POPUP_MOVE3D_DOWN,
-    ID_POPUP_3D_VIEW_END
-};
+/**
+ * @file 3d_viewer_id.h
+ */
+
+/**
+ * Command IDs for the 3D viewer.
+ *
+ * Please add IDs that are unique to the 3D viewer here and not in the global
+ * id.h file.  This will prevent the entire project from being rebuilt when
+ * adding new commands to the 3D viewer.
+ */
+
+ #include <id.h>        // Generic Id.
+
+enum id_3dview_frm
+{
+    ID_START_COMMAND_3D = ID_END_LIST,
+    ID_ROTATE3D_X_NEG,
+    ID_ROTATE3D_X_POS,
+    ID_ROTATE3D_Y_NEG,
+    ID_ROTATE3D_Y_POS,
+    ID_ROTATE3D_Z_NEG,
+    ID_ROTATE3D_Z_POS,
+    ID_RELOAD3D_BOARD,
+    ID_TOOL_SCREENCOPY_TOCLIBBOARD,
+    ID_MOVE3D_LEFT,
+    ID_MOVE3D_RIGHT,
+    ID_MOVE3D_UP,
+    ID_MOVE3D_DOWN,
+    ID_ORTHO,
+    ID_MENU3D_BGCOLOR_SELECTION,
+    ID_MENU3D_USE_COPPER_THICKNESS,
+    ID_MENU3D_AXIS_ONOFF,
+    ID_MENU3D_MODULE_ONOFF,
+    ID_MENU3D_ZONE_ONOFF,
+    ID_MENU3D_ADHESIVE_ONOFF,
+    ID_MENU3D_SILKSCREEN_ONOFF,
+    ID_MENU3D_SOLDER_PASTE_ONOFF,
+    ID_MENU3D_SOLDER_MASK_ONOFF,
+    ID_MENU3D_COMMENTS_ONOFF,
+    ID_MENU3D_ECO_ONOFF,
+    ID_END_COMMAND_3D,
+
+    ID_TOOL_SET_VISIBLE_ITEMS,
+
+    ID_MENU3D_GRID,
+    ID_MENU3D_GRID_NOGRID,
+    ID_MENU3D_GRID_10_MM,
+    ID_MENU3D_GRID_5_MM,
+    ID_MENU3D_GRID_2P5_MM,
+    ID_MENU3D_GRID_1_MM,
+    ID_MENU3D_GRID_END,
+
+    ID_MENU_SCREENCOPY_PNG,
+    ID_MENU_SCREENCOPY_JPEG,
+    ID_MENU_SCREENCOPY_TOCLIBBOARD,
+
+    ID_POPUP_3D_VIEW_START,
+    ID_POPUP_ZOOMIN,
+    ID_POPUP_ZOOMOUT,
+    ID_POPUP_VIEW_XPOS,
+    ID_POPUP_VIEW_XNEG,
+    ID_POPUP_VIEW_YPOS,
+    ID_POPUP_VIEW_YNEG,
+    ID_POPUP_VIEW_ZPOS,
+    ID_POPUP_VIEW_ZNEG,
+    ID_POPUP_MOVE3D_LEFT,
+    ID_POPUP_MOVE3D_RIGHT,
+    ID_POPUP_MOVE3D_UP,
+    ID_POPUP_MOVE3D_DOWN,
+    ID_POPUP_3D_VIEW_END
+};

3d-viewer/CMakeLists.txt

@@ -9,6 +9,8 @@ include_directories(
     )
 
 set(3D-VIEWER_SRCS
+    dialogs/dialog_3D_view_option_base.cpp
+    dialogs/dialog_3D_view_option.cpp
     3d_aux.cpp
     3d_canvas.cpp
     3d_class.cpp

3d-viewer/dialogs/dialog_3D_view_option.cpp

+
+#include "dialog_3D_view_option_base.h"
+#include <3d_viewer.h>
+#include <info3d_visu.h>
+
+class DIALOG_3D_VIEW_OPTIONS : public DIALOG_3D_VIEW_OPTIONS_BASE
+{
+public:
+    DIALOG_3D_VIEW_OPTIONS( EDA_3D_FRAME* parent );
+
+private:
+    EDA_3D_FRAME* m_parent;
+
+    void initDialog();
+
+    // Event functions:
+    void OnShowAllClick( wxCommandEvent& event );
+    void OnShowNoneClick( wxCommandEvent& event );
+    void OnOKClick( wxCommandEvent& event );
+};
+
+void EDA_3D_FRAME::Install_3D_ViewOptionDialog( wxCommandEvent& event )
+{
+    DIALOG_3D_VIEW_OPTIONS dlg( this );
+    if( dlg.ShowModal() == wxID_OK )
+    {
+        SetMenuBarOptionsState();
+        NewDisplay();
+    }
+}
+
+
+DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_FRAME* parent )
+     :DIALOG_3D_VIEW_OPTIONS_BASE( parent )
+{
+    m_parent = parent;
+
+    initDialog();
+
+	Layout();
+    GetSizer()->SetSizeHints(this);
+	Centre();
+}
+
+void DIALOG_3D_VIEW_OPTIONS::initDialog()
+{
+    m_bitmapCuThickness->SetBitmap( KiBitmap( use_3D_copper_thickness_xpm ) );
+    m_bitmap3Dshapes->SetBitmap( KiBitmap( shape_3d_xpm ) );
+    m_bitmapAreas->SetBitmap( KiBitmap( add_zone_xpm ) );
+    m_bitmapSilkscreen->SetBitmap( KiBitmap( add_text_xpm ) );
+    m_bitmapSolderMask->SetBitmap( KiBitmap( pads_mask_layers_xpm ) );
+    m_bitmapSolderPaste->SetBitmap( KiBitmap( pads_mask_layers_xpm ) );
+    m_bitmapAdhesive->SetBitmap( KiBitmap( tools_xpm ) );
+    m_bitmapComments->SetBitmap( KiBitmap( edit_sheet_xpm ) );
+    m_bitmapECO->SetBitmap( KiBitmap( edit_sheet_xpm ) );
+
+    // Check/uncheck checkboxes
+    m_checkBoxCuThickness->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS] );
+    m_checkBox3Dshapes->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE] );
+    m_checkBoxAreas->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE] );
+    m_checkBoxSilkscreen->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN] );
+    m_checkBoxSolderMask->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK] );
+    m_checkBoxSolderpaste->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE] );
+    m_checkBoxAdhesive->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE] );
+    m_checkBoxComments->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] );
+    m_checkBoxECO->SetValue(
+        g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO] );
+}
+
+void DIALOG_3D_VIEW_OPTIONS::OnShowAllClick( wxCommandEvent& event )
+{
+    bool state = true;
+    m_checkBoxCuThickness->SetValue( state );
+    m_checkBox3Dshapes->SetValue( state );
+    m_checkBoxAreas->SetValue( state );
+    m_checkBoxSilkscreen->SetValue( state );
+    m_checkBoxSolderMask->SetValue( state );
+    m_checkBoxSolderpaste->SetValue( state );
+    m_checkBoxAdhesive->SetValue( state );
+    m_checkBoxComments->SetValue( state );
+    m_checkBoxECO->SetValue( state );
+}
+
+void DIALOG_3D_VIEW_OPTIONS::OnShowNoneClick( wxCommandEvent& event )
+{
+    bool state = false;
+    m_checkBoxCuThickness->SetValue( state );
+    m_checkBox3Dshapes->SetValue( state );
+    m_checkBoxAreas->SetValue( state );
+    m_checkBoxSilkscreen->SetValue( state );
+    m_checkBoxSolderMask->SetValue( state );
+    m_checkBoxSolderpaste->SetValue( state );
+    m_checkBoxAdhesive->SetValue( state );
+    m_checkBoxComments->SetValue( state );
+    m_checkBoxECO->SetValue( state );
+}
+
+void DIALOG_3D_VIEW_OPTIONS::OnOKClick( wxCommandEvent& event )
+{
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS] =
+        m_checkBoxCuThickness->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE] =
+        m_checkBox3Dshapes->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE] =
+        m_checkBoxAreas->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN] =
+        m_checkBoxSilkscreen->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK] =
+        m_checkBoxSolderMask->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE] =
+        m_checkBoxSolderpaste->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE] =
+        m_checkBoxAdhesive->GetValue();
+    g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] =
+        m_checkBoxComments->GetValue();
+     g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO] =
+        m_checkBoxECO->GetValue();
+
+    EndModal( wxID_OK );
+}

3d-viewer/dialogs/dialog_3D_view_option_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_3D_view_option_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizerMain;
+	bSizerMain = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizerLeft;
+	bSizerLeft = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxFlexGridSizer* fgSizeShowOpts;
+	fgSizeShowOpts = new wxFlexGridSizer( 9, 2, 0, 0 );
+	fgSizeShowOpts->SetFlexibleDirection( wxBOTH );
+	fgSizeShowOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_bitmapCuThickness = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapCuThickness, 0, wxALL, 5 );
+	
+	m_checkBoxCuThickness = new wxCheckBox( this, wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxCuThickness, 0, wxALL, 5 );
+	
+	m_bitmap3Dshapes = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmap3Dshapes, 0, wxALL, 5 );
+	
+	m_checkBox3Dshapes = new wxCheckBox( this, wxID_ANY, _("Show component 3D shapes"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBox3Dshapes, 0, wxALL, 5 );
+	
+	m_bitmapAreas = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapAreas, 0, wxALL, 5 );
+	
+	m_checkBoxAreas = new wxCheckBox( this, wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxAreas, 0, wxALL, 5 );
+	
+	m_bitmapSilkscreen = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapSilkscreen, 0, wxALL, 5 );
+	
+	m_checkBoxSilkscreen = new wxCheckBox( this, wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxSilkscreen, 0, wxALL, 5 );
+	
+	m_bitmapSolderMask = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapSolderMask, 0, wxALL, 5 );
+	
+	m_checkBoxSolderMask = new wxCheckBox( this, wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxSolderMask, 0, wxALL, 5 );
+	
+	m_bitmapSolderPaste = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapSolderPaste, 0, wxALL, 5 );
+	
+	m_checkBoxSolderpaste = new wxCheckBox( this, wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxSolderpaste, 0, wxALL, 5 );
+	
+	m_bitmapAdhesive = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapAdhesive, 0, wxALL, 5 );
+	
+	m_checkBoxAdhesive = new wxCheckBox( this, wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxAdhesive, 0, wxALL, 5 );
+	
+	m_bitmapComments = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapComments, 0, wxALL, 5 );
+	
+	m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings Layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxComments, 0, wxALL, 5 );
+	
+	m_bitmapECO = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_bitmapECO, 0, wxALL, 5 );
+	
+	m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECOs layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizeShowOpts->Add( m_checkBoxECO, 0, wxALL, 5 );
+	
+	
+	bSizerLeft->Add( fgSizeShowOpts, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerRight;
+	bSizerRight = new wxBoxSizer( wxVERTICAL );
+	
+	m_buttonShowAll = new wxButton( this, wxID_ANY, _("Show All"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerRight->Add( m_buttonShowAll, 0, wxALL, 5 );
+	
+	m_buttonShowNone = new wxButton( this, wxID_ANY, _("Show None"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerRight->Add( m_buttonShowNone, 0, wxALL, 5 );
+	
+	
+	bSizerLeft->Add( bSizerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerMain->Add( bSizerLeft, 1, wxEXPAND, 5 );
+	
+	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
+	
+	m_sdbSizer = new wxStdDialogButtonSizer();
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
+	m_sdbSizer->AddButton( m_sdbSizerOK );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizer->AddButton( m_sdbSizerCancel );
+	m_sdbSizer->Realize();
+	
+	bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizerMain );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	m_buttonShowAll->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowAllClick ), NULL, this );
+	m_buttonShowNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowNoneClick ), NULL, this );
+	m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCancelClick ), NULL, this );
+	m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnOKClick ), NULL, this );
+}
+
+DIALOG_3D_VIEW_OPTIONS_BASE::~DIALOG_3D_VIEW_OPTIONS_BASE()
+{
+	// Disconnect Events
+	m_buttonShowAll->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowAllClick ), NULL, this );
+	m_buttonShowNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowNoneClick ), NULL, this );
+	m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCancelClick ), NULL, this );
+	m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnOKClick ), NULL, this );
+	
+}

3d-viewer/dialogs/dialog_3D_view_option_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_3D_VIEW_OPTION_BASE_H__
+#define __DIALOG_3D_VIEW_OPTION_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+class DIALOG_SHIM;
+
+#include "dialog_shim.h"
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/statbmp.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/string.h>
+#include <wx/checkbox.h>
+#include <wx/sizer.h>
+#include <wx/button.h>
+#include <wx/statline.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_3D_VIEW_OPTIONS_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapCuThickness;
+		wxCheckBox* m_checkBoxCuThickness;
+		wxStaticBitmap* m_bitmap3Dshapes;
+		wxCheckBox* m_checkBox3Dshapes;
+		wxStaticBitmap* m_bitmapAreas;
+		wxCheckBox* m_checkBoxAreas;
+		wxStaticBitmap* m_bitmapSilkscreen;
+		wxCheckBox* m_checkBoxSilkscreen;
+		wxStaticBitmap* m_bitmapSolderMask;
+		wxCheckBox* m_checkBoxSolderMask;
+		wxStaticBitmap* m_bitmapSolderPaste;
+		wxCheckBox* m_checkBoxSolderpaste;
+		wxStaticBitmap* m_bitmapAdhesive;
+		wxCheckBox* m_checkBoxAdhesive;
+		wxStaticBitmap* m_bitmapComments;
+		wxCheckBox* m_checkBoxComments;
+		wxStaticBitmap* m_bitmapECO;
+		wxCheckBox* m_checkBoxECO;
+		wxButton* m_buttonShowAll;
+		wxButton* m_buttonShowNone;
+		wxStaticLine* m_staticline1;
+		wxStdDialogButtonSizer* m_sdbSizer;
+		wxButton* m_sdbSizerOK;
+		wxButton* m_sdbSizerCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnShowAllClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowNoneClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,344 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_3D_VIEW_OPTIONS_BASE();
+	
+};
+
+#endif //__DIALOG_3D_VIEW_OPTION_BASE_H__

3d-viewer/info3d_visu.cpp

@@ -39,9 +39,9 @@
 
 // Thickness of copper
 // TODO: define the actual copper thickness by user
-#define COPPER_THICKNESS (int)(0.035 * IU_PER_MM)   // for 35 u
-#define TECH_LAYER_THICKNESS (int)(0.04 * IU_PER_MM)
-#define EPOXY_THICKNESS (int)(1.6 * IU_PER_MM)   // for 1.6 mm
+#define COPPER_THICKNESS KiROUND( 0.035 * IU_PER_MM )   // for 35 µm
+#define TECH_LAYER_THICKNESS KiROUND( 0.04 * IU_PER_MM )
+#define EPOXY_THICKNESS KiROUND( 1.6 * IU_PER_MM )   // for 1.6 mm
 
 
 /* INFO3D_VISU in an helper class to store parameters like scaling factors,

3d-viewer/info3d_visu.h

@@ -68,7 +68,8 @@ class INFO3D_VISU
 public:
     enum DISPLAY3D_FLG {
         FL_AXIS=0, FL_MODULE, FL_ZONE,
-        FL_COMMENTS, FL_DRAWINGS, FL_ECO1, FL_ECO2,
+        FL_ADHESIVE, FL_SILKSCREEN, FL_SOLDERMASK, FL_SOLDERPASTE,
+        FL_COMMENTS, FL_ECO,
         FL_GRID,
         FL_USE_COPPER_THICKNESS,
         FL_LAST
@@ -123,7 +124,7 @@ public: INFO3D_VISU();
      */
     int GetLayerZcoordBIU( int aLayerId )
     {
-        return (int) (m_LayerZcoord[aLayerId] / m_BiuTo3Dunits );
+        return KiROUND( m_LayerZcoord[aLayerId] / m_BiuTo3Dunits );
     }
 
     /**
@@ -137,7 +138,7 @@ public: INFO3D_VISU();
     int GetCopperThicknessBIU() const
     {
         return m_DrawFlags[FL_USE_COPPER_THICKNESS] ?
-            (int) (m_CopperThickness / m_BiuTo3Dunits )
+            KiROUND( m_CopperThickness / m_BiuTo3Dunits )
             : 0;
     }
 
@@ -147,7 +148,7 @@ public: INFO3D_VISU();
      */
     int GetEpoxyThicknessBIU() const
     {
-        return (int) (m_EpoxyThickness / m_BiuTo3Dunits );
+        return KiROUND( m_EpoxyThickness / m_BiuTo3Dunits );
     }
 
     /**
@@ -160,7 +161,7 @@ public: INFO3D_VISU();
     int GetNonCopperLayerThicknessBIU() const
     {
         return  m_DrawFlags[FL_USE_COPPER_THICKNESS] ?
-            (int) (m_NonCopperLayerThickness / m_BiuTo3Dunits )
+            KiROUND( m_NonCopperLayerThickness / m_BiuTo3Dunits )
             : 0;
     }
 

CMakeLists.txt

 project(kicad)
 
-# The minimum CMake version requirement could be different under unix, OSX,  or Windows
-if(WIN32)
-    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()
-    cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)   # Linux, Unix, and everything else.
-endif()
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
+# because of http://public.kitware.com/Bug/view.php?id=10395
 
 # Path to local CMake modules.
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
@@ -251,6 +245,12 @@ mark_as_advanced(KICAD_BIN
 
 include(Functions)
 
+include( ExternalProject )
+
+# All CMake downloads go here, up in the source tree, not in the build dir where they
+# would have to be downloaded over and over again.
+set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads-by-cmake )
+
 #================================================
 # Find libraries that are needed to build KiCad.
 #================================================
@@ -279,14 +279,11 @@ find_package(Cairo 1.8.1 QUIET)
 check_find_package_result(CAIRO_FOUND "Cairo")
 endif(KICAD_GAL)
 
-######################
-# Find Boost library #
-######################
-# kicad now includes needed boost files.
-# the two next lines can be uncommented to use the native boost lib.
-# but this is not a good idea
-#find_package(Boost 1.36 QUIET)
-#check_find_package_result(Boost_FOUND "Boost")
+##########################
+# Download Boost library #
+##########################
+include( download_boost )
+
 
 ##########################
 # Find wxWidgets library #
@@ -381,9 +378,9 @@ set(INC_AFTER
 # 'CMakeLists.txt' files to process
 #================================================
 
-############
-# Binaries #
-############
+############################
+# Binaries (CMake targets) #
+############################
 
 add_subdirectory(bitmaps_png)
 add_subdirectory(common)
@@ -402,6 +399,18 @@ add_subdirectory(tools)
 #add_subdirectory(new)
 
 
+# Make all libs and executables depend on ExternalProject_Add( boost ),
+# except perhaps bitmap lib
+add_dependencies( pcbnew boost )
+add_dependencies( eeschema boost )
+add_dependencies( cvpcb boost )
+add_dependencies( common boost )
+add_dependencies( pcbcommon boost )
+add_dependencies( 3d-viewer boost )
+add_dependencies( pcad2kicadpcb boost )
+add_dependencies( polygon boost )
+
+
 #############
 # Resources #
 #############

CMakeModules/CheckCXXSymbolExists.cmake

-# - Check if a symbol exists as a function, variable, or macro in C++
-# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>)
-#
-# Check that the <symbol> is available after including given header
-# <files> and store the result in a <variable>.  Specify the list
-# of files in one argument as a semicolon-separated list.
-# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
-# to CHECK_SYMBOL_EXISTS(), which works only for C.
-#
-# If the header files define the symbol as a macro it is considered
-# available and assumed to work.  If the header files declare the
-# symbol as a function or variable then the symbol must also be
-# available for linking.  If the symbol is a type or enum value
-# it will not be recognized (consider using CheckTypeSize or
-# CheckCSourceCompiles).
-#
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#  CMAKE_REQUIRED_INCLUDES = list of include directories
-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2003-2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-include(CheckSymbolExists)
-
-macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
-  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
-endmacro()
+# - Check if a symbol exists as a function, variable, or macro in C++
+# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>)
+#
+# Check that the <symbol> is available after including given header
+# <files> and store the result in a <variable>.  Specify the list
+# of files in one argument as a semicolon-separated list.
+# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
+# to CHECK_SYMBOL_EXISTS(), which works only for C.
+#
+# If the header files define the symbol as a macro it is considered
+# available and assumed to work.  If the header files declare the
+# symbol as a function or variable then the symbol must also be
+# available for linking.  If the symbol is a type or enum value
+# it will not be recognized (consider using CheckTypeSize or
+# CheckCSourceCompiles).
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+#=============================================================================
+# Copyright 2003-2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+include(CheckSymbolExists)
+
+macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
+  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+endmacro()

CMakeModules/FindGdiPlus.cmake

-# - Try to find Microsoft GDI+ build files.
-# Once done this will define
-#
-#  GDI_PLUS_FOUND - system has GDI+
-#  GDI_PLUS_INCLUDE_DIR - the GDI+ include directory
-#  GDI_PLUS_LIBRARIES - Link these to use GDI+
-
-if(GDI_PLUS_INCLUDE_DIR AND GDI_PLUS_LIBRARIES)
-    set(GDI_PLUS_FIND_QUIETLY TRUE)
-endif(GDI_PLUS_INCLUDE_DIR AND GDI_PLUS_LIBRARIES)
-
-find_path(GDI_PLUS_INCLUDE_DIR GdiPlus.h )
-
-find_library(GDI_PLUS_LIBRARIES gdiplus )
-
-# handle the QUIETLY and REQUIRED arguments and set GDI_PLUS_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(GDI_PLUS DEFAULT_MSG GDI_PLUS_LIBRARIES GDI_PLUS_INCLUDE_DIR)
-
-mark_as_advanced(GDI_PLUS_INCLUDE_DIR GDI_PLUS_LIBRARIES)
+# - Try to find Microsoft GDI+ build files.
+# Once done this will define
+#
+#  GDI_PLUS_FOUND - system has GDI+
+#  GDI_PLUS_INCLUDE_DIR - the GDI+ include directory
+#  GDI_PLUS_LIBRARIES - Link these to use GDI+
+
+if(GDI_PLUS_INCLUDE_DIR AND GDI_PLUS_LIBRARIES)
+    set(GDI_PLUS_FIND_QUIETLY TRUE)
+endif(GDI_PLUS_INCLUDE_DIR AND GDI_PLUS_LIBRARIES)
+
+find_path(GDI_PLUS_INCLUDE_DIR GdiPlus.h )
+
+find_library(GDI_PLUS_LIBRARIES gdiplus )
+
+# handle the QUIETLY and REQUIRED arguments and set GDI_PLUS_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(GDI_PLUS DEFAULT_MSG GDI_PLUS_LIBRARIES GDI_PLUS_INCLUDE_DIR)
+
+mark_as_advanced(GDI_PLUS_INCLUDE_DIR GDI_PLUS_LIBRARIES)

bitmaps_png/CMakeLists.txt

@@ -359,6 +359,7 @@ set( BMAPS_MID
     module_full_list
     module_options
     module_pin_filtered_list
+    module_library_list
     module_ratsnest
     module
     modview_icon
@@ -752,4 +753,3 @@ endforeach()
 
 #add_library( bitmaps SHARED ${CPP_LIST} )
 add_library( bitmaps STATIC ${CPP_LIST} )
-