pcbnew: Added option in left tool bar to show/hide Layer manager tool bar

bitmaps/CMakeLists.txt

@@ -190,6 +190,7 @@ set(BITMAP_SRCS
     Lang_Ru.xpm
     Lang_Sl.xpm
     Language.xpm
+    layers_manager.xpm
     Leave_Sheet.xpm
     left.xpm
     libedit_icon.xpm

bitmaps/layers_manager.xpm

+/* XPM */
+const char *layers_manager_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"X c #3A3916",
+"o c #165304",
+"& c #534D52",
+"; c #375884",
+"  c #1A6C08",
+". c #AE1D04",
+"O c None",
+"% c #678B87",
+"$ c #616E7F",
+"# c #6A4E40",
+"- c #587FAA",
+"+ c #0A8108",
+": c #9CBADC",
+"@ c #796E50",
+"= c #2E2320",
+"* c #7699AC",
+/* pixels */
+"  ..........XoOO",
+"oo........... OO",
+"X++++++++++ .oOO",
+"O+++++++++++..XO",
+"O ++++++++++X.oO",
+"Oo++++@ ++++ .#O",
+"OX++++@@@+++ $%&",
+"OO+@ ++@@+++%*$X",
+"OO @@@@##@+%%@+o",
+"OOo+@@@@#&*%+++ ",
+"OOOOOOO=$*$@OOOO",
+"OOOOO=$*-$##@=OO",
+"OOOO&-*-;OX@#@XO",
+"OOO;:*$;OOO=@@%=",
+"OOO;--;OOOOOO#@O",
+"OOOO&&OOOOOOOOOO"
+};

cvpcb/init.cpp

@@ -139,7 +139,7 @@ int WinEDA_CvpcbFrame::SaveNetList( const wxString& fileName )
 
     wxFileDialog dlg( this, _( "Save Net and Component List" ), fn.GetPath(),
                       fn.GetFullName(), NetlistFileWildcard,
-                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                      wxFD_SAVE/*| wxFD_OVERWRITE_PROMPT*/ );
 
     if( dlg.ShowModal() == wxID_CANCEL )
         return -1;

eeschema/tool_viewlib.cpp

@@ -126,22 +126,19 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar()
     }
 
     // Must be AFTER Realize():
+    m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, asdeMorgan );
+    m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, asdeMorgan );
     if( asdeMorgan )
     {
-        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT,
-                                (m_convert <= 1) ? true : false );
-        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT,
-                                (m_convert >= 2) ? true : false );
-        m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, true );
-        m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, true );
+        bool normal = m_convert <= 1;
+        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT,normal );
+        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, !normal );
     }
     else
     {
         m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, true  );
         m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, false );
-        m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, false );
-        m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, false );
-    }
+     }
 
 
     int parts_count = 1;

include/bitmaps.h

@@ -182,6 +182,7 @@ extern const char* lang_pt_xpm[];
 extern const char* lang_ru_xpm[];
 extern const char* lang_sl_xpm[];
 extern const char* language_xpm[];
+extern const char* layers_manager_xpm[];
 extern const char* leave_sheet_xpm[];
 extern const char* left_xpm[];
 extern const char* libedit_icon_xpm[];

include/class_board_design_settings.h

@@ -40,7 +40,7 @@ protected:
 public:
 
     // Color options for screen display of the Printed Board:
-    int m_LayerColor[NB_LAYERS];                    ///< Layer colors (tracks and graphic items)
+    int m_LayerColor[LAYER_COUNT];                    ///< Layer colors (tracks and graphic items)
 
     int m_ViaColor[4];                              // Via color (depending on is type)
 

include/wxPcbStruct.h

@@ -104,6 +104,7 @@ public:
     bool             m_TrackAndViasSizesList_Changed;
 
     bool             m_show_microwave_tools;
+    bool             m_show_layer_manager_tools;
 
 private:
 

pcbnew/class_netinfo_item.cpp

