From aa0fdb1c8635aaf25a63a901c96b2a8cb15c6701 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 4 Oct 2010 13:50:43 +0200 Subject: [PATCH 1/2] fixed issues in 3D viewer --- 3d-viewer/3d_canvas.cpp | 42 +++++++++++--------------------------- 3d-viewer/3d_read_mesh.cpp | 10 ++------- 3d-viewer/3d_toolbar.cpp | 13 +++++++++--- 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp index 05019ed0f6..b61464aa66 100644 --- a/3d-viewer/3d_canvas.cpp +++ b/3d-viewer/3d_canvas.cpp @@ -568,9 +568,9 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) fmt_is_jpeg = TRUE; if( event.GetId() != ID_TOOL_SCREENCOPY_TOCLIBBOARD ) { - file_ext = fmt_is_jpeg ? wxT( "jpg" ) : wxT( "png" ); - mask = wxT( "*." ) + file_ext; - FullFileName = m_Parent->m_Parent->GetScreen()->m_FileName; + file_ext = fmt_is_jpeg ? wxT( "jpg" ) : wxT( "png" ); + mask = wxT( "*." ) + file_ext; + FullFileName = m_Parent->m_Parent->GetScreen()->m_FileName; fn.SetExt( file_ext ); FullFileName = @@ -582,17 +582,7 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) return; } - Redraw( true ); - - wxSize image_size = GetClientSize(); - #ifndef __WXMAC__ - wxClientDC dc( this ); - wxBitmap bitmap( image_size.x, image_size.y ); - wxMemoryDC memdc; - memdc.SelectObject( bitmap ); - memdc.Blit( 0, 0, image_size.x, image_size.y, &dc, 0, 0 ); - memdc.SelectObject( wxNullBitmap ); -#else + wxSize image_size = GetClientSize(); struct vieport_params { GLint originx; @@ -600,7 +590,8 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) GLint x; GLint y; } viewport; - + + // Build image from the 3D buffer wxWindowUpdateLocker noUpdates( this ); glGetIntegerv( GL_VIEWPORT, (GLint*) &viewport ); @@ -610,27 +601,18 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) glPixelStorei( GL_PACK_ALIGNMENT, 1 ); glReadBuffer( GL_BACK_LEFT ); - glReadPixels( viewport.originx, - viewport.originy, - viewport.x, - viewport.y, - GL_RGB, - GL_UNSIGNED_BYTE, - pixelbuffer ); - glReadPixels( viewport.originx, - viewport.originy, - viewport.x, - viewport.y, - GL_ALPHA, - GL_UNSIGNED_BYTE, - alphabuffer ); + glReadPixels( viewport.originx, viewport.originy, + viewport.x, viewport.y, + GL_RGB, GL_UNSIGNED_BYTE, pixelbuffer ); + glReadPixels( viewport.originx, viewport.originy, + viewport.x, viewport.y, + GL_ALPHA, GL_UNSIGNED_BYTE, alphabuffer ); image.SetData( pixelbuffer ); image.SetAlpha( alphabuffer ); image = image.Mirror( false ); wxBitmap bitmap( image ); -#endif if( event.GetId() == ID_TOOL_SCREENCOPY_TOCLIBBOARD ) { diff --git a/3d-viewer/3d_read_mesh.cpp b/3d-viewer/3d_read_mesh.cpp index 4b43b1e043..a33c143bbe 100644 --- a/3d-viewer/3d_read_mesh.cpp +++ b/3d-viewer/3d_read_mesh.cpp @@ -2,12 +2,6 @@ // Name: 3d_read_mesh.cpp ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation -#pragma interface -#endif - #include "fctsys.h" #include "common.h" #include "macros.h" @@ -417,7 +411,7 @@ int S3D_MASTER::ReadGeometry( FILE* file, int* LineNum ) int coord_number; double* buf_points = ReadCoordsList( file, line, &coord_number, LineNum ); - continue; + // Do something if needed free( buf_points ); continue; } @@ -445,7 +439,7 @@ int S3D_MASTER::ReadGeometry( FILE* file, int* LineNum ) int coord_number; double* buf_points = ReadCoordsList( file, line, &coord_number, LineNum ); - continue; + // Do something if needed free( buf_points ); continue; } diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index da068788fd..b9c10478b9 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -104,9 +104,9 @@ void WinEDA3D_DrawFrame::ReCreateMenuBar() // If called from the display frame of cvpcb, only some options are // relevant - if( m_Parent->m_FrameName == wxT( "CmpFrame" ) ) // Called from cvpcb ! - full_options = false; // Do not display all - // options + if( m_Parent->m_FrameName == wxT( "CmpFrame" ) ) + // Called from cvpcb: do not display all options + full_options = false; wxMenuBar* menuBar = new wxMenuBar; @@ -118,6 +118,13 @@ void WinEDA3D_DrawFrame::ReCreateMenuBar() _( "Create Image (png format)" ) ); fileMenu->Append( ID_MENU_SCREENCOPY_JPEG, _( "Create Image (jpeg format)" ) ); + +#if (defined(__WINDOWS__) || defined(__APPLE__ ) ) + // Does not work properly under linux + fileMenu->AppendSeparator(); + fileMenu->Append( ID_TOOL_SCREENCOPY_TOCLIBBOARD, + _( "Copy 3D Image to Clipboard" ) ); +#endif fileMenu->AppendSeparator(); fileMenu->Append( wxID_EXIT, _( "&Exit" ) ); From a188f9d06e00629211b7f936b85a1a16a5900fb7 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 4 Oct 2010 14:58:07 +0200 Subject: [PATCH 2/2] added orto2 patch --- 3d-viewer/3d_canvas.cpp | 29 +++++++++++++++++------- 3d-viewer/3d_frame.cpp | 4 ++++ 3d-viewer/3d_toolbar.cpp | 5 ++++ 3d-viewer/3d_viewer.h | 12 +++++++++- bitmaps/CMakeLists.txt | 1 + bitmaps/ortho.xpm | 21 +++++++++++++++++ common/base_screen.cpp | 2 +- common/class_undoredo_container.cpp | 4 ++-- common/dcsvg.cpp | 10 ++++---- common/dialog_about/AboutDialog_main.cpp | 2 +- eeschema/class_pin.h | 4 ++-- eeschema/class_schematic_items.cpp | 2 +- eeschema/files-io.cpp | 2 +- eeschema/pinedit.cpp | 2 +- eeschema/template_fieldnames.h | 2 +- gerbview/class_aperture_macro.h | 2 +- gerbview/gerbview.h | 4 ++-- gerbview/wxGerberFrame.h | 2 +- include/appl_wxstruct.h | 4 ++-- include/base_struct.h | 2 +- include/bitmaps.h | 1 + include/dsnlexer.h | 2 +- include/macros.h | 24 ++++++++++---------- include/param_config.h | 2 +- include/wxstruct.h | 2 +- kicad/commandframe.cpp | 2 +- kicad/kicad.h | 4 ++-- pcbnew/build_BOM_from_board.cpp | 2 +- pcbnew/deltrack.cpp | 9 +++++--- pcbnew/dialog_design_rules.cpp | 2 +- pcbnew/specctra.h | 2 +- pcbnew/tr_modif.cpp | 3 ++- polygon/PolyLine.cpp | 2 +- polygon/kbool/src/booleng.cpp | 4 ++-- polygon/kbool/src/graph.cpp | 4 ++-- 35 files changed, 120 insertions(+), 61 deletions(-) create mode 100644 bitmaps/ortho.xpm diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp index b61464aa66..ab345dcd52 100644 --- a/3d-viewer/3d_canvas.cpp +++ b/3d-viewer/3d_canvas.cpp @@ -57,6 +57,7 @@ Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) : m_init = FALSE; m_gllist = 0; m_Parent = parent; + m_ortho = false; #if wxCHECK_VERSION( 2, 9, 0 ) @@ -498,32 +499,44 @@ void Pcb3D_GLCanvas::InitGL() glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); } - /* set viewing projection */ + // 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 ) 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); + 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 */ + + // 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(); } diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index 4e2f420203..3841a84d96 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -292,6 +292,10 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event ) 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: diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index b9c10478b9..3e744e3d80 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -88,6 +88,11 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() m_HToolBar->AddTool( ID_MOVE3D_DOWN, wxEmptyString, wxBitmap( down_xpm ), _( "Move down" ) ); + + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_ORTHO, wxEmptyString, wxBitmap( ortho_xpm ), + _( "Enable/Disable ortographic projection" ), + wxITEM_CHECK ); m_HToolBar->Realize(); } diff --git a/3d-viewer/3d_viewer.h b/3d-viewer/3d_viewer.h index cdbfd9b5e1..edcd8880d0 100644 --- a/3d-viewer/3d_viewer.h +++ b/3d-viewer/3d_viewer.h @@ -53,6 +53,7 @@ enum id_3dview_frm ID_MOVE3D_RIGHT, ID_MOVE3D_UP, ID_MOVE3D_DOWN, + ID_ORTHO, ID_MENU3D_BGCOLOR_SELECTION, ID_MENU3D_AXIS_ONOFF, ID_MENU3D_MODULE_ONOFF, @@ -137,6 +138,9 @@ public: 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 @@ -181,6 +185,12 @@ public: void Draw3D_Via( SEGVIA* via ); 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); @@ -223,7 +233,7 @@ public: /** 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( ) { diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt index c4e70b382f..e842f91dfd 100644 --- a/bitmaps/CMakeLists.txt +++ b/bitmaps/CMakeLists.txt @@ -285,6 +285,7 @@ set(BITMAP_SRCS Options_Vias.xpm opt_show_polygon.xpm Orient.xpm + ortho.xpm Pad_Sketch.xpm pad.xpm pads_mask_layers.xpm diff --git a/bitmaps/ortho.xpm b/bitmaps/ortho.xpm new file mode 100644 index 0000000000..14bdb5b70d --- /dev/null +++ b/bitmaps/ortho.xpm @@ -0,0 +1,21 @@ +/* XPM */ +const char *ortho_xpm[]={ +"16 15 2 1", +"# c #008080", +". c none", +"................", +"......####......", +".....######.....", +"....###..###....", +"....##....##....", +"...##......##...", +"...##......##...", +"...##......##...", +"...##......##...", +"...##......##...", +"....##....##....", +"....###..###....", +".....######.....", +"......####......", +"................" +}; diff --git a/common/base_screen.cpp b/common/base_screen.cpp index 4733e46641..2cd5f6b42c 100644 --- a/common/base_screen.cpp +++ b/common/base_screen.cpp @@ -15,7 +15,7 @@ /* Implement wxSize array for grid list implementation. */ #include -WX_DEFINE_OBJARRAY( GridArray ); +WX_DEFINE_OBJARRAY( GridArray ) BASE_SCREEN* ActiveScreen = NULL; diff --git a/common/class_undoredo_container.cpp b/common/class_undoredo_container.cpp index 6d0781059d..97c88aa0ba 100644 --- a/common/class_undoredo_container.cpp +++ b/common/class_undoredo_container.cpp @@ -44,7 +44,7 @@ ITEM_PICKER::ITEM_PICKER( EDA_BaseStruct* aItem, UndoRedoOpType aUndoRedoStatus PICKED_ITEMS_LIST::PICKED_ITEMS_LIST() { m_Status = UR_UNSPECIFIED; -}; +} PICKED_ITEMS_LIST::~PICKED_ITEMS_LIST() { @@ -321,7 +321,7 @@ bool PICKED_ITEMS_LIST::SetPickerFlags( int aFlags, unsigned aIdx ) /** 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 */ diff --git a/common/dcsvg.cpp b/common/dcsvg.cpp index a954be7838..4069ce6d5f 100644 --- a/common/dcsvg.cpp +++ b/common/dcsvg.cpp @@ -55,7 +55,7 @@ static inline double DegToRad( double deg ) { return (deg * M_PI) / 180.0; -}; +} wxString wxColStr( wxColour c ) { @@ -180,17 +180,17 @@ wxSVGFileDC::wxSVGFileDC( wxString f ) { // 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 @@ void wxSVGFileDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); return; -}; +} void wxSVGFileDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset ) { diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 5d42f03e98..473ea11fe1 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -26,7 +26,7 @@ #include -WX_DEFINE_OBJARRAY( Contributors ); +WX_DEFINE_OBJARRAY( Contributors ) // Helper functions: static wxString HtmlHyperlink( const wxString& url, const wxString& description = wxEmptyString ); diff --git a/eeschema/class_pin.h b/eeschema/class_pin.h index 5972537013..16c618a72d 100644 --- a/eeschema/class_pin.h +++ b/eeschema/class_pin.h @@ -63,7 +63,7 @@ enum DrawPinShape { 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 @@ enum DrawPinOrient { PIN_RIGHT = 'R', PIN_LEFT = 'L', PIN_UP = 'U', - PIN_DOWN = 'D', + PIN_DOWN = 'D' }; diff --git a/eeschema/class_schematic_items.cpp b/eeschema/class_schematic_items.cpp index 5821699ed7..e620462d12 100644 --- a/eeschema/class_schematic_items.cpp +++ b/eeschema/class_schematic_items.cpp @@ -221,7 +221,7 @@ EDA_Rect SCH_JUNCTION::GetBoundingBox() rect.Inflate( ( GetPenSize() + m_Size.x ) / 2 ); return rect; -}; +} /** Function HitTest diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 5cfe5f3454..088a98824e 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -190,7 +190,7 @@ bool WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsN { 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 ); diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp index 9dafcc4a5d..85869b1e37 100644 --- a/eeschema/pinedit.cpp +++ b/eeschema/pinedit.cpp @@ -279,7 +279,7 @@ another pin. Continue?" ) ); DrawPanel->CursorOn( DC ); m_drawItem = NULL; -}; +} /** diff --git a/eeschema/template_fieldnames.h b/eeschema/template_fieldnames.h index 82f3b5d733..ff3b3af3b8 100644 --- a/eeschema/template_fieldnames.h +++ b/eeschema/template_fieldnames.h @@ -35,7 +35,7 @@ enum NumFieldType { FIELD5, FIELD6, FIELD7, - FIELD8, + FIELD8 }; diff --git a/gerbview/class_aperture_macro.h b/gerbview/class_aperture_macro.h index 07221c5291..98fabc7d1c 100644 --- a/gerbview/class_aperture_macro.h +++ b/gerbview/class_aperture_macro.h @@ -54,7 +54,7 @@ enum AM_PRIMITIVE_ID { 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 diameter, cross hair thickness + rotation) + AMP_THERMAL = 7 // Thermal shape (pos, outer and inner diameter, cross hair thickness + rotation) }; diff --git a/gerbview/gerbview.h b/gerbview/gerbview.h index 096ea1fb54..8010cf16ce 100644 --- a/gerbview/gerbview.h +++ b/gerbview/gerbview.h @@ -65,7 +65,7 @@ enum Gerb_Interpolation GERB_INTERPOL_LINEAR_01X, GERB_INTERPOL_LINEAR_001X, GERB_INTERPOL_ARC_NEG, - GERB_INTERPOL_ARC_POS, + GERB_INTERPOL_ARC_POS }; @@ -144,7 +144,7 @@ public: 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 diff --git a/gerbview/wxGerberFrame.h b/gerbview/wxGerberFrame.h index 1a2f9a6c7f..05fec3d466 100644 --- a/gerbview/wxGerberFrame.h +++ b/gerbview/wxGerberFrame.h @@ -28,7 +28,7 @@ enum id_gerbview_frm 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 }; diff --git a/include/appl_wxstruct.h b/include/appl_wxstruct.h index 75d9e0e266..fac13ce486 100644 --- a/include/appl_wxstruct.h +++ b/include/appl_wxstruct.h @@ -19,7 +19,7 @@ enum id_app_type { APP_TYPE_PCBNEW, APP_TYPE_CVPCB, APP_TYPE_GERBVIEW, - APP_TYPE_KICAD, + APP_TYPE_KICAD }; class wxConfigBase; @@ -227,6 +227,6 @@ public: WinEDA_App(); * 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 */ diff --git a/include/base_struct.h b/include/base_struct.h index 521a82843b..46837d075f 100644 --- a/include/base_struct.h +++ b/include/base_struct.h @@ -544,7 +544,7 @@ enum FILL_T { 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 diff --git a/include/bitmaps.h b/include/bitmaps.h index 25351eaf29..b233488391 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -93,6 +93,7 @@ extern const char* delete_xpm[]; 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[]; diff --git a/include/dsnlexer.h b/include/dsnlexer.h index 996b3db779..ea149e5a56 100644 --- a/include/dsnlexer.h +++ b/include/dsnlexer.h @@ -65,7 +65,7 @@ enum DSN_SYNTAX_T { 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 }; diff --git a/include/macros.h b/include/macros.h index 5c38c3f00c..63a1e4460e 100644 --- a/include/macros.h +++ b/include/macros.h @@ -102,18 +102,18 @@ static inline const wxChar* GetChars( const wxString& s ) #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 @@ static inline void ADD_MENUITEM( wxMenu* menu, int id, #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 @@ static inline void ADD_MENUITEM_WITH_HELP( wxMenu* menu, int id, #endif /* !defined( __WXMAC__ ) */ menu->Append( l_item ); -}; +} #ifdef __WINDOWS__ static inline void ADD_MENUITEM_WITH_SUBMENU( wxMenu* menu, wxMenu* submenu, @@ -198,7 +198,7 @@ static inline void ADD_MENUITEM_WITH_SUBMENU( wxMenu* menu, wxMenu* submenu, #endif /* !defined( __WXMAC__ ) */ menu->Append( l_item ); -}; +} static inline void ADD_MENUITEM_WITH_HELP_AND_SUBMENU( wxMenu* menu, wxMenu* submenu, @@ -217,7 +217,7 @@ static inline void ADD_MENUITEM_WITH_HELP_AND_SUBMENU( wxMenu* menu, #endif /* !defined( __WXMAC__ ) */ menu->Append( l_item ); -}; +} #endif diff --git a/include/param_config.h b/include/param_config.h index b5c4dde71d..8457cdfb4f 100644 --- a/include/param_config.h +++ b/include/param_config.h @@ -21,7 +21,7 @@ enum paramcfg_id PARAM_LIBNAME_LIST, PARAM_WXSTRING, PARAM_COMMAND_ERASE, - PARAM_FIELDNAME_LIST, + PARAM_FIELDNAME_LIST }; #define MAX_COLOR 0x8001F diff --git a/include/wxstruct.h b/include/wxstruct.h index 67a74728ad..2e9ed16c81 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -480,7 +480,7 @@ public: int aPrintMask, bool aPrintMirrorMode, void * aData = NULL); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/kicad/commandframe.cpp b/kicad/commandframe.cpp index 5e1ac3f34c..daaf91e474 100644 --- a/kicad/commandframe.cpp +++ b/kicad/commandframe.cpp @@ -28,7 +28,7 @@ RIGHT_KM_FRAME::RIGHT_KM_FRAME( WinEDA_MainFrame* parent ) : wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY ); -}; +} void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event ) { diff --git a/kicad/kicad.h b/kicad/kicad.h index ec2849da86..9a09712aaf 100644 --- a/kicad/kicad.h +++ b/kicad/kicad.h @@ -50,7 +50,7 @@ enum id_kicad_frm { 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 @@ enum TreeFileType { TREE_NET, TREE_UNKNOWN, TREE_DIRECTORY, - TREE_MAX, + TREE_MAX }; /** class RIGHT_KM_FRAME diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp index bef35c7419..a25edb73a6 100644 --- a/pcbnew/build_BOM_from_board.cpp +++ b/pcbnew/build_BOM_from_board.cpp @@ -44,7 +44,7 @@ public: }; WX_DECLARE_LIST( cmp, CmpList ); -WX_DEFINE_LIST( CmpList ); +WX_DEFINE_LIST( CmpList ) void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent ) { diff --git a/pcbnew/deltrack.cpp b/pcbnew/deltrack.cpp index 63cb279a4a..f12185c534 100644 --- a/pcbnew/deltrack.cpp +++ b/pcbnew/deltrack.cpp @@ -204,9 +204,12 @@ void WinEDA_PcbFrame::Remove_One_Track( wxDC* DC, TRACK* pt_segm ) 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 "<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 "<SetState( BUSY | EDIT | CHAIN, OFF ); if( pt_del == BufEnd ) // Last segment reached break; diff --git a/polygon/PolyLine.cpp b/polygon/PolyLine.cpp index 59174dc093..573993d39b 100644 --- a/polygon/PolyLine.cpp +++ b/polygon/PolyLine.cpp @@ -1193,7 +1193,7 @@ void CPolyLine::Hatch() 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]; diff --git a/polygon/kbool/src/booleng.cpp b/polygon/kbool/src/booleng.cpp index ac61f3987d..50c5a629a6 100644 --- a/polygon/kbool/src/booleng.cpp +++ b/polygon/kbool/src/booleng.cpp @@ -164,13 +164,13 @@ void Bool_Engine::error( string text, string title ) 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 ) { diff --git a/polygon/kbool/src/graph.cpp b/polygon/kbool/src/graph.cpp index 67a53854f1..cab57cda72 100644 --- a/polygon/kbool/src/graph.cpp +++ b/polygon/kbool/src/graph.cpp @@ -88,7 +88,7 @@ kbGraph::~kbGraph() kbLink* kbGraph::GetFirstLink() { return ( kbLink* ) _linklist->headitem(); -}; +} void kbGraph::Prepare( int intersectionruns ) @@ -2275,7 +2275,7 @@ void kbGraph::Make_Rounded_Shape( kbLink* a_link, double factor ) // 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