Gerbview: fixed some problems in layers visibility selection. clean up.

gerbview/gerbview.cpp

@@ -15,6 +15,7 @@
 #include "bitmaps.h"
 #include "protos.h"
 #include "zones.h"
+#include "class_board_design_settings.h"
 
 #include <wx/file.h>
 #include <wx/snglinst.h>
@@ -45,6 +46,8 @@ bool WinEDA_App::OnInit()
     ScreenPcb = new PCB_SCREEN();
     ScreenPcb->m_CurrentSheetDesc = &g_Sheet_GERBER;
 
+    g_DesignSettings.SetEnabledLayers( FULL_LAYERS );     // All 32 layers enabled at first.
+
     ActiveScreen = ScreenPcb;
 
     // read current setup and reopen last directory if no filename to open in

gerbview/protos.h

@@ -12,9 +12,6 @@ bool Read_Config();
 bool Read_Hotkey_Config( WinEDA_DrawFrame* frame, bool verbose );
 
 
-/* pcbplot.cpp */
-void Plume( int state );
-
 /****************/
 /* lay2plot.cpp */
 
@@ -26,100 +23,11 @@ void Print_PcbItems( BOARD* Pcb, wxDC* DC, int drawmode, int printmasklayer );
 void DisplayColorSetupFrame( WinEDA_DrawFrame* parent, const wxPoint& framepos );
 
 
-/* PLOT_RTN.CC */
-void ComputePlotFileName( char* FullFileName, char* Ext );
-void calcule_coord_plot( int* dx, int* dy );
-void calcule_dim_plot( int* dx, int* dy );
-void Trace_Un_TextePcb( TEXTE_PCB* pt_texte, int format_plot, int masque_layer );
-
-/* Trace 1 Texte type PCB , c.a.d autre que les textes sur modules,
- *  prepare les parametres de trace de texte */
-void trace_1_arc( int format_plot, int cx, int cy, int start, int end,
-                  int rayon, int epaisseur );
-void trace_1_cercle( int format_plot, int epaisseur, int cx, int cy, int rayon );
-
-void Trace_Un_DrawSegment( DRAWSEGMENT* PtSegm,
-                           int          format_plot,
-                           int          masque_layer );
-
-void Trace_Une_MirePcb( MIREPCB* PtMire, int format_plot, int masque_layer );
-
-/* PLOTGERB.CC */
-void trace_1_segment_GERBER( int pos_X0, int pos_Y0, int pos_X1, int pos_Y1,
-                             int hauteur );
-void trace_1_cercle_GERBER( int cx, int cy, int rayon, int epaisseur );
-void trace_1_contour_GERBER( int cX, int cY, int dimX, int dimY,
-                             int deltaX, int deltaY,
-                             int dim_trait, int orient );
-
-/* Trace 1 contour rectangulaire ou trapezoidal d'orientation quelconque
- *    donne par son centre cX, cY, ses dimensions dimX et dimY,
- *    ses variations deltaX et deltaY  et son orientation orient */
-
-/* PLOTHPGL.CC */
-void Init_Trace_HPGL();
-void Fin_Trace_HPGL();
-void trace_1_segment_HPGL( int pos_X0, int pos_Y0, int pos_X1, int pos_Y1,
-                           int hauteur );
-
-void trace_1_pad_TRAPEZE_HPGL( int cX, int cY,
-                               int dimX, int dimY, int deltaX, int deltaY,
-                               int orient, int modetrace );
-
-void trace_1_pastille_RONDE_HPGL( int pos_X,
-                                  int pos_Y,
-                                  int diametre,
-                                  int modetrace );
-
-void trace_1_pastille_OVALE_HPGL( int pos_X, int pos_Y, int dx, int dy,
-                                  int orient, int modetrace );
-void trace_1_pad_rectangulaire_HPGL( int cX, int cY, int dimX, int dimY,
-                                     int orient, int modetrace );
-void Move_Plume_HPGL( int x, int y, int plume );
-
-/*  deplace la plume levee (plume = 'U') ou baissee (plume = 'D')
- *  en position x,y */
-
-void Plume_HPGL( int plume );
-
-/* leve (plume = 'U') ou baisse (plume = 'D') la plume */
-
-/**************/
-/* PRINTPS.CC */
-/**************/
-void trace_1_pastille_OVALE_POST( int pos_X, int pos_Y,
-                                  int dx, int dy, int orient, int modetrace );
-void trace_1_pastille_RONDE_POST( int pos_X, int pos_Y, int diametre,
-                                  int modetrace );
-void trace_1_pad_rectangulaire_POST( int cX, int cY,
-                                     int dimX, int dimY, int orient,
-                                     int modetrace );
-void trace_1_contour_POST( int cX, int cY, int dimX, int dimY,
-                           int deltaX, int deltaY,
-                           int dim_trait, int orient );
-void trace_1_pad_TRAPEZE_POST( int cX, int cY,
-                               int dimX, int dimY, int deltaX, int deltaY,
-                               int orient, int modetrace );
-void trace_1_segment_POST( int pos_X0, int pos_Y0, int pos_X1, int pos_Y1,
-                           int large );
-void trace_1_Cercle_POST( int pos_X, int pos_Y, int diametre, int width );
-void PlotArcPS( int x, int y, int StAngle, int EndAngle, int rayon, int width );
-
-
 /***************/
 /* trpiste.cpp */
 /***************/
-void Draw_Track_Buffer( WinEDA_DrawPanel* panel,
-                        wxDC*             DC,
-                        BOARD*            Pcb,
-                        int               drawmode,
-                        int               printmasklayer );
 void Trace_Segment( WinEDA_DrawPanel* panel,
                     wxDC*             DC,
                     TRACK*            pt_piste,
                     int               draw_mode );
-void Trace_1_texte_pcb( WinEDA_DrawPanel* panel, wxDC* DC,
-                        TEXTE_PCB* pt_texte, int ox, int oy, int DrawMode );
 
-void Affiche_DCodes_Pistes( WinEDA_DrawPanel* panel, wxDC* DC,
-                            BOARD* Pcb, int drawmode );

include/pcbstruct.h

@@ -115,8 +115,9 @@
 #define LAST_NON_COPPER_LAYER  EDGE_N
 
 //      extra bits              0xE0000000
-/* masques generaux : */
-#define ALL_LAYERS       0x1FFFFFFF
+/* Helpful global layers maks : */
+#define ALL_LAYERS       0x1FFFFFFF             // Pcbnew used 29 layers
+#define FULL_LAYERS       0xFFFFFFFF            // Gerbview used 32 layers
 #define ALL_NO_CU_LAYERS 0x1FFF0000
 #define ALL_CU_LAYERS    0x0000FFFF
 #define INTERNAL_LAYERS  0x00007FFE             /* Bits layers internes */

pcbnew/class_board_design_settings.cpp

@@ -83,7 +83,8 @@ int EDA_BoardDesignSettings::GetVisibleLayers() const
 
 void EDA_BoardDesignSettings::SetVisibleLayers( int aMask )
 {
-    m_VisibleLayers = aMask & m_EnabledLayers & ALL_LAYERS;
+    // Altough Pcbnew uses only 29, Gerbview uses all 32 layers
+    m_VisibleLayers = aMask & m_EnabledLayers & FULL_LAYERS;
 }