@@ -192,6 +192,7 @@ void RATSNEST_ITEM::Draw( WinEDA_DrawPanel* panel,
                           int               aDrawMode,
                           const wxPoint&    aOffset )
 {
+    GRSetDrawMode( DC, aDrawMode );
     GRLine( &panel->m_ClipBox, DC, m_PadStart->m_Pos - aOffset,
             m_PadEnd->m_Pos - aOffset, 0, g_DesignSettings.m_RatsnestColor );
 }

pcbnew/dialog_general_options.cpp

@@ -256,15 +256,25 @@ void WinEDA_PcbFrame::OnSelectOptionToolbar( wxCommandEvent& event )
         break;
 
     case ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1:
+        m_show_microwave_tools = m_OptionsToolBar->GetToolState( id );
 #if !defined(KICAD_AUIMANAGER)
         // show auxiliary Vertical toolbar (Microwave tool)
-        m_AuxVToolBar->Show(m_OptionsToolBar->GetToolState( id ));
+        m_AuxVToolBar->Show(m_show_microwave_tools);
         {
         wxSizeEvent SizeEv( GetSize() );
         OnSize( SizeEv );
         }
 #else
-        m_auimgr.GetPane( wxT( "m_AuxVToolBar" ) ).Show( m_OptionsToolBar->GetToolState( id ) );
+        m_auimgr.GetPane( wxT( "m_AuxVToolBar" ) ).Show( m_show_microwave_tools );
+        m_auimgr.Update();
+#endif
+        break;
+
+    case ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR:
+#if defined(KICAD_AUIMANAGER)
+        // show auxiliary Vertical layers and visibility manager toolbar
+        m_show_layer_manager_tools = m_OptionsToolBar->GetToolState( id );
+        m_auimgr.GetPane( wxT( "m_LayersManagerToolBar" ) ).Show( m_show_layer_manager_tools );
         m_auimgr.Update();
 #endif
         break;

pcbnew/editrack.cpp

@@ -495,7 +495,7 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
         TRACK* firstTrack = g_FirstTrackSegment;
         int    newCount   = g_CurrentTrackList.GetCount();
 
-        // Put entire new current segment list in BOARD, ans prepare undo
+        // Put entire new current segment list in BOARD, and prepare undo
         // command
         TRACK* track;
         TRACK* insertBeforeMe = g_CurrentTrackSegment->GetBestInsertPoint(
@@ -526,10 +526,8 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
         SaveCopyInUndoList( s_ItemsListPicker, UR_UNSPECIFIED );
         s_ItemsListPicker.ClearItemsList(); // s_ItemsListPicker is no more
                                             // owner of picked items
-
         /* compute the new rastnest */
         test_1_net_connexion( DC, netcode );
-
         GetScreen()->SetModify();
         GetBoard()->DisplayInfo( this );
     }

pcbnew/layer_widget.cpp

@@ -718,7 +718,7 @@ class MYFRAME : public wxFrame
 
 public:
     MYFRAME( wxWindow * parent ) :
