haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some tab-induced disalignments 

Charras beat me on fixing the include/sch_item_struct.h include issue from 4069
This commit is contained in:
Lorenzo Marcantonio 2013-04-06 14:28:02 +02:00
parent ca4a3651c0
commit 150cfebb59
15 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3d-viewer/3d_draw.cpp
View File

@ -552,7 +552,7 @@ void EDA_3D_CANVAS::Draw3D_DrawSegment( DRAWSEGMENT* segment )
break; break;
case S_CIRCLE: case S_CIRCLE:
{ {
int radius = KiROUND( hypot( double(segment->GetStart().x - segment->GetEnd().x), int radius = KiROUND( hypot( double(segment->GetStart().x - segment->GetEnd().x),
double(segment->GetStart().y - segment->GetEnd().y) ) double(segment->GetStart().y - segment->GetEnd().y) )
); );
@ -998,12 +998,11 @@ void D_PAD::Draw3D( EDA_3D_CANVAS* glcanvas )
polyPadShape.insert( polyPadShape.end(), holecornersBuffer.begin(), polyPadShape.insert( polyPadShape.end(), holecornersBuffer.begin(),
holecornersBuffer.end() ); holecornersBuffer.end() );
} }
break; break;
case PAD_RECT: case PAD_RECT:
case PAD_TRAPEZOID: case PAD_TRAPEZOID:
{ {
wxPoint coord[5]; wxPoint coord[5];
BuildPadPolygon( coord, wxSize(0,0), m_Orient ); BuildPadPolygon( coord, wxSize(0,0), m_Orient );
for( int ii = 0; ii < 4; ii ++ ) for( int ii = 0; ii < 4; ii ++ )
@ -1018,7 +1017,7 @@ void D_PAD::Draw3D( EDA_3D_CANVAS* glcanvas )
polyPadShape.insert( polyPadShape.end(), holecornersBuffer.begin(), polyPadShape.insert( polyPadShape.end(), holecornersBuffer.begin(),
holecornersBuffer.end() ); holecornersBuffer.end() );
} }
break; break;
default: default:
break; break;

2
3d-viewer/3d_draw_basic_functions.cpp
View File

