kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #05527
[PATCH] Ortographic mode for 3D viewer and minor cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I didn't want to stay idle while everybody talked about the new library
structure. Since that is above my paygrade at the moment, I did ne next
best thing I could.
I've added a button in 3d-viewer to switch between perspective and
ortographic projection modes. The icon is a big boring "O", but then
artwork was never my strong point.
I've also cleaned up some -pedantic errors that annoyingly filled up the
virtual terminal.
I also came across some files that used tabs instead of spaces, so I
refactored them to use spaces.
I hope this fits the guidelines ( and I hope I did the bzr diff thingy
correctly).
Alex
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJMqKKtAAoJEL0kPHNPXJJKZcoP/1oHeczSbffjUcy+wc9hxDrz
zARBIZmud2Kp6bTf+LuJ4e7b1de8kbUwJRjG6B3kTZrjy4Bwe06nhDY1swPpf5Z0
W8P/CvO5JOnlps3L6kVDhfNXgw86gerNP4lN7+TcORpvXHLdQrTiCIVwVC3+5INj
TxjRHU9hahML4fNC/UlsDRPJakHD5PPN+BAJpX4wBFKMDaVEvYawxhQEX1Ox3ngW
FSHQzj9C1JBjWdE57RUPlGZXs4Rh2KKv3vFjpOulXYhX8Bet4kJtI+E9kXBww3Mx
Tb8pJvuiO7XUbv1EkTYnYxj5jveaVfwSEnkwSzsud4pPEEyfnvDgm4jqX3e9sT8l
iP1P03eRdzOEiiKZe2jLU19c2DqIx50b5C90fYqsUk3SISdQHK9ujTRj0XK9jt6p
C6B1m2Fk9Ly7NiBDrtIyoiDQ7ErPg9kRwTNV3V9l0gaHcBDpNlYhJTpcBh90KTLQ
dtmlAujz+F+SRIS1u4C94H5mdpIYv3xuO5Lg3GSt2Ae1gwNvGiSDAs8tIEYvcpOr
ZLLoquIeIHZmWI4hoB8ccEXrE5OEyoyihhvUShjLB/+acY7HOQwbNyBEUR7JMTcE
gRa4qu5tGASucQ7nz/k8rVjcs7NaR70ZzpgsS+wZtNdnWxLlBVPYbIDCKGWedvWd
9sxXHZIHm7ojZhoj7DMz
=YUgL
-----END PGP SIGNATURE-----
=== modified file '3d-viewer/3d_canvas.cpp'
--- 3d-viewer/3d_canvas.cpp 2010-07-20 10:30:40 +0000
+++ 3d-viewer/3d_canvas.cpp 2010-10-03 15:16:35 +0000
@@ -29,34 +29,35 @@
*/
BEGIN_EVENT_TABLE( Pcb3D_GLCanvas, wxGLCanvas )
-EVT_PAINT( Pcb3D_GLCanvas::OnPaint )
-
-// key event:
-EVT_CHAR( Pcb3D_GLCanvas::OnChar )
-
-// mouse events
-EVT_RIGHT_DOWN( Pcb3D_GLCanvas::OnRightClick )
-EVT_MOUSEWHEEL( Pcb3D_GLCanvas::OnMouseWheel )
-EVT_MOTION( Pcb3D_GLCanvas::OnMouseMove )
-
-// other events
-EVT_ERASE_BACKGROUND( Pcb3D_GLCanvas::OnEraseBackground )
-EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END,
- Pcb3D_GLCanvas::OnPopUpMenu )
+ EVT_PAINT( Pcb3D_GLCanvas::OnPaint )
+
+ // key event:
+ EVT_CHAR( Pcb3D_GLCanvas::OnChar )
+
+ // mouse events
+ EVT_RIGHT_DOWN( Pcb3D_GLCanvas::OnRightClick )
+ EVT_MOUSEWHEEL( Pcb3D_GLCanvas::OnMouseWheel )
+ EVT_MOTION( Pcb3D_GLCanvas::OnMouseMove )
+
+ // other events
+ EVT_ERASE_BACKGROUND( Pcb3D_GLCanvas::OnEraseBackground )
+ EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END,
+ Pcb3D_GLCanvas::OnPopUpMenu )
END_EVENT_TABLE()
Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :
#if wxCHECK_VERSION( 2, 9, 0 )
- wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize,
- wxFULL_REPAINT_ON_RESIZE )
+ wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize,
+ wxFULL_REPAINT_ON_RESIZE )
#else
- wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize,
- wxFULL_REPAINT_ON_RESIZE )
+ wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize,
+ wxFULL_REPAINT_ON_RESIZE )
#endif
{
m_init = FALSE;
m_gllist = 0;
m_Parent = parent;
+ m_ortho = false; // Disable ortoghraphic projectin by default
#if wxCHECK_VERSION( 2, 9, 0 )
@@ -80,7 +81,7 @@
void Pcb3D_GLCanvas::ClearLists()
{
- if( m_gllist > 0 )
+ if ( m_gllist > 0 )
glDeleteLists( m_gllist, 1 );
m_gllist = 0;
}
@@ -98,7 +99,7 @@
int ii;
double delta_move = 0.7 * g_Parm_3D_Visu.m_Zoom;
- switch( keycode )
+ switch ( keycode )
{
case WXK_LEFT:
g_Draw3d_dx -= delta_move;
@@ -127,7 +128,7 @@
case WXK_F1:
g_Parm_3D_Visu.m_Zoom /= 1.4;
- if( g_Parm_3D_Visu.m_Zoom <= 0.01 )
+ if ( g_Parm_3D_Visu.m_Zoom <= 0.01 )
g_Parm_3D_Visu.m_Zoom = 0.01;
break;
@@ -144,14 +145,14 @@
case 'r':
case 'R':
g_Draw3d_dx = g_Draw3d_dy = 0;
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
break;
case 'x':
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
@@ -160,7 +161,7 @@
break;
case 'X':
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
@@ -169,7 +170,7 @@
break;
case 'y':
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
@@ -177,7 +178,7 @@
break;
case 'Y':
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
@@ -186,14 +187,14 @@
break;
case 'z':
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
break;
case 'Z':
- for( ii = 0; ii < 4; ii++ )
+ for ( ii = 0; ii < 4; ii++ )
g_Parm_3D_Visu.m_Rot[ii] = 0.0;
trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 );
@@ -213,9 +214,9 @@
{
wxSize size( GetClientSize() );
- if( event.ShiftDown() )
+ if ( event.ShiftDown() )
{
- if( event.GetWheelRotation() < 0 )
+ if ( event.GetWheelRotation() < 0 )
{
/* up */
SetView3D( WXK_UP );
@@ -226,9 +227,9 @@
SetView3D( WXK_DOWN );
}
}
- else if( event.ControlDown() )
+ else if ( event.ControlDown() )
{
- if( event.GetWheelRotation() > 0 )
+ if ( event.GetWheelRotation() > 0 )
{
/* right */
SetView3D( WXK_RIGHT );
@@ -241,10 +242,10 @@
}
else
{
- if( event.GetWheelRotation() > 0 )
+ if ( event.GetWheelRotation() > 0 )
{
g_Parm_3D_Visu.m_Zoom /= 1.4;
- if( g_Parm_3D_Visu.m_Zoom <= 0.01 )
+ if ( g_Parm_3D_Visu.m_Zoom <= 0.01 )
g_Parm_3D_Visu.m_Zoom = 0.01;
}
else
@@ -263,9 +264,9 @@
wxSize size( GetClientSize() );
double spin_quat[4];
- if( event.Dragging() )
+ if ( event.Dragging() )
{
- if( event.LeftIsDown() )
+ if ( event.LeftIsDown() )
{
/* drag in progress, simulate trackball */
trackball( spin_quat,
@@ -276,7 +277,7 @@
add_quats( spin_quat, g_Parm_3D_Visu.m_Quat, g_Parm_3D_Visu.m_Quat );
}
- else if( event.MiddleIsDown() )
+ else if ( event.MiddleIsDown() )
{
/* middle button drag -> pan */
@@ -306,69 +307,70 @@
wxPoint pos;
wxMenu PopUpMenu;
- pos.x = event.GetX(); pos.y = event.GetY();
+ pos.x = event.GetX();
+ pos.y = event.GetY();
wxMenuItem* item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN,
- _( "Zoom +" ) );
+ _( "Zoom +" ) );
item->SetBitmap( zoom_in_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT,
- _( "Zoom -" ) );
+ _( "Zoom -" ) );
item->SetBitmap( zoom_out_xpm );
PopUpMenu.Append( item );
PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS,
- _( "Top View" ) );
+ _( "Top View" ) );
item->SetBitmap( axis3d_top_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG,
- _( "Bottom View" ) );
+ _( "Bottom View" ) );
item->SetBitmap( axis3d_bottom_xpm );
PopUpMenu.Append( item );
PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS,
- _( "Right View" ) );
+ _( "Right View" ) );
item->SetBitmap( axis3d_right_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG,
- _( "Left View" ) );
+ _( "Left View" ) );
item->SetBitmap( axis3d_left_xpm );
PopUpMenu.Append( item );
PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS,
- _( "Front View" ) );
+ _( "Front View" ) );
item->SetBitmap( axis3d_front_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG,
- _( "Back View" ) );
+ _( "Back View" ) );
item->SetBitmap( axis3d_back_xpm );
PopUpMenu.Append( item );
PopUpMenu.AppendSeparator();
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT,
- _( "Move left <-" ) );
+ _( "Move left <-" ) );
item->SetBitmap( left_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT,
- _( "Move right ->" ) );
+ _( "Move right ->" ) );
item->SetBitmap( right_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP,
- _( "Move Up ^" ) );
+ _( "Move Up ^" ) );
item->SetBitmap( up_xpm );
PopUpMenu.Append( item );
item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN,
- _( "Move Down" ) );
+ _( "Move Down" ) );
item->SetBitmap( down_xpm );
PopUpMenu.Append( item );
@@ -380,7 +382,7 @@
{
int key = 0;
- switch( event.GetId() )
+ switch ( event.GetId() )
{
case ID_POPUP_ZOOMIN:
key = WXK_F1;
@@ -473,11 +475,12 @@
{
wxSize size = GetClientSize();
- if( !m_init )
+ if ( !m_init )
{
m_init = TRUE;
g_Parm_3D_Visu.m_Zoom = 1.0;
- ZBottom = 1.0; ZTop = 10.0;
+ ZBottom = 1.0;
+ ZTop = 10.0;
glDisable( GL_CULL_FACE ); // show back faces
@@ -499,31 +502,43 @@
}
/* set viewing projection */
-
- // Ratio width / height of the window display
- double ratio_HV = (double) size.x / size.y;
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
#define MAX_VIEW_ANGLE 160.0 / 45.0
- if( g_Parm_3D_Visu.m_Zoom > MAX_VIEW_ANGLE )
+ if ( g_Parm_3D_Visu.m_Zoom > MAX_VIEW_ANGLE )
g_Parm_3D_Visu.m_Zoom = MAX_VIEW_ANGLE;
- gluPerspective( 45.0 * g_Parm_3D_Visu.m_Zoom, ratio_HV, 1, 10 );
-
-// glFrustum(-1., 1.1F, -1.1F, 1.1F, ZBottom, ZTop);
-
- /* position viewer */
+ if ( ModeIsOrtho() )
+ {
+ // OrthoReductionFactor is chosen so as to provide roughly the same size as Perspective View
+ const double orthoReductionFactor = 400/g_Parm_3D_Visu.m_Zoom;
+ // Initialize Projection Matrix for Ortographic View
+ glOrtho(-size.x/orthoReductionFactor, size.x/orthoReductionFactor, -size.y/orthoReductionFactor, size.y/orthoReductionFactor, 1, 10);
+ }
+ else
+ {
+ // Ratio width / height of the window display
+ double ratio_HV = (double) size.x / size.y;
+
+ // Initialize Projection Matrix for Perspective View
+ gluPerspective( 45.0 * g_Parm_3D_Visu.m_Zoom, ratio_HV, 1, 10 );
+ }
+
+
+
+
+ // Position viewer
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
glTranslatef( 0.0F, 0.0F, -( ZBottom + ZTop) / 2 );
- /* clear color and depth buffers */
+ // Clear color and depth buffers
glClearColor( g_Parm_3D_Visu.m_BgColor.m_Red,
g_Parm_3D_Visu.m_BgColor.m_Green,
g_Parm_3D_Visu.m_BgColor.m_Blue, 1 );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
- /* Setup light souces: */
+ // Setup light souces:
SetLights();
}
@@ -564,9 +579,9 @@
wxString file_ext, mask;
bool fmt_is_jpeg = FALSE;
- if( event.GetId() == ID_MENU_SCREENCOPY_JPEG )
+ if ( event.GetId() == ID_MENU_SCREENCOPY_JPEG )
fmt_is_jpeg = TRUE;
- if( event.GetId() != ID_TOOL_SCREENCOPY_TOCLIBBOARD )
+ if ( event.GetId() != ID_TOOL_SCREENCOPY_TOCLIBBOARD )
{
file_ext = fmt_is_jpeg ? wxT( "jpg" ) : wxT( "png" );
mask = wxT( "*." ) + file_ext;
@@ -578,14 +593,14 @@
fn.GetFullName(), file_ext, mask, this,
wxFD_SAVE, TRUE );
- if( FullFileName.IsEmpty() )
+ if ( FullFileName.IsEmpty() )
return;
}
Redraw( true );
wxSize image_size = GetClientSize();
- #ifndef __WXMAC__
+#ifndef __WXMAC__
wxClientDC dc( this );
wxBitmap bitmap( image_size.x, image_size.y );
wxMemoryDC memdc;
@@ -632,13 +647,13 @@
wxBitmap bitmap( image );
#endif
- if( event.GetId() == ID_TOOL_SCREENCOPY_TOCLIBBOARD )
+ if ( event.GetId() == ID_TOOL_SCREENCOPY_TOCLIBBOARD )
{
wxBitmapDataObject* dobjBmp = new wxBitmapDataObject;
dobjBmp->SetBitmap( bitmap );
- if( wxTheClipboard->Open() )
+ if ( wxTheClipboard->Open() )
{
- if( !wxTheClipboard->SetData( dobjBmp ) )
+ if ( !wxTheClipboard->SetData( dobjBmp ) )
wxMessageBox( _( "Failed to copy image to clipboard" ) );
wxTheClipboard->Flush(); /* the data in clipboard will stay
@@ -651,9 +666,9 @@
{
wxImage image = bitmap.ConvertToImage();
- if( !image.SaveFile( FullFileName,
- fmt_is_jpeg ? wxBITMAP_TYPE_JPEG :
- wxBITMAP_TYPE_PNG ) )
+ if ( !image.SaveFile( FullFileName,
+ fmt_is_jpeg ? wxBITMAP_TYPE_JPEG :
+ wxBITMAP_TYPE_PNG ) )
wxMessageBox( _( "Can't save file" ) );
image.Destroy();
=== modified file '3d-viewer/3d_frame.cpp'
--- 3d-viewer/3d_frame.cpp 2010-05-01 12:46:33 +0000
+++ 3d-viewer/3d_frame.cpp 2010-10-03 15:16:35 +0000
@@ -292,6 +292,10 @@
case ID_MOVE3D_DOWN:
m_Canvas->SetView3D( WXK_DOWN );
return;
+
+ case ID_ORTHO:
+ m_Canvas->ToggleOrtho();
+ return;
case ID_TOOL_SCREENCOPY_TOCLIBBOARD:
case ID_MENU_SCREENCOPY_PNG:
=== modified file '3d-viewer/3d_toolbar.cpp'
--- 3d-viewer/3d_toolbar.cpp 2010-02-08 18:15:42 +0000
+++ 3d-viewer/3d_toolbar.cpp 2010-10-03 15:16:35 +0000
@@ -88,6 +88,10 @@
m_HToolBar->AddTool( ID_MOVE3D_DOWN, wxEmptyString, wxBitmap( down_xpm ),
_( "Move down" ) );
+
+ m_HToolBar->AddTool( ID_ORTHO, wxEmptyString, wxBitmap( ortho_xpm ),
+ _( "Enable/Disable ortographic projection" ) );
+
m_HToolBar->Realize();
}
=== modified file '3d-viewer/3d_viewer.h'
--- 3d-viewer/3d_viewer.h 2010-08-19 14:21:05 +0000
+++ 3d-viewer/3d_viewer.h 2010-10-03 15:16:35 +0000
@@ -53,6 +53,7 @@
ID_MOVE3D_RIGHT,
ID_MOVE3D_UP,
ID_MOVE3D_DOWN,
+ ID_ORTHO,
ID_MENU3D_BGCOLOR_SELECTION,
ID_MENU3D_AXIS_ONOFF,
ID_MENU3D_MODULE_ONOFF,
@@ -123,7 +124,7 @@
double m_BoardScale; /* Normalization scale for coordinates:
* when scaled between -1.0 and +1.0 */
double m_LayerZcoord[32];
- double m_ActZpos;
+ double m_ActZpos;
public: Info_3D_Visu();
~Info_3D_Visu();
};
@@ -137,6 +138,9 @@
private:
bool m_init;
GLuint m_gllist;
+ /// Tracks whether to use Orthographic or Perspective projection
+ //TODO: Does this belong here, or in WinEDA3D_DrawFrame ???
+ bool m_ortho;
#if wxCHECK_VERSION( 2, 9, 0 )
wxGLContext* m_glRC;
#endif
@@ -170,7 +174,7 @@
* draw all solid polygons used as filles areas in a zone
* @param aZone_c = the zone to draw
*/
- void Draw3D_SolidPolygonsInZones( ZONE_CONTAINER* aZone_c );
+ void Draw3D_SolidPolygonsInZones( ZONE_CONTAINER* aZone_c );
/** Function Draw3D_Polygon
* draw one solid polygon
@@ -182,6 +186,11 @@
void Draw3D_DrawSegment( DRAWSEGMENT* segment );
void Draw3D_DrawText( TEXTE_PCB* text );
+ /// Toggles ortographic projection on and off
+ void ToggleOrtho(){ m_ortho = !m_ortho ; Refresh(true);};
+ /// Returns the orthographic projection flag
+ bool ModeIsOrtho() { return m_ortho ;};
+
//int Get3DLayerEnable(int act_layer);
DECLARE_EVENT_TABLE()
@@ -223,7 +232,7 @@
/** function ReloadRequest
* must be called when reloading data from Pcbnew is needed
* mainly after edition of the board or footprint beeing displayed.
- * mainly for the mudule editor.
+ * mainly for the module editor.
*/
void ReloadRequest( )
{
=== modified file 'bitmaps/CMakeLists.txt'
--- bitmaps/CMakeLists.txt 2010-09-29 18:19:26 +0000
+++ bitmaps/CMakeLists.txt 2010-10-03 15:16:35 +0000
@@ -241,6 +241,7 @@
Move_Track_Segment.xpm
Move_Track.xpm
Move.xpm
+ ortho.xpm
mw_Add_Gap.xpm
mw_Add_Line.xpm
mw_Add_Shape.xpm
=== added file 'bitmaps/ortho.xpm'
--- bitmaps/ortho.xpm 1970-01-01 00:00:00 +0000
+++ bitmaps/ortho.xpm 2010-10-03 15:16:35 +0000
@@ -0,0 +1,20 @@
+/* XPM */
+const char *ortho_xpm[]={
+"16 15 2 1",
+"# c #000000",
+". c #ffffff",
+"................",
+"................",
+"......####......",
+".....##..##.....",
+".....#....#.....",
+"....#......#....",
+"....#......#....",
+"....#......#....",
+"....#......#....",
+"....#......#....",
+".....#....#.....",
+".....##..##.....",
+"......####......",
+"................",
+"................"};
=== modified file 'common/base_screen.cpp'
--- common/base_screen.cpp 2010-09-23 14:04:08 +0000
+++ common/base_screen.cpp 2010-10-03 15:16:35 +0000
@@ -15,7 +15,7 @@
/* Implement wxSize array for grid list implementation. */
#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY( GridArray );
+WX_DEFINE_OBJARRAY( GridArray )
BASE_SCREEN* ActiveScreen = NULL;
=== modified file 'common/class_undoredo_container.cpp'
--- common/class_undoredo_container.cpp 2009-08-27 13:51:02 +0000
+++ common/class_undoredo_container.cpp 2010-10-03 15:16:35 +0000
@@ -44,7 +44,7 @@
PICKED_ITEMS_LIST::PICKED_ITEMS_LIST()
{
m_Status = UR_UNSPECIFIED;
-};
+}
PICKED_ITEMS_LIST::~PICKED_ITEMS_LIST()
{
@@ -69,7 +69,7 @@
{
ITEM_PICKER item;
- if( m_ItemsList.size() != 0 )
+ if ( m_ItemsList.size() != 0 )
{
item = m_ItemsList.back();
m_ItemsList.pop_back();
@@ -96,15 +96,15 @@
bool show_error_message = true;
// Delete items is they are not flagged UR_NEW, or if this is a block operation
- while( GetCount() > 0 )
+ while ( GetCount() > 0 )
{
ITEM_PICKER wrapper = PopItem();
- if( wrapper.m_PickedItem == NULL ) // No more item in list.
+ if ( wrapper.m_PickedItem == NULL ) // No more item in list.
break;
- switch( wrapper.m_UndoRedoStatus )
+ switch ( wrapper.m_UndoRedoStatus )
{
case UR_UNSPECIFIED:
- if( show_error_message )
+ if ( show_error_message )
wxMessageBox( wxT( "ClearUndoORRedoList() error: UR_UNSPECIFIED command type" ) );
show_error_message = false;
break;
@@ -114,7 +114,7 @@
// Specific to eeschema: a linked list of wires is stored.
// the wrapper picks only the first item (head of list), and is owner of all picked items
EDA_BaseStruct* item = wrapper.m_PickedItem;
- while( item )
+ while ( item )
{
// Delete old copy of wires
EDA_BaseStruct* nextitem = item->Next();
@@ -171,7 +171,7 @@
{
ITEM_PICKER picker;
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
picker = m_ItemsList[aIdx];
return picker;
@@ -184,7 +184,7 @@
*/
EDA_BaseStruct* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
return m_ItemsList[aIdx].m_PickedItem;
else
return NULL;
@@ -197,7 +197,7 @@
*/
EDA_BaseStruct* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
return m_ItemsList[aIdx].m_Link;
else
return NULL;
@@ -211,7 +211,7 @@
*/
UndoRedoOpType PICKED_ITEMS_LIST::GetPickedItemStatus( unsigned int aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
return m_ItemsList[aIdx].m_UndoRedoStatus;
else
return UR_UNSPECIFIED;
@@ -224,7 +224,7 @@
*/
int PICKED_ITEMS_LIST::GetPickerFlags( unsigned aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
return m_ItemsList[aIdx].m_PickerFlags;
else
return 0;
@@ -237,7 +237,7 @@
*/
bool PICKED_ITEMS_LIST::SetPickedItem( EDA_BaseStruct* aItem, unsigned aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
{
m_ItemsList[aIdx].m_PickedItem = aItem;
return true;
@@ -255,7 +255,7 @@
*/
bool PICKED_ITEMS_LIST::SetPickedItemLink( EDA_BaseStruct* aLink, unsigned aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
{
m_ItemsList[aIdx].m_Link = aLink;
return true;
@@ -275,7 +275,7 @@
UndoRedoOpType aStatus,
unsigned aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
{
m_ItemsList[aIdx].m_PickedItem = aItem;
m_ItemsList[aIdx].m_UndoRedoStatus = aStatus;
@@ -294,7 +294,7 @@
*/
bool PICKED_ITEMS_LIST::SetPickedItemStatus( UndoRedoOpType aStatus, unsigned aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
{
m_ItemsList[aIdx].m_UndoRedoStatus = aStatus;
return true;
@@ -310,7 +310,7 @@
*/
bool PICKED_ITEMS_LIST::SetPickerFlags( int aFlags, unsigned aIdx )
{
- if( aIdx < m_ItemsList.size() )
+ if ( aIdx < m_ItemsList.size() )
{
m_ItemsList[aIdx].m_PickerFlags = aFlags;
return true;
@@ -321,13 +321,13 @@
/** function RemovePicker
- * remùove one entry (one picker) from the list of picked items
+ * rem�ove one entry (one picker) from the list of picked items
* @param aIdx = index of the picker in the picked list
* @return true if ok, or false if did not exist
*/
bool PICKED_ITEMS_LIST::RemovePicker( unsigned aIdx )
{
- if( aIdx >= m_ItemsList.size() )
+ if ( aIdx >= m_ItemsList.size() )
return false;
m_ItemsList.erase( m_ItemsList.begin() + aIdx );
return true;
@@ -353,7 +353,7 @@
void PICKED_ITEMS_LIST::ReversePickersListOrder()
{
std::vector <ITEM_PICKER> tmp;
- while( !m_ItemsList.empty() )
+ while ( !m_ItemsList.empty() )
{
tmp.push_back( m_ItemsList.back() );
m_ItemsList.pop_back();
@@ -380,7 +380,7 @@
void UNDO_REDO_CONTAINER::ClearCommandList()
{
- for( unsigned ii = 0; ii < m_CommandsList.size(); ii++ )
+ for ( unsigned ii = 0; ii < m_CommandsList.size(); ii++ )
delete m_CommandsList[ii];
m_CommandsList.clear();
@@ -395,7 +395,7 @@
PICKED_ITEMS_LIST* UNDO_REDO_CONTAINER::PopCommand()
{
- if( m_CommandsList.size() != 0 )
+ if ( m_CommandsList.size() != 0 )
{
PICKED_ITEMS_LIST* item = m_CommandsList.back();
m_CommandsList.pop_back();
=== modified file 'common/dcsvg.cpp'
--- common/dcsvg.cpp 2010-04-20 11:23:59 +0000
+++ common/dcsvg.cpp 2010-10-03 15:16:35 +0000
@@ -55,7 +55,7 @@
static inline double DegToRad( double deg )
{
return (deg * M_PI) / 180.0;
-};
+}
wxString wxColStr( wxColour c )
{
@@ -180,17 +180,17 @@
{
// quarter 640x480 screen display at 72 dpi
Init( f, 320, 240, 72.0 );
-};
+}
wxSVGFileDC::wxSVGFileDC( wxString f, int Width, int Height )
{
Init( f, Width, Height, 72.0 );
-};
+}
wxSVGFileDC::wxSVGFileDC( wxString f, int Width, int Height, float dpi )
{
Init( f, Width, Height, dpi );
-};
+}
wxSVGFileDC::~wxSVGFileDC()
{
@@ -217,7 +217,7 @@
CalcBoundingBox( x1, y1 );
CalcBoundingBox( x2, y2 );
return;
-};
+}
void wxSVGFileDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
{
=== modified file 'common/dialog_about/AboutDialog_main.cpp'
--- common/dialog_about/AboutDialog_main.cpp 2010-09-03 14:33:09 +0000
+++ common/dialog_about/AboutDialog_main.cpp 2010-10-03 15:16:35 +0000
@@ -26,7 +26,7 @@
#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY( Contributors );
+WX_DEFINE_OBJARRAY( Contributors )
// Helper functions:
static wxString HtmlHyperlink( const wxString& url, const wxString& description = wxEmptyString );
=== modified file 'cvpcb/dialog_cvpcb_config_fbp.h'
--- cvpcb/dialog_cvpcb_config_fbp.h 2010-04-02 15:18:46 +0000
+++ cvpcb/dialog_cvpcb_config_fbp.h 2010-10-03 15:16:35 +0000
@@ -28,70 +28,90 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_CVPCB_CONFIG_FBP
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_CVPCB_CONFIG_FBP : public wxDialog
+class DIALOG_CVPCB_CONFIG_FBP : public wxDialog
{
- private:
-
- protected:
- enum
- {
- ID_ADD_LIB = 1000,
- ID_INSERT_LIB,
- ID_REMOVE_LIB,
- ID_LIB_UP,
- ID_LIB_DOWN,
- ID_ADD_EQU,
- ID_INSERT_EQU,
- ID_REMOVE_EQU,
- ID_EQU_UP,
- ID_EQU_DOWN,
- ID_BROWSE_MOD_DOC,
- ID_LIB_PATH_SEL,
- ID_INSERT_PATH,
- ID_REMOVE_PATH,
- };
-
- wxListBox* m_ListLibr;
- wxButton* m_buttonAddLib;
- wxButton* m_buttonInsLib;
- wxButton* m_buttonRemoveLib;
- wxButton* m_buttonLibUp;
- wxButton* m_buttonLibDown;
- wxListBox* m_ListEquiv;
- wxButton* m_buttonAddEqu;
- wxButton* m_buttonInsEqu;
- wxButton* m_buttonRemoveEqu;
- wxButton* m_buttonEquUp;
- wxButton* m_buttonEquDown;
- wxTextCtrl* m_TextHelpModulesFileName;
- wxButton* m_buttonModDoc;
- wxListBox* m_listUserPaths;
- wxButton* m_buttonAddPath;
- wxButton* m_buttonInsPath;
- wxButton* m_buttonRemovePath;
- wxListBox* m_DefaultLibraryPathslistBox;
- wxStaticLine* m_staticline2;
- wxStdDialogButtonSizer* m_sdbSizer2;
- wxButton* m_sdbSizer2OK;
- wxButton* m_sdbSizer2Cancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnAddOrInsertLibClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveLibClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonUpClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonDownClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnBrowseModDocFile( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnAddOrInsertPath( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveUserPath( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 570,625 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_CVPCB_CONFIG_FBP();
-
+private:
+
+protected:
+ enum
+ {
+ ID_ADD_LIB = 1000,
+ ID_INSERT_LIB,
+ ID_REMOVE_LIB,
+ ID_LIB_UP,
+ ID_LIB_DOWN,
+ ID_ADD_EQU,
+ ID_INSERT_EQU,
+ ID_REMOVE_EQU,
+ ID_EQU_UP,
+ ID_EQU_DOWN,
+ ID_BROWSE_MOD_DOC,
+ ID_LIB_PATH_SEL,
+ ID_INSERT_PATH,
+ ID_REMOVE_PATH
+ };
+
+ wxListBox* m_ListLibr;
+ wxButton* m_buttonAddLib;
+ wxButton* m_buttonInsLib;
+ wxButton* m_buttonRemoveLib;
+ wxButton* m_buttonLibUp;
+ wxButton* m_buttonLibDown;
+ wxListBox* m_ListEquiv;
+ wxButton* m_buttonAddEqu;
+ wxButton* m_buttonInsEqu;
+ wxButton* m_buttonRemoveEqu;
+ wxButton* m_buttonEquUp;
+ wxButton* m_buttonEquDown;
+ wxTextCtrl* m_TextHelpModulesFileName;
+ wxButton* m_buttonModDoc;
+ wxListBox* m_listUserPaths;
+ wxButton* m_buttonAddPath;
+ wxButton* m_buttonInsPath;
+ wxButton* m_buttonRemovePath;
+ wxListBox* m_DefaultLibraryPathslistBox;
+ wxStaticLine* m_staticline2;
+ wxStdDialogButtonSizer* m_sdbSizer2;
+ wxButton* m_sdbSizer2OK;
+ wxButton* m_sdbSizer2Cancel;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddOrInsertLibClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveLibClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonUpClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonDownClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnBrowseModDocFile( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddOrInsertPath( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveUserPath( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 570,625 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_CVPCB_CONFIG_FBP();
+
};
#endif //__dialog_cvpcb_config_fbp__
=== modified file 'eeschema/class_pin.h'
--- eeschema/class_pin.h 2010-09-24 16:00:40 +0000
+++ eeschema/class_pin.h 2010-10-03 15:16:35 +0000
@@ -63,7 +63,7 @@
LOWLEVEL_IN = 4,
LOWLEVEL_OUT = 8,
CLOCK_FALL = 0x10, /* this is common form for inverted clock in Eastern Block */
- NONLOGIC = 0x20,
+ NONLOGIC = 0x20
};
@@ -74,7 +74,7 @@
PIN_RIGHT = 'R',
PIN_LEFT = 'L',
PIN_UP = 'U',
- PIN_DOWN = 'D',
+ PIN_DOWN = 'D'
};
=== modified file 'eeschema/class_schematic_items.cpp'
--- eeschema/class_schematic_items.cpp 2010-09-05 17:01:48 +0000
+++ eeschema/class_schematic_items.cpp 2010-10-03 15:16:35 +0000
@@ -221,7 +221,7 @@
rect.Inflate( ( GetPenSize() + m_Size.x ) / 2 );
return rect;
-};
+}
/** Function HitTest
=== modified file 'eeschema/dialog_SVG_print_base.h'
--- eeschema/dialog_SVG_print_base.h 2010-02-23 20:18:27 +0000
+++ eeschema/dialog_SVG_print_base.h 2010-10-03 15:16:35 +0000
@@ -37,7 +37,7 @@
enum
{
wxID_PRINT_CURRENT = 1000,
- wxID_PRINT_ALL,
+ wxID_PRINT_ALL
};
wxStaticText* m_TextPenWidth;
=== modified file 'eeschema/dialog_build_BOM_base.h'
--- eeschema/dialog_build_BOM_base.h 2010-02-26 06:06:03 +0000
+++ eeschema/dialog_build_BOM_base.h 2010-10-03 15:16:35 +0000
@@ -27,48 +27,54 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_BUILD_BOM_BASE
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_BUILD_BOM_BASE : public wxDialog
+class DIALOG_BUILD_BOM_BASE : public wxDialog
{
- private:
-
- protected:
- enum
- {
- ID_RADIOBOX_SELECT_FORMAT = 1000,
- };
-
- wxCheckBox* m_ListCmpbyRefItems;
- wxCheckBox* m_ListSubCmpItems;
- wxCheckBox* m_ListCmpbyValItems;
- wxCheckBox* m_GenListLabelsbyVal;
- wxCheckBox* m_GenListLabelsbySheet;
- wxRadioBox* m_OutputFormCtrl;
- wxRadioBox* m_OutputSeparatorCtrl;
- wxCheckBox* m_GetListBrowser;
- wxCheckBox* m_AddFootprintField;
- wxCheckBox* m_AddField1;
- wxCheckBox* m_AddField2;
- wxCheckBox* m_AddField3;
- wxCheckBox* m_AddField4;
- wxCheckBox* m_AddField5;
- wxCheckBox* m_AddField6;
- wxCheckBox* m_AddField7;
- wxCheckBox* m_AddField8;
- wxCheckBox* m_AddAllFields;
-
- wxButton* m_buttonOK;
- wxButton* m_buttonCANCEL;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnRadioboxSelectFormatSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 415,382 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_BUILD_BOM_BASE();
-
+private:
+
+protected:
+ enum
+ {
+ ID_RADIOBOX_SELECT_FORMAT = 1000
+ };
+
+ wxCheckBox* m_ListCmpbyRefItems;
+ wxCheckBox* m_ListSubCmpItems;
+ wxCheckBox* m_ListCmpbyValItems;
+ wxCheckBox* m_GenListLabelsbyVal;
+ wxCheckBox* m_GenListLabelsbySheet;
+ wxRadioBox* m_OutputFormCtrl;
+ wxRadioBox* m_OutputSeparatorCtrl;
+ wxCheckBox* m_GetListBrowser;
+ wxCheckBox* m_AddFootprintField;
+ wxCheckBox* m_AddField1;
+ wxCheckBox* m_AddField2;
+ wxCheckBox* m_AddField3;
+ wxCheckBox* m_AddField4;
+ wxCheckBox* m_AddField5;
+ wxCheckBox* m_AddField6;
+ wxCheckBox* m_AddField7;
+ wxCheckBox* m_AddField8;
+ wxCheckBox* m_AddAllFields;
+
+ wxButton* m_buttonOK;
+ wxButton* m_buttonCANCEL;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnRadioboxSelectFormatSelected( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 415,382 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_BUILD_BOM_BASE();
+
};
#endif //__dialog_build_BOM_base__
=== modified file 'eeschema/dialog_edit_label_base.h'
--- eeschema/dialog_edit_label_base.h 2010-07-14 13:24:36 +0000
+++ eeschema/dialog_edit_label_base.h 2010-10-03 15:16:35 +0000
@@ -36,7 +36,7 @@
{
wxID_VALUESINGLE = 1000,
wxID_VALUEMULTI,
- wxID_SIZE,
+ wxID_SIZE
};
wxFlexGridSizer* m_textControlSizer;
=== modified file 'eeschema/dialog_eeschema_config_fbp.h'
--- eeschema/dialog_eeschema_config_fbp.h 2010-04-02 11:48:30 +0000
+++ eeschema/dialog_eeschema_config_fbp.h 2010-10-03 15:16:35 +0000
@@ -27,53 +27,73 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_EESCHEMA_CONFIG_FBP
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_EESCHEMA_CONFIG_FBP : public wxDialog
+class DIALOG_EESCHEMA_CONFIG_FBP : public wxDialog
{
- private:
-
- protected:
- enum
- {
- ID_ADD_LIB = 1000,
- ID_REMOVE_LIB,
- ID_LIB_PATH_SEL,
- wxID_INSERT_PATH,
- wxID_REMOVE_PATH,
- };
-
- wxListBox* m_ListLibr;
- wxButton* m_buttonAddLib;
- wxButton* m_buttonIns;
- wxButton* m_buttonRemoveLib;
- wxButton* m_buttonUp;
- wxButton* m_buttonDown;
- wxListBox* m_listUserPaths;
- wxButton* m_buttonAddPath;
- wxButton* m_buttonInsPath;
- wxButton* m_buttonRemovePath;
- wxListBox* m_DefaultLibraryPathslistBox;
- wxStaticLine* m_staticline3;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnFilesListClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnAddOrInsertLibClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveLibClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonUpClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonDownClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnAddOrInsertPath( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveUserPath( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- wxStdDialogButtonSizer* m_sdbSizer1;
- wxButton* m_sdbSizer1OK;
- wxButton* m_sdbSizer1Cancel;
- DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_EESCHEMA_CONFIG_FBP();
-
+private:
+
+protected:
+ enum
+ {
+ ID_ADD_LIB = 1000,
+ ID_REMOVE_LIB,
+ ID_LIB_PATH_SEL,
+ wxID_INSERT_PATH,
+ wxID_REMOVE_PATH
+ };
+
+ wxListBox* m_ListLibr;
+ wxButton* m_buttonAddLib;
+ wxButton* m_buttonIns;
+ wxButton* m_buttonRemoveLib;
+ wxButton* m_buttonUp;
+ wxButton* m_buttonDown;
+ wxListBox* m_listUserPaths;
+ wxButton* m_buttonAddPath;
+ wxButton* m_buttonInsPath;
+ wxButton* m_buttonRemovePath;
+ wxListBox* m_DefaultLibraryPathslistBox;
+ wxStaticLine* m_staticline3;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnFilesListClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddOrInsertLibClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveLibClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonUpClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonDownClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddOrInsertPath( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveUserPath( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ wxStdDialogButtonSizer* m_sdbSizer1;
+ wxButton* m_sdbSizer1OK;
+ wxButton* m_sdbSizer1Cancel;
+ DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_EESCHEMA_CONFIG_FBP();
+
};
#endif //__dialog_eeschema_config_fbp__
=== modified file 'eeschema/dialog_erc_base.h'
--- eeschema/dialog_erc_base.h 2009-07-08 18:06:11 +0000
+++ eeschema/dialog_erc_base.h 2010-10-03 15:16:35 +0000
@@ -56,7 +56,7 @@
ID_ERC_CMP = 1000,
ID_ERASE_DRC_MARKERS,
ID_MAKER_HTMLLISTBOX,
- ID_RESET_MATRIX,
+ ID_RESET_MATRIX
};
wxNotebook* m_NoteBook;
=== modified file 'eeschema/files-io.cpp'
--- eeschema/files-io.cpp 2010-07-14 13:24:36 +0000
+++ eeschema/files-io.cpp 2010-10-03 15:16:35 +0000
@@ -190,7 +190,7 @@
{
wxString prompt;
- prompt.Printf( _( "Component library <%s> failed to load.\n\n\Error: %s" ),
+ prompt.Printf( _( "Component library <%s> failed to load.\n\n Error: %s" ),
GetChars( fn.GetFullPath() ),
GetChars( errMsg ) );
DisplayError( this, prompt );
=== modified file 'eeschema/pinedit.cpp'
--- eeschema/pinedit.cpp 2010-07-12 14:07:09 +0000
+++ eeschema/pinedit.cpp 2010-10-03 15:16:35 +0000
@@ -279,7 +279,7 @@
DrawPanel->CursorOn( DC );
m_drawItem = NULL;
-};
+}
/**
=== modified file 'eeschema/template_fieldnames.h'
--- eeschema/template_fieldnames.h 2010-08-09 02:03:16 +0000
+++ eeschema/template_fieldnames.h 2010-10-03 15:16:35 +0000
@@ -35,7 +35,7 @@
FIELD5,
FIELD6,
FIELD7,
- FIELD8,
+ FIELD8
};
=== modified file 'gerbview/dcode.h'
--- gerbview/dcode.h 2010-09-29 19:00:35 +0000
+++ gerbview/dcode.h 2010-10-03 15:16:35 +0000
@@ -115,7 +115,7 @@
AMP_OUTLINE = 4, // Free polyline (n corners + rotation)
AMP_POLYGON = 5, // Closed regular polygon(diameter, number of vertices (3 to 10), rotation)
AMP_MOIRE = 6, // A cross hair with n concentric circles + rotation
- AMP_THERMAL = 7, // Thermal shape (pos, outer and inner dioameter, cross hair thickness + rotation)
+ AMP_THERMAL = 7 // Thermal shape (pos, outer and inner dioameter, cross hair thickness + rotation)
};
=== modified file 'gerbview/dialog_print_using_printer_base.h'
--- gerbview/dialog_print_using_printer_base.h 2010-04-22 17:47:10 +0000
+++ gerbview/dialog_print_using_printer_base.h 2010-10-03 15:16:35 +0000
@@ -39,7 +39,7 @@
wxID_PRINT_MODE = 1000,
wxID_PAGE_MODE,
wxID_PRINT_OPTIONS,
- wxID_PRINT_ALL,
+ wxID_PRINT_ALL
};
wxStaticBoxSizer* m_leftLayersBoxSizer;
=== modified file 'gerbview/gerbview.h'
--- gerbview/gerbview.h 2010-09-28 14:42:05 +0000
+++ gerbview/gerbview.h 2010-10-03 15:16:35 +0000
@@ -63,7 +63,7 @@
GERB_INTERPOL_LINEAR_01X,
GERB_INTERPOL_LINEAR_001X,
GERB_INTERPOL_ARC_NEG,
- GERB_INTERPOL_ARC_POS,
+ GERB_INTERPOL_ARC_POS
};
@@ -142,7 +142,7 @@
FILE* m_FilesList[12]; // Files list
int m_FilesPtr; // Stack pointer for files list
- int m_Selected_Tool; // Pour editions: Tool (Dcode) selectionné
+ int m_Selected_Tool; // Pour editions: Tool (Dcode) selectionn�
int m_Transform[2][2]; // The rotation/mirror transformation matrix.
bool m_360Arc_enbl; // Enbl 360 deg circular interpolation
=== modified file 'gerbview/rs274d.cpp'
--- gerbview/rs274d.cpp 2010-09-29 19:00:35 +0000
+++ gerbview/rs274d.cpp 2010-10-03 15:16:35 +0000
@@ -114,7 +114,7 @@
NEGATE( aGbrItem->m_Start.y );
NEGATE( aGbrItem->m_End.y );
- if( !isDark )
+ if ( !isDark )
{
aGbrItem->m_Flags |= DRAW_ERASED;
}
@@ -151,7 +151,7 @@
aGbrItem->m_Shape = GBR_SPOT_CIRCLE;
aGbrItem->m_Flashed = true;
- if( !isDark )
+ if ( !isDark )
{
aGbrItem->m_Flags |= DRAW_ERASED;
}
@@ -174,12 +174,12 @@
* when drawing so that an erasure happens.
*/
static void fillOvalOrRectFlashGBRITEM( GERBER_DRAW_ITEM* aGbrItem,
- int Dcode_index,
- int aLayer,
- const wxPoint& aPos,
- const wxSize& aSize,
- int aShape,
- bool isDark )
+ int Dcode_index,
+ int aLayer,
+ const wxPoint& aPos,
+ const wxSize& aSize,
+ int aShape,
+ bool isDark )
{
aGbrItem->SetLayer( aLayer );
aGbrItem->m_Flashed = true;
@@ -193,7 +193,7 @@
aGbrItem->m_DCode = Dcode_index;
aGbrItem->m_Shape = aShape;
- if( !isDark )
+ if ( !isDark )
{
aGbrItem->m_Flags |= DRAW_ERASED;
}
@@ -234,7 +234,7 @@
aGbrItem->m_DCode = Dcode_index;
- if( !isDark )
+ if ( !isDark )
{
aGbrItem->m_Flags |= DRAW_ERASED;
}
@@ -283,12 +283,12 @@
aGbrItem->m_Size.x = aGbrItem->m_Size.y = aWidth;
aGbrItem->m_Flashed = false;
- if( multiquadrant )
+ if ( multiquadrant )
{
center.x = aStart.x + rel_center.x;
center.y = aStart.y + rel_center.y;
- if( clockwise )
+ if ( clockwise )
{
aGbrItem->m_Start = aStart;
aGbrItem->m_End = aEnd;
@@ -304,16 +304,16 @@
center = rel_center;
delta = aEnd - aStart;
- if( (delta.x >= 0) && (delta.y >= 0) )
+ if ( (delta.x >= 0) && (delta.y >= 0) )
{
// Quadrant 2
}
- else if( (delta.x >= 0) && (delta.y < 0) )
+ else if ( (delta.x >= 0) && (delta.y < 0) )
{
// Quadrant 1
center.y = -center.y;
}
- else if( (delta.x < 0) && (delta.y >= 0) )
+ else if ( (delta.x < 0) && (delta.y >= 0) )
{
// Quadrant 4
center.x = -center.x;
@@ -328,7 +328,7 @@
center.x += aStart.x;
center.y += aStart.y;
- if( clockwise )
+ if ( clockwise )
{
aGbrItem->m_Start = aStart;
aGbrItem->m_End = aEnd;
@@ -347,7 +347,7 @@
NEGATE( aGbrItem->m_End.y );
NEGATE( aGbrItem->m_ArcCentre.y );
- if( !isDark )
+ if ( !isDark )
{
aGbrItem->m_Flags |= DRAW_ERASED;
}
@@ -419,34 +419,34 @@
// D( printf( " >>>> st %d,%d angle %f, end %d,%d angle %f delta %f\n",
// start.x, start.y, start_angle, end.x, end.y, end_angle, angle ) );
- if( !clockwise )
+ if ( !clockwise )
{
EXCHG( start, end );
D( printf( " >>>> reverse arc\n" ) );
}
// Normalize angle
- while( angle > 360.0 )
+ while ( angle > 360.0 )
angle -= 360.0;
- while( angle < 0.0 )
+ while ( angle < 0.0 )
angle += 360.0;
int count = (int) ( angle / increment_angle );
- if( count <= 0 )
+ if ( count <= 0 )
count = 1;
// D( printf( " >>>> angle %f, cnt %d sens %d\n", angle, count, clockwise ) );
// calculate segments
wxPoint start_arc = start;
- for( int ii = 1; ii <= count; ii++ )
+ for ( int ii = 1; ii <= count; ii++ )
{
wxPoint end_arc = start;
int rot = 10 * ii * increment_angle; // rot is in 0.1 deg
- if( ii < count )
+ if ( ii < count )
{
- if( clockwise )
+ if ( clockwise )
RotatePoint( &end_arc, rot );
else
RotatePoint( &end_arc, -rot );
@@ -457,11 +457,11 @@
// D( printf( " >> Add arc %d rot %d, edge poly item %d,%d to %d,%d\n",
// ii, rot, start_arc.x, start_arc.y,end_arc.x, end_arc.y ); )
- if( aGrbrItem->m_PolyCorners.size() == 0 )
+ if ( aGrbrItem->m_PolyCorners.size() == 0 )
aGrbrItem->m_PolyCorners.push_back( start_arc + center );
aGrbrItem->m_PolyCorners.push_back( end_arc + center );
- if( !isDark )
+ if ( !isDark )
{
aGrbrItem->m_Flags |= DRAW_ERASED;
}
@@ -482,36 +482,36 @@
char line[256];
- if( m_Relative )
+ if ( m_Relative )
pos.x = pos.y = 0;
else
pos = m_CurrentPos;
- if( Text == NULL )
+ if ( Text == NULL )
return pos;
text = line;
- while( *Text )
+ while ( *Text )
{
- if( (*Text == 'X') || (*Text == 'Y') )
+ if ( (*Text == 'X') || (*Text == 'Y') )
{
type_coord = *Text;
Text++;
text = line;
nbchar = 0;
- while( IsNumber( *Text ) )
+ while ( IsNumber( *Text ) )
{
- if( *Text == '.' )
+ if ( *Text == '.' )
is_float = true;
*(text++) = *(Text++);
- if( (*Text >= '0') && (*Text <='9') )
+ if ( (*Text >= '0') && (*Text <='9') )
nbchar++;
}
*text = 0;
- if( is_float )
+ if ( is_float )
{
- if( m_GerbMetric )
+ if ( m_GerbMetric )
current_coord = wxRound( atof( line ) / 0.00254 );
else
current_coord = wxRound( atof( line ) * PCB_INTERNAL_UNIT );
@@ -520,11 +520,11 @@
{
int fmt_scale =
(type_coord == 'X') ? m_FmtScale.x : m_FmtScale.y;
- if( m_NoTrailingZeros )
+ if ( m_NoTrailingZeros )
{
int min_digit =
(type_coord == 'X') ? m_FmtLen.x : m_FmtLen.y;
- while( nbchar < min_digit )
+ while ( nbchar < min_digit )
{
*(text++) = '0';
nbchar++;
@@ -534,24 +534,24 @@
}
current_coord = atoi( line );
double real_scale = 1.0;
- if( fmt_scale < 0 || fmt_scale > 9 )
+ if ( fmt_scale < 0 || fmt_scale > 9 )
fmt_scale = 4;
double scale_list[10] =
{ 10000.0, 1000.0, 100.0, 10.0,
- 1,
- 0.1, 0.01, 0.001, 0.0001, 0.00001
+ 1,
+ 0.1, 0.01, 0.001, 0.0001, 0.00001
};
real_scale = scale_list[fmt_scale];
- if( m_GerbMetric )
+ if ( m_GerbMetric )
real_scale = real_scale / 25.4;
current_coord = wxRound( current_coord * real_scale );
}
- if( type_coord == 'X' )
+ if ( type_coord == 'X' )
pos.x = current_coord;
- else if( type_coord == 'Y' )
+ else if ( type_coord == 'Y' )
pos.y = current_coord;
continue;
@@ -560,7 +560,7 @@
break;
}
- if( m_Relative )
+ if ( m_Relative )
{
pos.x += m_CurrentPos.x;
pos.y += m_CurrentPos.y;
@@ -584,31 +584,31 @@
char* text;
char line[256];
- if( Text == NULL )
+ if ( Text == NULL )
return pos;
text = line;
- while( *Text )
+ while ( *Text )
{
- if( (*Text == 'I') || (*Text == 'J') )
+ if ( (*Text == 'I') || (*Text == 'J') )
{
type_coord = *Text;
Text++;
text = line;
nbchar = 0;
- while( IsNumber( *Text ) )
+ while ( IsNumber( *Text ) )
{
- if( *Text == '.' )
+ if ( *Text == '.' )
is_float = true;
*(text++) = *(Text++);
- if( (*Text >= '0') && (*Text <='9') )
+ if ( (*Text >= '0') && (*Text <='9') )
nbchar++;
}
*text = 0;
- if( is_float )
+ if ( is_float )
{
- if( m_GerbMetric )
+ if ( m_GerbMetric )
current_coord = wxRound( atof( line ) / 0.00254 );
else
current_coord = wxRound( atof( line ) * PCB_INTERNAL_UNIT );
@@ -617,11 +617,11 @@
{
int fmt_scale =
(type_coord == 'I') ? m_FmtScale.x : m_FmtScale.y;
- if( m_NoTrailingZeros )
+ if ( m_NoTrailingZeros )
{
int min_digit =
(type_coord == 'I') ? m_FmtLen.x : m_FmtLen.y;
- while( nbchar < min_digit )
+ while ( nbchar < min_digit )
{
*(text++) = '0';
nbchar++;
@@ -632,7 +632,7 @@
current_coord = atoi( line );
double real_scale = 1.0;
- switch( fmt_scale )
+ switch ( fmt_scale )
{
case 0:
real_scale = 10000.0;
@@ -674,13 +674,13 @@
break;
}
- if( m_GerbMetric )
+ if ( m_GerbMetric )
real_scale = real_scale / 25.4;
current_coord = wxRound( current_coord * real_scale );
}
- if( type_coord == 'I' )
+ if ( type_coord == 'I' )
pos.x = current_coord;
- else if( type_coord == 'J' )
+ else if ( type_coord == 'J' )
pos.y = current_coord;
continue;
}
@@ -701,11 +701,11 @@
char* text;
char line[1024];
- if( Text == NULL )
+ if ( Text == NULL )
return 0;
Text++;
text = line;
- while( IsNumber( *Text ) )
+ while ( IsNumber( *Text ) )
{
*(text++) = *(Text++);
}
@@ -724,12 +724,12 @@
char* text;
char line[1024];
- if( Text == NULL )
+ if ( Text == NULL )
return 0;
Text++;
text = line;
- while( IsNumber( *Text ) )
+ while ( IsNumber( *Text ) )
*(text++) = *(Text++);
*text = 0;
@@ -742,10 +742,10 @@
{
D( printf( "%22s: G_CODE<%d>\n", __func__, G_commande ); )
- switch( G_commande )
+ switch ( G_commande )
{
case GC_PHOTO_MODE: // can starts a D03 flash command: redundant, can
- // be safely ignored
+ // be safely ignored
break;
case GC_LINEAR_INTERPOL_1X:
@@ -779,13 +779,13 @@
case GC_SELECT_TOOL:
{
int D_commande = ReturnDCodeNumber( text );
- if( D_commande < FIRST_DCODE )
+ if ( D_commande < FIRST_DCODE )
return false;
- if( D_commande > (TOOLS_MAX_COUNT - 1) )
+ if ( D_commande > (TOOLS_MAX_COUNT - 1) )
D_commande = TOOLS_MAX_COUNT - 1;
m_Current_Tool = D_commande;
D_CODE* pt_Dcode = GetDCODE( D_commande, false );
- if( pt_Dcode )
+ if ( pt_Dcode )
pt_Dcode->m_InUse = true;
break;
}
@@ -808,12 +808,12 @@
case GC_SPECIFY_ABSOLUES_COORD:
m_Relative = false; // false = absolute Coord, true = relative
- // Coord
+ // Coord
break;
case GC_SPECIFY_RELATIVEES_COORD:
m_Relative = true; // false = absolute Coord, true = relative
- // Coord
+ // Coord
break;
case GC_TURN_ON_POLY_FILL:
@@ -828,8 +828,9 @@
case GC_MOVE: // Non existent
default:
{
- wxString msg; msg.Printf( wxT( "G%0.2d command not handled" ),
- G_commande );
+ wxString msg;
+ msg.Printf( wxT( "G%0.2d command not handled" ),
+ G_commande );
DisplayError( NULL, msg );
return false;
}
@@ -848,7 +849,7 @@
{
int ret;
- if( isMetric )
+ if ( isMetric )
ret = wxRound( aCoord / 0.00254 );
else
ret = wxRound( aCoord * PCB_INTERNAL_UNIT );
@@ -866,7 +867,7 @@
static wxPoint mapPt( double x, double y, bool isMetric )
{
wxPoint ret( scale( x, isMetric ),
- scale( y, isMetric ) );
+ scale( y, isMetric ) );
return ret;
}
@@ -889,7 +890,7 @@
{
bool exposure;
- switch( param1 )
+ switch ( param1 )
{
case 0:
exposure = false;
@@ -925,9 +926,9 @@
D( printf( "%22s: D_CODE<%d>\n", __func__, D_commande ); )
- if( D_commande >= FIRST_DCODE ) // This is a "Set tool" command
+ if ( D_commande >= FIRST_DCODE ) // This is a "Set tool" command
{
- if( D_commande > (TOOLS_MAX_COUNT - 1) )
+ if ( D_commande > (TOOLS_MAX_COUNT - 1) )
D_commande = TOOLS_MAX_COUNT - 1;
// remember which tool is selected, nothing is done with it in this
@@ -935,7 +936,7 @@
m_Current_Tool = D_commande;
D_CODE* pt_Dcode = GetDCODE( D_commande, false );
- if( pt_Dcode )
+ if ( pt_Dcode )
pt_Dcode->m_InUse = true;
return true;
@@ -945,12 +946,12 @@
m_Last_Pen_Command = D_commande;
}
- if( m_PolygonFillMode ) // Enter a polygon description:
+ if ( m_PolygonFillMode ) // Enter a polygon description:
{
- switch( D_commande )
+ switch ( D_commande )
{
case 1: // code D01 Draw line, exposure ON
- if( !m_Exposure )
+ if ( !m_Exposure )
{
m_Exposure = true;
gbritem = new GERBER_DRAW_ITEM( pcb );
@@ -960,7 +961,7 @@
gbritem->m_Flashed = false;
}
- switch( m_Iterpolation )
+ switch ( m_Iterpolation )
{
case GERB_INTERPOL_ARC_NEG:
case GERB_INTERPOL_ARC_POS:
@@ -969,10 +970,10 @@
m_PreviousPos.x, m_PreviousPos.y, m_CurrentPos.x,
m_CurrentPos.y, m_PolygonFillModeState, m_Iterpolation, m_360Arc_enbl ); )
fillArcPOLY( pcb, gbritem, m_PreviousPos,
- m_CurrentPos, m_IJPos,
- ( m_Iterpolation == GERB_INTERPOL_ARC_NEG ) ?
- false : true, m_360Arc_enbl,
- !(m_LayerNegative ^ m_ImageNegative) );
+ m_CurrentPos, m_IJPos,
+ ( m_Iterpolation == GERB_INTERPOL_ARC_NEG ) ?
+ false : true, m_360Arc_enbl,
+ !(m_LayerNegative ^ m_ImageNegative) );
break;
default:
@@ -983,7 +984,7 @@
gbritem->m_Start = m_PreviousPos; // m_Start is used as temporary storage
NEGATE( gbritem->m_Start.y );
- if( gbritem->m_PolyCorners.size() == 0 )
+ if ( gbritem->m_PolyCorners.size() == 0 )
gbritem->m_PolyCorners.push_back( gbritem->m_Start );
gbritem->m_End = m_CurrentPos; // m_End is used as temporary storage
@@ -991,9 +992,9 @@
gbritem->m_PolyCorners.push_back( gbritem->m_End );
// Set the erasure flag of gbritem if a negative polygon.
- if( !m_PolygonFillModeState )
+ if ( !m_PolygonFillModeState )
{
- if( m_LayerNegative ^ m_ImageNegative )
+ if ( m_LayerNegative ^ m_ImageNegative )
gbritem->m_Flags |= DRAW_ERASED;
D( printf( "\nm_Flags=0x%08X\n", gbritem->m_Flags ); )
}
@@ -1016,28 +1017,29 @@
}
else
{
- switch( D_commande )
+ switch ( D_commande )
{
case 1: // code D01 Draw line, exposure ON
m_Exposure = true;
tool = GetDCODE( m_Current_Tool, false );
- if( tool )
+ if ( tool )
{
size = tool->m_Size;
dcode = tool->m_Num_Dcode;
aperture = tool->m_Shape;
}
- switch( m_Iterpolation )
+ switch ( m_Iterpolation )
{
case GERB_INTERPOL_LINEAR_1X:
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ //D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; );
fillLineGBRITEM( gbritem, dcode, activeLayer, m_PreviousPos,
- m_CurrentPos, size.x,
- !(m_LayerNegative ^ m_ImageNegative) );
+ m_CurrentPos, size.x,
+ !(m_LayerNegative ^ m_ImageNegative) );
break;
case GERB_INTERPOL_LINEAR_01X:
@@ -1050,12 +1052,13 @@
case GERB_INTERPOL_ARC_POS:
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ //D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; );
fillArcGBRITEM( gbritem, dcode, activeLayer, m_PreviousPos,
- m_CurrentPos, m_IJPos, size.x,
- ( m_Iterpolation == GERB_INTERPOL_ARC_NEG ) ?
- false : true, m_360Arc_enbl,
- !(m_LayerNegative ^ m_ImageNegative) );
+ m_CurrentPos, m_IJPos, size.x,
+ ( m_Iterpolation == GERB_INTERPOL_ARC_NEG ) ?
+ false : true, m_360Arc_enbl,
+ !(m_LayerNegative ^ m_ImageNegative) );
break;
default:
@@ -1075,24 +1078,25 @@
case 3: // code D3: flash aperture
tool = GetDCODE( m_Current_Tool, false );
- if( tool )
+ if ( tool )
{
size = tool->m_Size;
dcode = tool->m_Num_Dcode;
aperture = tool->m_Shape;
}
- switch( aperture )
+ switch ( aperture )
{
case APT_POLYGON: // flashed regular polygon
case APT_CIRCLE:
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ //D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillRoundFlashGBRITEM( gbritem, dcode, activeLayer,
- m_CurrentPos, size.x,
- !(m_LayerNegative ^ m_ImageNegative) );
- if( aperture == APT_POLYGON )
+ m_CurrentPos, size.x,
+ !(m_LayerNegative ^ m_ImageNegative) );
+ if ( aperture == APT_POLYGON )
gbritem->m_Shape = GBR_SPOT_POLY;
break;
@@ -1100,12 +1104,12 @@
case APT_RECT:
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillOvalOrRectFlashGBRITEM( gbritem, dcode, activeLayer,
- m_CurrentPos, size,
- ( aperture == APT_RECT ) ?
- GBR_SPOT_RECT : GBR_SPOT_OVAL,
- !(m_LayerNegative ^ m_ImageNegative) );
+ m_CurrentPos, size,
+ ( aperture == APT_RECT ) ?
+ GBR_SPOT_RECT : GBR_SPOT_OVAL,
+ !(m_LayerNegative ^ m_ImageNegative) );
break;
case APT_MACRO:
@@ -1115,14 +1119,14 @@
// split the macro primitives up into multiple normal GBRITEM
// elements
- for( AM_PRIMITIVES::iterator p = macro->primitives.begin();
- p!=macro->primitives.end();
- ++p )
+ for ( AM_PRIMITIVES::iterator p = macro->primitives.begin();
+ p!=macro->primitives.end();
+ ++p )
{
bool exposure;
wxPoint curPos = m_CurrentPos;
- switch( p->primitive_id )
+ switch ( p->primitive_id )
{
case AMP_CIRCLE:
{
@@ -1136,7 +1140,7 @@
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillRoundFlashGBRITEM( gbritem, dcode, activeLayer,
curPos, diameter, exposure );
}
@@ -1146,7 +1150,7 @@
case AMP_LINE20:
{
exposure = mapExposure(
- p->GetExposure(), m_Exposure, m_ImageNegative );
+ p->GetExposure(), m_Exposure, m_ImageNegative );
int width = scale( p->params[1].GetValue( tool ),
m_GerbMetric );
wxPoint start = mapPt( p->params[2].GetValue( tool ),
@@ -1156,7 +1160,7 @@
p->params[5].GetValue( tool ),
m_GerbMetric );
- if( start.x == end.x )
+ if ( start.x == end.x )
{
size.x = width;
size.y = ABS( end.y - start.y ) + 1;
@@ -1168,11 +1172,11 @@
}
wxPoint midPoint( ( start.x + end.x ) / 2,
- ( start.y + end.y ) / 2 );
+ ( start.y + end.y ) / 2 );
curPos += midPoint;
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillOvalOrRectFlashGBRITEM( gbritem, dcode, activeLayer,
curPos, size, GBR_SPOT_RECT,
exposure );
@@ -1193,7 +1197,7 @@
m_GerbMetric );
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillOvalOrRectFlashGBRITEM( gbritem, dcode, activeLayer,
curPos, size, GBR_SPOT_RECT,
exposure );
@@ -1203,7 +1207,7 @@
case AMP_LINE_LOWER_LEFT:
{
exposure = mapExposure(
- p->GetExposure(), m_Exposure, m_ImageNegative );
+ p->GetExposure(), m_Exposure, m_ImageNegative );
wxPoint msize = mapPt( p->params[1].GetValue( tool ),
p->params[2].GetValue( tool ),
m_GerbMetric );
@@ -1219,7 +1223,7 @@
curPos.x += size.x / 2;
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillOvalOrRectFlashGBRITEM( gbritem, dcode, activeLayer,
curPos, size, GBR_SPOT_RECT,
exposure );
@@ -1239,17 +1243,17 @@
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillRoundFlashGBRITEM( gbritem, dcode, activeLayer,
- curPos, outerDiam,
- !( m_LayerNegative ^ m_ImageNegative ) );
+ curPos, outerDiam,
+ !( m_LayerNegative ^ m_ImageNegative ) );
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillRoundFlashGBRITEM( gbritem, dcode, activeLayer, curPos,
- innerDiam,
- ( m_LayerNegative ^ m_ImageNegative ) );
+ innerDiam,
+ ( m_LayerNegative ^ m_ImageNegative ) );
// @todo: draw the cross hairs, see page 23 of rs274
// spec. this might be done with two lines, thickness
@@ -1280,38 +1284,38 @@
// ignore rotation, not supported
// adjust outerDiam by this on each nested circle
int diamAdjust = 2 * (gap + penThickness);
- for( int i = 0; i < numCircles; ++i, outerDiam -= diamAdjust )
+ for ( int i = 0; i < numCircles; ++i, outerDiam -= diamAdjust )
{
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillCircularGBRITEM( gbritem, dcode, activeLayer,
- curPos, outerDiam,
- penThickness,
- !( m_LayerNegative ^ m_ImageNegative ) );
+ curPos, outerDiam,
+ penThickness,
+ !( m_LayerNegative ^ m_ImageNegative ) );
}
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
fillOvalOrRectFlashGBRITEM( gbritem, dcode, activeLayer,
- curPos,
- wxSize( crossHairThickness,
- crossHairLength ),
- GBR_SPOT_RECT,
- !( m_LayerNegative ^ m_ImageNegative ) );
+ curPos,
+ wxSize( crossHairThickness,
+ crossHairLength ),
+ GBR_SPOT_RECT,
+ !( m_LayerNegative ^ m_ImageNegative ) );
gbritem = new GERBER_DRAW_ITEM( pcb );
pcb->m_Drawings.Append( gbritem );
- D( printf( "R:%p\n", gbritem ); )
+ D( std::cout<<"R: "<<gbritem<<std::endl; )
// swap x and y in wxSize() for this one
fillOvalOrRectFlashGBRITEM( gbritem, dcode, activeLayer,
- curPos,
- wxSize( crossHairLength,
- crossHairThickness ),
- GBR_SPOT_RECT,
- !( m_LayerNegative ^ m_ImageNegative ) );
+ curPos,
+ wxSize( crossHairLength,
+ crossHairThickness ),
+ GBR_SPOT_RECT,
+ !( m_LayerNegative ^ m_ImageNegative ) );
}
break;
@@ -1325,12 +1329,12 @@
printf( " # points: %d\n", numPoints );
// numPoints does not include the starting point, so add 1.
- for( int i = 0; i<numPoints + 1; ++i )
+ for ( int i = 0; i<numPoints + 1; ++i )
{
printf( " [%d]: X=%g Y=%g\n", i,
p->params[i * 2 + 2 + 0].GetValue( tool ),
p->params[i * 2 + 2 + 1].GetValue( tool )
- );
+ );
}
printf( " rotation: %g\n", p->params[numPoints * 2 + 4].GetValue( tool ) );
=== modified file 'gerbview/wxGerberFrame.h'
--- gerbview/wxGerberFrame.h 2010-09-28 14:42:05 +0000
+++ gerbview/wxGerberFrame.h 2010-10-03 15:16:35 +0000
@@ -28,7 +28,7 @@
ID_INC_LAYER_AND_APPEND_FILE,
ID_GERBVIEW_SHOW_SOURCE,
ID_GERBVIEW_EXPORT_TO_PCBNEW,
- ID_GERBVIEW_POPUP_DELETE_DCODE_ITEMS,
+ ID_GERBVIEW_POPUP_DELETE_DCODE_ITEMS
};
=== modified file 'include/appl_wxstruct.h'
--- include/appl_wxstruct.h 2010-02-28 13:44:29 +0000
+++ include/appl_wxstruct.h 2010-10-03 15:16:35 +0000
@@ -19,7 +19,7 @@
APP_TYPE_PCBNEW,
APP_TYPE_CVPCB,
APP_TYPE_GERBVIEW,
- APP_TYPE_KICAD,
+ APP_TYPE_KICAD
};
class wxConfigBase;
@@ -227,6 +227,6 @@
* of the application pointer all over the place or worse yet in a global
* variable.
*/
-DECLARE_APP( WinEDA_App );
+DECLARE_APP( WinEDA_App )
#endif /* APPL_WXSTRUCT_H */
=== modified file 'include/base_struct.h'
--- include/base_struct.h 2010-09-28 14:42:05 +0000
+++ include/base_struct.h 2010-10-03 15:16:35 +0000
@@ -544,7 +544,7 @@
NO_FILL, // Poly, Square, Circle, Arc = option No Fill
FILLED_SHAPE, /* Poly, Square, Circle, Arc = option Fill
* with current color ("Solid shape") */
- FILLED_WITH_BG_BODYCOLOR, /* Poly, Square, Circle, Arc = option Fill
+ FILLED_WITH_BG_BODYCOLOR /* Poly, Square, Circle, Arc = option Fill
* with background body color, translucent
* (texts inside this shape can be seen)
* not filled in B&W mode when plotting or
=== modified file 'include/bitmaps.h'
--- include/bitmaps.h 2010-09-24 16:00:40 +0000
+++ include/bitmaps.h 2010-10-03 15:16:35 +0000
@@ -93,6 +93,7 @@
extern const char* directory_xpm[];
extern const char* display_options_xpm[];
extern const char* down_xpm[];
+extern const char* ortho_xpm[];
extern const char* drag_module_xpm[];
extern const char* drag_outline_segment_xpm[];
extern const char* drag_pad_xpm[];
=== modified file 'include/dsnlexer.h'
--- include/dsnlexer.h 2010-08-09 02:03:16 +0000
+++ include/dsnlexer.h 2010-10-03 15:16:35 +0000
@@ -65,7 +65,7 @@
DSN_RIGHT = -4, // right bracket, ')'
DSN_LEFT = -3, // left bracket, '('
DSN_STRING = -2, // a quoted string, stripped of the quotes
- DSN_EOF = -1, // special case for end of file
+ DSN_EOF = -1 // special case for end of file
};
=== modified file 'include/macros.h'
--- include/macros.h 2010-08-03 02:13:33 +0000
+++ include/macros.h 2010-10-03 15:16:35 +0000
@@ -102,18 +102,18 @@
#include "boost/typeof/typeof.hpp"
// we have to register the types used with the typeof keyword with boost
-BOOST_TYPEOF_REGISTER_TYPE( wxPoint );
-BOOST_TYPEOF_REGISTER_TYPE( wxSize );
-BOOST_TYPEOF_REGISTER_TYPE( wxString );
+BOOST_TYPEOF_REGISTER_TYPE( wxPoint )
+BOOST_TYPEOF_REGISTER_TYPE( wxSize )
+BOOST_TYPEOF_REGISTER_TYPE( wxString )
class DrawSheetLabelStruct;
-BOOST_TYPEOF_REGISTER_TYPE( DrawSheetLabelStruct* );
+BOOST_TYPEOF_REGISTER_TYPE( DrawSheetLabelStruct* )
class EDA_BaseStruct;
-BOOST_TYPEOF_REGISTER_TYPE( EDA_BaseStruct* );
+BOOST_TYPEOF_REGISTER_TYPE( EDA_BaseStruct* )
class D_PAD;
-BOOST_TYPEOF_REGISTER_TYPE( D_PAD* );
-BOOST_TYPEOF_REGISTER_TYPE( const D_PAD* );
+BOOST_TYPEOF_REGISTER_TYPE( D_PAD* )
+BOOST_TYPEOF_REGISTER_TYPE( const D_PAD* )
class BOARD_ITEM;
-BOOST_TYPEOF_REGISTER_TYPE( BOARD_ITEM* );
+BOOST_TYPEOF_REGISTER_TYPE( BOARD_ITEM* )
#define EXCHG( a, b ) { BOOST_TYPEOF( a ) __temp__ = (a); \
(a) = (b); \
@@ -136,7 +136,7 @@
#endif /* !defined( __WXMAC__ ) */
menu->Append( l_item );
-};
+}
static inline void ADD_MENUITEM_WITH_HELP( wxMenu* menu, int id,
const wxString& text,
@@ -152,7 +152,7 @@
#endif /* !defined( __WXMAC__ ) */
menu->Append( l_item );
-};
+}
#ifdef __WINDOWS__
static inline void ADD_MENUITEM_WITH_SUBMENU( wxMenu* menu, wxMenu* submenu,
@@ -198,7 +198,7 @@
#endif /* !defined( __WXMAC__ ) */
menu->Append( l_item );
-};
+}
static inline void ADD_MENUITEM_WITH_HELP_AND_SUBMENU( wxMenu* menu,
wxMenu* submenu,
@@ -217,7 +217,7 @@
#endif /* !defined( __WXMAC__ ) */
menu->Append( l_item );
-};
+}
#endif
=== modified file 'include/param_config.h'
--- include/param_config.h 2010-06-17 16:30:10 +0000
+++ include/param_config.h 2010-10-03 15:16:35 +0000
@@ -21,7 +21,7 @@
PARAM_LIBNAME_LIST,
PARAM_WXSTRING,
PARAM_COMMAND_ERASE,
- PARAM_FIELDNAME_LIST,
+ PARAM_FIELDNAME_LIST
};
#define MAX_COLOR 0x8001F
=== modified file 'include/wxstruct.h'
--- include/wxstruct.h 2010-09-23 14:04:08 +0000
+++ include/wxstruct.h 2010-10-03 15:16:35 +0000
@@ -480,7 +480,7 @@
int aPrintMask, bool aPrintMirrorMode,
void * aData = NULL);
- DECLARE_EVENT_TABLE();
+ DECLARE_EVENT_TABLE()
};
=== modified file 'kicad/commandframe.cpp'
--- kicad/commandframe.cpp 2010-09-26 05:35:29 +0000
+++ kicad/commandframe.cpp 2010-10-03 15:16:35 +0000
@@ -28,7 +28,7 @@
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY );
-};
+}
void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event )
{
=== modified file 'kicad/kicad.h'
--- kicad/kicad.h 2010-07-21 09:12:25 +0000
+++ kicad/kicad.h 2010-10-03 15:16:35 +0000
@@ -50,7 +50,7 @@
ID_SELECT_PREFERED_PDF_BROWSER,
ID_SELECT_DEFAULT_PDF_BROWSER,
ID_SAVE_AND_ZIP_FILES,
- ID_READ_ZIP_ARCHIVE,
+ ID_READ_ZIP_ARCHIVE
};
@@ -133,7 +133,7 @@
TREE_NET,
TREE_UNKNOWN,
TREE_DIRECTORY,
- TREE_MAX,
+ TREE_MAX
};
/** class RIGHT_KM_FRAME
=== modified file 'pcbnew/build_BOM_from_board.cpp'
--- pcbnew/build_BOM_from_board.cpp 2010-01-28 13:10:46 +0000
+++ pcbnew/build_BOM_from_board.cpp 2010-10-03 15:16:35 +0000
@@ -44,7 +44,7 @@
};
WX_DECLARE_LIST( cmp, CmpList );
-WX_DEFINE_LIST( CmpList );
+WX_DEFINE_LIST( CmpList )
void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
{
=== modified file 'pcbnew/deltrack.cpp'
--- pcbnew/deltrack.cpp 2010-02-19 13:23:58 +0000
+++ pcbnew/deltrack.cpp 2010-10-03 15:16:35 +0000
@@ -204,9 +204,13 @@
next_track = tracksegment->Next();
tracksegment->SetState( BUSY, OFF );
- D( printf( "%s: track %p status=\"%s\"\n", __func__, tracksegment,
- CONV_TO_UTF8( TRACK::ShowState( tracksegment->GetState( -1 ) ) )
- ); )
+ //D( printf( "%s: track %p status=\"%s\"\n", __func__, tracksegment,
+ // CONV_TO_UTF8( TRACK::ShowState( tracksegment->GetState( -1 ) ) )
+ // ); )
+ D( std::cout<<__func__<<": track "<<tracksegment<<" status=\"" \
+ << CONV_TO_UTF8( TRACK::ShowState( tracksegment->GetState( -1 ) ) ) \
+ <<"\""<<std::endl;
+ ; )
GetBoard()->m_Track.Remove( tracksegment );
=== modified file 'pcbnew/dialog_SVG_print_base.h'
--- pcbnew/dialog_SVG_print_base.h 2010-03-26 17:18:59 +0000
+++ pcbnew/dialog_SVG_print_base.h 2010-10-03 15:16:35 +0000
@@ -29,44 +29,54 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_SVG_PRINT_base
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_SVG_PRINT_base : public wxDialog
+class DIALOG_SVG_PRINT_base : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_PRINT_CURRENT = 1000,
- wxID_PRINT_BOARD,
- };
-
- wxStaticBoxSizer* m_CopperLayersBoxSizer;
- wxStaticBoxSizer* m_TechnicalBoxSizer;
- wxStaticText* m_TextPenWidth;
- wxTextCtrl* m_DialogPenWidth;
- wxRadioBox* m_ModeColorOption;
- wxCheckBox* m_Print_Frame_Ref_Ctrl;
- wxCheckBox* m_PrintBoardEdgesCtrl;
- wxButton* m_buttonPrintSelected;
- wxButton* m_buttonBoard;
- wxButton* m_buttonQuit;
- wxStaticText* m_staticText1;
- wxTextCtrl* m_FileNameCtrl;
- wxStaticText* m_staticText2;
- wxTextCtrl* m_MessagesBox;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnSetColorModeSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonPrintSelectedClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonPrintBoardClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create SVG file"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 507,375 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_SVG_PRINT_base();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_PRINT_CURRENT = 1000,
+ wxID_PRINT_BOARD
+ };
+
+ wxStaticBoxSizer* m_CopperLayersBoxSizer;
+ wxStaticBoxSizer* m_TechnicalBoxSizer;
+ wxStaticText* m_TextPenWidth;
+ wxTextCtrl* m_DialogPenWidth;
+ wxRadioBox* m_ModeColorOption;
+ wxCheckBox* m_Print_Frame_Ref_Ctrl;
+ wxCheckBox* m_PrintBoardEdgesCtrl;
+ wxButton* m_buttonPrintSelected;
+ wxButton* m_buttonBoard;
+ wxButton* m_buttonQuit;
+ wxStaticText* m_staticText1;
+ wxTextCtrl* m_FileNameCtrl;
+ wxStaticText* m_staticText2;
+ wxTextCtrl* m_MessagesBox;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnSetColorModeSelected( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonPrintSelectedClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonPrintBoardClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create SVG file"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 507,375 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_SVG_PRINT_base();
+
};
#endif //__dialog_SVG_print_base__
=== modified file 'pcbnew/dialog_copper_zones_base.h'
--- pcbnew/dialog_copper_zones_base.h 2010-08-23 12:13:48 +0000
+++ pcbnew/dialog_copper_zones_base.h 2010-10-03 15:16:35 +0000
@@ -29,79 +29,103 @@
///////////////////////////////////////////////////////////////////////////////
/// Class dialog_copper_zone_base
///////////////////////////////////////////////////////////////////////////////
-class dialog_copper_zone_base : public wxDialog
+class dialog_copper_zone_base : public wxDialog
{
- DECLARE_EVENT_TABLE()
- private:
-
- // Private event handlers
- void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); }
- void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); }
- void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); }
- void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); }
- void _wxFB_OnNetSortingOptionSelected( wxCommandEvent& event ){ OnNetSortingOptionSelected( event ); }
- void _wxFB_OnRunFiltersButtonClick( wxCommandEvent& event ){ OnRunFiltersButtonClick( event ); }
-
-
- protected:
- enum
- {
- ID_RADIOBOX_FILL_MODE_SELECTION = 1000,
- wxID_ARC_APPROX,
- wxID_PADS_IN_ZONE_OPTIONS,
- wxID_ANTIPAD_SIZE,
- wxID_COPPER_BRIDGE_VALUE,
- ID_RADIOBOX_OUTLINES_OPTION,
- wxID_BUTTON_EXPORT,
- ID_NET_SORTING_OPTION,
- ID_TEXTCTRL_NETNAMES_FILTER,
- ID_NETNAME_SELECTION,
- ID_LAYER_CHOICE,
- };
-
- wxRadioBox* m_FillModeCtrl;
- wxRadioBox* m_ArcApproximationOpt;
- wxRadioBox* m_PadInZoneOpt;
- wxStaticText* m_AntipadSizeText;
- wxTextCtrl* m_AntipadSizeValue;
- wxStaticText* m_CopperBridgeWidthText;
- wxTextCtrl* m_CopperWidthValue;
-
- wxRadioBox* m_OrientEdgesOpt;
- wxRadioBox* m_OutlineAppearanceCtrl;
- wxStaticText* m_ClearanceValueTitle;
- wxTextCtrl* m_ZoneClearanceCtrl;
- wxStaticText* m_MinThicknessValueTitle;
- wxTextCtrl* m_ZoneMinThicknessCtrl;
-
- wxButton* m_ExportSetupButton;
- wxButton* m_OkButton;
- wxButton* m_ButtonCancel;
-
- wxRadioBox* m_NetDisplayOption;
- wxStaticText* m_staticText5;
- wxTextCtrl* m_DoNotShowNetNameFilter;
- wxStaticText* m_staticText51;
- wxTextCtrl* m_ShowNetNameFilter;
- wxButton* m_buttonRunFilter;
- wxStaticText* m_staticText2;
- wxListBox* m_ListNetNameSelection;
- wxStaticText* m_staticText3;
- wxListBox* m_LayerSelectionCtrl;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnPadsInZoneClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonOkClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnNetSortingOptionSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRunFiltersButtonClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- dialog_copper_zone_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fill Zones Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 566,582 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~dialog_copper_zone_base();
-
+ DECLARE_EVENT_TABLE()
+private:
+
+ // Private event handlers
+ void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ) {
+ OnPadsInZoneClick( event );
+ }
+ void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ) {
+ ExportSetupToOtherCopperZones( event );
+ }
+ void _wxFB_OnButtonOkClick( wxCommandEvent& event ) {
+ OnButtonOkClick( event );
+ }
+ void _wxFB_OnButtonCancelClick( wxCommandEvent& event ) {
+ OnButtonCancelClick( event );
+ }
+ void _wxFB_OnNetSortingOptionSelected( wxCommandEvent& event ) {
+ OnNetSortingOptionSelected( event );
+ }
+ void _wxFB_OnRunFiltersButtonClick( wxCommandEvent& event ) {
+ OnRunFiltersButtonClick( event );
+ }
+
+
+protected:
+ enum
+ {
+ ID_RADIOBOX_FILL_MODE_SELECTION = 1000,
+ wxID_ARC_APPROX,
+ wxID_PADS_IN_ZONE_OPTIONS,
+ wxID_ANTIPAD_SIZE,
+ wxID_COPPER_BRIDGE_VALUE,
+ ID_RADIOBOX_OUTLINES_OPTION,
+ wxID_BUTTON_EXPORT,
+ ID_NET_SORTING_OPTION,
+ ID_TEXTCTRL_NETNAMES_FILTER,
+ ID_NETNAME_SELECTION,
+ ID_LAYER_CHOICE
+ };
+
+ wxRadioBox* m_FillModeCtrl;
+ wxRadioBox* m_ArcApproximationOpt;
+ wxRadioBox* m_PadInZoneOpt;
+ wxStaticText* m_AntipadSizeText;
+ wxTextCtrl* m_AntipadSizeValue;
+ wxStaticText* m_CopperBridgeWidthText;
+ wxTextCtrl* m_CopperWidthValue;
+
+ wxRadioBox* m_OrientEdgesOpt;
+ wxRadioBox* m_OutlineAppearanceCtrl;
+ wxStaticText* m_ClearanceValueTitle;
+ wxTextCtrl* m_ZoneClearanceCtrl;
+ wxStaticText* m_MinThicknessValueTitle;
+ wxTextCtrl* m_ZoneMinThicknessCtrl;
+
+ wxButton* m_ExportSetupButton;
+ wxButton* m_OkButton;
+ wxButton* m_ButtonCancel;
+
+ wxRadioBox* m_NetDisplayOption;
+ wxStaticText* m_staticText5;
+ wxTextCtrl* m_DoNotShowNetNameFilter;
+ wxStaticText* m_staticText51;
+ wxTextCtrl* m_ShowNetNameFilter;
+ wxButton* m_buttonRunFilter;
+ wxStaticText* m_staticText2;
+ wxListBox* m_ListNetNameSelection;
+ wxStaticText* m_staticText3;
+ wxListBox* m_LayerSelectionCtrl;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnPadsInZoneClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnNetSortingOptionSelected( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRunFiltersButtonClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ dialog_copper_zone_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fill Zones Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 566,582 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~dialog_copper_zone_base();
+
};
#endif //__dialog_copper_zones_base__
=== modified file 'pcbnew/dialog_design_rules.cpp'
--- pcbnew/dialog_design_rules.cpp 2010-09-02 13:10:48 +0000
+++ pcbnew/dialog_design_rules.cpp 2010-10-03 15:16:35 +0000
@@ -52,7 +52,7 @@
GRID_VIASIZE,
GRID_VIADRILL,
GRID_uVIASIZE,
- GRID_uVIADRILL,
+ GRID_uVIADRILL
};
const wxString DIALOG_DESIGN_RULES::wildCard = _( "* (Any)" );
=== modified file 'pcbnew/dialog_design_rules_base.h'
--- pcbnew/dialog_design_rules_base.h 2010-09-02 13:10:48 +0000
+++ pcbnew/dialog_design_rules_base.h 2010-10-03 15:16:35 +0000
@@ -40,78 +40,104 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_DESIGN_RULES_BASE
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_DESIGN_RULES_BASE : public wxDialog
+class DIALOG_DESIGN_RULES_BASE : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_ADD_NETCLASS = 1000,
- wxID_REMOVE_NETCLASS,
- ID_LEFT_CHOICE_CLICK,
- ID_LEFT_TO_RIGHT_COPY,
- ID_RIGHT_TO_LEFT_COPY,
- ID_RIGHT_CHOICE_CLICK,
- };
-
- wxNotebook* m_DRnotebook;
- wxPanel* m_panelNetClassesEditor;
- wxGrid* m_grid;
- wxButton* m_addButton;
- wxButton* m_removeButton;
- wxButton* m_moveUpButton;
- wxChoice* m_leftClassChoice;
- NETS_LIST_CTRL* m_leftListCtrl;
- wxButton* m_buttonRightToLeft;
- wxButton* m_buttonLeftToRight;
- wxButton* m_buttonLeftSelAll;
- wxButton* m_buttonRightSelAll;
- wxChoice* m_rightClassChoice;
- NETS_LIST_CTRL* m_rightListCtrl;
- wxPanel* m_panelGolbalDesignRules;
- wxRadioBox* m_OptViaType;
- wxStaticText* m_ViaMinTitle;
- wxTextCtrl* m_SetViasMinSizeCtrl;
- wxStaticText* m_ViaMinDrillTitle;
- wxTextCtrl* m_SetViasMinDrillCtrl;
- wxRadioBox* m_AllowMicroViaCtrl;
- wxStaticText* m_MicroViaMinSizeTitle;
- wxTextCtrl* m_SetMicroViasMinSizeCtrl;
- wxStaticText* m_MicroViaMinDrillTitle;
- wxTextCtrl* m_SetMicroViasMinDrillCtrl;
- wxStaticText* m_TrackMinWidthTitle;
- wxTextCtrl* m_SetTrackMinWidthCtrl;
- wxStaticLine* m_staticline1;
- wxStaticText* m_staticTextInfo;
- wxStaticText* m_staticText7;
- wxGrid* m_gridViaSizeList;
- wxStaticText* m_staticText8;
- wxGrid* m_gridTrackWidthList;
- wxHtmlWindow* m_MessagesList;
- wxButton* m_buttonOk;
- wxButton* m_buttonCancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnNetClassesNameLeftClick( wxGridEvent& event ){ event.Skip(); }
- virtual void OnNetClassesNameRightClick( wxGridEvent& event ){ event.Skip(); }
- virtual void OnAddNetclassClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveNetclassClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnLeftCBSelection( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRightToLeftCopyButton( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnLeftToRightCopyButton( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnLeftSelectAllButton( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRightSelectAllButton( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRightCBSelection( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOkButtonClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_DESIGN_RULES_BASE();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_ADD_NETCLASS = 1000,
+ wxID_REMOVE_NETCLASS,
+ ID_LEFT_CHOICE_CLICK,
+ ID_LEFT_TO_RIGHT_COPY,
+ ID_RIGHT_TO_LEFT_COPY,
+ ID_RIGHT_CHOICE_CLICK
+ };
+
+ wxNotebook* m_DRnotebook;
+ wxPanel* m_panelNetClassesEditor;
+ wxGrid* m_grid;
+ wxButton* m_addButton;
+ wxButton* m_removeButton;
+ wxButton* m_moveUpButton;
+ wxChoice* m_leftClassChoice;
+ NETS_LIST_CTRL* m_leftListCtrl;
+ wxButton* m_buttonRightToLeft;
+ wxButton* m_buttonLeftToRight;
+ wxButton* m_buttonLeftSelAll;
+ wxButton* m_buttonRightSelAll;
+ wxChoice* m_rightClassChoice;
+ NETS_LIST_CTRL* m_rightListCtrl;
+ wxPanel* m_panelGolbalDesignRules;
+ wxRadioBox* m_OptViaType;
+ wxStaticText* m_ViaMinTitle;
+ wxTextCtrl* m_SetViasMinSizeCtrl;
+ wxStaticText* m_ViaMinDrillTitle;
+ wxTextCtrl* m_SetViasMinDrillCtrl;
+ wxRadioBox* m_AllowMicroViaCtrl;
+ wxStaticText* m_MicroViaMinSizeTitle;
+ wxTextCtrl* m_SetMicroViasMinSizeCtrl;
+ wxStaticText* m_MicroViaMinDrillTitle;
+ wxTextCtrl* m_SetMicroViasMinDrillCtrl;
+ wxStaticText* m_TrackMinWidthTitle;
+ wxTextCtrl* m_SetTrackMinWidthCtrl;
+ wxStaticLine* m_staticline1;
+ wxStaticText* m_staticTextInfo;
+ wxStaticText* m_staticText7;
+ wxGrid* m_gridViaSizeList;
+ wxStaticText* m_staticText8;
+ wxGrid* m_gridTrackWidthList;
+ wxHtmlWindow* m_MessagesList;
+ wxButton* m_buttonOk;
+ wxButton* m_buttonCancel;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnNetClassesNameLeftClick( wxGridEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnNetClassesNameRightClick( wxGridEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddNetclassClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveNetclassClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnLeftCBSelection( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRightToLeftCopyButton( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnLeftToRightCopyButton( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnLeftSelectAllButton( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRightSelectAllButton( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRightCBSelection( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnOkButtonClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelButtonClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_DESIGN_RULES_BASE();
+
};
#endif //__dialog_design_rules_base__
=== modified file 'pcbnew/dialog_display_options_base.h'
--- pcbnew/dialog_display_options_base.h 2010-03-01 11:25:08 +0000
+++ pcbnew/dialog_display_options_base.h 2010-10-03 15:16:35 +0000
@@ -27,48 +27,52 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DialogDisplayOptions_base
///////////////////////////////////////////////////////////////////////////////
-class DialogDisplayOptions_base : public wxDialog
+class DialogDisplayOptions_base : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_DISPLAY_TRACK = 1000,
- ID_SHOW_CLEARANCE,
- ID_VIAS_HOLES,
- ID_EDGES_MODULES,
- ID_TEXT_MODULES,
- ID_PADS_SHAPES,
- ID_VIAS_SHAPES,
- };
-
- wxRadioBox* m_OptDisplayTracks;
- wxRadioBox* m_OptDisplayTracksClearance;
- wxRadioBox* m_OptDisplayViaHole;
- wxRadioBox* m_ShowNetNamesOption;
- wxRadioBox* m_OptDisplayModEdges;
- wxRadioBox* m_OptDisplayModTexts;
- wxRadioBox* m_OptDisplayPads;
- wxRadioBox* m_OptDisplayVias;
- wxCheckBox* m_OptDisplayPadClearence;
- wxCheckBox* m_OptDisplayPadNumber;
- wxCheckBox* m_OptDisplayPadNoConn;
- wxRadioBox* m_OptDisplayDrawings;
- wxRadioBox* m_Show_Page_Limits;
-
- wxButton* m_buttonOK;
- wxButton* m_buttonCANCEL;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 731,331 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DialogDisplayOptions_base();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_DISPLAY_TRACK = 1000,
+ ID_SHOW_CLEARANCE,
+ ID_VIAS_HOLES,
+ ID_EDGES_MODULES,
+ ID_TEXT_MODULES,
+ ID_PADS_SHAPES,
+ ID_VIAS_SHAPES
+ };
+
+ wxRadioBox* m_OptDisplayTracks;
+ wxRadioBox* m_OptDisplayTracksClearance;
+ wxRadioBox* m_OptDisplayViaHole;
+ wxRadioBox* m_ShowNetNamesOption;
+ wxRadioBox* m_OptDisplayModEdges;
+ wxRadioBox* m_OptDisplayModTexts;
+ wxRadioBox* m_OptDisplayPads;
+ wxRadioBox* m_OptDisplayVias;
+ wxCheckBox* m_OptDisplayPadClearence;
+ wxCheckBox* m_OptDisplayPadNumber;
+ wxCheckBox* m_OptDisplayPadNoConn;
+ wxRadioBox* m_OptDisplayDrawings;
+ wxRadioBox* m_Show_Page_Limits;
+
+ wxButton* m_buttonOK;
+ wxButton* m_buttonCANCEL;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 731,331 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DialogDisplayOptions_base();
+
};
#endif //__dialog_display_options_base__
=== modified file 'pcbnew/dialog_general_options_BoardEditor_base.h'
--- pcbnew/dialog_general_options_BoardEditor_base.h 2010-02-24 15:33:03 +0000
+++ pcbnew/dialog_general_options_BoardEditor_base.h 2010-10-03 15:16:35 +0000
@@ -29,55 +29,59 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DialogGeneralOptionsBoardEditor_base
///////////////////////////////////////////////////////////////////////////////
-class DialogGeneralOptionsBoardEditor_base : public wxDialog
+class DialogGeneralOptionsBoardEditor_base : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_POLAR_CTRL = 1000,
- wxID_UNITS,
- wxID_CURSOR_SHAPE,
- wxID_DRC_ONOFF,
- wxID_GENERAL_RATSNEST,
- wxID_RATSNEST_MODULE,
- wxID_TRACK_AUTODEL,
- wxID_TRACKS45,
- wxID_SEGMENTS45,
- wxID_AUTOPAN,
- wxID_MAGNETIC_TRACKS,
- };
-
- wxRadioBox* m_PolarDisplay;
- wxRadioBox* m_UnitsSelection;
- wxRadioBox* m_CursorShape;
- wxStaticText* m_staticTextmaxlinks;
- wxSpinCtrl* m_MaxShowLinks;
- wxStaticText* m_staticTextautosave;
- wxSpinCtrl* m_SaveTime;
- wxCheckBox* m_DrcOn;
- wxCheckBox* m_ShowGlobalRatsnest;
- wxCheckBox* m_ShowModuleRatsnest;
- wxCheckBox* m_TrackAutodel;
- wxCheckBox* m_Track_45_Only_Ctrl;
- wxCheckBox* m_Segments_45_Only_Ctrl;
- wxCheckBox* m_AutoPANOpt;
- wxCheckBox* m_Track_DoubleSegm_Ctrl;
- wxRadioBox* m_MagneticPadOptCtrl;
- wxRadioBox* m_MagneticTrackOptCtrl;
- wxButton* m_buttonOK;
- wxButton* m_buttonCANCEL;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 585,280 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DialogGeneralOptionsBoardEditor_base();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_POLAR_CTRL = 1000,
+ wxID_UNITS,
+ wxID_CURSOR_SHAPE,
+ wxID_DRC_ONOFF,
+ wxID_GENERAL_RATSNEST,
+ wxID_RATSNEST_MODULE,
+ wxID_TRACK_AUTODEL,
+ wxID_TRACKS45,
+ wxID_SEGMENTS45,
+ wxID_AUTOPAN,
+ wxID_MAGNETIC_TRACKS
+ };
+
+ wxRadioBox* m_PolarDisplay;
+ wxRadioBox* m_UnitsSelection;
+ wxRadioBox* m_CursorShape;
+ wxStaticText* m_staticTextmaxlinks;
+ wxSpinCtrl* m_MaxShowLinks;
+ wxStaticText* m_staticTextautosave;
+ wxSpinCtrl* m_SaveTime;
+ wxCheckBox* m_DrcOn;
+ wxCheckBox* m_ShowGlobalRatsnest;
+ wxCheckBox* m_ShowModuleRatsnest;
+ wxCheckBox* m_TrackAutodel;
+ wxCheckBox* m_Track_45_Only_Ctrl;
+ wxCheckBox* m_Segments_45_Only_Ctrl;
+ wxCheckBox* m_AutoPANOpt;
+ wxCheckBox* m_Track_DoubleSegm_Ctrl;
+ wxRadioBox* m_MagneticPadOptCtrl;
+ wxRadioBox* m_MagneticTrackOptCtrl;
+ wxButton* m_buttonOK;
+ wxButton* m_buttonCANCEL;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 585,280 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DialogGeneralOptionsBoardEditor_base();
+
};
#endif //__dialog_general_options_BoardEditor_base__
=== modified file 'pcbnew/dialog_graphic_item_properties_base.h'
--- pcbnew/dialog_graphic_item_properties_base.h 2009-08-11 10:27:21 +0000
+++ pcbnew/dialog_graphic_item_properties_base.h 2010-10-03 15:16:35 +0000
@@ -26,47 +26,53 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DialogGraphicItemProperties_base
///////////////////////////////////////////////////////////////////////////////
-class DialogGraphicItemProperties_base : public wxDialog
+class DialogGraphicItemProperties_base : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_ANGLE_CTRL = 1000,
- wxID_LAYER_SELECTION,
- };
-
- wxStaticText* m_Start_Center_XText;
- wxTextCtrl* m_Center_StartXCtrl;
- wxStaticText* m_Start_Center_YText;
- wxTextCtrl* m_Center_StartYCtrl;
- wxStaticText* m_EndX_Radius_Text;
- wxTextCtrl* m_EndX_Radius_Ctrl;
- wxStaticText* m_EndY_Text;
- wxTextCtrl* m_EndY_Ctrl;
- wxStaticText* m_Angle_Text;
- wxTextCtrl* m_Angle_Ctrl;
- wxStaticText* m_ItemThicknessText;
- wxTextCtrl* m_ThicknessCtrl;
- wxStaticText* m_DefaultThicknessText;
- wxTextCtrl* m_DefaultThicknessCtrl;
- wxStaticLine* m_staticline1;
- wxStaticText* m_LayerText;
- wxChoice* m_LayerSelection;
- wxButton* m_buttonOK;
- wxButton* m_buttonCANCEL;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnLayerChoice( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DialogGraphicItemProperties_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Graphic item properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 399,247 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU );
- ~DialogGraphicItemProperties_base();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_ANGLE_CTRL = 1000,
+ wxID_LAYER_SELECTION
+ };
+
+ wxStaticText* m_Start_Center_XText;
+ wxTextCtrl* m_Center_StartXCtrl;
+ wxStaticText* m_Start_Center_YText;
+ wxTextCtrl* m_Center_StartYCtrl;
+ wxStaticText* m_EndX_Radius_Text;
+ wxTextCtrl* m_EndX_Radius_Ctrl;
+ wxStaticText* m_EndY_Text;
+ wxTextCtrl* m_EndY_Ctrl;
+ wxStaticText* m_Angle_Text;
+ wxTextCtrl* m_Angle_Ctrl;
+ wxStaticText* m_ItemThicknessText;
+ wxTextCtrl* m_ThicknessCtrl;
+ wxStaticText* m_DefaultThicknessText;
+ wxTextCtrl* m_DefaultThicknessCtrl;
+ wxStaticLine* m_staticline1;
+ wxStaticText* m_LayerText;
+ wxChoice* m_LayerSelection;
+ wxButton* m_buttonOK;
+ wxButton* m_buttonCANCEL;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnLayerChoice( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DialogGraphicItemProperties_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Graphic item properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 399,247 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU );
+ ~DialogGraphicItemProperties_base();
+
};
#endif //__dialog_graphic_item_properties_base__
=== modified file 'pcbnew/dialog_netlist_fbp.h'
--- pcbnew/dialog_netlist_fbp.h 2009-04-24 07:36:36 +0000
+++ pcbnew/dialog_netlist_fbp.h 2010-10-03 15:16:35 +0000
@@ -28,46 +28,56 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_NETLIST_FBP
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_NETLIST_FBP : public wxDialog
+class DIALOG_NETLIST_FBP : public wxDialog
{
- private:
-
- protected:
- enum
- {
- ID_OPEN_NELIST = 1000,
- ID_READ_NETLIST_FILE,
- ID_TEST_NETLIST,
- ID_COMPILE_RATSNEST,
- };
-
- wxRadioBox* m_Select_By_Timestamp;
- wxRadioBox* m_ChangeExistingFootprintCtrl;
- wxRadioBox* m_DeleteBadTracks;
- wxRadioBox* m_RemoveExtraFootprintsCtrl;
- wxButton* m_button1;
- wxButton* m_button2;
- wxButton* m_button3;
- wxButton* m_button4;
- wxButton* m_button5;
- wxStaticLine* m_staticline1;
- wxStaticText* m_staticTextNetfilename;
- wxTextCtrl* m_NetlistFilenameCtrl;
- wxStaticText* m_staticText1;
- wxTextCtrl* m_MessageWindow;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnOpenNelistClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnReadNetlistFileClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnTestFootprintsClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCompileRatsnestClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id = wxID_CANCEL, const wxString& title = _("Netlist Dialog"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,431 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_NETLIST_FBP();
-
+private:
+
+protected:
+ enum
+ {
+ ID_OPEN_NELIST = 1000,
+ ID_READ_NETLIST_FILE,
+ ID_TEST_NETLIST,
+ ID_COMPILE_RATSNEST
+ };
+
+ wxRadioBox* m_Select_By_Timestamp;
+ wxRadioBox* m_ChangeExistingFootprintCtrl;
+ wxRadioBox* m_DeleteBadTracks;
+ wxRadioBox* m_RemoveExtraFootprintsCtrl;
+ wxButton* m_button1;
+ wxButton* m_button2;
+ wxButton* m_button3;
+ wxButton* m_button4;
+ wxButton* m_button5;
+ wxStaticLine* m_staticline1;
+ wxStaticText* m_staticTextNetfilename;
+ wxTextCtrl* m_NetlistFilenameCtrl;
+ wxStaticText* m_staticText1;
+ wxTextCtrl* m_MessageWindow;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnOpenNelistClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnReadNetlistFileClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnTestFootprintsClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCompileRatsnestClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id = wxID_CANCEL, const wxString& title = _("Netlist Dialog"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,431 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_NETLIST_FBP();
+
};
#endif //__dialog_netlist_fbp__
=== modified file 'pcbnew/dialog_pad_properties_base.h'
--- pcbnew/dialog_pad_properties_base.h 2010-09-15 14:53:33 +0000
+++ pcbnew/dialog_pad_properties_base.h 2010-10-03 15:16:35 +0000
@@ -32,129 +32,147 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAD_PROPERTIES_BASE
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PAD_PROPERTIES_BASE : public wxDialog
+class DIALOG_PAD_PROPERTIES_BASE : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_DIALOG_EDIT_PAD = 1000,
- wxID_PADNUMCTRL,
- wxID_PADNETNAMECTRL,
- wxID_DDIRX,
- wxID_DDIRY,
- ID_LISTBOX_SHAPE_PAD,
- ID_RADIOBOX_DRILL_SHAPE,
- ID_LISTBOX_ORIENT_PAD,
- ID_LISTBOX_TYPE_PAD,
- };
-
- wxStaticText* m_PadNumText;
- wxTextCtrl* m_PadNumCtrl;
- wxStaticText* m_PadNameText;
- wxTextCtrl* m_PadNetNameCtrl;
- wxStaticText* m_staticText4;
- wxTextCtrl* m_PadPosition_X_Ctrl;
- wxStaticText* m_PadPosX_Unit;
- wxStaticText* m_staticText41;
- wxTextCtrl* m_PadPosition_Y_Ctrl;
- wxStaticText* m_PadPosY_Unit;
- wxStaticLine* m_staticline7;
- wxStaticLine* m_staticline8;
- wxStaticLine* m_staticline9;
- wxStaticText* m_textPadDrillX;
- wxTextCtrl* m_PadDrill_X_Ctrl;
- wxStaticText* m_PadDrill_X_Unit;
- wxStaticText* m_textPadDrillY;
- wxTextCtrl* m_PadDrill_Y_Ctrl;
- wxStaticText* m_PadDrill_Y_Unit;
- wxStaticLine* m_staticline4;
- wxStaticLine* m_staticline5;
- wxStaticLine* m_staticline6;
- wxStaticText* m_staticText12;
- wxTextCtrl* m_ShapeSize_X_Ctrl;
- wxStaticText* m_PadShapeSizeX_Unit;
- wxStaticText* m_staticText15;
- wxTextCtrl* m_ShapeSize_Y_Ctrl;
- wxStaticText* m_PadShapeSizeY_Unit;
- wxStaticText* m_staticText17;
- wxTextCtrl* m_ShapeOffset_X_Ctrl;
- wxStaticText* m_PadShapeOffsetX_Unit;
- wxStaticText* m_staticText19;
- wxTextCtrl* m_ShapeOffset_Y_Ctrl;
- wxStaticText* m_PadShapeOffsetY_Unit;
- wxStaticText* m_staticText21;
- wxTextCtrl* m_ShapeDelta_Ctrl;
- wxStaticText* m_PadShapeDelta_Unit;
- wxStaticText* m_staticText23;
- wxRadioButton* m_radioBtnDeltaXdir;
- wxRadioButton* m_radioBtnDeltaYdir;
- wxStaticText* m_staticTextDDirInfo;
- wxBoxSizer* m_DrillShapeBoxSizer;
- wxRadioBox* m_PadShape;
- wxRadioBox* m_DrillShapeCtrl;
- wxRadioBox* m_PadOrient;
- wxStaticText* m_PadOrientText;
- wxTextCtrl* m_PadOrientCtrl;
- wxPanel* m_panelShowPad;
- wxStaticText* m_staticTitleModuleRot;
- wxStaticText* m_staticModuleRotValue;
- wxStaticText* m_staticTitleModuleSide;
- wxStaticText* m_staticModuleSideValue;
- wxStaticText* m_staticTextWarningPadFlipped;
- wxStaticText* m_staticTextWarning;
- wxStaticText* m_staticTextNetClearance;
- wxTextCtrl* m_NetClearanceValueCtrl;
- wxStaticText* m_NetClearanceUnits;
- wxStaticLine* m_staticline1;
- wxStaticLine* m_staticline2;
- wxStaticLine* m_staticline3;
- wxStaticText* m_MaskClearanceTitle;
- wxTextCtrl* m_SolderMaskMarginCtrl;
- wxStaticText* m_SolderMaskMarginUnits;
- wxStaticText* m_staticTextSolderPaste;
- wxTextCtrl* m_SolderPasteMarginCtrl;
- wxStaticText* m_SolderPasteMarginUnits;
- wxStaticText* m_staticTextRatio;
- wxTextCtrl* m_SolderPasteMarginRatioCtrl;
- wxStaticText* m_SolderPasteRatioMarginUnits;
- wxRadioBox* m_PadType;
- wxCheckBox* m_PadLayerCmp;
- wxCheckBox* m_PadLayerCu;
-
- wxCheckBox* m_PadLayerAdhCmp;
- wxCheckBox* m_PadLayerAdhCu;
- wxCheckBox* m_PadLayerPateCmp;
- wxCheckBox* m_PadLayerPateCu;
- wxCheckBox* m_PadLayerSilkCmp;
- wxCheckBox* m_PadLayerSilkCu;
- wxCheckBox* m_PadLayerMaskCmp;
- wxCheckBox* m_PadLayerMaskCu;
- wxCheckBox* m_PadLayerDraft;
- wxCheckBox* m_PadLayerECO1;
- wxCheckBox* m_PadLayerECO2;
- wxStdDialogButtonSizer* m_sdbSizer1;
- wxButton* m_sdbSizer1OK;
- wxButton* m_sdbSizer1Cancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnValuesChanged( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnPadShapeSelection( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnDrillShapeSelected( wxCommandEvent& event ) { event.Skip(); }
- virtual void PadOrientEvent( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnPaintShowPanel( wxPaintEvent& event ) { event.Skip(); }
- virtual void PadTypeSelected( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnSetLayer( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
- virtual void PadPropertiesAccept( wxCommandEvent& event ) { event.Skip(); }
-
-
- public:
-
- DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 733,486 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER );
- ~DIALOG_PAD_PROPERTIES_BASE();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_DIALOG_EDIT_PAD = 1000,
+ wxID_PADNUMCTRL,
+ wxID_PADNETNAMECTRL,
+ wxID_DDIRX,
+ wxID_DDIRY,
+ ID_LISTBOX_SHAPE_PAD,
+ ID_RADIOBOX_DRILL_SHAPE,
+ ID_LISTBOX_ORIENT_PAD,
+ ID_LISTBOX_TYPE_PAD
+ };
+
+ wxStaticText* m_PadNumText;
+ wxTextCtrl* m_PadNumCtrl;
+ wxStaticText* m_PadNameText;
+ wxTextCtrl* m_PadNetNameCtrl;
+ wxStaticText* m_staticText4;
+ wxTextCtrl* m_PadPosition_X_Ctrl;
+ wxStaticText* m_PadPosX_Unit;
+ wxStaticText* m_staticText41;
+ wxTextCtrl* m_PadPosition_Y_Ctrl;
+ wxStaticText* m_PadPosY_Unit;
+ wxStaticLine* m_staticline7;
+ wxStaticLine* m_staticline8;
+ wxStaticLine* m_staticline9;
+ wxStaticText* m_textPadDrillX;
+ wxTextCtrl* m_PadDrill_X_Ctrl;
+ wxStaticText* m_PadDrill_X_Unit;
+ wxStaticText* m_textPadDrillY;
+ wxTextCtrl* m_PadDrill_Y_Ctrl;
+ wxStaticText* m_PadDrill_Y_Unit;
+ wxStaticLine* m_staticline4;
+ wxStaticLine* m_staticline5;
+ wxStaticLine* m_staticline6;
+ wxStaticText* m_staticText12;
+ wxTextCtrl* m_ShapeSize_X_Ctrl;
+ wxStaticText* m_PadShapeSizeX_Unit;
+ wxStaticText* m_staticText15;
+ wxTextCtrl* m_ShapeSize_Y_Ctrl;
+ wxStaticText* m_PadShapeSizeY_Unit;
+ wxStaticText* m_staticText17;
+ wxTextCtrl* m_ShapeOffset_X_Ctrl;
+ wxStaticText* m_PadShapeOffsetX_Unit;
+ wxStaticText* m_staticText19;
+ wxTextCtrl* m_ShapeOffset_Y_Ctrl;
+ wxStaticText* m_PadShapeOffsetY_Unit;
+ wxStaticText* m_staticText21;
+ wxTextCtrl* m_ShapeDelta_Ctrl;
+ wxStaticText* m_PadShapeDelta_Unit;
+ wxStaticText* m_staticText23;
+ wxRadioButton* m_radioBtnDeltaXdir;
+ wxRadioButton* m_radioBtnDeltaYdir;
+ wxStaticText* m_staticTextDDirInfo;
+ wxBoxSizer* m_DrillShapeBoxSizer;
+ wxRadioBox* m_PadShape;
+ wxRadioBox* m_DrillShapeCtrl;
+ wxRadioBox* m_PadOrient;
+ wxStaticText* m_PadOrientText;
+ wxTextCtrl* m_PadOrientCtrl;
+ wxPanel* m_panelShowPad;
+ wxStaticText* m_staticTitleModuleRot;
+ wxStaticText* m_staticModuleRotValue;
+ wxStaticText* m_staticTitleModuleSide;
+ wxStaticText* m_staticModuleSideValue;
+ wxStaticText* m_staticTextWarningPadFlipped;
+ wxStaticText* m_staticTextWarning;
+ wxStaticText* m_staticTextNetClearance;
+ wxTextCtrl* m_NetClearanceValueCtrl;
+ wxStaticText* m_NetClearanceUnits;
+ wxStaticLine* m_staticline1;
+ wxStaticLine* m_staticline2;
+ wxStaticLine* m_staticline3;
+ wxStaticText* m_MaskClearanceTitle;
+ wxTextCtrl* m_SolderMaskMarginCtrl;
+ wxStaticText* m_SolderMaskMarginUnits;
+ wxStaticText* m_staticTextSolderPaste;
+ wxTextCtrl* m_SolderPasteMarginCtrl;
+ wxStaticText* m_SolderPasteMarginUnits;
+ wxStaticText* m_staticTextRatio;
+ wxTextCtrl* m_SolderPasteMarginRatioCtrl;
+ wxStaticText* m_SolderPasteRatioMarginUnits;
+ wxRadioBox* m_PadType;
+ wxCheckBox* m_PadLayerCmp;
+ wxCheckBox* m_PadLayerCu;
+
+ wxCheckBox* m_PadLayerAdhCmp;
+ wxCheckBox* m_PadLayerAdhCu;
+ wxCheckBox* m_PadLayerPateCmp;
+ wxCheckBox* m_PadLayerPateCu;
+ wxCheckBox* m_PadLayerSilkCmp;
+ wxCheckBox* m_PadLayerSilkCu;
+ wxCheckBox* m_PadLayerMaskCmp;
+ wxCheckBox* m_PadLayerMaskCu;
+ wxCheckBox* m_PadLayerDraft;
+ wxCheckBox* m_PadLayerECO1;
+ wxCheckBox* m_PadLayerECO2;
+ wxStdDialogButtonSizer* m_sdbSizer1;
+ wxButton* m_sdbSizer1OK;
+ wxButton* m_sdbSizer1Cancel;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnValuesChanged( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPadShapeSelection( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnDrillShapeSelected( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void PadOrientEvent( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPaintShowPanel( wxPaintEvent& event ) {
+ event.Skip();
+ }
+ virtual void PadTypeSelected( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnSetLayer( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelButtonClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void PadPropertiesAccept( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+
+ DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 733,486 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER );
+ ~DIALOG_PAD_PROPERTIES_BASE();
+
};
#endif //__dialog_pad_properties_base__
=== modified file 'pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.h'
--- pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.h 2010-04-02 14:26:27 +0000
+++ pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.h 2010-10-03 15:16:35 +0000
@@ -28,56 +28,76 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PCBNEW_CONFIG_LIBS_FBP
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public wxDialog
+class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public wxDialog
{
- private:
-
- protected:
- enum
- {
- ID_ADD_LIB = 1000,
- ID_REMOVE_LIB,
- wxID_BROWSE_MOD_DOC,
- ID_LIB_PATH_SEL,
- wxID_INSERT_PATH,
- wxID_REMOVE_PATH,
- };
-
- wxListBox* m_ListLibr;
- wxButton* m_buttonAddLib;
- wxButton* m_buttonIns;
- wxButton* m_buttonRemoveLib;
- wxButton* m_buttonUp;
- wxButton* m_buttonDown;
- wxTextCtrl* m_TextHelpModulesFileName;
- wxButton* m_buttonModDoc;
- wxListBox* m_listUserPaths;
- wxButton* m_buttonAddPath;
- wxButton* m_buttonInsPath;
- wxButton* m_buttonRemovePath;
- wxListBox* m_DefaultLibraryPathslistBox;
- wxStaticLine* m_staticline1;
- wxStdDialogButtonSizer* m_sdbSizer1;
- wxButton* m_sdbSizer1OK;
- wxButton* m_sdbSizer1Cancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnAddOrInsertLibClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveLibClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonUpClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonDownClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnBrowseModDocFile( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnAddOrInsertPath( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnRemoveUserPath( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_PCBNEW_CONFIG_LIBS_FBP();
-
+private:
+
+protected:
+ enum
+ {
+ ID_ADD_LIB = 1000,
+ ID_REMOVE_LIB,
+ wxID_BROWSE_MOD_DOC,
+ ID_LIB_PATH_SEL,
+ wxID_INSERT_PATH,
+ wxID_REMOVE_PATH
+ };
+
+ wxListBox* m_ListLibr;
+ wxButton* m_buttonAddLib;
+ wxButton* m_buttonIns;
+ wxButton* m_buttonRemoveLib;
+ wxButton* m_buttonUp;
+ wxButton* m_buttonDown;
+ wxTextCtrl* m_TextHelpModulesFileName;
+ wxButton* m_buttonModDoc;
+ wxListBox* m_listUserPaths;
+ wxButton* m_buttonAddPath;
+ wxButton* m_buttonInsPath;
+ wxButton* m_buttonRemovePath;
+ wxListBox* m_DefaultLibraryPathslistBox;
+ wxStaticLine* m_staticline1;
+ wxStdDialogButtonSizer* m_sdbSizer1;
+ wxButton* m_sdbSizer1OK;
+ wxButton* m_sdbSizer1Cancel;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddOrInsertLibClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveLibClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonUpClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonDownClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnBrowseModDocFile( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnAddOrInsertPath( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnRemoveUserPath( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnOkClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_PCBNEW_CONFIG_LIBS_FBP();
+
};
#endif //__dialog_pcbnew_config_libs_and_paths_fbp__
=== modified file 'pcbnew/dialog_plot_base.h'
--- pcbnew/dialog_plot_base.h 2010-01-18 15:11:35 +0000
+++ pcbnew/dialog_plot_base.h 2010-10-03 15:16:35 +0000
@@ -29,80 +29,94 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PLOT_BASE
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PLOT_BASE : public wxDialog
+class DIALOG_PLOT_BASE : public wxDialog
{
- private:
-
- protected:
- enum
- {
- ID_USE_GERBER_EXTENSIONS = 1000,
- ID_ALLOW_PRINT_PAD_ON_SILKSCREEN,
- ID_PRINT_VALUE,
- ID_PRINT_REF,
- ID_PRINT_MODULE_TEXTS,
- ID_FORCE_PRINT_INVISIBLE_TEXT,
- ID_DRILL_SHAPE_OPT,
- ID_MIROR_OPT,
- ID_MASKVIA_OPT,
- ID_EXEC_PLOT,
- ID_SAVE_OPT_PLOT,
- ID_CREATE_DRILL_FILE,
- };
-
- wxStaticBoxSizer* m_CopperLayersBoxSizer;
- wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
- wxCheckBox* m_Use_Gerber_Extensions;
- wxCheckBox* m_Exclude_Edges_Pcb;
- wxCheckBox* m_Plot_Sheet_Ref;
- wxCheckBox* m_Plot_Pads_on_Silkscreen;
- wxCheckBox* m_Plot_Text_Value;
- wxCheckBox* m_Plot_Text_Ref;
- wxCheckBox* m_Plot_Text_Div;
- wxCheckBox* m_Plot_Invisible_Text;
- wxRadioBox* m_Drill_Shape_Opt;
- wxRadioBox* m_Scale_Opt;
- wxRadioBox* m_PlotModeOpt;
- wxRadioBox* m_Choice_Plot_Offset;
- wxRadioBox* m_PlotFormatOpt;
- wxStaticText* m_textPenSize;
- wxTextCtrl* m_HPGLPenSizeOpt;
- wxStaticText* m_staticText3;
- wxTextCtrl* m_HPGLPenSpeedOpt;
- wxStaticText* m_textPenOvr;
- wxTextCtrl* m_HPGLPenOverlayOpt;
- wxCheckBox* m_Plot_PS_Negative;
- wxCheckBox* m_PlotMirorOpt;
- wxCheckBox* m_PlotNoViaOnMaskOpt;
- wxStaticText* m_staticText6;
- wxTextCtrl* m_LinesWidth;
-
- wxStaticText* m_staticText7;
- wxTextCtrl* m_FineAdjustXscaleOpt;
- wxStaticText* m_staticText8;
- wxTextCtrl* m_FineAdjustYscaleOpt;
-
- wxButton* m_PlotButton;
- wxButton* m_buttonSaveOpt;
- wxButton* m_buttonDrill;
- wxButton* m_buttonQuit;
- wxStaticText* m_staticText2;
- wxTextCtrl* m_MessagesBox;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); }
- virtual void SetPlotFormat( wxCommandEvent& event ){ event.Skip(); }
- virtual void Plot( wxCommandEvent& event ){ event.Skip(); }
- virtual void SaveOptPlot( wxCommandEvent& event ){ event.Skip(); }
- virtual void CreateDrillFile( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnQuit( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 575,590 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_PLOT_BASE();
-
+private:
+
+protected:
+ enum
+ {
+ ID_USE_GERBER_EXTENSIONS = 1000,
+ ID_ALLOW_PRINT_PAD_ON_SILKSCREEN,
+ ID_PRINT_VALUE,
+ ID_PRINT_REF,
+ ID_PRINT_MODULE_TEXTS,
+ ID_FORCE_PRINT_INVISIBLE_TEXT,
+ ID_DRILL_SHAPE_OPT,
+ ID_MIROR_OPT,
+ ID_MASKVIA_OPT,
+ ID_EXEC_PLOT,
+ ID_SAVE_OPT_PLOT,
+ ID_CREATE_DRILL_FILE
+ };
+
+ wxStaticBoxSizer* m_CopperLayersBoxSizer;
+ wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
+ wxCheckBox* m_Use_Gerber_Extensions;
+ wxCheckBox* m_Exclude_Edges_Pcb;
+ wxCheckBox* m_Plot_Sheet_Ref;
+ wxCheckBox* m_Plot_Pads_on_Silkscreen;
+ wxCheckBox* m_Plot_Text_Value;
+ wxCheckBox* m_Plot_Text_Ref;
+ wxCheckBox* m_Plot_Text_Div;
+ wxCheckBox* m_Plot_Invisible_Text;
+ wxRadioBox* m_Drill_Shape_Opt;
+ wxRadioBox* m_Scale_Opt;
+ wxRadioBox* m_PlotModeOpt;
+ wxRadioBox* m_Choice_Plot_Offset;
+ wxRadioBox* m_PlotFormatOpt;
+ wxStaticText* m_textPenSize;
+ wxTextCtrl* m_HPGLPenSizeOpt;
+ wxStaticText* m_staticText3;
+ wxTextCtrl* m_HPGLPenSpeedOpt;
+ wxStaticText* m_textPenOvr;
+ wxTextCtrl* m_HPGLPenOverlayOpt;
+ wxCheckBox* m_Plot_PS_Negative;
+ wxCheckBox* m_PlotMirorOpt;
+ wxCheckBox* m_PlotNoViaOnMaskOpt;
+ wxStaticText* m_staticText6;
+ wxTextCtrl* m_LinesWidth;
+
+ wxStaticText* m_staticText7;
+ wxTextCtrl* m_FineAdjustXscaleOpt;
+ wxStaticText* m_staticText8;
+ wxTextCtrl* m_FineAdjustYscaleOpt;
+
+ wxButton* m_PlotButton;
+ wxButton* m_buttonSaveOpt;
+ wxButton* m_buttonDrill;
+ wxButton* m_buttonQuit;
+ wxStaticText* m_staticText2;
+ wxTextCtrl* m_MessagesBox;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnInitDialog( wxInitDialogEvent& event ) {
+ event.Skip();
+ }
+ virtual void SetPlotFormat( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void Plot( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void SaveOptPlot( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void CreateDrillFile( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnQuit( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 575,590 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_PLOT_BASE();
+
};
#endif //__dialog_plot_base__
=== modified file 'pcbnew/dialog_print_for_modedit_base.h'
--- pcbnew/dialog_print_for_modedit_base.h 2010-02-22 19:56:32 +0000
+++ pcbnew/dialog_print_for_modedit_base.h 2010-10-03 15:16:35 +0000
@@ -25,37 +25,47 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PRINT_FOR_MODEDIT_BASE
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PRINT_FOR_MODEDIT_BASE : public wxDialog
+class DIALOG_PRINT_FOR_MODEDIT_BASE : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_PRINT_MODE = 1000,
- wxID_PRINT_OPTIONS,
- wxID_PRINT_ALL,
- };
-
- wxRadioBox* m_ScaleOption;
- wxRadioBox* m_ModeColorOption;
- wxButton* m_buttonOption;
- wxButton* m_buttonPreview;
- wxButton* m_buttonPrint;
- wxButton* m_buttonQuit;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnPrintSetup( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPrintPreview( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPrintButtonClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 375,254 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_PRINT_FOR_MODEDIT_BASE();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_PRINT_MODE = 1000,
+ wxID_PRINT_OPTIONS,
+ wxID_PRINT_ALL
+ };
+
+ wxRadioBox* m_ScaleOption;
+ wxRadioBox* m_ModeColorOption;
+ wxButton* m_buttonOption;
+ wxButton* m_buttonPreview;
+ wxButton* m_buttonPrint;
+ wxButton* m_buttonQuit;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPrintSetup( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPrintPreview( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPrintButtonClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 375,254 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_PRINT_FOR_MODEDIT_BASE();
+
};
#endif //__dialog_print_for_modedit_base__
=== modified file 'pcbnew/dialog_print_using_printer_base.h'
--- pcbnew/dialog_print_using_printer_base.h 2010-04-22 17:47:10 +0000
+++ pcbnew/dialog_print_using_printer_base.h 2010-10-03 15:16:35 +0000
@@ -29,55 +29,67 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PRINT_USING_PRINTER_base
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
+class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
{
- private:
-
- protected:
- enum
- {
- wxID_FRAME_SEL = 1000,
- wxID_PRINT_MODE,
- wxID_PAGE_MODE,
- wxID_PRINT_OPTIONS,
- wxID_PRINT_ALL,
- };
-
- wxStaticBoxSizer* m_CopperLayersBoxSizer;
- wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
- wxCheckBox* m_Exclude_Edges_Pcb;
- wxRadioBox* m_ScaleOption;
- wxStaticText* m_FineAdjustXscaleTitle;
- wxTextCtrl* m_FineAdjustXscaleOpt;
- wxStaticText* m_FineAdjustYscaleTitle;
- wxTextCtrl* m_FineAdjustYscaleOpt;
- wxStaticText* m_TextPenWidth;
- wxTextCtrl* m_DialogPenWidth;
- wxCheckBox* m_Print_Sheet_Ref;
- wxCheckBox* m_Print_Mirror;
- wxRadioBox* m_Drill_Shape_Opt;
- wxRadioBox* m_ModeColorOption;
- wxRadioBox* m_PagesOption;
-
- wxButton* m_buttonOption;
- wxButton* m_buttonPreview;
- wxButton* m_buttonPrint;
- wxButton* m_buttonQuit;
-
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
- virtual void OnScaleSelectionClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPageSetup( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPrintPreview( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPrintButtonClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 551,315 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_PRINT_USING_PRINTER_base();
-
+private:
+
+protected:
+ enum
+ {
+ wxID_FRAME_SEL = 1000,
+ wxID_PRINT_MODE,
+ wxID_PAGE_MODE,
+ wxID_PRINT_OPTIONS,
+ wxID_PRINT_ALL
+ };
+
+ wxStaticBoxSizer* m_CopperLayersBoxSizer;
+ wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
+ wxCheckBox* m_Exclude_Edges_Pcb;
+ wxRadioBox* m_ScaleOption;
+ wxStaticText* m_FineAdjustXscaleTitle;
+ wxTextCtrl* m_FineAdjustXscaleOpt;
+ wxStaticText* m_FineAdjustYscaleTitle;
+ wxTextCtrl* m_FineAdjustYscaleOpt;
+ wxStaticText* m_TextPenWidth;
+ wxTextCtrl* m_DialogPenWidth;
+ wxCheckBox* m_Print_Sheet_Ref;
+ wxCheckBox* m_Print_Mirror;
+ wxRadioBox* m_Drill_Shape_Opt;
+ wxRadioBox* m_ModeColorOption;
+ wxRadioBox* m_PagesOption;
+
+ wxButton* m_buttonOption;
+ wxButton* m_buttonPreview;
+ wxButton* m_buttonPrint;
+ wxButton* m_buttonQuit;
+
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCloseWindow( wxCloseEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnScaleSelectionClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPageSetup( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPrintPreview( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnPrintButtonClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+ virtual void OnButtonCancelClick( wxCommandEvent& event ) {
+ event.Skip();
+ }
+
+
+public:
+ DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 551,315 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_PRINT_USING_PRINTER_base();
+
};
#endif //__dialog_print_using_printer_base__
=== modified file 'pcbnew/specctra.h'
--- pcbnew/specctra.h 2010-08-09 02:03:16 +0000
+++ pcbnew/specctra.h 2010-10-03 15:16:35 +0000
@@ -477,7 +477,7 @@
T_write_resolution,
T_x,
T_xy,
- T_y,
+ T_y
};
=== modified file 'pcbnew/tr_modif.cpp'
--- pcbnew/tr_modif.cpp 2009-11-20 14:55:20 +0000
+++ pcbnew/tr_modif.cpp 2010-10-03 15:16:35 +0000
@@ -86,7 +86,8 @@
/* Flags for cleaning the net. */
for( pt_del = BufDeb; pt_del; pt_del = pt_del->Next() )
{
- D( printf( "track %p turning off BUSY | EDIT | CHAIN\n", pt_del ); )
+ //D( printf( "track %p turning off BUSY | EDIT | CHAIN\n", pt_del ); )
+ D( std::cout<<" track "<<pt_del<<" turning off BUSY | EDIT | CHAIN"<<std::endl ; )
pt_del->SetState( BUSY | EDIT | CHAIN, OFF );
if( pt_del == BufEnd ) // Last segment reached
break;
=== modified file 'polygon/PolyLine.cpp'
--- polygon/PolyLine.cpp 2009-11-16 12:10:37 +0000
+++ polygon/PolyLine.cpp 2010-10-03 15:16:35 +0000
@@ -1193,7 +1193,7 @@
if( GetClosed() ) // If not closed, the poly is beeing created and not finalised. Not not hatch
{
enum {
- MAXPTS = 100,
+ MAXPTS = 100
};
int xx[MAXPTS], yy[MAXPTS];
=== modified file 'polygon/kbool/src/booleng.cpp'
--- polygon/kbool/src/booleng.cpp 2009-09-17 17:48:40 +0000
+++ polygon/kbool/src/booleng.cpp 2010-10-03 15:16:35 +0000
@@ -164,13 +164,13 @@
Write_Log( "FATAL ERROR: ", title );
Write_Log( "FATAL ERROR: ", text );
throw Bool_Engine_Error( " Fatal Error", "Fatal Error", 9, 1 );
-};
+}
void Bool_Engine::info( string text, string title )
{
Write_Log( "FATAL ERROR: ", title );
Write_Log( "FATAL ERROR: ", text );
-};
+}
void Bool_Engine::SetMarge( double marge )
{
=== modified file 'polygon/kbool/src/graph.cpp'
--- polygon/kbool/src/graph.cpp 2009-09-17 17:48:40 +0000
+++ polygon/kbool/src/graph.cpp 2010-10-03 15:16:35 +0000
@@ -88,7 +88,7 @@
kbLink* kbGraph::GetFirstLink()
{
return ( kbLink* ) _linklist->headitem();
-};
+}
void kbGraph::Prepare( int intersectionruns )
@@ -2275,7 +2275,7 @@
// make a link between the last and the first to close the graph
AddLink( _last_ins, _first );
-};
+}
//make the graph clockwise orientation,
//return if the graph needed redirection
Attachment:
ortho.patch.sig
Description: PGP signature
Follow ups