-        wxFrame( parent, -1, _( "wxAUI Test" ), wxDefaultPosition,
+        wxFrame( parent, -1, wxT( "wxAUI Test" ), wxDefaultPosition,
             wxSize( 800, 600 ), wxDEFAULT_FRAME_STYLE )
     {
         // notify wxAUI which frame to use
@@ -728,19 +728,19 @@ public:
 
         // add some layer rows
         static const LAYER_WIDGET::ROW layerRows[] = {
-            LAYER_WIDGET::ROW( wxT("layer 1"), 0, RED, _("RED"), false ),
-            LAYER_WIDGET::ROW( wxT("layer 2"), 1, GREEN, _("GREEN"), true ),
-            LAYER_WIDGET::ROW( wxT("brown_layer"), 2, BROWN, _("BROWN"), true ),
-            LAYER_WIDGET::ROW( wxT("layer_4_you"), 3, BLUE, _("BLUE"), false ),
+            LAYER_WIDGET::ROW( wxT("layer 1"), 0, RED, wxT("RED"), false ),
+            LAYER_WIDGET::ROW( wxT("layer 2"), 1, GREEN, wxT("GREEN"), true ),
+            LAYER_WIDGET::ROW( wxT("brown_layer"), 2, BROWN, wxT("BROWN"), true ),
+            LAYER_WIDGET::ROW( wxT("layer_4_you"), 3, BLUE, wxT("BLUE"), false ),
         };
 
         lw->AppendLayerRows( layerRows, DIM(layerRows) );
 
         // add some render rows
         static const LAYER_WIDGET::ROW renderRows[] = {
-            LAYER_WIDGET::ROW( wxT("With Very Large Ears"), 0, -1, _("Spock here") ),
+            LAYER_WIDGET::ROW( wxT("With Very Large Ears"), 0, -1, wxT("Spock here") ),
             LAYER_WIDGET::ROW( wxT("With Legs"), 1, YELLOW ),
-            LAYER_WIDGET::ROW( wxT("With Oval Eyes"), 1, BROWN, _("My eyes are upon you") ),
+            LAYER_WIDGET::ROW( wxT("With Oval Eyes"), 1, BROWN, wxT("My eyes are upon you") ),
         };
 
         lw->AppendRenderRows( renderRows, DIM(renderRows) );
@@ -758,12 +758,12 @@ public:
         m_mgr.AddPane( lw, li );
 
 
-        wxTextCtrl* text2 = new wxTextCtrl( this, -1, _( "Pane 2 - sample text" ),
+        wxTextCtrl* text2 = new wxTextCtrl( this, -1, wxT( "Pane 2 - sample text" ),
                                             wxDefaultPosition, wxSize( 200, 150 ),
                                             wxNO_BORDER | wxTE_MULTILINE );
         m_mgr.AddPane( text2, wxBOTTOM, wxT( "Pane Number Two" ) );
 
-        wxTextCtrl* text3 = new wxTextCtrl( this, -1, _( "Main content window" ),
+        wxTextCtrl* text3 = new wxTextCtrl( this, -1, wxT( "Main content window" ),
                                             wxDefaultPosition, wxSize( 200, 150 ),
                                             wxNO_BORDER | wxTE_MULTILINE );
         m_mgr.AddPane( text3, wxCENTER );

pcbnew/pcbframe.cpp

@@ -23,7 +23,7 @@
 #define PCB_MAGNETIC_PADS_OPT   wxT( "PcbMagPadOpt" )
 #define PCB_MAGNETIC_TRACKS_OPT wxT( "PcbMagTrackOpt" )
 #define SHOW_MICROWAVE_TOOLS    wxT( "ShowMicrowaveTools" )
-
+#define SHOW_LAYER_MANAGER_TOOLS    wxT( "ShowLayerManagerTools" )
 
 BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
     EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer )
@@ -153,6 +153,8 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
     // Option toolbar
     EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
                     WinEDA_PcbFrame::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
+                    WinEDA_PcbFrame::OnSelectOptionToolbar)
 
     // Vertical toolbar:
     EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
@@ -241,6 +243,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
     m_SelLayerBox   = NULL;
     m_TrackAndViasSizesList_Changed = false;
     m_show_microwave_tools = false;
+    m_show_layer_manager_tools = true;
 
     m_Layers = new LYRS( this );
     m_Layers->AppendRenderRows( renderRows, DIM(renderRows) );
@@ -320,11 +323,16 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
         m_auimgr.AddPane( m_VToolBar,
                           wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right().Row( 1 ) );
 
-    m_auimgr.AddPane( m_Layers, lyrs.Right().Row( 0 ) );
+    m_auimgr.AddPane( m_Layers, lyrs.Name( wxT( "m_LayersManagerToolBar" ) ).Right().Row( 0 ) );
 
     if( m_OptionsToolBar )
+    {
         m_auimgr.AddPane( m_OptionsToolBar,
                           wxAuiPaneInfo( vert ).Name( wxT( "m_OptionsToolBar" ) ).Left() );
+        m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
+                                      m_show_layer_manager_tools );
+        m_auimgr.GetPane( wxT( "m_LayersManagerToolBar" ) ).Show( m_show_layer_manager_tools );
+    }
 
     if( DrawPanel )
         m_auimgr.AddPane( DrawPanel,
@@ -531,6 +539,7 @@ void WinEDA_PcbFrame::LoadSettings()
     config->Read( PCB_MAGNETIC_PADS_OPT, &g_MagneticPadOption );
     config->Read( PCB_MAGNETIC_TRACKS_OPT, &g_MagneticTrackOption );
     config->Read( SHOW_MICROWAVE_TOOLS, &m_show_microwave_tools );
+    config->Read( SHOW_LAYER_MANAGER_TOOLS, &m_show_layer_manager_tools );
 }
 
 
@@ -547,5 +556,8 @@ void WinEDA_PcbFrame::SaveSettings()
 
     config->Write( PCB_MAGNETIC_PADS_OPT, (long) g_MagneticPadOption );
     config->Write( PCB_MAGNETIC_TRACKS_OPT, (long) g_MagneticTrackOption );
-    config->Write( SHOW_MICROWAVE_TOOLS, ( m_AuxVToolBar && m_AuxVToolBar->IsShown() ) ? true : false );
+    config->Write( SHOW_MICROWAVE_TOOLS,
+        ( m_AuxVToolBar && m_AuxVToolBar->IsShown() ) ? true : false );
+    config->Write( SHOW_LAYER_MANAGER_TOOLS, (long)m_show_layer_manager_tools );
+
 }