@ -124,7 +124,7 @@ static void Draw3D_VerticalPolygonalCylinder( const std::vector<CPolyPt>& aPolys
void SetGLColor( EDA_COLOR_T color ) void SetGLColor( EDA_COLOR_T color )
{ {
double red, green, blue; double red, green, blue;
const StructColors &colordata = g_ColorRefs[ColorGetBase( color )]; const StructColors &colordata = g_ColorRefs[ColorGetBase( color )];
red = colordata.m_Red / 255.0; red = colordata.m_Red / 255.0;

4
common/projet_config.cpp
View File

@ -358,8 +358,8 @@ PARAM_CFG_SETCOLOR::PARAM_CFG_SETCOLOR( const wxChar* ident, EDA_COLOR_T* ptpara
PARAM_CFG_SETCOLOR::PARAM_CFG_SETCOLOR( bool Insetup, PARAM_CFG_SETCOLOR::PARAM_CFG_SETCOLOR( bool Insetup,
const wxChar* ident, const wxChar* ident,
EDA_COLOR_T* ptparam, EDA_COLOR_T* ptparam,
EDA_COLOR_T default_val, EDA_COLOR_T default_val,
const wxChar* group ) : const wxChar* group ) :
PARAM_CFG_BASE( ident, PARAM_SETCOLOR, group ) PARAM_CFG_BASE( ident, PARAM_SETCOLOR, group )
{ {

2
eeschema/bus-wire-junction.cpp
View File

@ -345,7 +345,7 @@ void SCH_EDIT_FRAME::DeleteCurrentSegment( wxDC* DC )
if( ( screen->GetCurItem() == NULL ) || !screen->GetCurItem()->IsNew() ) if( ( screen->GetCurItem() == NULL ) || !screen->GetCurItem()->IsNew() )
return; return;
DrawSegment( m_canvas, DC, wxDefaultPosition, false ); DrawSegment( m_canvas, DC, wxDefaultPosition, false );
screen->Remove( screen->GetCurItem() ); screen->Remove( screen->GetCurItem() );
m_canvas->SetMouseCaptureCallback( NULL ); m_canvas->SetMouseCaptureCallback( NULL );

2
eeschema/hierarch.cpp
View File

@ -101,7 +101,7 @@ class HIERARCHY_NAVIG_DLG : public wxDialog
{ {
public: public:
SCH_EDIT_FRAME* m_Parent; SCH_EDIT_FRAME* m_Parent;
HIERARCHY_TREE* m_Tree; HIERARCHY_TREE* m_Tree;
int m_nbsheets; int m_nbsheets;
wxDC* m_DC; wxDC* m_DC;

2
eeschema/load_one_schematic_file.cpp
View File

@ -227,7 +227,7 @@ again." );
{ {
// Load it if it wasn't by a factory // Load it if it wasn't by a factory
if( !itemLoaded ) if( !itemLoaded )
itemLoaded = item->Load( reader, msgDiag ); itemLoaded = item->Load( reader, msgDiag );
if( !itemLoaded ) if( !itemLoaded )
{ {

2
eeschema/netlist.h
View File

@ -45,7 +45,7 @@ class SCH_REFERENC_LIST;
#define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1" #define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1"
// Max pin number per component and footprint // Max pin number per component and footprint
#define MAXPIN 5000 #define MAXPIN 5000

4
eeschema/sch_bus_entry.cpp
View File

@ -62,7 +62,7 @@ SCH_BUS_WIRE_ENTRY::SCH_BUS_WIRE_ENTRY( const wxPoint& pos, char shape ) :
SCH_BUS_BUS_ENTRY::SCH_BUS_BUS_ENTRY( const wxPoint& pos, char shape ) : SCH_BUS_BUS_ENTRY::SCH_BUS_BUS_ENTRY( const wxPoint& pos, char shape ) :
SCH_BUS_ENTRY_BASE( SCH_BUS_BUS_ENTRY_T, pos, shape ) SCH_BUS_ENTRY_BASE( SCH_BUS_BUS_ENTRY_T, pos, shape )
{ {
m_Layer = LAYER_BUS; m_Layer = LAYER_BUS;
} }
EDA_ITEM* SCH_BUS_WIRE_ENTRY::Clone() const EDA_ITEM* SCH_BUS_WIRE_ENTRY::Clone() const
@ -255,7 +255,7 @@ void SCH_BUS_ENTRY_BASE::GetConnectionPoints( vector< wxPoint >& aPoints ) const
wxString SCH_BUS_WIRE_ENTRY::GetSelectMenuText() const wxString SCH_BUS_WIRE_ENTRY::GetSelectMenuText() const
{ {
return wxString( _( "Bus to Wire Entry" ) ); return wxString( _( "Bus to Wire Entry" ) );
} }

8
eeschema/sch_screen.cpp
View File

@ -965,10 +965,10 @@ bool SCH_SCREEN::BreakSegmentsOnJunctions()
{ {
SCH_BUS_ENTRY_BASE* busEntry = dynamic_cast<SCH_BUS_ENTRY_BASE*>( item ); SCH_BUS_ENTRY_BASE* busEntry = dynamic_cast<SCH_BUS_ENTRY_BASE*>( item );
if( busEntry ) if( busEntry )
{ {
if( BreakSegment( busEntry->GetPosition() ) if( BreakSegment( busEntry->GetPosition() )
|| BreakSegment( busEntry->m_End() ) ) || BreakSegment( busEntry->m_End() ) )
brokenSegments = true; brokenSegments = true;
} }
} }
} }

6
pcbnew/autorouter/graphpcb.cpp
View File

@ -71,14 +71,14 @@ static void TraceCircle( int ux0, int uy0, int ux1, int uy1, int lg, LAYER_NUM l
if( layer == UNDEFINED_LAYER ) \ if( layer == UNDEFINED_LAYER ) \
{ \ { \
RoutingMatrix.WriteCell( dy, dx, BOTTOM, color ); \ RoutingMatrix.WriteCell( dy, dx, BOTTOM, color ); \
if( RoutingMatrix.m_RoutingLayersCount > 1 ) \ if( RoutingMatrix.m_RoutingLayersCount > 1 ) \
RoutingMatrix.WriteCell( dy, dx, TOP, color ); \ RoutingMatrix.WriteCell( dy, dx, TOP, color ); \
} \ } \
else \ else \
{ \ { \
if( layer == g_Route_Layer_BOTTOM ) \ if( layer == g_Route_Layer_BOTTOM ) \
RoutingMatrix.WriteCell( dy, dx, BOTTOM, color ); \ RoutingMatrix.WriteCell( dy, dx, BOTTOM, color ); \
if( RoutingMatrix.m_RoutingLayersCount > 1 ) \ if( RoutingMatrix.m_RoutingLayersCount > 1 ) \
if( layer == g_Route_Layer_TOP ) \ if( layer == g_Route_Layer_TOP ) \
RoutingMatrix.WriteCell( dy, dx, TOP, color ); \ RoutingMatrix.WriteCell( dy, dx, TOP, color ); \
} \ } \

2
pcbnew/class_track.cpp
View File

@ -1206,7 +1206,7 @@ TRACK* TRACK::GetVia( const wxPoint& aPosition, LAYER_NUM aLayer)
if( track->GetState( BUSY | IS_DELETED ) ) if( track->GetState( BUSY | IS_DELETED ) )
continue; continue;
if( aLayer == UNDEFINED_LAYER ) if( aLayer == UNDEFINED_LAYER )
break; break;
if( track->IsOnLayer( aLayer ) ) if( track->IsOnLayer( aLayer ) )

2
pcbnew/print_board_functions.cpp
View File

@ -280,7 +280,7 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
ZONE_CONTAINER* zone = Pcb->GetArea( ii ); ZONE_CONTAINER* zone = Pcb->GetArea( ii );
if( aPrintMaskLayer & GetLayerMask( zone->GetLayer() ) ) if( aPrintMaskLayer & GetLayerMask( zone->GetLayer() ) )
zone->DrawFilledArea( m_canvas, aDC, drawmode ); zone->DrawFilledArea( m_canvas, aDC, drawmode );
} }
// Draw footprints, this is done at last in order to print the pad holes in // Draw footprints, this is done at last in order to print the pad holes in

32
pcbnew/scripting/units.i
View File

@ -46,34 +46,34 @@
def ToMils(iu): def ToMils(iu):
if type(iu) in [int,float]: if type(iu) in [int,float]:
return float(iu) / float(IU_PER_MILS) return float(iu) / float(IU_PER_MILS)
elif type(iu) in [wxPoint,wxSize]: elif type(iu) in [wxPoint,wxSize]:
return tuple(map(ToMils,iu)) return tuple(map(ToMils,iu))
def FromMils(mils): def FromMils(mils):
if type(mils) in [int,float]: if type(mils) in [int,float]:
return int(float(mils)*float(IU_PER_MILS)) return int(float(mils)*float(IU_PER_MILS))
elif type(mils) in [wxPoint,wxSize]: elif type(mils) in [wxPoint,wxSize]:
return tuple(map(FromMils,mils)) return tuple(map(FromMils,mils))
def wxSizeMM(mmx,mmy): return wxSize(FromMM(mmx),FromMM(mmy)) def wxSizeMM(mmx,mmy): return wxSize(FromMM(mmx),FromMM(mmy))
def wxSizeMils(mmx,mmy): return wxSize(FromMils(mmx),FromMils(mmy)) def wxSizeMils(mmx,mmy): return wxSize(FromMils(mmx),FromMils(mmy))
def wxPointMM(mmx,mmy): return wxPoint(FromMM(mmx),FromMM(mmy)) def wxPointMM(mmx,mmy): return wxPoint(FromMM(mmx),FromMM(mmy))
def wxPointMils(mmx,mmy): return wxPoint(FromMils(mmx),FromMils(mmy)) def wxPointMils(mmx,mmy): return wxPoint(FromMils(mmx),FromMils(mmy))
def wxRectMM(x,y,wx,wy): def wxRectMM(x,y,wx,wy):
x = int(FromMM(x)) x = int(FromMM(x))
y = int(FromMM(y)) y = int(FromMM(y))
wx = int(FromMM(wx)) wx = int(FromMM(wx))
wy = int (FromMM(wy)) wy = int (FromMM(wy))
return wxRect(x,y,wx,wy) return wxRect(x,y,wx,wy)
def wxRectMils(x,y,wx,wy): def wxRectMils(x,y,wx,wy):
x = int(FromMils(x)) x = int(FromMils(x))
y = int(FromMils(y)) y = int(FromMils(y))
wx = int(FromMils(wx)) wx = int(FromMils(wx))
wy = int (FromMils(wy)) wy = int (FromMils(wy))
return wxRect(x,y,wx,wy) return wxRect(x,y,wx,wy)
} }

2
pcbnew/sel_layer.cpp
View File

@ -68,7 +68,7 @@ END_EVENT_TABLE()
LAYER_NUM PCB_BASE_FRAME::SelectLayer( LAYER_NUM default_layer, LAYER_NUM PCB_BASE_FRAME::SelectLayer( LAYER_NUM default_layer,
LAYER_NUM min_layer, LAYER_NUM min_layer,
LAYER_NUM max_layer, LAYER_NUM max_layer,
bool null_layer ) bool null_layer )
{ {
SELECT_LAYER_DIALOG* frame = new SELECT_LAYER_DIALOG( this, SELECT_LAYER_DIALOG* frame = new SELECT_LAYER_DIALOG( this,
default_layer, default_layer,

2
pcbnew/tracepcb.cpp
View File

@ -198,7 +198,7 @@ void BOARD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* DC, GR_DRAWMODE aDrawMode, const
for( MODULE* module = m_Modules; module; module = module->Next() ) for( MODULE* module = m_Modules; module; module = module->Next() )
{ {
bool display = true; bool display = true;
LAYER_MSK layerMask = ALL_CU_LAYERS; LAYER_MSK layerMask = ALL_CU_LAYERS;
if( module->IsMoving() ) if( module->IsMoving() )