From 7dfd7f2ff5b8713f50236b2912dbabc227f28065 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 13 Sep 2010 16:45:19 +0200 Subject: [PATCH 1/2] fixed in Gerbview: Hide/show layers not working very well. --- gerbview/CMakeLists.txt | 3 +- gerbview/menubar.cpp | 137 ++++++++++++++++++ .../{tool_gerber.cpp => toolbars_gerber.cpp} | 121 ---------------- gerbview/tracepcb.cpp | 12 +- 4 files changed, 146 insertions(+), 127 deletions(-) create mode 100644 gerbview/menubar.cpp rename gerbview/{tool_gerber.cpp => toolbars_gerber.cpp} (60%) diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt index d1fe94db85..f702f1431e 100644 --- a/gerbview/CMakeLists.txt +++ b/gerbview/CMakeLists.txt @@ -34,6 +34,7 @@ set(GERBVIEW_SRCS initpcb.cpp lay2plot.cpp locate.cpp + menubar.cpp onrightclick.cpp options.cpp pcbplot.cpp @@ -42,7 +43,7 @@ set(GERBVIEW_SRCS rs274d.cpp rs274x.cpp select_layers_to_pcb.cpp - tool_gerber.cpp + toolbars_gerber.cpp tracepcb.cpp ) ### diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp new file mode 100644 index 0000000000..1e1ac8b287 --- /dev/null +++ b/gerbview/menubar.cpp @@ -0,0 +1,137 @@ +/***************************************************/ +/* tool_gerber.cpp: Build tool bars and main menu */ +/***************************************************/ + +#include "fctsys.h" +#include "wx/wupdlock.h" + +#include "appl_wxstruct.h" +#include "common.h" +#include "macros.h" +#include "gerbview.h" +#include "pcbplot.h" +#include "protos.h" +#include "bitmaps.h" +#include "gerbview_id.h" +#include "hotkeys.h" + + +void WinEDA_GerberFrame::ReCreateMenuBar( void ) +{ + wxWindowUpdateLocker dummy(this); + + wxMenuBar *menuBar = GetMenuBar(); + + /* Destroy the existing menu bar so it can be rebuilt. This allows + * language changes of the menu text on the fly. */ + if( menuBar ) + SetMenuBar( NULL ); + + menuBar = new wxMenuBar(); + + wxMenu* filesMenu = new wxMenu; + filesMenu->Append( wxID_FILE, _( "Load Gerber File" ), + _( "Load a new Gerber file on the current layer" ), + FALSE ); + + filesMenu->Append( ID_APPEND_FILE, _( "Append Gerber File to Current Layer" ), + _( "Append a new Gerber file to the current layer" ), + FALSE ); + + filesMenu->Append( ID_MENU_INC_LAYER_AND_APPEND_FILE, + _( "Inc Layer and load Gerber file" ), + _( "Increment layer number, and Load Gerber file" ), + FALSE ); + + filesMenu->Append( ID_GERBVIEW_LOAD_DCODE_FILE, _( "Load DCodes" ), + _( "Load D-Codes File" ), FALSE ); +#if 0 + filesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE, _( "Load EXCELLON Drill File" ), + _( "Load excellon drill file" ), FALSE ); +#endif + + filesMenu->Append( ID_NEW_BOARD, _( "&Clear All" ), + _( "Clear all layers" ), FALSE ); + + filesMenu->AppendSeparator(); + filesMenu->Append( ID_GERBVIEW_EXPORT_TO_PCBNEW, _( "&Export to Pcbnew" ), + _( "Export data in pcbnew format" ), FALSE ); + +#if 0 + filesMenu->AppendSeparator(); + filesMenu->Append( ID_SAVE_BOARD, _( "&Save Layers" ), + _( "Save current layers (GERBER format)" ), FALSE ); + + filesMenu->Append( ID_SAVE_BOARD_AS, _( "Save Layers As..." ), + _( "Save current layers as.." ), FALSE ); +#endif + + filesMenu->AppendSeparator(); + + filesMenu->Append( wxID_PRINT, _( "P&rint" ), _( "Print gerber" ) ); + filesMenu->Append( ID_GEN_PLOT, _( "Plot" ), + _( "Plotting in various formats" ) ); + + filesMenu->AppendSeparator(); + filesMenu->Append( ID_EXIT, _( "E&xit" ), _( "Quit Gerbview" ) ); + + wxGetApp().m_fileHistory.AddFilesToMenu( filesMenu ); + + // Configuration and preferences: + wxMenu* configmenu = new wxMenu; + ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_REQ, _( "&File Ext" ), + _( "Set files extensions" ), config_xpm ); + ADD_MENUITEM_WITH_HELP( configmenu, ID_MENU_GERBVIEW_SHOW_HIDE_LAYERS_MANAGER_DIALOG, + _( "Hide &Layers Manager" ), + _( "Show/hide the layers manager toolbar" ), + layers_manager_xpm ); + ADD_MENUITEM_WITH_HELP( configmenu, ID_OPTIONS_SETUP, _( "&Options" ), + _( "Select general options" ), preference_xpm ); + + ADD_MENUITEM_WITH_HELP( configmenu, ID_GERBVIEW_DISPLAY_OPTIONS_SETUP, + _( "Display" ), + _( "Select how items are displayed" ), + display_options_xpm ); + + wxGetApp().AddMenuLanguageList( configmenu ); + + AddHotkeyConfigMenu( configmenu ); + + + configmenu->AppendSeparator(); + ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_SAVE, _( "&Save Setup" ), + _( "Save application preferences" ), + save_setup_xpm ); + + wxMenu* miscellaneous_menu = new wxMenu; + ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_LIST_DCODES, + _( "&List DCodes" ), + _( "List and edit D-codes" ), show_dcodenumber_xpm ); + ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE, + _( "&Show Source" ), + _( "Show source file for the current layer" ), + tools_xpm ); + miscellaneous_menu->AppendSeparator(); + ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_GLOBAL_DELETE, + _( "&Delete Layer" ), + _( "Delete current layer" ), general_deletions_xpm ); + + // Menu Help: + wxMenu* helpMenu = new wxMenu; + AddHelpVersionInfoMenuEntry( helpMenu ); + ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), + _( "Open the gerbview manual" ), help_xpm ); + ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About Gerbview" ), + _( "About gerbview gerber and drill viewer" ), + online_help_xpm ); + + menuBar->Append( filesMenu, _( "&File" ) ); + menuBar->Append( configmenu, _( "&Preferences" ) ); + menuBar->Append( miscellaneous_menu, _( "&Miscellaneous" ) ); + +//TODO: one day... menuBar->Append(drill_menu, _("&Drill")); + menuBar->Append( helpMenu, _( "&Help" ) ); + + // Associate the menu bar with the frame + SetMenuBar( menuBar ); +} diff --git a/gerbview/tool_gerber.cpp b/gerbview/toolbars_gerber.cpp similarity index 60% rename from gerbview/tool_gerber.cpp rename to gerbview/toolbars_gerber.cpp index 4862d92798..bd55e86d46 100644 --- a/gerbview/tool_gerber.cpp +++ b/gerbview/toolbars_gerber.cpp @@ -16,127 +16,6 @@ #include "hotkeys.h" -void WinEDA_GerberFrame::ReCreateMenuBar( void ) -{ - wxWindowUpdateLocker dummy(this); - - wxMenuBar *menuBar = GetMenuBar(); - - /* Destroy the existing menu bar so it can be rebuilt. This allows - * language changes of the menu text on the fly. */ - if( menuBar ) - SetMenuBar( NULL ); - - menuBar = new wxMenuBar(); - - wxMenu* filesMenu = new wxMenu; - filesMenu->Append( wxID_FILE, _( "Load Gerber File" ), - _( "Load a new Gerber file on the current layer" ), - FALSE ); - - filesMenu->Append( ID_APPEND_FILE, _( "Append Gerber File to Current Layer" ), - _( "Append a new Gerber file to the current layer" ), - FALSE ); - - filesMenu->Append( ID_MENU_INC_LAYER_AND_APPEND_FILE, - _( "Inc Layer and load Gerber file" ), - _( "Increment layer number, and Load Gerber file" ), - FALSE ); - - filesMenu->Append( ID_GERBVIEW_LOAD_DCODE_FILE, _( "Load DCodes" ), - _( "Load D-Codes File" ), FALSE ); -#if 0 - filesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE, _( "Load EXCELLON Drill File" ), - _( "Load excellon drill file" ), FALSE ); -#endif - - filesMenu->Append( ID_NEW_BOARD, _( "&Clear All" ), - _( "Clear all layers" ), FALSE ); - - filesMenu->AppendSeparator(); - filesMenu->Append( ID_GERBVIEW_EXPORT_TO_PCBNEW, _( "&Export to Pcbnew" ), - _( "Export data in pcbnew format" ), FALSE ); - -#if 0 - filesMenu->AppendSeparator(); - filesMenu->Append( ID_SAVE_BOARD, _( "&Save Layers" ), - _( "Save current layers (GERBER format)" ), FALSE ); - - filesMenu->Append( ID_SAVE_BOARD_AS, _( "Save Layers As..." ), - _( "Save current layers as.." ), FALSE ); -#endif - - filesMenu->AppendSeparator(); - - filesMenu->Append( wxID_PRINT, _( "P&rint" ), _( "Print gerber" ) ); - filesMenu->Append( ID_GEN_PLOT, _( "Plot" ), - _( "Plotting in various formats" ) ); - - filesMenu->AppendSeparator(); - filesMenu->Append( ID_EXIT, _( "E&xit" ), _( "Quit Gerbview" ) ); - - wxGetApp().m_fileHistory.AddFilesToMenu( filesMenu ); - - // Configuration and preferences: - wxMenu* configmenu = new wxMenu; - ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_REQ, _( "&File Ext" ), - _( "Set files extensions" ), config_xpm ); - ADD_MENUITEM_WITH_HELP( configmenu, ID_MENU_GERBVIEW_SHOW_HIDE_LAYERS_MANAGER_DIALOG, - _( "Hide &Layers Manager" ), - _( "Show/hide the layers manager toolbar" ), - layers_manager_xpm ); - ADD_MENUITEM_WITH_HELP( configmenu, ID_OPTIONS_SETUP, _( "&Options" ), - _( "Select general options" ), preference_xpm ); - - ADD_MENUITEM_WITH_HELP( configmenu, ID_GERBVIEW_DISPLAY_OPTIONS_SETUP, - _( "Display" ), - _( "Select how items are displayed" ), - display_options_xpm ); - - wxGetApp().AddMenuLanguageList( configmenu ); - - AddHotkeyConfigMenu( configmenu ); - - - configmenu->AppendSeparator(); - ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_SAVE, _( "&Save Setup" ), - _( "Save application preferences" ), - save_setup_xpm ); - - wxMenu* miscellaneous_menu = new wxMenu; - ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_LIST_DCODES, - _( "&List DCodes" ), - _( "List and edit D-codes" ), show_dcodenumber_xpm ); - ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE, - _( "&Show Source" ), - _( "Show source file for the current layer" ), - tools_xpm ); - miscellaneous_menu->AppendSeparator(); - ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_GLOBAL_DELETE, - _( "&Delete Layer" ), - _( "Delete current layer" ), general_deletions_xpm ); - - // Menu Help: - wxMenu* helpMenu = new wxMenu; - AddHelpVersionInfoMenuEntry( helpMenu ); - ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), - _( "Open the gerbview manual" ), help_xpm ); - ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About Gerbview" ), - _( "About gerbview gerber and drill viewer" ), - online_help_xpm ); - - menuBar->Append( filesMenu, _( "&File" ) ); - menuBar->Append( configmenu, _( "&Preferences" ) ); - menuBar->Append( miscellaneous_menu, _( "&Miscellaneous" ) ); - -// menuBar->Append(drill_menu, _("&Drill")); - menuBar->Append( helpMenu, _( "&Help" ) ); - - // Associate the menu bar with the frame - SetMenuBar( menuBar ); -} - - void WinEDA_GerberFrame::ReCreateHToolbar( void ) { int layer = 0; diff --git a/gerbview/tracepcb.cpp b/gerbview/tracepcb.cpp index 1184cd93ea..fe84f3a066 100644 --- a/gerbview/tracepcb.cpp +++ b/gerbview/tracepcb.cpp @@ -84,7 +84,13 @@ void WinEDA_GerberFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg ) DrawPanel->DrawBackGround( DC ); - Trace_Gerber( DC, GR_COPY, -1 ); + //buid mask layer : + int masklayer = 0; + for( int layer = 0; layer < 32; layer++ ) + if( GetBoard()->IsLayerVisible( layer ) ) + masklayer |= 1 << layer; + + Trace_Gerber( DC, GR_COPY, masklayer ); TraceWorkSheet( DC, screen, 0 ); if( DrawPanel->ManageCurseur ) @@ -129,10 +135,6 @@ void WinEDA_GerberFrame::Trace_Gerber( wxDC* DC, int draw_mode, int printmasklay { if( !(track->ReturnMaskLayer() & printmasklayer) ) continue; - if( GetBoard()->IsLayerVisible( track->GetLayer() ) == false ) - continue; - -// D(printf("D:%p\n", track );) if( track->GetNet() == 0 ) // StartPoint { From 3e2cbea20e05a67096ffe7eee8011fee59a31206 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 13 Sep 2010 17:45:57 +0200 Subject: [PATCH 2/2] Gerbview: fixed a bug when more than one layer loaded: sometimes polygond were drawn in a bad color (including black, so sometimes polygons disappear) --- gerbview/tracepcb.cpp | 113 +++++++++++++----------------------------- 1 file changed, 34 insertions(+), 79 deletions(-) diff --git a/gerbview/tracepcb.cpp b/gerbview/tracepcb.cpp index fe84f3a066..e0a42ad821 100644 --- a/gerbview/tracepcb.cpp +++ b/gerbview/tracepcb.cpp @@ -22,11 +22,6 @@ /* tracepcb.cpp */ /***************/ -static void Draw_Track_Buffer( WinEDA_DrawPanel* panel, - wxDC* DC, - BOARD* Pcb, - int drawmode, - int printmasklayer ); static void Affiche_DCodes_Pistes( WinEDA_DrawPanel* panel, wxDC* DC, BOARD* Pcb, int drawmode ); @@ -39,7 +34,7 @@ static void Affiche_DCodes_Pistes( WinEDA_DrawPanel* panel, wxDC* DC, * @param aPrintMirrorMode = true to plot mirrored * @param aData = a pointer to an optional data (not used here: can be NULL) */ -void WinEDA_GerberFrame::PrintPage( wxDC* aDC, bool aPrint_Sheet_Ref, int aPrintmasklayer, +void WinEDA_GerberFrame::PrintPage( wxDC* aDC, bool aPrint_Sheet_Ref, int aPrintMasklayer, bool aPrintMirrorMode, void * aData ) { DISPLAY_OPTIONS save_opt; @@ -57,7 +52,7 @@ void WinEDA_GerberFrame::PrintPage( wxDC* aDC, bool aPrint_Sheet_Ref, int aPrint DrawPanel->m_PrintIsMirrored = aPrintMirrorMode; - Trace_Gerber( aDC, GR_COPY, aPrintmasklayer ); + Trace_Gerber( aDC, GR_COPY, aPrintMasklayer ); if( aPrint_Sheet_Ref ) TraceWorkSheet( aDC, GetScreen(), 0 ); @@ -110,20 +105,21 @@ void BOARD::Draw( WinEDA_DrawPanel* aPanel, wxDC* DC, /***********************************************************************************/ -void WinEDA_GerberFrame::Trace_Gerber( wxDC* DC, int draw_mode, int printmasklayer ) +void WinEDA_GerberFrame::Trace_Gerber( wxDC* aDC, int aDraw_mode, int aPrintMasklayer ) /***********************************************************************************/ /* Trace all elements of PCBs (i.e Spots, filled polygons or lines) on the active screen -* @param DC = current device context -* @param draw_mode = draw mode for the device context (GR_COPY, GR_OR, GR_XOR ..) -* @param printmasklayer = mask for allowed layer (=-1 to draw all layers) +* @param aDC = current device context +* @param aDraw_mode = draw mode for the device context (GR_COPY, GR_OR, GR_XOR ..) +* @param aPrintMasklayer = mask for allowed layer (=-1 to draw all layers) */ { if( !GetBoard() ) return; bool erase = false; - int Color; + int color; bool filled; + int layer = GetScreen()->m_Active_Layer; // Draw filled polygons std::vector points; @@ -131,102 +127,61 @@ void WinEDA_GerberFrame::Trace_Gerber( wxDC* DC, int draw_mode, int printmasklay // minimize reallocations of the vector's internal array by starting with a good sized one. points.reserve(10000); - for( TRACK* track = GetBoard()->m_Zone; track; track = track->Next() ) + TRACK* next_track; + for( TRACK* track = GetBoard()->m_Zone; track; track = next_track ) { - if( !(track->ReturnMaskLayer() & printmasklayer) ) + next_track = track->Next(); + + if( !(track->ReturnMaskLayer() & aPrintMasklayer) ) continue; - if( track->GetNet() == 0 ) // StartPoint + if( (points.size() == 0) && (track->GetNet() == 0) ) // first point of a new polygon { - if( points.size() ) // we have found a new polygon: Draw the old polygon - { - if( erase ) - { - Color = g_DrawBgColor; - filled = true; - } - else - { - Color = g_ColorsSettings.GetLayerColor( track->GetLayer() ); - filled = (g_DisplayPolygonsModeSketch == 0); - } - - GRClosedPoly( &DrawPanel->m_ClipBox, DC, points.size(), &points[0], - filled, Color, Color ); - } - erase = ( track->m_Flags & DRAW_ERASED ); - - points.clear(); points.push_back( track->m_Start ); - points.push_back( track->m_End ); - } - else - { - points.push_back( track->m_End ); } - if( track->Next() == NULL ) // Last point + points.push_back( track->m_End ); + + if( (next_track == NULL ) || (next_track->GetNet() == 0) ) // EndPoint of the current polygon { + color = g_ColorsSettings.GetLayerColor( track->GetLayer() ); + filled = (g_DisplayPolygonsModeSketch == 0); if( erase ) { - Color = g_DrawBgColor; + color = g_DrawBgColor; filled = true; } - else - { - Color = g_ColorsSettings.GetLayerColor( track->GetLayer() ); - filled = (g_DisplayPolygonsModeSketch == 0); - } - GRClosedPoly( &DrawPanel->m_ClipBox, DC, points.size(), &points[0], - filled, Color, Color ); + GRClosedPoly( &DrawPanel->m_ClipBox, aDC, points.size(), &points[0], + filled, color, color ); + points.clear(); } } - // Draw tracks and flashes down here. This will probably not be a final solution to drawing order issues - Draw_Track_Buffer( DrawPanel, DC, GetBoard(), draw_mode, printmasklayer ); - - if( IsElementVisible( DCODES_VISIBLE) ) - Affiche_DCodes_Pistes( DrawPanel, DC, GetBoard(), GR_COPY ); - - GetScreen()->ClrRefreshReq(); -} - -/***************************************************************************************************/ -void Draw_Track_Buffer( WinEDA_DrawPanel* panel, wxDC* DC, BOARD* Pcb, int draw_mode, - int printmasklayer ) -/***************************************************************************************************/ - -/* Function to draw the tracks (i.e Spots or lines) in gerbview - * Polygons are not handled here (there are in Pcb->m_Zone) - * @param DC = device context to draw - * @param Pcb = Board to draw (only Pcb->m_Track is used) - * @param draw_mode = draw mode for the device context (GR_COPY, GR_OR, GR_XOR ..) - * @param printmasklayer = mask for allowed layer (=-1 to draw all layers) - */ -{ - int layer = ( (PCB_SCREEN*) panel->GetScreen() )->m_Active_Layer; + // Draw tracks and flashes down here. + // This will probably not be a final solution to drawing order issues GERBER* gerber = g_GERBER_List[layer]; int dcode_hightlight = 0; if( gerber ) dcode_hightlight = gerber->m_Selected_Tool; - for( TRACK* track = Pcb->m_Track; track; track = track->Next() ) + for( TRACK* track = GetBoard()->m_Track; track; track = track->Next() ) { - if( !(track->ReturnMaskLayer() & printmasklayer) ) + if( !(track->ReturnMaskLayer() & aPrintMasklayer) ) continue; - -// D(printf("D:%p\n", track );) - if( dcode_hightlight == track->GetNet() && track->GetLayer()==layer ) - Trace_Segment( Pcb, panel, DC, track, draw_mode | GR_SURBRILL ); + Trace_Segment( GetBoard(), DrawPanel, aDC, track, aDraw_mode | GR_SURBRILL ); else - Trace_Segment( Pcb, panel, DC, track, draw_mode ); + Trace_Segment( GetBoard(), DrawPanel, aDC, track, aDraw_mode ); } -} + if( IsElementVisible( DCODES_VISIBLE) ) + Affiche_DCodes_Pistes( DrawPanel, aDC, GetBoard(), GR_COPY ); + + GetScreen()->ClrRefreshReq(); +} #if 1