pcbnew/pcbnew_id.h

@@ -231,6 +231,17 @@ enum pcbnew_ids
     ID_PCB_GEN_BOM_FILE_FROM_BOARD,
     ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG,
 
+    ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
+
+    ID_PCB_MUWAVE_START_CMD,
+    ID_PCB_MUWAVE_TOOL_DISPLAY_TOOLS,
+    ID_PCB_MUWAVE_TOOL_SELF_CMD,
+    ID_PCB_MUWAVE_TOOL_GAP_CMD,
+    ID_PCB_MUWAVE_TOOL_STUB_CMD,
+    ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD,
+    ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD,
+    ID_PCB_MUWAVE_END_CMD,
+
     ID_MODEDIT_CHECK,
     ID_MODEDIT_SELECT_CURRENT_LIB,
     ID_MODEDIT_SAVE_LIBMODULE,
@@ -251,16 +262,7 @@ enum pcbnew_ids
     ID_MODEDIT_MODULE_MIRROR,
     ID_MODEDIT_IMPORT_PART,
     ID_MODEDIT_EXPORT_PART,
-    ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
-
-    ID_PCB_MUWAVE_START_CMD,
-    ID_PCB_MUWAVE_TOOL_DISPLAY_TOOLS,
-    ID_PCB_MUWAVE_TOOL_SELF_CMD,
-    ID_PCB_MUWAVE_TOOL_GAP_CMD,
-    ID_PCB_MUWAVE_TOOL_STUB_CMD,
-    ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD,
-    ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD,
-    ID_PCB_MUWAVE_END_CMD
+    ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART
 };
 
 #endif  /* __PCBNEW_IDS_H__  */

pcbnew/ratsnest.cpp

@@ -529,18 +529,17 @@ void WinEDA_BasePcbFrame::DrawGeneralRatsnest( wxDC* DC, int net_code )
         return;
     if( DC == NULL )
         return;
-
+    int state = CH_VISIBLE | CH_ACTIF;
     for( unsigned ii = 0; ii < m_Pcb->GetRatsnestsCount(); ii++ )
     {
-        if( ( m_Pcb->m_FullRatsnest[ii].m_Status &
-             ( CH_VISIBLE | CH_ACTIF ) ) !=
-           ( CH_VISIBLE | CH_ACTIF ) )
+        RATSNEST_ITEM& item = m_Pcb->m_FullRatsnest[ii];
+        if( ( item.m_Status & state ) != state )
             continue;
 
-        if( ( net_code <= 0 )
-            || ( net_code == m_Pcb->m_FullRatsnest[ii].GetNet() ) )
-            m_Pcb->m_FullRatsnest[ii].Draw( DrawPanel, DC, GR_XOR,
-                                            wxPoint( 0, 0 ) );
+        if( ( net_code <= 0 ) || ( net_code == item.GetNet() ) )
+        {
+            item.Draw( DrawPanel, DC, GR_XOR, wxPoint( 0, 0 ) );
+        }
     }
 }