Commit e027e659 authored by charras's avatar charras
Browse files

code and files cleanup

parent 4a515196

3d-viewer/3d_draw.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "macros.h"

#include "macros.h"

#include "drawtxt.h"

#include "drawtxt.h"

#include "confirm.h"

#include "confirm.h"

#include "class_board_design_settings.h"





#include "3d_viewer.h"

#include "3d_viewer.h"

#include "trackball.h"

#include "trackball.h"
@@ -113,7 +114,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() 
    g_Parm_3D_Visu.m_BoardSize     = pcb->m_BoundaryBox.GetSize();

    g_Parm_3D_Visu.m_BoardSize     = pcb->m_BoundaryBox.GetSize();

    g_Parm_3D_Visu.m_BoardPos   = pcb->m_BoundaryBox.Centre();

    g_Parm_3D_Visu.m_BoardPos   = pcb->m_BoundaryBox.Centre();

    g_Parm_3D_Visu.m_BoardPos.y = -g_Parm_3D_Visu.m_BoardPos.y;

    g_Parm_3D_Visu.m_BoardPos.y = -g_Parm_3D_Visu.m_BoardPos.y;

    g_Parm_3D_Visu.m_Layers     = pcb->m_BoardSettings->m_CopperLayerCount;

    g_Parm_3D_Visu.m_Layers     = pcb->m_BoardSettings->GetCopperLayerCount();





    // Ensure the board has 2 sides for 3D views, because it is hard to find a *really* single side board in the true life...

    // Ensure the board has 2 sides for 3D views, because it is hard to find a *really* single side board in the true life...

    if ( g_Parm_3D_Visu.m_Layers < 2 )

    if ( g_Parm_3D_Visu.m_Layers < 2 )

common/CMakeLists.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ set(PCB_COMMON_SRCS 
    ../pcbnew/basepcbframe.cpp

    ../pcbnew/basepcbframe.cpp

    ../pcbnew/class_board.cpp

    ../pcbnew/class_board.cpp

    ../pcbnew/class_board_connected_item.cpp

    ../pcbnew/class_board_connected_item.cpp

    ../pcbnew/class_board_design_settings.cpp

    ../pcbnew/class_board_item.cpp

    ../pcbnew/class_board_item.cpp

    ../pcbnew/class_cotation.cpp

    ../pcbnew/class_cotation.cpp

    ../pcbnew/class_drawsegment.cpp

    ../pcbnew/class_drawsegment.cpp

common/pcbcommon.cpp

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

#include "pcbcommon.h"

#include "plot_common.h"

#include "plot_common.h"

#include "class_zone_setting.h"

#include "class_zone_setting.h"



#include "class_board_design_settings.h"





/* Look up Table for conversion one layer number -> one bit layer mask: */

/* Look up Table for conversion one layer number -> one bit layer mask: */

int g_TabOneLayerMask[LAYER_COUNT] = {

int g_TabOneLayerMask[LAYER_COUNT] = {

gerbview/CMakeLists.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -33,8 +33,7 @@ set(GERBVIEW_SRCS 
    select_layers_to_pcb.cpp

    select_layers_to_pcb.cpp

    set_color.cpp

    set_color.cpp

    tool_gerber.cpp

    tool_gerber.cpp

    tracepcb.cpp

    tracepcb.cpp )

    trpiste.cpp )





set(GERBVIEW_EXTRA_SRCS

set(GERBVIEW_EXTRA_SRCS

    ../share/setpage.cpp

    ../share/setpage.cpp

gerbview/export_to_pcbnew.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "gestfich.h"

#include "gestfich.h"





#include "gerbview.h"

#include "gerbview.h"

#include "class_board_design_settings.h"

#include "protos.h"

#include "protos.h"





/* Routines Locales : */

/* Routines Locales : */
@@ -96,8 +97,8 @@ static int WriteSetup( FILE* File, BOARD* Pcb ) 
    sprintf( text, "InternalUnit %f INCH\n", 1.0 / PCB_INTERNAL_UNIT );

    sprintf( text, "InternalUnit %f INCH\n", 1.0 / PCB_INTERNAL_UNIT );

    fprintf( File, "%s", text );

    fprintf( File, "%s", text );





    Pcb->m_BoardSettings->m_CopperLayerCount = g_DesignSettings.m_CopperLayerCount;

    Pcb->m_BoardSettings->SetCopperLayerCount( g_DesignSettings.GetCopperLayerCount( ) );

    fprintf( File, "Layers %d\n", g_DesignSettings.m_CopperLayerCount );

    fprintf( File, "Layers %d\n", g_DesignSettings.GetCopperLayerCount( ) );





    fprintf( File, "$EndSETUP\n\n" );

    fprintf( File, "$EndSETUP\n\n" );

    return 1;

    return 1;
@@ -111,7 +112,7 @@ static bool WriteGeneralDescrPcb( BOARD* Pcb, FILE* File ) 
    int NbLayers;

    int NbLayers;





    /* Print the copper layer count */

    /* Print the copper layer count */

    NbLayers = Pcb->m_BoardSettings->m_CopperLayerCount;

    NbLayers = Pcb->m_BoardSettings->GetCopperLayerCount( );

    fprintf( File, "$GENERAL\n" );

    fprintf( File, "$GENERAL\n" );

    fprintf( File, "LayerCount %d\n", NbLayers );

    fprintf( File, "LayerCount %d\n", NbLayers );